From 3abc63c77ff7d110d572f9ba7e071269f28de941 Mon Sep 17 00:00:00 2001
From: Jim Foley <james.foley4@va.gov>
Date: Tue, 26 Dec 2023 07:38:24 -0700
Subject: [PATCH 001/237] Merge branch 'master' into feature/APPEALS-27311
 (#20342)

* Initial Commit

* Running tests

* Adding appellant phone number to serializer

* Adding paper case attribute

* Add attributes to search hash

* add KNAPSACK_PRO_FIXED_QUEUE_SPLIT to workflow.yml (#20329)

* add KNAPSACK_PRO_FIXED_QUEUE_SPLIT to workflow.yml

* update deprecated method for knapsack

* add comment

---------

Co-authored-by: AimanK <Aiman.Kayad@va.gov>
Co-authored-by: raymond-hughes <raymond.hughes2@va.gov>
Co-authored-by: Craig Reese <109101548+craigrva@users.noreply.github.com>
Co-authored-by: Raymond Hughes <131811099+raymond-hughes@users.noreply.github.com>
---
 .github/workflows/workflow.yml                |  1 +
 .../work_queue/appeal_search_serializer.rb    | 29 +++++++++++++++++++
 client/app/queue/VeteranCasesView.jsx         |  4 +--
 client/app/queue/utils.js                     |  8 +++++
 spec/spec_helper.rb                           |  4 +--
 5 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 8b5b8a19bda..224d0b7488e 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -72,6 +72,7 @@ jobs:
           KNAPSACK_PRO_CI_NODE_TOTAL: ${{ matrix.ci_node_total }}
           KNAPSACK_PRO_CI_NODE_INDEX: ${{ matrix.ci_node_index }}
           KNAPSACK_PRO_LOG_LEVEL: info
+          KNAPSACK_PRO_FIXED_QUEUE_SPLIT: true
           WD_INSTALL_DIR: .webdrivers
           CI: true
           REDIS_URL_CACHE: redis://redis:6379/0/cache/
diff --git a/app/models/serializers/work_queue/appeal_search_serializer.rb b/app/models/serializers/work_queue/appeal_search_serializer.rb
index d72ff4547a8..cdce3ff7be9 100644
--- a/app/models/serializers/work_queue/appeal_search_serializer.rb
+++ b/app/models/serializers/work_queue/appeal_search_serializer.rb
@@ -25,6 +25,25 @@ class WorkQueue::AppealSearchSerializer
 
   attribute :status
 
+  attribute :decision_issues do |object, params|
+    if params[:user].nil?
+      fail Caseflow::Error::MissingRequiredProperty, message: "Params[:user] is required"
+    end
+
+    decision_issues = AppealDecisionIssuesPolicy.new(appeal: object, user: params[:user]).visible_decision_issues
+    decision_issues.uniq.map do |issue|
+      {
+        id: issue.id,
+        disposition: issue.disposition,
+        description: issue.description,
+        benefit_type: issue.benefit_type,
+        remand_reasons: issue.remand_reasons,
+        diagnostic_code: issue.diagnostic_code,
+        request_issue_ids: issue.request_decision_issues.pluck(:request_issue_id)
+      }
+    end
+  end
+
   attribute(:hearings) do |object, params|
     # For substitution appeals after death dismissal, we need to show hearings from the source appeal
     # in addition to those on the new/target appeal; this avoids copying them to new appeal stream
@@ -53,6 +72,10 @@ class WorkQueue::AppealSearchSerializer
     object.claimant&.name
   end
 
+  attribute :appellant_phone_number do |object|
+    object.claimant&.unrecognized_claimant? ? object.claimant&.phone_number : nil
+  end
+
   attribute :veteran_death_date
 
   attribute :veteran_file_number
@@ -61,6 +84,8 @@ class WorkQueue::AppealSearchSerializer
     object.veteran ? object.veteran.name.formatted(:readable_full) : "Cannot locate"
   end
 
+  attribute(:available_hearing_locations) { |object| available_hearing_locations(object) }
+
   attribute :external_id, &:uuid
 
   attribute :type
@@ -73,6 +98,10 @@ class WorkQueue::AppealSearchSerializer
   attribute :nod_date, &:receipt_date
   attribute :withdrawal_date
 
+  attribute :paper_case do
+    false
+  end
+
   attribute :caseflow_veteran_id do |object|
     object.veteran ? object.veteran.id : nil
   end
diff --git a/client/app/queue/VeteranCasesView.jsx b/client/app/queue/VeteranCasesView.jsx
index 7498fc42c9e..43f23fa5149 100644
--- a/client/app/queue/VeteranCasesView.jsx
+++ b/client/app/queue/VeteranCasesView.jsx
@@ -12,7 +12,7 @@ import { setFetchedAllCasesFor } from './CaseList/CaseListActions';
 import { hideVeteranCaseList } from './uiReducer/uiActions';
 import { onReceiveAppealDetails } from './QueueActions';
 import { appealsByCaseflowVeteranId } from './selectors';
-import { prepareAppealForStore } from './utils';
+import { prepareAppealForSearchStore } from './utils';
 
 import COPY from '../../COPY';
 import WindowUtil from '../util/WindowUtil';
@@ -50,7 +50,7 @@ class VeteranCasesView extends React.PureComponent {
           return Promise.reject(response);
         }
 
-        this.props.onReceiveAppealDetails(prepareAppealForStore(returnedObject.appeals));
+        this.props.onReceiveAppealDetails(prepareAppealForSearchStore(returnedObject.appeals));
         this.props.setFetchedAllCasesFor(caseflowVeteranId);
 
         return Promise.resolve();
diff --git a/client/app/queue/utils.js b/client/app/queue/utils.js
index c02b4448e80..67b49d19d4e 100644
--- a/client/app/queue/utils.js
+++ b/client/app/queue/utils.js
@@ -556,16 +556,21 @@ export const prepareAppealForSearchStore = (appeals) => {
       distributedToJudge: appeal.attributes.distributed_to_a_judge,
       veteranFullName: appeal.attributes.veteran_full_name,
       veteranFileNumber: appeal.attributes.veteran_file_number,
+      isPaperCase: appeal.attributes.paper_case,
       vacateType: appeal.attributes.vacate_type,
     };
 
     return accumulator;
   }, {});
 
+
   const appealDetailsHash = appeals.reduce((accumulator, appeal) => {
     accumulator[appeal.attributes.external_id] = {
       hearings: prepareAppealHearingsForStore(appeal),
+      issues: prepareAppealIssuesForStore(appeal),
+      decisionIssues: appeal.attributes.decision_issues,
       appellantFullName: appeal.attributes.appellant_full_name,
+      appellantPhoneNumber: appeal.attributes.appellant_phone_number,
       contestedClaim: appeal.attributes.contested_claim,
       assignedToLocation: appeal.attributes.assigned_to_location,
       veteranParticipantId: appeal.attributes.veteran_participant_id,
@@ -573,6 +578,9 @@ export const prepareAppealForSearchStore = (appeals) => {
       status: appeal.attributes.status,
       decisionDate: appeal.attributes.decision_date,
       caseflowVeteranId: appeal.attributes.caseflow_veteran_id,
+      availableHearingLocations: prepareAppealAvailableHearingLocationsForStore(
+        appeal
+      ),
       locationHistory: prepareLocationHistoryForStore(appeal),
     };
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 115b5eab77c..b4007c966c3 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -61,8 +61,8 @@
   # Allows us to use shorthand FactoryBot methods.
   config.include FactoryBot::Syntax::Methods
 
-  config.filter_run focus: true
-  config.run_all_when_everything_filtered = true
+  # allows test suite to only run tests tagged with :focus for specific testing
+  config.filter_run_when_matching :focus
   # rspec-expectations config goes here. You can use an alternate
   # assertion/expectation library such as wrong or the stdlib/minitest
   # assertions if you prefer.

From 9ae8f98dfc64c265d5353530dcc7067af9646299 Mon Sep 17 00:00:00 2001
From: HunJerBAH <Jeremy.Hunton@va.gov>
Date: Tue, 26 Dec 2023 12:19:45 -0500
Subject: [PATCH 002/237] Revert "Revert "Feature/appeals 27311" (#20343)"

This reverts commit 084cd9819ca5e2151cd6daadb0273075d362cf66.
---
 Gemfile                                       |   1 +
 Gemfile.lock                                  |  17 +
 Makefile.example                              |   5 +
 app/controllers/appeals_controller.rb         |   5 +
 app/controllers/application_controller.rb     |   2 +-
 .../concerns/explain_timeline_concern.rb      |   1 +
 app/controllers/correspondence_controller.rb  | 357 +++++++++++
 .../correspondence_document_controller.rb     |  15 +
 .../correspondence_tasks_controller.rb        |  73 +++
 app/controllers/explain_controller.rb         |  36 +-
 app/controllers/team_management_controller.rb |   3 +-
 app/models/appeal.rb                          |   2 +
 app/models/auto_text.rb                       |   4 +
 app/models/cached_appeal.rb                   |   1 +
 app/models/correspondence.rb                  |  45 ++
 app/models/correspondence_document.rb         |  40 ++
 app/models/correspondence_intake.rb           |   9 +
 app/models/correspondence_relation.rb         |  35 ++
 app/models/correspondence_type.rb             |   5 +
 app/models/correspondences_appeal.rb          |   6 +
 .../legacy_tasks/attorney_legacy_task.rb      |   9 +-
 .../organizations/mail_team_supervisor.rb     |  12 +
 app/models/package_document_type.rb           |   5 +
 .../work_queue/appeal_serializer.rb           |   4 +
 .../correspondence_document_serializer.rb     |  17 +
 app/models/task.rb                            |   8 +-
 .../correspondence/reassign_package_task.rb   |   4 +
 .../tasks/correspondence_intake_task.rb       |  42 ++
 app/models/tasks/correspondence_root_task.rb  |   4 +
 app/models/tasks/correspondence_task.rb       |  41 ++
 .../tasks/efolder_upload_failed_task.rb       |   4 +
 app/models/tasks/merge_package_task.rb        |   4 +
 app/models/tasks/remove_package_task.rb       |   4 +
 app/models/tasks/review_package_task.rb       |  31 +
 app/models/tasks/split_package_task.rb        |   4 +
 app/models/vbms_document_type.rb              |   5 +
 app/models/veteran.rb                         |   1 +
 app/queries/appeals_updated_since_query.rb    |   2 +
 app/views/appeals/edit.html.erb               |   1 +
 .../application/under_construction.html.erb   |  11 +
 .../correspondence_cases.html.erb             |  17 +
 app/views/correspondence/intake.html.erb      |  15 +
 .../correspondence/review_package.html.erb    |  14 +
 app/views/explain/show.html.erb               | 182 ++++++
 app/views/queue/index.html.erb                |   1 +
 .../correspondence_root_task_factory.rb       |  49 ++
 client/COPY.json                              |  30 +-
 client/app/components/Dropdown.jsx            |   2 +-
 .../Pagination/CorrespondencePagination.jsx   | 161 +++++
 .../app/components/Pagination/Pagination.jsx  |   7 +-
 client/app/components/ReactSelectDropdown.jsx |  25 +-
 .../icons/fontAwesome/UnlinkIcon.jsx          |  38 ++
 client/app/containers/UnderConstruction.jsx   |  47 ++
 client/app/index.js                           |   4 +-
 client/app/nonComp/components/Alerts.jsx      |   2 +
 client/app/queue/CaseDetailsLink.jsx          |  30 +-
 client/app/queue/CaseListTable.jsx            |  99 +++-
 client/app/queue/OrganizationQueue.jsx        |   7 +-
 client/app/queue/QueueApp.jsx                 |  48 +-
 client/app/queue/QueueTableBuilder.jsx        |   3 +-
 .../components/QueueOrganizationDropdown.jsx  |  17 +-
 client/app/queue/constants.js                 |   8 +-
 .../correspondence/CorrespondenceCases.jsx    |  82 +++
 .../CorrespondencePaginationWrapper.jsx       |  52 ++
 .../correspondence/CorrespondenceTable.jsx    |  71 +++
 .../component/EditDocumentTypeModal.jsx       | 123 ++++
 .../correspondenceActions.js                  | 126 ++++
 .../correspondenceConstants.js                |  15 +
 .../correspondenceReducer.js                  | 126 ++++
 .../reviewPackageActions.js                   |  63 ++
 .../reviewPackageConstants.js                 |   8 +
 .../reviewPackageReducer.js                   |  77 +++
 .../AddCorrespondenceView.jsx                 | 271 +++++++++
 .../intake/components/CheckboxModal.jsx       | 100 ++++
 .../ConfirmCorrespondenceView.jsx             | 241 ++++++++
 .../ConfirmTasksNotRelatedToAnAppeal.jsx      |  45 ++
 .../ConfirmTasksRelatedToAnAppeal.jsx         | 154 +++++
 .../CorrespondenceDetailsTable.jsx            |  53 ++
 .../SubmitCorrespondenceModal.jsx             | 101 ++++
 .../components/CorrespondenceIntake.jsx       | 228 +++++++
 .../TasksAppeals/AddAppealRelatedTaskView.jsx | 213 +++++++
 .../AddEvidenceSubmissionTaskView.jsx         |  86 +++
 .../components/TasksAppeals/AddTaskView.jsx   | 203 +++++++
 .../TasksAppeals/AddTasksAppealsView.jsx      | 134 +++++
 .../TasksAppeals/AddUnrelatedTaskView.jsx     | 144 +++++
 .../TasksAppeals/ExistingAppealTasksView.jsx  | 147 +++++
 .../modals/PackageActionModal.jsx             | 213 +++++++
 .../queue/correspondence/modals/editModal.jsx | 214 +++++++
 .../pdfPreview/CorrespondencePdfFooter.jsx    |  50 ++
 .../pdfPreview/CorrespondencePdfPage.jsx      |  45 ++
 .../pdfPreview/CorrespondencePdfToolBar.jsx   | 113 ++++
 .../pdfPreview/CorrespondencePdfUI.jsx        | 267 +++++++++
 .../review_package/CmpDocuments.jsx           | 100 ++++
 .../CorrespondenceReviewPackage.jsx           | 235 ++++++++
 .../review_package/ReviewForm.jsx             | 295 +++++++++
 .../review_package/ReviewPackageCaseTitle.jsx |  96 +++
 .../review_package/ReviewPackageData.jsx      | 111 ++++
 .../ReviewPackageLoadingScreen.jsx            |  81 +++
 .../ReviewPackageNotificationBanner.jsx       |  24 +
 .../correspondence/review_package/utils.js    | 136 +++++
 client/app/queue/reducers.js                  |   6 +-
 client/app/queue/utils.js                     |   6 +
 client/app/styles/_main.scss                  |   4 +
 client/app/styles/_table.scss                 |  58 ++
 client/app/styles/app.scss                    |   1 +
 client/app/styles/queue/_correspondence.scss  |  96 +++
 .../QUEUE_INTAKE_FORM_TASK_TYPES.json         | 194 ++++++
 client/constants/TASK_ACTIONS.json            |   4 +
 client/constants/TASK_STATUSES.json           |   3 +-
 .../correspondences/CmpDocuments.test.js      |  19 +
 .../CorrespondencePdfUI.test.js               |  69 +++
 .../CorrespondenceReviewPackage.test.js       | 124 ++++
 .../queue/correspondences/ReviewForm.test.js  |  49 ++
 .../correspondences/ReviewPackageData.test.js |  35 ++
 .../modals/PackageActionModal.test.js         | 158 +++++
 client/test/data/correspondence.js            |  65 ++
 config/brakeman.ignore                        |  26 +-
 config/routes.rb                              |  21 +
 .../20231018185238_create_correspondence.rb   |  25 +
 ...18192834_create_correspondence_document.rb |  10 +
 ...023155854_update_cmp_packet_number_type.rb |  13 +
 ...espondence_reference_to_correspondences.rb |   8 +
 ...d_timestamps_to_correspondence_document.rb |   6 +
 ...026122835_create_correspondence_intakes.rb |  17 +
 ...7_add_indexes_to_correspondence_intakes.rb |   6 +
 ...93346_create_correspondence_types_table.rb |  13 +
 ...031041759_create_package_document_types.rb |   9 +
 ...or_correspondence_id_on_correspondences.rb |   5 +
 ...231107103628_create_vbms_document_types.rb |   8 +
 ..._type_pages_to_correspondence_documents.rb |   6 +
 ...doc_type_id_in_correspondence_documents.rb |  15 +
 db/migrate/20231121184716_create_auto_text.rb |   7 +
 ...04193100_create_correspondences_appeals.rb |  10 +
 ...safe_indices_to_correspondences_appeals.rb |   6 +
 ...5160831_create_correspondence_relations.rb |  10 +
 ...afe_indices_to_correspondence_relations.rb |   6 +
 ..._correspondence_id_from_correspondences.rb |   5 +
 ...31214200955_drop_correspondence_intakes.rb |  21 +
 ...4201518_recreate_correspondence_intakes.rb |  16 +
 db/schema.rb                                  | 138 ++++-
 db/seeds.rb                                   |   6 +
 db/seeds/auto_texts.rb                        |  41 ++
 db/seeds/correspondence.rb                    | 185 ++++++
 db/seeds/correspondence_types.rb              |  45 ++
 db/seeds/multi_correspondences.rb             | 167 ++++++
 db/seeds/package_document_types.rb            |  26 +
 db/seeds/users.rb                             |  10 +
 db/seeds/vbms_document_types.rb               |  31 +
 lib/tasks/correspondence.rake                 | 561 ++++++++++++++++++
 .../correspondence_controller_spec.rb         | 205 +++++++
 ...correspondence_document_controller_spec.rb |  24 +
 .../correspondence_tasks_controller_spec.rb   |  91 +++
 spec/controllers/explain_controller_spec.rb   |  68 ++-
 spec/factories/correspondence.rb              |  31 +
 spec/feature/explain_spec.rb                  |  42 +-
 .../add_related_correspondence_spec.rb        | 151 +++++
 .../correspondence_cases_spec.rb              |  32 +
 .../edit_cmp_information_spec.rb              | 155 +++++
 .../correspondence/intake_form_persistence.rb |  51 ++
 .../queue/correspondence/intake_form_spec.rb  |  45 ++
 .../queue/correspondence/intake_spec.rb       | 343 +++++++++++
 .../correspondence/mail_tasks_confirm_spec.rb |  66 +++
 .../correspondence/review_package_spec.rb     | 102 ++++
 .../correspondence/submit_intake_form_spec.rb | 142 +++++
 ...asks_related_to_an_existing_appeal_spec.rb | 304 ++++++++++
 spec/models/correspondence_document_spec.rb   |  35 ++
 spec/models/correspondence_intake_spec.rb     |  27 +
 spec/models/correspondence_spec.rb            |  68 +++
 spec/models/correspondences_appeal_spec.rb    |  29 +
 ...l_notification_letter_holding_task_spec.rb |   2 -
 .../correspondence_controller_spec.rb         |  50 ++
 spec/seeds/correspondence.rb                  |  32 +
 spec/seeds/package_document_types.rb          |  12 +
 spec/seeds/users_spec.rb                      |   4 +-
 spec/seeds/vbms_document_types.rb             |  12 +
 spec/support/correspondence_helpers.rb        | 114 ++++
 vbms doc types.json                           | 100 ++++
 177 files changed, 11150 insertions(+), 81 deletions(-)
 create mode 100644 app/controllers/correspondence_controller.rb
 create mode 100644 app/controllers/correspondence_document_controller.rb
 create mode 100644 app/controllers/correspondence_tasks_controller.rb
 create mode 100644 app/models/auto_text.rb
 create mode 100644 app/models/correspondence.rb
 create mode 100644 app/models/correspondence_document.rb
 create mode 100644 app/models/correspondence_intake.rb
 create mode 100644 app/models/correspondence_relation.rb
 create mode 100644 app/models/correspondence_type.rb
 create mode 100644 app/models/correspondences_appeal.rb
 create mode 100644 app/models/organizations/mail_team_supervisor.rb
 create mode 100644 app/models/package_document_type.rb
 create mode 100644 app/models/serializers/work_queue/correspondence_document_serializer.rb
 create mode 100644 app/models/tasks/correspondence/reassign_package_task.rb
 create mode 100644 app/models/tasks/correspondence_intake_task.rb
 create mode 100644 app/models/tasks/correspondence_root_task.rb
 create mode 100644 app/models/tasks/correspondence_task.rb
 create mode 100644 app/models/tasks/efolder_upload_failed_task.rb
 create mode 100644 app/models/tasks/merge_package_task.rb
 create mode 100644 app/models/tasks/remove_package_task.rb
 create mode 100644 app/models/tasks/review_package_task.rb
 create mode 100644 app/models/tasks/split_package_task.rb
 create mode 100644 app/models/vbms_document_type.rb
 create mode 100644 app/views/application/under_construction.html.erb
 create mode 100644 app/views/correspondence/correspondence_cases.html.erb
 create mode 100644 app/views/correspondence/intake.html.erb
 create mode 100644 app/views/correspondence/review_package.html.erb
 create mode 100644 app/workflows/correspondence_root_task_factory.rb
 create mode 100644 client/app/components/Pagination/CorrespondencePagination.jsx
 create mode 100644 client/app/components/icons/fontAwesome/UnlinkIcon.jsx
 create mode 100644 client/app/containers/UnderConstruction.jsx
 create mode 100644 client/app/queue/correspondence/CorrespondenceCases.jsx
 create mode 100644 client/app/queue/correspondence/CorrespondencePaginationWrapper.jsx
 create mode 100644 client/app/queue/correspondence/CorrespondenceTable.jsx
 create mode 100644 client/app/queue/correspondence/component/EditDocumentTypeModal.jsx
 create mode 100644 client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
 create mode 100644 client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
 create mode 100644 client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
 create mode 100644 client/app/queue/correspondence/correspondenceReducer/reviewPackageActions.js
 create mode 100644 client/app/queue/correspondence/correspondenceReducer/reviewPackageConstants.js
 create mode 100644 client/app/queue/correspondence/correspondenceReducer/reviewPackageReducer.js
 create mode 100644 client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx
 create mode 100644 client/app/queue/correspondence/intake/components/CheckboxModal.jsx
 create mode 100644 client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmCorrespondenceView.jsx
 create mode 100644 client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmTasksNotRelatedToAnAppeal.jsx
 create mode 100644 client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmTasksRelatedToAnAppeal.jsx
 create mode 100644 client/app/queue/correspondence/intake/components/ConfirmCorrespondence/CorrespondenceDetailsTable.jsx
 create mode 100644 client/app/queue/correspondence/intake/components/ConfirmCorrespondence/SubmitCorrespondenceModal.jsx
 create mode 100644 client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx
 create mode 100644 client/app/queue/correspondence/intake/components/TasksAppeals/AddAppealRelatedTaskView.jsx
 create mode 100644 client/app/queue/correspondence/intake/components/TasksAppeals/AddEvidenceSubmissionTaskView.jsx
 create mode 100644 client/app/queue/correspondence/intake/components/TasksAppeals/AddTaskView.jsx
 create mode 100644 client/app/queue/correspondence/intake/components/TasksAppeals/AddTasksAppealsView.jsx
 create mode 100644 client/app/queue/correspondence/intake/components/TasksAppeals/AddUnrelatedTaskView.jsx
 create mode 100644 client/app/queue/correspondence/intake/components/TasksAppeals/ExistingAppealTasksView.jsx
 create mode 100644 client/app/queue/correspondence/modals/PackageActionModal.jsx
 create mode 100644 client/app/queue/correspondence/modals/editModal.jsx
 create mode 100644 client/app/queue/correspondence/pdfPreview/CorrespondencePdfFooter.jsx
 create mode 100644 client/app/queue/correspondence/pdfPreview/CorrespondencePdfPage.jsx
 create mode 100644 client/app/queue/correspondence/pdfPreview/CorrespondencePdfToolBar.jsx
 create mode 100644 client/app/queue/correspondence/pdfPreview/CorrespondencePdfUI.jsx
 create mode 100644 client/app/queue/correspondence/review_package/CmpDocuments.jsx
 create mode 100644 client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
 create mode 100644 client/app/queue/correspondence/review_package/ReviewForm.jsx
 create mode 100644 client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx
 create mode 100644 client/app/queue/correspondence/review_package/ReviewPackageData.jsx
 create mode 100644 client/app/queue/correspondence/review_package/ReviewPackageLoadingScreen.jsx
 create mode 100644 client/app/queue/correspondence/review_package/ReviewPackageNotificationBanner.jsx
 create mode 100644 client/app/queue/correspondence/review_package/utils.js
 create mode 100644 client/app/styles/queue/_correspondence.scss
 create mode 100644 client/constants/QUEUE_INTAKE_FORM_TASK_TYPES.json
 create mode 100644 client/test/app/queue/correspondences/CmpDocuments.test.js
 create mode 100644 client/test/app/queue/correspondences/CorrespondencePdfUI.test.js
 create mode 100644 client/test/app/queue/correspondences/CorrespondenceReviewPackage.test.js
 create mode 100644 client/test/app/queue/correspondences/ReviewForm.test.js
 create mode 100644 client/test/app/queue/correspondences/ReviewPackageData.test.js
 create mode 100644 client/test/app/queue/correspondences/modals/PackageActionModal.test.js
 create mode 100644 client/test/data/correspondence.js
 create mode 100644 db/migrate/20231018185238_create_correspondence.rb
 create mode 100644 db/migrate/20231018192834_create_correspondence_document.rb
 create mode 100644 db/migrate/20231023155854_update_cmp_packet_number_type.rb
 create mode 100644 db/migrate/20231024151721_add_prior_correspondence_reference_to_correspondences.rb
 create mode 100644 db/migrate/20231024162133_add_timestamps_to_correspondence_document.rb
 create mode 100644 db/migrate/20231026122835_create_correspondence_intakes.rb
 create mode 100644 db/migrate/20231026123217_add_indexes_to_correspondence_intakes.rb
 create mode 100644 db/migrate/20231027193346_create_correspondence_types_table.rb
 create mode 100644 db/migrate/20231031041759_create_package_document_types.rb
 create mode 100644 db/migrate/20231101163717_change_prior_correspondence_id_on_correspondences.rb
 create mode 100644 db/migrate/20231107103628_create_vbms_document_types.rb
 create mode 100644 db/migrate/20231108075643_add_document_type_pages_to_correspondence_documents.rb
 create mode 100644 db/migrate/20231115170454_update_vbms_doc_type_id_in_correspondence_documents.rb
 create mode 100644 db/migrate/20231121184716_create_auto_text.rb
 create mode 100644 db/migrate/20231204193100_create_correspondences_appeals.rb
 create mode 100644 db/migrate/20231204195133_add_safe_indices_to_correspondences_appeals.rb
 create mode 100644 db/migrate/20231205160831_create_correspondence_relations.rb
 create mode 100644 db/migrate/20231205161301_add_safe_indices_to_correspondence_relations.rb
 create mode 100644 db/migrate/20231205171256_remove_prior_correspondence_id_from_correspondences.rb
 create mode 100644 db/migrate/20231214200955_drop_correspondence_intakes.rb
 create mode 100644 db/migrate/20231214201518_recreate_correspondence_intakes.rb
 create mode 100644 db/seeds/auto_texts.rb
 create mode 100644 db/seeds/correspondence.rb
 create mode 100644 db/seeds/correspondence_types.rb
 create mode 100644 db/seeds/multi_correspondences.rb
 create mode 100644 db/seeds/package_document_types.rb
 create mode 100644 db/seeds/vbms_document_types.rb
 create mode 100644 lib/tasks/correspondence.rake
 create mode 100644 spec/controllers/correspondence_controller_spec.rb
 create mode 100644 spec/controllers/correspondence_document_controller_spec.rb
 create mode 100644 spec/controllers/correspondence_tasks_controller_spec.rb
 create mode 100644 spec/factories/correspondence.rb
 create mode 100644 spec/feature/queue/correspondence/add_related_correspondence_spec.rb
 create mode 100644 spec/feature/queue/correspondence/correspondence_cases_spec.rb
 create mode 100644 spec/feature/queue/correspondence/edit_cmp_information_spec.rb
 create mode 100644 spec/feature/queue/correspondence/intake_form_persistence.rb
 create mode 100644 spec/feature/queue/correspondence/intake_form_spec.rb
 create mode 100644 spec/feature/queue/correspondence/intake_spec.rb
 create mode 100644 spec/feature/queue/correspondence/mail_tasks_confirm_spec.rb
 create mode 100644 spec/feature/queue/correspondence/review_package_spec.rb
 create mode 100644 spec/feature/queue/correspondence/submit_intake_form_spec.rb
 create mode 100644 spec/feature/queue/correspondence/tasks_related_to_an_existing_appeal_spec.rb
 create mode 100644 spec/models/correspondence_document_spec.rb
 create mode 100644 spec/models/correspondence_intake_spec.rb
 create mode 100644 spec/models/correspondence_spec.rb
 create mode 100644 spec/models/correspondences_appeal_spec.rb
 create mode 100644 spec/requests/correspondence_controller_spec.rb
 create mode 100644 spec/seeds/correspondence.rb
 create mode 100644 spec/seeds/package_document_types.rb
 create mode 100644 spec/seeds/vbms_document_types.rb
 create mode 100644 spec/support/correspondence_helpers.rb
 create mode 100644 vbms doc types.json

diff --git a/Gemfile b/Gemfile
index 02511aa1b49..f145cd914ba 100644
--- a/Gemfile
+++ b/Gemfile
@@ -66,6 +66,7 @@ gem "redis-namespace"
 gem "redis-rails", "~> 5.0.2"
 gem "request_store"
 gem "roo", "~> 2.7"
+gem "ruby_claim_evidence_api", git: "https://github.com/department-of-veterans-affairs/ruby_claim_evidence_api.git", ref: "f1686404d448e1d8d13e533400817bcab175ed65"
 # Use SCSS for stylesheets
 gem "sass-rails", "~> 5.0"
 # Error reporting to Sentry
diff --git a/Gemfile.lock b/Gemfile.lock
index aa035d911aa..6b5ba418d69 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -65,6 +65,19 @@ GIT
       nokogiri (>= 1.11.0.rc4)
       savon (~> 2.12)
 
+GIT
+  remote: https://github.com/department-of-veterans-affairs/ruby_claim_evidence_api.git
+  revision: f1686404d448e1d8d13e533400817bcab175ed65
+  ref: f1686404d448e1d8d13e533400817bcab175ed65
+  specs:
+    ruby_claim_evidence_api (0.0.1)
+      activesupport
+      base64
+      faraday
+      faraday-multipart
+      httpi
+      railties
+
 GIT
   remote: https://github.com/department-of-veterans-affairs/sniffybara.git
   revision: 351560b5789ca638ba7c9b093c2bb1a9a6fda4b3
@@ -153,6 +166,7 @@ GEM
       aws-sdk-core (= 2.10.112)
     aws-sigv4 (1.0.2)
     backport (1.2.0)
+    base64 (0.2.0)
     benchmark-ips (2.7.2)
     bootsnap (1.7.5)
       msgpack (~> 1.0)
@@ -290,6 +304,8 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday-http-cache (2.4.1)
       faraday (>= 0.8)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
     faraday_middleware (0.13.1)
       faraday (>= 0.7.4, < 1.0)
     fast_jsonapi (1.5)
@@ -815,6 +831,7 @@ DEPENDENCIES
   ruby-debug-ide
   ruby-oci8 (~> 2.2)
   ruby-prof (~> 1.4)
+  ruby_claim_evidence_api!
   sass-rails (~> 5.0)
   scss_lint
   sentry-raven
diff --git a/Makefile.example b/Makefile.example
index 45cc6e80d09..af35e88cb32 100644
--- a/Makefile.example
+++ b/Makefile.example
@@ -113,6 +113,11 @@ realclean: clean ## TODO
 	rm -rf client/node_modules
 	rm -f client/package-lock.json
 
+precompile: ## Precompiles assets for testing
+	bundle exec rake assets:precompile
+
+yeet: clean precompile ## Cleans and precompiles assets for testing
+
 facols-bash:  ## Connect to the docker FACOLS instance
 	docker exec --tty -i VACOLS_DB bash
 
diff --git a/app/controllers/appeals_controller.rb b/app/controllers/appeals_controller.rb
index 4685e39f5d1..85f77f8729f 100644
--- a/app/controllers/appeals_controller.rb
+++ b/app/controllers/appeals_controller.rb
@@ -188,6 +188,11 @@ def update
     end
   end
 
+  def active_evidence_submissions
+    appeal = Appeal.find(params[:appeal_id])
+    render json: appeal.evidence_submission_task
+  end
+
   private
 
   # :reek:DuplicateMethodCall { allow_calls: ['result.extra'] }
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index bb3e4cc7797..a53cfc593b1 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -9,7 +9,7 @@ class ApplicationController < ApplicationBaseController
   before_action :set_raven_user
   before_action :verify_authentication
   before_action :set_paper_trail_whodunnit
-  before_action :deny_vso_access, except: [:unauthorized, :feedback]
+  before_action :deny_vso_access, except: [:unauthorized, :feedback, :under_construction]
   before_action :set_no_cache_headers
 
   rescue_from StandardError do |e|
diff --git a/app/controllers/concerns/explain_timeline_concern.rb b/app/controllers/concerns/explain_timeline_concern.rb
index a72722a4354..0c19c27bb1a 100644
--- a/app/controllers/concerns/explain_timeline_concern.rb
+++ b/app/controllers/concerns/explain_timeline_concern.rb
@@ -9,6 +9,7 @@ module ExplainTimelineConcern
   # :reek:FeatureEnvy
   def timeline_data
     return "(LegacyAppeals are not yet supported)".to_json if legacy_appeal?
+    return "(Correspondences are not yet supported)".to_json if correspondence?
 
     (tasks_timeline_data + intake_timeline_data + hearings_timeline_data).map(&:as_json)
   end
diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
new file mode 100644
index 00000000000..21b8f85057f
--- /dev/null
+++ b/app/controllers/correspondence_controller.rb
@@ -0,0 +1,357 @@
+# frozen_string_literal: true
+
+class CorrespondenceController < ApplicationController
+  before_action :verify_correspondence_access
+  before_action :verify_feature_toggle
+  before_action :correspondence
+  before_action :auto_texts
+  before_action :veteran_information
+
+  def intake
+    respond_to do |format|
+      format.html { return render "correspondence/intake" }
+      format.json do
+        render json: {
+          currentCorrespondence: current_correspondence,
+          correspondence: correspondence_load,
+          veteranInformation: veteran_information
+        }
+      end
+    end
+  end
+
+  def current_step
+    intake = CorrespondenceIntake.find_by(user: current_user, correspondence: current_correspondence) ||
+      CorrespondenceIntake.new(user: current_user, correspondence: current_correspondence)
+
+    intake.update(
+      current_step: params[:current_step],
+      redux_store: params[:redux_store]
+    )
+
+    if intake.valid?
+      intake.save!
+
+      render json: {}, status: :ok and return
+    else
+      render json: intake.errors.full_messages, status: :unprocessable_entity and return
+    end
+  end
+
+  def correspondence_cases
+    respond_to do |format|
+      format.html { "correspondence_cases" }
+      format.json do
+        render json: { vetCorrespondences: veterans_with_correspondences }
+      end
+    end
+  end
+
+  def review_package
+    render "correspondence/review_package"
+  end
+
+  def intake_update
+    tasks = Task.where("appeal_id = ? and appeal_type = ?", @correspondence.id, "Correspondence")
+    begin
+      tasks.map do |task|
+        if task.type == "ReviewPackageTask"
+          task.instructions.push("An appeal intake was started because this Correspondence is a 10182")
+          task.assigned_to_id = @correspondence.assigned_by_id
+          task.assigned_to = User.find(@correspondence.assigned_by_id)
+        end
+        task.status = "cancelled"
+        task.save
+      end
+      if upload_documents_to_claim_evidence
+        render json: { correspondence: @correspondence }
+      else
+        render json: {}, status: bad_request
+      end
+    rescue StandardError => error
+      Rails.logger.error(error.to_s)
+      render json: {}, status: bad_request
+    end
+  end
+
+  def veteran
+    render json: { veteran_id: veteran_by_correspondence&.id, file_number: veteran_by_correspondence&.file_number }
+  end
+
+  def package_documents
+    packages = PackageDocumentType.all
+    render json: { package_document_types: packages }
+  end
+
+  def current_correspondence
+    @current_correspondence ||= correspondence
+  end
+
+  def veteran_information
+    @veteran_information ||= veteran_by_correspondence
+  end
+
+  def show
+    corres_docs = correspondence.correspondence_documents
+    response_json = {
+      correspondence: correspondence,
+      package_document_type: correspondence&.package_document_type,
+      general_information: general_information,
+      user_can_edit_vador: MailTeamSupervisor.singleton.user_has_access?(current_user),
+      correspondence_documents: corres_docs.map do |doc|
+        WorkQueue::CorrespondenceDocumentSerializer.new(doc).serializable_hash[:data][:attributes]
+      end
+    }
+    render({ json: response_json }, status: :ok)
+  end
+
+  def update
+    veteran = Veteran.find_by(file_number: veteran_params["file_number"])
+    if veteran && correspondence.update(
+      correspondence_params.merge(
+        veteran_id: veteran.id,
+        updated_by_id: RequestStore.store[:current_user].id
+      )
+    )
+      render json: { status: :ok }
+    else
+      render json: { error: "Please enter a valid Veteran ID" }, status: :unprocessable_entity
+    end
+  end
+
+  def update_cmp
+    correspondence.update(
+      va_date_of_receipt: params["VADORDate"].in_time_zone,
+      package_document_type_id: params["packageDocument"]["value"].to_i
+    )
+    render json: { status: 200, correspondence: correspondence }
+  end
+
+  def document_type_correspondence
+    data = vbms_document_types
+    render json: { data: data }
+  end
+
+  # :reek:UtilityFunction
+  def vbms_document_types
+    data = ExternalApi::ClaimEvidenceService.document_types
+    data["documentTypes"].map { |document_type| { id: document_type["id"], name: document_type["name"] } }
+  end
+
+  def pdf
+    document = Document.find(params[:pdf_id])
+
+    document_disposition = "inline"
+    if params[:download]
+      document_disposition = "attachment; filename='#{params[:type]}-#{params[:id]}.pdf'"
+    end
+
+    # The line below enables document caching for a month.
+    expires_in 30.days, public: true
+    send_file(
+      document.serve,
+      type: "application/pdf",
+      disposition: document_disposition
+    )
+  end
+
+  def process_intake
+    correspondence_id = Correspondence.find_by(uuid: params[:correspondence_uuid])&.id
+    ActiveRecord::Base.transaction do
+      begin
+        create_correspondence_relations(correspondence_id)
+        link_appeals_to_correspondence(correspondence_id)
+        add_tasks_to_related_appeals(correspondence_id)
+        complete_waived_evidence_submission_tasks(correspondence_id)
+      rescue ActiveRecord::RecordInvalid
+        render json: { error: "Failed to update records" }, status: :bad_request
+        raise ActiveRecord::Rollback
+      rescue ActiveRecord::RecordNotUnique
+        render json: { error: "Failed to update records" }, status: :bad_request
+        raise ActiveRecord::Rollback
+      else
+        set_flash_intake_success_message
+        render json: {}, status: :created
+      end
+    end
+  end
+
+  private
+
+  def vbms_document_types
+    begin
+      data = ExternalApi::ClaimEvidenceService.document_types
+    rescue StandardError => error
+      Rails.logger.error(error.full_message)
+      data ||= demo_data
+    end
+    data["documentTypes"].map { |document_type| { id: document_type["id"], name: document_type["description"] } }
+  end
+
+  def demo_data
+    json_file_path = "vbms doc types.json"
+    JSON.parse(File.read(json_file_path))
+  end
+
+  def set_flash_intake_success_message
+    # intake error message is handled in client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx
+    vet = veteran_by_correspondence
+    flash[:correspondence_intake_success] = [
+      "You have successfully submitted a correspondence record for #{vet.name}(#{vet.file_number})",
+      "The mail package has been uploaded to the Veteran's eFolder as well."
+    ]
+  end
+
+  def create_correspondence_relations(correspondence_id)
+    params[:related_correspondence_uuids]&.map do |uuid|
+      CorrespondenceRelation.create!(
+        correspondence_id: correspondence_id,
+        related_correspondence_id: Correspondence.find_by(uuid: uuid)&.id
+      )
+    end
+  end
+
+  def link_appeals_to_correspondence(correspondence_id)
+    params[:related_appeal_ids].map do |appeal_id|
+      CorrespondencesAppeal.find_or_create_by(correspondence_id: correspondence_id, appeal_id: appeal_id)
+    end
+  end
+
+  def complete_waived_evidence_submission_tasks(correspondence_id)
+    params[:waived_evidence_submission_window_tasks]&.map do |task|
+      evidence_submission_window_task = EvidenceSubmissionWindowTask.find(task[:task_id])
+      instructions = evidence_submission_window_task.instructions
+      evidence_submission_window_task.when_timer_ends
+      evidence_submission_window_task.update!(instructions: (instructions << task[:waive_reason]))
+    end
+  end
+
+  def add_tasks_to_related_appeals(correspondence_id)
+    params[:tasks_related_to_appeal]&.map do |data|
+      appeal = Appeal.find(data[:appeal_id])
+      data[:klass].constantize.create_from_params(
+        {
+          appeal: appeal,
+          parent_id: appeal.root_task&.id,
+          assigned_to: data[:assigned_to].constantize.singleton,
+          instructions: data[:content]
+        }, current_user
+      )
+    end
+  end
+
+  def verify_correspondence_access
+    return true if MailTeamSupervisor.singleton.user_has_access?(current_user) ||
+                   MailTeam.singleton.user_has_access?(current_user)
+
+    redirect_to "/unauthorized"
+  end
+
+  def general_information
+    vet = veteran_by_correspondence
+    {
+      notes: correspondence.notes,
+      file_number: vet.file_number,
+      veteran_name: vet.name,
+      correspondence_type_id: correspondence.correspondence_type_id,
+      correspondence_types: CorrespondenceType.all
+    }
+  end
+
+  def correspondence_params
+    params.require(:correspondence).permit(:notes, :correspondence_type_id)
+  end
+
+  def veteran_params
+    params.require(:veteran).permit(:file_number)
+  end
+
+  def verify_feature_toggle
+    if !FeatureToggle.enabled?(:correspondence_queue)
+      redirect_to "/unauthorized"
+    end
+  end
+
+  def correspondence
+    return @correspondence if @correspondence.present?
+
+    if params[:id].present?
+      @correspondence = Correspondence.find(params[:id])
+    elsif params[:correspondence_uuid].present?
+      @correspondence = Correspondence.find_by(uuid: params[:correspondence_uuid])
+    end
+
+    @correspondence
+  end
+
+  def correspondence_load
+    Correspondence.where(veteran_id: veteran_by_correspondence.id).where.not(uuid: params[:correspondence_uuid])
+  end
+
+  def veteran_by_correspondence
+    return unless correspondence&.veteran_id
+
+    @veteran_by_correspondence ||= begin
+      veteran = Veteran.find_by(id: correspondence.veteran_id)
+      if veteran.nil?
+        # Handle the case where the veteran is not found
+        puts "Veteran not found for ID: #{correspondence.veteran_id}"
+      end
+      veteran
+    end
+  end
+
+  def veterans_with_correspondences
+    veterans = Veteran.includes(:correspondences).where(correspondences: { id: Correspondence.select(:id) })
+    veterans.map { |veteran| vet_info_serializer(veteran, veteran.correspondences.last) }
+  end
+
+  def vet_info_serializer(veteran, correspondence)
+    {
+      firstName: veteran.first_name,
+      lastName: veteran.last_name,
+      fileNumber: veteran.file_number,
+      cmPacketNumber: correspondence.cmp_packet_number,
+      correspondenceUuid: correspondence.uuid,
+      packageDocumentType: correspondence.correspondence_type_id
+    }
+  end
+
+  def auto_texts
+    @auto_texts ||= AutoText.all.pluck(:name)
+  end
+
+  def upload_documents_to_claim_evidence
+    if Rails.env.development? || Rails.env.demo? || Rails.env.test?
+      true
+    else
+      begin
+        correspondence.correspondence_documents.all.each do |doc|
+          ExternalApi::ClaimEvidenceService.upload_document(
+            doc.pdf_location,
+            veteran_by_correspondence.file_number,
+            doc.claim_evidence_upload_json
+          )
+        end
+        true
+      rescue StandardError => error
+        Rails.logger.error(error.to_s)
+        create_efolder_upload_failed_task
+        false
+      end
+    end
+  end
+
+  def create_efolder_upload_failed_task
+    rpt = ReviewPackageTask.find_by(appeal_id: correspondence.id, type: ReviewPackageTask.name)
+    euft = EfolderUploadFailedTask.find_or_create_by(
+      appeal_id: correspondence.id,
+      appeal_type: "Correspondence",
+      type: EfolderUploadFailedTask.name,
+      assigned_to: current_user,
+      parent_id: rpt.id
+    )
+
+    euft.update!(status: Constants.TASK_STATUSES.in_progress)
+  end
+end
diff --git a/app/controllers/correspondence_document_controller.rb b/app/controllers/correspondence_document_controller.rb
new file mode 100644
index 00000000000..fb080304fe3
--- /dev/null
+++ b/app/controllers/correspondence_document_controller.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require "paper_trail"
+
+class CorrespondenceDocumentController < ApplicationController
+  def update_document
+    document = CorrespondenceDocument.find(params[:id])
+    document.update!(update_params)
+    render json: {}
+  end
+
+  def update_params
+    params.permit(:vbms_document_type_id)
+  end
+end
diff --git a/app/controllers/correspondence_tasks_controller.rb b/app/controllers/correspondence_tasks_controller.rb
new file mode 100644
index 00000000000..f3ee50e597c
--- /dev/null
+++ b/app/controllers/correspondence_tasks_controller.rb
@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+class CorrespondenceTasksController < TasksController
+  PACKAGE_ACTION_TYPES = [
+    SplitPackageTask: SplitPackageTask,
+    MergePackageTask: MergePackageTask,
+    RemovePackageTask: RemovePackageTask,
+    ReassignPackageTask: ReassignPackageTask
+  ].freeze
+
+  def create_package_action_task
+    review_package_task = ReviewPackageTask.find_by(appeal_id: params[:correspondence_id], type: ReviewPackageTask.name)
+    if review_package_task.children.present?
+      render json:
+      { message: "Existing package action request. Only one package action request may be made at a time" },
+             status: :bad_request
+    else
+      task = task_to_create
+      task_params = {
+        parent_id: review_package_task.id,
+        instructions: params[:instructions],
+        assigned_to: MailTeamSupervisor.singleton,
+        appeal_id: params[:correspondence_id],
+        appeal_type: "Correspondence",
+        status: Constants.TASK_STATUSES.assigned,
+        type: task.name
+      }
+
+      ReviewPackageTask.create_from_params(task_params, current_user)
+      review_package_task.update!(assigned_to: MailTeamSupervisor.singleton, status: :on_hold)
+      render json: { status: :ok }
+    end
+  end
+
+  def create_correspondence_intake_task
+    review_package_task = ReviewPackageTask.find_by(appeal_id: params[:id], type: ReviewPackageTask.name)
+    current_parent = review_package_task.parent
+    current_cit = CorrespondenceIntakeTask.find_by(parent_id: current_parent.id, type: CorrespondenceIntakeTask.name)
+
+    if current_cit.present?
+      review_package_task.update!(assigned_to: current_user)
+      current_cit.update!(assigned_to: current_user)
+      render json: { status: :ok }
+    else
+      cit = CorrespondenceIntakeTask.create_from_params(current_parent, current_user)
+      if cit.present?
+        review_package_task.update!(assigned_to: current_user, status: :completed)
+        render json: { status: :ok }
+      else
+        render json:
+        { message: "No exist Correspondence Intake Task" },
+               status: :bad_request
+      end
+    end
+  end
+
+  private
+
+  def task_to_create
+    case params[:type]
+    when "removePackage"
+      RemovePackageTask
+    when "mergePackage"
+      MergePackageTask
+    when "splitPackage"
+      SplitPackageTask
+    when "reassignPackage"
+      ReassignPackageTask
+    else
+      fail NotImplementedError "Type not implemented"
+    end
+  end
+end
diff --git a/app/controllers/explain_controller.rb b/app/controllers/explain_controller.rb
index d534d02cd31..56b8bb5e14e 100644
--- a/app/controllers/explain_controller.rb
+++ b/app/controllers/explain_controller.rb
@@ -36,7 +36,7 @@ def access_allowed?
       Rails.env.development?
   end
 
-  helper_method :legacy_appeal?, :appeal,
+  helper_method :legacy_appeal?, :correspondence?, :appeal,
                 :show_pii_query_param, :fields_query_param, :sections_query_param,
                 :treee_fields, :enabled_sections,
                 :available_fields,
@@ -51,15 +51,22 @@ def appeal_object_id
   end
 
   def explain_as_text
-    [
-      "show_pii = #{show_pii_query_param}",
-      task_tree_as_text,
-      intake_as_text,
-      hearing_as_text,
-      JSON.pretty_generate(event_table_data),
-      JSON.pretty_generate(timeline_data),
-      JSON.pretty_generate(network_graph_data)
-    ].join("\n\n")
+    if correspondence?
+      [
+        "show_pii = #{show_pii_query_param}",
+        appeal.tree(*treee_fields)
+      ].join("\n\n")
+    else
+      [
+        "show_pii = #{show_pii_query_param}",
+        task_tree_as_text,
+        intake_as_text,
+        hearing_as_text,
+        JSON.pretty_generate(event_table_data),
+        JSON.pretty_generate(timeline_data),
+        JSON.pretty_generate(network_graph_data)
+      ].join("\n\n")
+    end
   end
 
   def available_fields
@@ -127,6 +134,7 @@ def hearing_as_text
 
   def sanitized_json
     return "(LegacyAppeals are not yet supported)".to_json if legacy_appeal?
+    return "(Correspondences are not yet supported)".to_json if correspondence?
 
     SanitizedJsonExporter.new(appeal, sanitize: !show_pii_query_param, verbosity: 0).file_contents
   end
@@ -143,12 +151,18 @@ def legacy_appeal?
     appeal.is_a?(LegacyAppeal)
   end
 
+  def correspondence?
+    appeal.is_a?(Correspondence)
+  end
+
   def appeal
     @appeal ||= fetch_appeal
   end
 
   def fetch_appeal
-    if appeal_id.start_with?("ama-")
+    if params[:correspondence_uuid].present?
+      Correspondence.find_by_uuid(params[:correspondence_uuid])
+    elsif appeal_id.start_with?("ama-")
       record_id = appeal_id.delete_prefix("ama-")
       Appeal.find_by_id(record_id)
     elsif appeal_id.start_with?("legacy-")
diff --git a/app/controllers/team_management_controller.rb b/app/controllers/team_management_controller.rb
index 9cabc00d940..0476f5a3b6f 100644
--- a/app/controllers/team_management_controller.rb
+++ b/app/controllers/team_management_controller.rb
@@ -119,7 +119,8 @@ def other_orgs
         org.is_a?(Representative) ||
         org.is_a?(VhaProgramOffice) ||
         org.is_a?(VhaRegionalOffice) ||
-        org.is_a?(EducationRpo)
+        org.is_a?(EducationRpo) || 
+        org.is_a?(MailTeamSupervisor)
     end
   end
 
diff --git a/app/models/appeal.rb b/app/models/appeal.rb
index d7fad5ba102..98057f260d8 100644
--- a/app/models/appeal.rb
+++ b/app/models/appeal.rb
@@ -25,6 +25,8 @@ class Appeal < DecisionReview
   has_many :email_recipients, class_name: "HearingEmailRecipient"
   has_many :available_hearing_locations, as: :appeal, class_name: "AvailableHearingLocations"
   has_many :vbms_uploaded_documents, as: :appeal
+  has_many :correspondences_appeals
+  has_many :correspondences, through: :correspondences_appeals
 
   # decision_documents is effectively a has_one until post decisional motions are supported
   has_many :decision_documents, as: :appeal
diff --git a/app/models/auto_text.rb b/app/models/auto_text.rb
new file mode 100644
index 00000000000..a7ce40e2902
--- /dev/null
+++ b/app/models/auto_text.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+# this is a lookup table
+class AutoText < ApplicationRecord
+end
diff --git a/app/models/cached_appeal.rb b/app/models/cached_appeal.rb
index e17d150c976..e9b598f5690 100644
--- a/app/models/cached_appeal.rb
+++ b/app/models/cached_appeal.rb
@@ -4,6 +4,7 @@ class CachedAppeal < CaseflowRecord
   self.table_name = "cached_appeal_attributes"
 
   # For convenience when working in the Rails console
+  scope :correspondence, -> { where(appeal_type: "Correspondence") }
   scope :ama_appeal, -> { where(appeal_type: "Appeal") }
   scope :legacy_appeal, -> { where(appeal_type: "LegacyAppeal") }
   scope :docket, ->(docket) { where(docket_type: docket) }
diff --git a/app/models/correspondence.rb b/app/models/correspondence.rb
new file mode 100644
index 00000000000..465a9a5c568
--- /dev/null
+++ b/app/models/correspondence.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+# Correspondence is a top level object similar to Appeals.
+# Serves as a collection of all data related to Correspondence workflow
+class Correspondence < CaseflowRecord
+  has_paper_trail
+  include PrintsTaskTree
+
+  has_many :correspondence_documents
+  has_many :correspondence_intakes
+  has_many :correspondences_appeals
+  has_many :appeals, through: :correspondences_appeals
+  has_many :correspondence_relations
+  has_many :related_correspondences, through: :correspondence_relations, dependent: :destroy
+  belongs_to :correspondence_type
+  belongs_to :package_document_type
+  belongs_to :veteran
+
+  after_create :initialize_correspondence_tasks
+
+  def initialize_correspondence_tasks
+    CorrespondenceRootTaskFactory.new(self).create_root_and_sub_tasks!
+  end
+
+  def type
+    "Correspondence"
+  end
+
+  # Cannot use has_many :tasks - Task model does not contain a correspondence_id column
+  def tasks
+    Task.where(appeal_id: id, appeal_type: type)
+  end
+
+  # Methods below are included to allow Correspondences to render in explain page
+
+  # Alias for cmp_packet_number
+  def docket_number
+    cmp_packet_number
+  end
+
+  # Alias for package_document_type.name
+  def docket_name
+    package_document_type.name
+  end
+end
diff --git a/app/models/correspondence_document.rb b/app/models/correspondence_document.rb
new file mode 100644
index 00000000000..ad3e6e2cdda
--- /dev/null
+++ b/app/models/correspondence_document.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+class CorrespondenceDocument < CaseflowRecord
+  belongs_to :correspondence
+  belongs_to :vbms_document_type
+
+  S3_BUCKET_NAME = "documents"
+
+  def pdf_name
+    "#{uuid}.pdf"
+  end
+
+  def s3_location
+    "#{S3_BUCKET_NAME}/#{uuid}"
+  end
+
+  def output_location
+    File.join(Rails.root, "tmp", "pdfs", pdf_name)
+  end
+
+  def pdf_location
+    S3Service.fetch_file(s3_location, output_location)
+  end
+
+  def claim_evidence_upload_json
+    {
+      contentName: pdf_name,
+      providerData: {
+        contentSource: "VISTA",
+        claimantFirstName: correspondence.veteran.first_name,
+        claimantLastName: correspondence.veteran.last_name,
+        claimantParticipantId: correspondence.veteran.participant_id,
+        claimantSsn: correspondence.veteran.ssn,
+        documentTypeId: vbms_document_type_id,
+        dateVaReceivedDocument: correspondence.va_date_of_receipt.strftime("%Y-%m-%d"),
+        actionable: true
+      }
+    }.to_json
+  end
+end
diff --git a/app/models/correspondence_intake.rb b/app/models/correspondence_intake.rb
new file mode 100644
index 00000000000..6d2d884bbcf
--- /dev/null
+++ b/app/models/correspondence_intake.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class CorrespondenceIntake < ApplicationRecord
+  belongs_to :correspondence
+  belongs_to :user
+
+  validates_presence_of :correspondence_id
+  validates_presence_of :user_id
+end
diff --git a/app/models/correspondence_relation.rb b/app/models/correspondence_relation.rb
new file mode 100644
index 00000000000..5257ab1ae8b
--- /dev/null
+++ b/app/models/correspondence_relation.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+class CorrespondenceRelation < ApplicationRecord
+  belongs_to :correspondence
+  belongs_to :related_correspondence, class_name: "Correspondence"
+
+  # Makes the relationship bi-directional - both Correspondences are aware of the relationship
+  after_create :create_inverse, unless: :has_inverse?
+  after_destroy :destroy_inverses, if: :has_inverse?
+
+  validates_presence_of :correspondence_id
+  validates_presence_of :related_correspondence_id
+  validates_numericality_of :correspondence_id
+  validates_numericality_of :related_correspondence_id
+
+  def create_inverse
+    self.class.create(inverse_match_options)
+  end
+
+  def destroy_inverses
+    inverses.destroy_all
+  end
+
+  def has_inverse?
+    self.class.exists?(inverse_match_options)
+  end
+
+  def inverses
+    self.class.where(inverse_match_options)
+  end
+
+  def inverse_match_options
+    { related_correspondence_id: correspondence_id, correspondence_id: related_correspondence_id }
+  end
+end
diff --git a/app/models/correspondence_type.rb b/app/models/correspondence_type.rb
new file mode 100644
index 00000000000..48512797729
--- /dev/null
+++ b/app/models/correspondence_type.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class CorrespondenceType < ApplicationRecord
+  has_many :correspondences
+end
diff --git a/app/models/correspondences_appeal.rb b/app/models/correspondences_appeal.rb
new file mode 100644
index 00000000000..907d172467b
--- /dev/null
+++ b/app/models/correspondences_appeal.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+class CorrespondencesAppeal < ApplicationRecord
+  belongs_to :correspondence
+  belongs_to :appeal
+end
diff --git a/app/models/legacy_tasks/attorney_legacy_task.rb b/app/models/legacy_tasks/attorney_legacy_task.rb
index 28276dbc28b..fe188382c1d 100644
--- a/app/models/legacy_tasks/attorney_legacy_task.rb
+++ b/app/models/legacy_tasks/attorney_legacy_task.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 class AttorneyLegacyTask < LegacyTask
+  # :reek:ControlParameter
   def available_actions(current_user, role)
     return [] if role != "attorney" || current_user != assigned_to
 
@@ -9,11 +10,9 @@ def available_actions(current_user, role)
     # so we use the absence of this value to indicate that there is no case assignment and return no actions.
     return [] unless task_id
 
-    actions = [Constants.TASK_ACTIONS.REVIEW_LEGACY_DECISION.to_h,
-               Constants.TASK_ACTIONS.SUBMIT_OMO_REQUEST_FOR_REVIEW.to_h,
-               Constants.TASK_ACTIONS.ADD_ADMIN_ACTION.to_h]
-
-    actions
+    [Constants.TASK_ACTIONS.REVIEW_LEGACY_DECISION.to_h,
+     Constants.TASK_ACTIONS.SUBMIT_OMO_REQUEST_FOR_REVIEW.to_h,
+     Constants.TASK_ACTIONS.ADD_ADMIN_ACTION.to_h]
   end
 
   def timeline_title
diff --git a/app/models/organizations/mail_team_supervisor.rb b/app/models/organizations/mail_team_supervisor.rb
new file mode 100644
index 00000000000..25782a4e1b5
--- /dev/null
+++ b/app/models/organizations/mail_team_supervisor.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class MailTeamSupervisor < Organization
+  def self.singleton
+    MailTeamSupervisor.first ||
+      MailTeamSupervisor.create(name: "Mail Team Supervisor", url: "mail-team-supervisor")
+  end
+
+  def selectable_in_queue?
+    !Rails.env.production?
+  end
+end
diff --git a/app/models/package_document_type.rb b/app/models/package_document_type.rb
new file mode 100644
index 00000000000..b5c5530e040
--- /dev/null
+++ b/app/models/package_document_type.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class PackageDocumentType < ApplicationRecord
+  has_many :correspondences
+end
diff --git a/app/models/serializers/work_queue/appeal_serializer.rb b/app/models/serializers/work_queue/appeal_serializer.rb
index 62409533333..d8b926efc84 100644
--- a/app/models/serializers/work_queue/appeal_serializer.rb
+++ b/app/models/serializers/work_queue/appeal_serializer.rb
@@ -320,4 +320,8 @@ class WorkQueue::AppealSerializer
       Constants.CAVC_DECISION_TYPES.settlement
     ]).count
   end
+
+  attribute :evidence_submission_task do |object|
+    object.tasks.find_by(type: "EvidenceSubmissionWindowTask", status: "assigned")
+  end
 end
diff --git a/app/models/serializers/work_queue/correspondence_document_serializer.rb b/app/models/serializers/work_queue/correspondence_document_serializer.rb
new file mode 100644
index 00000000000..98655a419ad
--- /dev/null
+++ b/app/models/serializers/work_queue/correspondence_document_serializer.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class WorkQueue::CorrespondenceDocumentSerializer
+  include FastJsonapi::ObjectSerializer
+
+  attribute :id
+  attribute :correspondence_id
+  attribute :document_file_number
+  attribute :pages
+  attribute :vbms_document_type_id
+  attribute :uuid
+  attribute :document_type
+  attribute :document_title do |object|
+    doc_id = object.attributes["vbms_document_type_id"]
+    Caseflow::DocumentTypes::TYPES[doc_id]
+  end
+end
diff --git a/app/models/task.rb b/app/models/task.rb
index 807bb780036..c0ed69b9a6e 100644
--- a/app/models/task.rb
+++ b/app/models/task.rb
@@ -54,7 +54,8 @@ class Task < CaseflowRecord
     Constants.TASK_STATUSES.in_progress.to_sym => Constants.TASK_STATUSES.in_progress,
     Constants.TASK_STATUSES.on_hold.to_sym => Constants.TASK_STATUSES.on_hold,
     Constants.TASK_STATUSES.completed.to_sym => Constants.TASK_STATUSES.completed,
-    Constants.TASK_STATUSES.cancelled.to_sym => Constants.TASK_STATUSES.cancelled
+    Constants.TASK_STATUSES.cancelled.to_sym => Constants.TASK_STATUSES.cancelled,
+    Constants.TASK_STATUSES.unassigned.to_sym => Constants.TASK_STATUSES.unassigned
   }
 
   enum cancellation_reason: {
@@ -154,7 +155,7 @@ def active_statuses
     end
 
     def open_statuses
-      active_statuses.concat([Constants.TASK_STATUSES.on_hold])
+      active_statuses.concat([Constants.TASK_STATUSES.on_hold, Constants.TASK_STATUSES.unassigned])
     end
 
     def create_many_from_params(params_array, current_user)
@@ -932,7 +933,8 @@ def set_cancelled_by_id
     in_progress: :started_at,
     on_hold: :placed_on_hold_at,
     completed: :closed_at,
-    cancelled: :closed_at
+    cancelled: :closed_at,
+    unassigned: :assigned_at
   }.freeze
 
   def set_timestamp
diff --git a/app/models/tasks/correspondence/reassign_package_task.rb b/app/models/tasks/correspondence/reassign_package_task.rb
new file mode 100644
index 00000000000..0feb2e7bcf9
--- /dev/null
+++ b/app/models/tasks/correspondence/reassign_package_task.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class ReassignPackageTask < ReviewPackageTask
+end
diff --git a/app/models/tasks/correspondence_intake_task.rb b/app/models/tasks/correspondence_intake_task.rb
new file mode 100644
index 00000000000..a219756393a
--- /dev/null
+++ b/app/models/tasks/correspondence_intake_task.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+class CorrespondenceIntakeTask < CorrespondenceTask
+  class << self
+    def create_from_params(params, user)
+      parent_task = params
+      params = {
+        instructions: [],
+        assigned_to: user,
+        appeal_id: parent_task.appeal_id,
+        appeal_type: "Correspondence",
+        status: Constants.TASK_STATUSES.in_progress,
+        type: "CorrespondenceIntakeTask"
+      }
+      fail Caseflow::Error::ChildTaskAssignedToSameUser if parent_of_same_type_has_same_assignee(parent_task, params)
+
+      verify_current_user_can_create!(user)
+
+      current_params = modify_params_for_create(params)
+      child = create_child_task(parent_task, user, current_params)
+      child
+    end
+
+    def create_child_task(parent_task, current_user, params)
+      Task.create!(
+        type: params[:type],
+        appeal_type: "Correspondence",
+        appeal: parent_task.appeal,
+        assigned_by_id: child_assigned_by_id(parent_task, current_user),
+        parent_id: parent_task.id,
+        assigned_to: params[:assigned_to] || child_task_assignee(parent_task, params),
+        instructions: params[:instructions]
+      )
+    end
+
+    private
+
+    def verify_current_user_can_create!(user)
+      MailTeam.singleton.user_has_access?(user)
+    end
+  end
+end
diff --git a/app/models/tasks/correspondence_root_task.rb b/app/models/tasks/correspondence_root_task.rb
new file mode 100644
index 00000000000..5552936aa0e
--- /dev/null
+++ b/app/models/tasks/correspondence_root_task.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class CorrespondenceRootTask < CorrespondenceTask
+end
diff --git a/app/models/tasks/correspondence_task.rb b/app/models/tasks/correspondence_task.rb
new file mode 100644
index 00000000000..e6aed2d3916
--- /dev/null
+++ b/app/models/tasks/correspondence_task.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+class CorrespondenceTask < Task
+  before_create :verify_org_task_unique
+  validate :status_is_valid_on_create, on: :create
+  validate :assignee_status_is_valid_on_create, on: :create
+
+  def verify_org_task_unique
+    if Task.where(
+      appeal_id: appeal_id,
+      appeal_type: appeal_type,
+      type: type
+    ).any?
+      fail(
+        Caseflow::Error::DuplicateOrgTask,
+        task_type: self.class.name,
+        assignee_type: assigned_to.class.name
+      )
+    end
+  end
+
+  private
+
+  def status_is_valid_on_create
+    if type == "ReviewPackageTask" && status != Constants.TASK_STATUSES.unassigned
+      update!(status: :unassigned)
+    elsif type != "ReviewPackageTask" && status != Constants.TASK_STATUSES.assigned
+      fail Caseflow::Error::InvalidStatusOnTaskCreate, task_type: type
+    end
+
+    true
+  end
+
+  def assignee_status_is_valid_on_create
+    if parent&.child_must_have_active_assignee? && assigned_to.is_a?(User) && !assigned_to.active?
+      fail Caseflow::Error::InvalidAssigneeStatusOnTaskCreate, assignee: assigned_to
+    end
+
+    true
+  end
+end
diff --git a/app/models/tasks/efolder_upload_failed_task.rb b/app/models/tasks/efolder_upload_failed_task.rb
new file mode 100644
index 00000000000..3bafaf1c87f
--- /dev/null
+++ b/app/models/tasks/efolder_upload_failed_task.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class EfolderUploadFailedTask < ReviewPackageTask
+end
diff --git a/app/models/tasks/merge_package_task.rb b/app/models/tasks/merge_package_task.rb
new file mode 100644
index 00000000000..fcc94564c1f
--- /dev/null
+++ b/app/models/tasks/merge_package_task.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class MergePackageTask < ReviewPackageTask
+end
diff --git a/app/models/tasks/remove_package_task.rb b/app/models/tasks/remove_package_task.rb
new file mode 100644
index 00000000000..63af99adfbb
--- /dev/null
+++ b/app/models/tasks/remove_package_task.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class RemovePackageTask < ReviewPackageTask
+end
diff --git a/app/models/tasks/review_package_task.rb b/app/models/tasks/review_package_task.rb
new file mode 100644
index 00000000000..2ef2b2c9a30
--- /dev/null
+++ b/app/models/tasks/review_package_task.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+class ReviewPackageTask < CorrespondenceTask
+  class << self
+    def create_from_params(params, user)
+      parent_task = ReviewPackageTask.find(params[:parent_id])
+      fail Caseflow::Error::ChildTaskAssignedToSameUser if parent_of_same_type_has_same_assignee(parent_task, params)
+
+      params = modify_params_for_create(params)
+      child = create_child_task(parent_task, user, params)
+      parent_task.update!(status: params[:status]) if params[:status]
+      child
+    end
+
+    def create_child_task(parent_task, current_user, params)
+      Task.create!(
+        type: params[:type],
+        appeal_type: "Correspondence",
+        appeal: parent_task.appeal,
+        assigned_by_id: child_assigned_by_id(parent_task, current_user),
+        parent_id: parent_task.id,
+        assigned_to: params[:assigned_to] || child_task_assignee(parent_task, params),
+        instructions: params[:instructions]
+      )
+    end
+  end
+
+  def when_child_task_created(_child_task)
+    true
+  end
+end
diff --git a/app/models/tasks/split_package_task.rb b/app/models/tasks/split_package_task.rb
new file mode 100644
index 00000000000..d12f057fbf0
--- /dev/null
+++ b/app/models/tasks/split_package_task.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class SplitPackageTask < ReviewPackageTask
+end
diff --git a/app/models/vbms_document_type.rb b/app/models/vbms_document_type.rb
new file mode 100644
index 00000000000..d2326567286
--- /dev/null
+++ b/app/models/vbms_document_type.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class VbmsDocumentType < ApplicationRecord
+  has_many :correspondence_documents
+end
diff --git a/app/models/veteran.rb b/app/models/veteran.rb
index 37d1927a562..8e889e65566 100644
--- a/app/models/veteran.rb
+++ b/app/models/veteran.rb
@@ -7,6 +7,7 @@
 class Veteran < CaseflowRecord
   include AssociatedBgsRecord
 
+  has_many :correspondences
   has_many :available_hearing_locations,
            foreign_key: :veteran_file_number,
            primary_key: :file_number, class_name: "AvailableHearingLocations"
diff --git a/app/queries/appeals_updated_since_query.rb b/app/queries/appeals_updated_since_query.rb
index 0e1bc75989d..58086203751 100644
--- a/app/queries/appeals_updated_since_query.rb
+++ b/app/queries/appeals_updated_since_query.rb
@@ -26,6 +26,8 @@ def call
     request_decision_issues
     request_issues_updates
     vbms_uploaded_documents
+    correspondences_appeals
+    correspondences
   ].freeze
 
   attr_reader :since_date
diff --git a/app/views/appeals/edit.html.erb b/app/views/appeals/edit.html.erb
index f543d778340..29e3c766cc1 100644
--- a/app/views/appeals/edit.html.erb
+++ b/app/views/appeals/edit.html.erb
@@ -18,6 +18,7 @@
       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),
+      correspondence_queue: FeatureToggle.enabled?(:correspondence_queue, user: current_user),
       cc_appeal_workflow: FeatureToggle.enabled?(:cc_appeal_workflow, user: current_user),
       vhaPreDocketAppeals: false
     }
diff --git a/app/views/application/under_construction.html.erb b/app/views/application/under_construction.html.erb
new file mode 100644
index 00000000000..5407297a3fb
--- /dev/null
+++ b/app/views/application/under_construction.html.erb
@@ -0,0 +1,11 @@
+<% content_for :page_title do certification_header("Under Construction") end %>
+
+<% content_for :full_page_content do %>
+  <%= react_component("UnderConstruction", props: {
+    userDisplayName: current_user ? current_user.display_name : "",
+    dropdownUrls: dropdown_urls,
+    feedbackUrl: feedback_url,
+    buildDate: build_date,
+    dependenciesFaked: ApplicationController.dependencies_faked?,
+  }) %>
+<% end %>
diff --git a/app/views/correspondence/correspondence_cases.html.erb b/app/views/correspondence/correspondence_cases.html.erb
new file mode 100644
index 00000000000..74298a297bc
--- /dev/null
+++ b/app/views/correspondence/correspondence_cases.html.erb
@@ -0,0 +1,17 @@
+<% content_for :full_page_content do %>
+  <%= react_component("Queue", props: {
+    userDisplayName: current_user.display_name,
+    userId: current_user.id,
+    userRole: (current_user.vacols_roles.first || "").capitalize,
+    userCssId: current_user.css_id,
+    organizations: current_user.selectable_organizations.map {|o| o.slice(:name, :url)},
+    caseSearchHomePage: case_search_home_page,
+    dropdownUrls: dropdown_urls,
+    applicationUrls: application_urls,
+    feedbackUrl: feedback_url,
+    flash: flash,
+    featureToggles: {
+      correspondence_queue: FeatureToggle.enabled?(:correspondence_queue, user: current_user)
+    }
+  }) %>
+<% end %>
diff --git a/app/views/correspondence/intake.html.erb b/app/views/correspondence/intake.html.erb
new file mode 100644
index 00000000000..f508218d4c0
--- /dev/null
+++ b/app/views/correspondence/intake.html.erb
@@ -0,0 +1,15 @@
+<% content_for :full_page_content do %>
+  <%= react_component("Queue", props: {
+    userDisplayName: current_user.display_name,
+    userId: current_user.id,
+    userRole: (current_user.vacols_roles.first || "").capitalize,
+    userCssId: current_user.css_id,
+    organizations: current_user.selectable_organizations.map {|o| o.slice(:name, :url)},
+    featureToggles: {
+      correspondence_queue: FeatureToggle.enabled?(:correspondence_queue, user: current_user)
+    },
+    correspondence: @correspondence,
+    autoTexts: @auto_texts,
+    veteranInformation: @veteran_information
+  }) %>
+<% end %>
diff --git a/app/views/correspondence/review_package.html.erb b/app/views/correspondence/review_package.html.erb
new file mode 100644
index 00000000000..0e8ae53b544
--- /dev/null
+++ b/app/views/correspondence/review_package.html.erb
@@ -0,0 +1,14 @@
+<% content_for :full_page_content do %>
+  <%= react_component("Queue", props: {
+    userDisplayName: current_user.display_name,
+    userId: current_user.id,
+    userRole: (current_user.vacols_roles.first || "").capitalize,
+    userCssId: current_user.css_id,
+    organizations: current_user.selectable_organizations.map {|o| o.slice(:name, :url)},
+    caseSearchHomePage: case_search_home_page,
+    dropdownUrls: dropdown_urls,
+    featureToggles: {
+      correspondence_queue: FeatureToggle.enabled?(:correspondence_queue, user: current_user)
+    }
+  }) %>
+<% end %>
diff --git a/app/views/explain/show.html.erb b/app/views/explain/show.html.erb
index 6c14341c578..efe7a93040c 100644
--- a/app/views/explain/show.html.erb
+++ b/app/views/explain/show.html.erb
@@ -82,6 +82,188 @@
       </div>
     </h2>
   </div>
+<% elsif appeal.class.name == "Correspondence" %>
+  <div style="font-size:0.875em; padding:10px">
+    <table id="header_table" style="margin: 4px;">
+      <colgroup>
+        <col style="width: 60%;">
+        <col style="width: 40%;">
+      </colgroup>
+      <tbody>
+        <tr>
+          <td>
+            <h3>Correspondence <%=appeal["uuid"]%> </h3>
+            <ul id="appeal_info">
+              <li><a href="/queue/correspondence/<%= appeal["uuid"]%>/review_package" target="_blank">Correspondence Details page</a></li>
+            </ul>
+          </td>
+          <td>
+            <div style="border: 1px solid lightgray; padding: 10px;">
+              <code class="show_pii_<%=show_pii_query_param%>">show_pii = <%= show_pii_query_param %></code>.
+              <br/>To toggle PII, click
+                <%= link_to('toggle show_pii', {action: 'show', show_pii: !show_pii_query_param,
+                                                                fields: fields_query_param.to_s,
+                                                                sections: sections_query_param.to_s}) %>.
+              <br/>
+            </div>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+
+    <%
+      sections1 = %w[task_tree task_versions]
+      sections2 = []
+
+      enabledSections = (enabled_sections.first&.downcase == 'all') ? sections1 + sections2 : enabled_sections
+      enabledSections << "task_tree" unless fields_query_param.nil?;
+    %>
+
+    <div id="section_checkboxes">
+      <div class="section_checkbox_row" id="main_panel_section_btns">
+        <% [sections1, sections2].each do |sections|  %>
+          <% sections.each do |sectionId| %>
+            <span class="row_item">
+              <% sectionEnabled = enabledSections.include?(sectionId) %>
+              <input id="<%=sectionId%>_chkbox" value="<%=sectionId%>_section" type="checkbox" <%=sectionEnabled ? 'checked' : nil%>
+                    onclick="toggleSection(this, 'main_panel', '<%=sectionId%>')">
+              <label for="<%=sectionId%>_chkbox"><%=sectionId.titleize%></label>
+              <a id="<%=sectionId%>_goLink" class="go_to_section_link <%=sectionEnabled ? 'enabled' : nil%>"
+                onclick="scrollToSection('<%=sectionId%>')">(go there)</a>
+            </span>
+          <% end %>
+        <% end %>
+
+        <span class="row_item">
+          <input id="side_panel_chkbox" value="side_panel" type="checkbox"
+           onclick="toggleSidePanel(this, event)">
+          <label for="side_panel_chkbox">Floating Panel</label>
+        </span>
+      </div>
+      <div>
+        <div id="menubar_settings" visibility="hidden">
+          <input id="autoshow_chkbox" type="checkbox">
+          <label for="autoshow_chkbox" style="margin: 8px;">Show on scrollup</label>
+          <button id="hide_menubar_btn" class="menuBtn" onclick="temporarilyHideStickyMenu()">Hide</button>
+        </div>
+      </div>
+    </div>
+
+    <%= render "menubar", menubarId: "section_checkboxes", contentId: "main_panel", autoshowId: "autoshow_chkbox" %>
+    <%= render "side_panel" %>
+
+    <br/>
+    <div id="main_panel">
+      <% (sections1 + sections2).each do |sectionId|  %>
+        <% sectionEnabled = enabledSections.include?(sectionId) %>
+        <div id="<%=sectionId%>_section" style="display: <%=sectionEnabled ? 'block' : 'none'%>;">
+          <%= render sectionId %>
+          <hr/>
+        </div>
+      <% end %>
+    </div>
+    <div id="blank_section" style="margin-bottom: 90vh;" />
+
+    <script type="text/javascript">
+      function toggleSection(chkbox, panelId, sectionId) {
+        const section = document.getElementById(chkbox.value);
+        section.style.display = chkbox.checked ? "block" : "none";
+
+        const goLink = document.getElementById(sectionId+"_goLink");
+        if(goLink) {
+          chkbox.checked ? goLink.classList.add("enabled") : goLink.classList.remove("enabled");
+        }
+
+        if(chkbox.checked){
+          if(panelId){
+            const panel = document.getElementById(panelId);
+            panel.appendChild(section); // Add it to the bottom of the page
+          }
+
+          // If more than 1 section visible, scroll to the newly visible section
+          // const visibleMainSections = document.querySelectorAll('#main_panel > div[style="display: block;"]')
+          // visibleMainSections.length > 1 && scrollToSection(sectionId);
+          setDetailsPaneMessage("Showing "+chkbox.value);
+        } else {
+          setDetailsPaneMessage("Hiding "+chkbox.value);
+        }
+      }
+
+      function showSection(sectionId){
+        const chkbox = document.getElementById(sectionId+"_chkbox");
+        if(!chkbox.checked){
+          chkbox.checked = true;
+          chkbox.onclick(); // calls toggleSection
+        }
+      }
+
+      /**
+       * https://stackoverflow.com/questions/52292603/is-there-a-callback-for-window-scrollto
+       * Native scrollTo with callback
+       * @param offset - offset to scroll to
+       * @param callback - callback function
+       */
+      function smoothScrollTo(offset, callback) {
+        const fixedOffset = offset.toFixed();
+        const body = document.body
+        const yOffsetAtBottom = body.scrollHeight - body.scrollTop - body.clientHeight - 20
+        const onScroll = ()=>{
+          const atBottom = window.pageYOffset >=  yOffsetAtBottom;
+          if (atBottom || window.pageYOffset.toFixed() === fixedOffset) {
+            window.removeEventListener('scroll', onScroll);
+            callback();
+          }
+        }
+
+        window.addEventListener('scroll', onScroll);
+        onScroll();
+        window.scrollTo({
+            top: offset,
+            behavior: 'smooth'
+        });
+      }
+
+      var tempIgnoreScroll = false;
+      function scrollToSection(sectionId){
+        tempIgnoreScroll = true;
+        const section = document.getElementById(sectionId+"_section");
+        const yPosAboveSection = section.getBoundingClientRect().top + window.pageYOffset - 100;
+        smoothScrollTo(yPosAboveSection, ()=>{
+          tempIgnoreScroll = false;
+          enableStickyMenu();
+          hideStickyMenu();
+          console.log("scrolled to section", sectionId);
+        });
+      }
+
+      const setDetailsPaneMessage = (htmlContent)=>{
+        document.getElementById("side_panel_message").innerHTML = htmlContent;
+      };
+
+      const scrollbarWidth = window.innerWidth - document.documentElement.clientWidth;
+      function toggleSidePanel(chkbox, event) {
+        const panel = document.getElementById(chkbox.value);
+        toggleSection(chkbox);
+        panel.style.top || showDetailsPane();
+        panel.style.top || (panel.style.top = "48px");
+        panel.style.left || (panel.style.left = "140px");
+        // panel.style.left || (panel.style.left = Math.min(
+        //                        window.innerWidth - panel.offsetWidth - 140,
+        //                        window.innerWidth/2
+        //                      )+"px");
+      }
+
+      window.addEventListener('load', (event) => {
+        console.log('show.html.erb onLoadListener');
+        const isTreeFieldsParamsProvided = <%= fields_query_param != nil %>;
+        if (isTreeFieldsParamsProvided) {
+          // showSection("task_tree");
+          scrollToSection("task_tree");
+        }
+      });
+    </script>
+  </div>
+
 <% else %>
     <div style="font-size:0.875em; padding:10px">
     <table id="header_table" style="margin: 4px;">
diff --git a/app/views/queue/index.html.erb b/app/views/queue/index.html.erb
index b12500347a8..fcc3a13e934 100644
--- a/app/views/queue/index.html.erb
+++ b/app/views/queue/index.html.erb
@@ -50,6 +50,7 @@
       das_case_timeliness: FeatureToggle.enabled?(:das_case_timeliness, user: current_user),
       das_case_timeline: FeatureToggle.enabled?(:das_case_timeline, user: current_user),
       split_appeal_workflow: FeatureToggle.enabled?(:split_appeal_workflow, user: current_user),
+      correspondence_queue: FeatureToggle.enabled?(:correspondence_queue, user: current_user),
       cavc_remand_granted_substitute_appellant: FeatureToggle.enabled?(:cavc_remand_granted_substitute_appellant, user: current_user),
       cavc_dashboard_workflow: FeatureToggle.enabled?(:cavc_dashboard_workflow, user: current_user),
       cc_appeal_workflow: FeatureToggle.enabled?(:cc_appeal_workflow, user: current_user),
diff --git a/app/workflows/correspondence_root_task_factory.rb b/app/workflows/correspondence_root_task_factory.rb
new file mode 100644
index 00000000000..668e15be1b8
--- /dev/null
+++ b/app/workflows/correspondence_root_task_factory.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+class CorrespondenceRootTaskFactory
+  include TasksFactoryConcern
+
+  def initialize(correspondence)
+    @correspondence = correspondence
+  end
+
+  def create_root_and_sub_tasks!
+    ActiveRecord::Base.transaction do
+      create_root!
+      create_subtasks!
+    end
+  end
+
+  private
+
+  def create_root!
+    @correspondence_task = CorrespondenceTask.find_or_create_by!(
+      appeal_id: @correspondence.id,
+      assigned_to: MailTeamSupervisor.singleton,
+      appeal_type: "Correspondence",
+      type: "CorrespondenceTask"
+    )
+
+    @correspondence_task.update(status: "on_hold")
+
+    @root_task = CorrespondenceRootTask.find_or_create_by!(
+      appeal_id: @correspondence.id,
+      assigned_to: MailTeamSupervisor.singleton,
+      appeal_type: "Correspondence",
+      parent_id: @correspondence_task.id,
+      type: "CorrespondenceRootTask"
+    )
+
+    @root_task.update(status: "on_hold")
+  end
+
+  def create_subtasks!
+    @review_package_task = ReviewPackageTask.find_or_create_by!(
+      appeal_id: @correspondence.id,
+      assigned_to: MailTeamSupervisor.singleton,
+      appeal_type: "Correspondence",
+      parent_id: @root_task.id,
+      type: "ReviewPackageTask"
+    )
+  end
+end
diff --git a/client/COPY.json b/client/COPY.json
index b92e0df6a5c..6e563a7ead0 100644
--- a/client/COPY.json
+++ b/client/COPY.json
@@ -50,6 +50,11 @@
   "CASE_LIST_TABLE_QUEUE_DROPDOWN_LABEL": "Switch views",
   "CASE_LIST_TABLE_QUEUE_DROPDOWN_OWN_CASES_LABEL": "Your cases",
   "CASE_LIST_TABLE_QUEUE_DROPDOWN_TEAM_CASES_LABEL": "%s team cases",
+  "CASE_LIST_TABLE_QUEUE_DROPDOWN_CORRESPONDENCE_CASES": "Correspondence Cases",
+  "TITLE_MODAL_EDIT_DOCUMENT_TYPE_CORRESPONDENCE" : "Edit document type",
+  "TEXT_MODAL_EDIT_DOCUMENT_TYPE_CORRESPONDENCE" : "Change the document type of the selected document.",
+  "ORIGINAL_DOC_EDIT_DOCUMENT_TYPE_CORRESPONDENCE" : "Original document type",
+  "NEW_DOC_EDIT_DOCUMENT_TYPE_CORRESPONDENCE" : "New document type",
   "CASE_LIST_TABLE_EMPTY_TEXT": "This Veteran has no appeals at this time.",
   "CASE_LIST_TABLE_TOTAL_DAYS_COLUMN_TITLE": "Total Days",
   "CASE_LIST_TABLE_BOARD_INTAKE": "Board Intake",
@@ -74,6 +79,14 @@
   "OTHER_REVIEWS_TABLE_ESTABLISHING": "Establishing...",
   "OTHER_REVIEWS_TABLE_SYNCING_DECISIONS": "Syncing decisions...",
   "OTHER_REVIEWS_TABLE_SYNCING_DECISIONS_ERROR": "Decisions sync failed. Support notified.",
+  "CORRESPONDENCE_REVIEW_PACKAGE_TITLE": "Review Package",
+  "CORRESPONDENCE_REVIEW_PACKAGE_SUB_TITLE": "Review the mail package details below. If the document type is a 10182, select the appropriate action needed for the form.",
+  "CORRESPONDENCE_REVIEW_CMP_INFO_TITLE": "CMP Information",
+  "CORRESPONDENCE_INTAKE_FORM_SUBMIT_MODAL_TITLE": "Confirm submission",
+  "CORRESPONDENCE_INTAKE_FORM_SUBMIT_MODAL_BODY": "Submitting the correspondence record will upload the mail package to the eFolder.  Make sure that all information is correct before submitting.",
+  "CORRESPONDENCE_INTAKE_FORM_ERROR_BANNER_TITLE": "The correspondence's documents have failed to upload to the eFolder",
+  "CORRESPONDENCE_INTAKE_FORM_ERROR_BANNER_TEXT": "You can upload it from this page to the veteran's eFolder at a later time.",
+  "DOCUMENT_PREVIEW": "Document Preview",
   "TASK_SNAPSHOT_ABOUT_BOX_TITLE": "About the case",
   "TASK_SNAPSHOT_ABOUT_BOX_HEARING_REQUEST_TYPE_LABEL": "Hearing Type",
   "TASK_SNAPSHOT_ABOUT_BOX_TYPE_LABEL": "Appeal Stream Type",
@@ -1394,5 +1407,20 @@
   "REFRESH_POA": "Refresh POA",
   "POA_SUCCESSFULLY_REFRESH_MESSAGE": "Successfully refreshed. No power of attorney information was found at this time.",
   "POA_UPDATED_SUCCESSFULLY": "POA Updated Successfully",
-  "EMPLOYER_IDENTIFICATION_NUMBER": "Employer Identification Number"
+  "EMPLOYER_IDENTIFICATION_NUMBER": "Employer Identification Number",
+  "PACKAGE_ACTION_MERGE_DESCRIPTION": "By confirming, you will send a request for the supervisor to take action on the following package:",
+  "PACKAGE_ACTION_MERGE_TITLE": "Request merge",
+  "PACKAGE_ACTION_MERGE_TEXTAREA_LABEL": "Reason for merge",
+  "PACKAGE_ACTION_MERGE_RADIO_LABEL": "Select a reason for merging this package.",
+  "PACKAGE_ACTION_MODAL_DESCRIPTION": "By confirming, you will send a request for the supervisor to take action on the following package:",
+  "PACKAGE_ACTION_REMOVAL_TITLE": "Request package removal",
+  "PACKAGE_ACTION_REMOVAL_TEXTAREA_LABEL": "Provide a reason for removal",
+  "PACKAGE_ACTION_REASSIGN_DESCRIPTION":"You have selected the following correspondence cases for reassignment to another users. Please confirm your selection(s) below:",
+  "PACKAGE_ACTION_REASSIGN_TITLE":"Request package reassignment",
+  "PACKAGE_ACTION_REASSIGN_TEXTAREA_LABEL":"Provide a reason for reassignment",
+  "PACKAGE_ACTION_SPLIT_TEXTAREA_LABEL":"Reason for split",
+  "PACKAGE_ACTION_SPLIT_TITLE": "Request split package",
+  "CORRESPONDENCE_DOC_UPLOAD_FAILED_HEADER": "The correspondence's documents have failed to upload to the eFolder",
+  "CORRESPONDENCE_DOC_UPLOAD_FAILED_MESSAGE": "You can upload it from this page to the veteran's eFolder at a later time.",
+  "UNDER_CONSTRUCTION_MESSAGE": "This page is under construction."
 }
diff --git a/client/app/components/Dropdown.jsx b/client/app/components/Dropdown.jsx
index ba141a66c81..dd098968d14 100644
--- a/client/app/components/Dropdown.jsx
+++ b/client/app/components/Dropdown.jsx
@@ -36,7 +36,7 @@ export default class Dropdown extends React.Component {
         {label || name} {required && <span className="cf-required">Required</span>}
       </label>
       {errorMessage && <span className="usa-input-error-message" tabIndex={0}>{errorMessage}</span>}
-      <select value={value} onChange={this.onChange} id={name} disabled={readOnly}>
+      <select value={value} aria-label="select dropdown" onChange={this.onChange} id={name} disabled={readOnly}>
         { defaultText && <option defaultValue hidden>{defaultText}</option>}
         {options.map((option, index) =>
           <option
diff --git a/client/app/components/Pagination/CorrespondencePagination.jsx b/client/app/components/Pagination/CorrespondencePagination.jsx
new file mode 100644
index 00000000000..d09bbd57210
--- /dev/null
+++ b/client/app/components/Pagination/CorrespondencePagination.jsx
@@ -0,0 +1,161 @@
+import React from 'react';
+import PropTypes, { object } from 'prop-types';
+import Table from '../Table';
+import PaginationButton from './PaginationButton';
+
+class CorrespondencePagination extends React.PureComponent {
+  handleChange = (index) => {
+    this.props.updatePage(index);
+  };
+
+  // pagination button is zero-based but we are one-based so fake out the currentPage.
+  currentPageIndex = () => {
+    return this.props.currentPage - 1;
+  }
+
+  handleNext = () => {
+    const nextPageIndex = this.currentPageIndex() + 1;
+
+    this.props.updatePage(nextPageIndex);
+  };
+
+  handlePrevious = () => {
+    const previousPageIndex = this.currentPageIndex() - 1;
+
+    this.props.updatePage(previousPageIndex);
+  };
+
+  generatePaginationButton = (indexOfPage) => {
+    return (
+      <PaginationButton
+        key={`pagination-button-${indexOfPage}`}
+        currentPage={this.currentPageIndex()}
+        index={indexOfPage}
+        handleChange={this.handleChange} />
+    );
+  };
+
+  generateBlankButton = (key) => {
+    return <button disabled key={`blank-button-${key}`} aria-label="More Pages">...</button>;
+  };
+
+  render() {
+    const {
+      totalPages,
+      currentPage,
+      pageSize,
+      totalItems,
+      currentItems,
+    } = this.props;
+
+    const beginningCaseNumber = totalItems === 0 ? 0 : ((currentPage * pageSize) - pageSize + 1);
+    // If there are no pages, there is no data, so the range should be 0-0.
+    // Otherwise, the end of the range is the previous amount of cases +
+    // the amount of data in the current page.
+    const endingCaseNumber = totalItems === 0 ? 0 : (beginningCaseNumber + currentItems - 1);
+    // Create the range
+    let currentCaseRange = `${beginningCaseNumber}-${endingCaseNumber}`;
+    // Create the entire summary
+    const paginationSummary = `Viewing ${currentCaseRange} of ${totalItems} total`;
+    // Render the page buttons
+    let pageButtons = [];
+    let paginationButtons = [];
+
+    if (totalPages > 5) {
+      const indexOfLastPage = totalPages - 1;
+      const firstPageButton = this.generatePaginationButton(0);
+      const lastPageButton = this.generatePaginationButton(indexOfLastPage);
+
+      if (currentPage < 3) {
+        pageButtons = [...Array(4)].map((number, index) =>
+          this.generatePaginationButton(index)
+        );
+        pageButtons.push(this.generateBlankButton(1));
+        pageButtons.push(lastPageButton);
+      } else if (currentPage > totalPages - 4) {
+        pageButtons.push(firstPageButton);
+        pageButtons.push(this.generateBlankButton(1));
+
+        const last4PageButtons = [...Array(4)].map((number, index) =>
+          this.generatePaginationButton(totalPages - (4 - index))
+        );
+
+        pageButtons = pageButtons.concat(last4PageButtons);
+      } else {
+        pageButtons.push(firstPageButton);
+        pageButtons.push(this.generateBlankButton(1));
+        pageButtons.push(this.generatePaginationButton(currentPage - 1));
+        pageButtons.push(this.generatePaginationButton(currentPage));
+        pageButtons.push(this.generatePaginationButton(currentPage + 1));
+        pageButtons.push(this.generateBlankButton(2));
+        pageButtons.push(lastPageButton);
+      }
+    } else {
+      pageButtons = [...Array(totalPages)].map((number, index) =>
+        this.generatePaginationButton(index)
+      );
+    }
+
+    if (totalPages > 1) {
+      paginationButtons.push(
+        <button
+          key="previous-button"
+          aria-label="Previous Page"
+          disabled={currentPage === 1}
+          onClick={() => this.handlePrevious()}>
+          Previous
+        </button>
+      );
+      paginationButtons = paginationButtons.concat(pageButtons);
+      paginationButtons.push(
+        <button
+          key="next-button"
+          aria-label="Next Page"
+          disabled={currentPage === totalPages}
+          onClick={() => this.handleNext()}>
+          Next
+        </button>
+      );
+    }
+
+    return (
+      <div className="cf-pagination">
+        <div className="cf-pagination-summary">
+          {paginationSummary}
+        </div>
+        <Table
+          columns={this.props.columns}
+          rowObjects={this.props.rowObjects}
+          summary={this.props.summary}
+          className={this.props.className}
+          headerClassName={this.props.headerClassName}
+          bodyClassName={this.props.bodyClassName}
+          tbodyId={this.props.tbodyId}
+          getKeyForRow={this.props.getKeyForRow}
+        />
+        <div className="cf-pagination-pages">
+          {paginationButtons}
+        </div>
+      </div>
+    );
+  }
+}
+
+CorrespondencePagination.propTypes = {
+  pageSize: PropTypes.number.isRequired,
+  currentPage: PropTypes.number.isRequired,
+  currentItems: PropTypes.number.isRequired,
+  totalPages: PropTypes.number,
+  totalItems: PropTypes.number,
+  updatePage: PropTypes.func.isRequired,
+  columns: PropTypes.func,
+  summary: PropTypes.string,
+  className: PropTypes.string,
+  rowObjects: PropTypes.arrayOf(object).isRequired,
+  headerClassName: PropTypes.string,
+  bodyClassName: PropTypes.string,
+  tbodyId: PropTypes.string,
+  getKeyForRow: PropTypes.func
+};
+
+export default React.memo(CorrespondencePagination);
diff --git a/client/app/components/Pagination/Pagination.jsx b/client/app/components/Pagination/Pagination.jsx
index a9b06122680..e8963893204 100644
--- a/client/app/components/Pagination/Pagination.jsx
+++ b/client/app/components/Pagination/Pagination.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import Table from 'app/components/Table';
 
 import PaginationButton from './PaginationButton';
 
@@ -36,7 +37,7 @@ class Pagination extends React.PureComponent {
   };
 
   generateBlankButton = (key) => {
-    return <button disabled key={`blank-button-${key}`} aria-label={`More Pages`}>...</button>;
+    return <button disabled key={`blank-button-${key}`} aria-label="More Pages">...</button>;
   };
 
   render() {
@@ -125,6 +126,7 @@ class Pagination extends React.PureComponent {
         <div className="cf-pagination-summary">
           {paginationSummary}
         </div>
+        {this.props.table}
         <div className="cf-pagination-pages">
           {paginationButtons}
         </div>
@@ -139,7 +141,8 @@ Pagination.propTypes = {
   currentCases: PropTypes.number.isRequired,
   totalPages: PropTypes.number,
   totalCases: PropTypes.number,
-  updatePage: PropTypes.func.isRequired
+  updatePage: PropTypes.func.isRequired,
+  table: PropTypes.instanceOf(Table)
 };
 
 export default Pagination;
diff --git a/client/app/components/ReactSelectDropdown.jsx b/client/app/components/ReactSelectDropdown.jsx
index fc26daadd7d..88528d315da 100644
--- a/client/app/components/ReactSelectDropdown.jsx
+++ b/client/app/components/ReactSelectDropdown.jsx
@@ -58,17 +58,22 @@ const selectContainerStyles = css({
 });
 
 const ReactSelectDropdown = (props) => {
+  const isDisabled = props.disabled || false;
+
   return (
-    <div {...selectContainerStyles}>
+    <div id="reactSelectContainer"
+      {...selectContainerStyles}>
 
       <label style={{ marginTop: '5px', marginBottom: '5px', marginLeft: '1px' }}>{props.label}</label>
       <Select
-        placeholder="select..."
+        placeholder={props.customPlaceholder || 'select...'}
         options={props.options}
         defaultValue={props.defaultValue}
         onChange={props.onChangeMethod}
         styles={customSelectStyles}
         className={props.className}
+        isDisabled={isDisabled}
+        aria-label="dropdown"
       />
     </div>
 
@@ -77,14 +82,18 @@ const ReactSelectDropdown = (props) => {
 
 ReactSelectDropdown.propTypes = {
   onChange: PropTypes.func,
-  options: PropTypes.shape({
-    value: PropTypes.number,
-    displayText: PropTypes.string,
-  }),
-  defaultValue: PropTypes.string,
+  options: PropTypes.arrayOf(
+    PropTypes.shape({
+      value: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+      displayText: PropTypes.string,
+    })
+  ),
+  defaultValue: PropTypes.object,
   label: PropTypes.string,
   onChangeMethod: PropTypes.func,
-  className: PropTypes.string
+  className: PropTypes.string,
+  disabled: PropTypes.bool,
+  customPlaceholder: PropTypes.string
 };
 
 export default ReactSelectDropdown;
diff --git a/client/app/components/icons/fontAwesome/UnlinkIcon.jsx b/client/app/components/icons/fontAwesome/UnlinkIcon.jsx
new file mode 100644
index 00000000000..3438339557e
--- /dev/null
+++ b/client/app/components/icons/fontAwesome/UnlinkIcon.jsx
@@ -0,0 +1,38 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { COLORS } from '../../../constants/AppConstants';
+
+export const UnlinkIcon = (props) => {
+  const { color } = props;
+
+  return (
+    <svg xmlns="http://www.w3.org/2000/svg"
+      height="1em" viewBox="0 0 512 512"
+      style={{ fill: color }}>
+      <path
+        d="M304.083 405.907c4.686 4.686 4.686 12.284 0 16.971l-44.674
+       44.674c-59.263 59.262-155.693 59.266-214.961 0-59.264-59.265-59.264-155.696
+       0-214.96l44.675-44.675c4.686-4.686 12.284-4.686 16.971 0l39.598 39.598c4.686
+       4.686 4.686 12.284 0 16.971l-44.675 44.674c-28.072 28.073-28.072 73.75 0 101.823
+       28.072 28.072 73.75 28.073 101.824 0l44.674-44.674c4.686-4.686 12.284-4.686
+       16.971 0l39.597 39.598zm-56.568-260.216c4.686 4.686 12.284 4.686 16.971
+       0l44.674-44.674c28.072-28.075 73.75-28.073 101.824 0 28.072 28.073 28.072 73.75 0
+       101.823l-44.675 44.674c-4.686 4.686-4.686 12.284 0 16.971l39.598 39.598c4.686
+       4.686 12.284 4.686 16.971 0l44.675-44.675c59.265-59.265 59.265-155.695
+       0-214.96-59.266-59.264-155.695-59.264-214.961 0l-44.674 44.674c-4.686
+       4.686-4.686 12.284 0 16.971l39.597 39.598zm234.828 359.28l22.627-22.627c9.373-9.373
+       9.373-24.569 0-33.941L63.598 7.029c-9.373-9.373-24.569-9.373-33.941 0L7.029
+       29.657c-9.373 9.373-9.373 24.569 0 33.941l441.373 441.373c9.373 9.372 24.569
+       9.372 33.941 0z" /></svg>
+  );
+};
+UnlinkIcon.propTypes = {
+
+  /**
+  Sets color of the component. Default value is 'COLORS.GREY'.
+  */
+  color: PropTypes.string,
+};
+UnlinkIcon.defaultProps = {
+  color: COLORS.GREY,
+};
diff --git a/client/app/containers/UnderConstruction.jsx b/client/app/containers/UnderConstruction.jsx
new file mode 100644
index 00000000000..96cf527d013
--- /dev/null
+++ b/client/app/containers/UnderConstruction.jsx
@@ -0,0 +1,47 @@
+import React from 'react';
+import AppFrame from '../components/AppFrame';
+import NavigationBar from '../components/NavigationBar';
+import StatusMessage from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/StatusMessage';
+import Footer from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/Footer';
+import PropTypes from 'prop-types';
+import { COLORS } from '@department-of-veterans-affairs/caseflow-frontend-toolkit/util/StyleConstants';
+import { BrowserRouter } from 'react-router-dom';
+
+// eslint-disable-next-line import/extensions
+import COPY from '../../COPY.json';
+
+const options = [{ title: 'Help',
+  link: '/help' },
+{ title: 'Switch User',
+  link: '/test/users' }];
+
+const UnderConstruction = (props) => <BrowserRouter>
+  <div>
+    <NavigationBar
+      dropdownUrls={options}
+      appName="Under Construction"
+      userDisplayName="Menu"
+      defaultUrl="/"
+      logoProps={{
+        accentColor: COLORS.GREY_DARK,
+        overlapColor: COLORS.GREY_DARK
+      }} />
+    <AppFrame>
+      <StatusMessage title= "Coming Soon!">
+        { COPY.UNDER_CONSTRUCTION_MESSAGE }
+      </StatusMessage>
+    </AppFrame>
+    <Footer
+      appName="Under Construction"
+      feedbackUrl={props.feedbackUrl}
+      buildDate={props.buildDate} />
+  </div>
+</BrowserRouter>;
+
+UnderConstruction.propTypes = {
+  feedbackUrl: PropTypes.string,
+  buildDate: PropTypes.object,
+};
+
+export default UnderConstruction;
+
diff --git a/client/app/index.js b/client/app/index.js
index 529cf1b6d9d..50f0e076e0a 100644
--- a/client/app/index.js
+++ b/client/app/index.js
@@ -43,6 +43,7 @@ import Error403 from 'app/errors/Error403';
 import Unauthorized from 'app/containers/Unauthorized';
 import OutOfService from 'app/containers/OutOfService';
 import Feedback from 'app/containers/Feedback';
+import UnderConstruction from 'app/containers/UnderConstruction';
 import Login from 'app/login';
 import TestUsers from 'app/test/TestUsers';
 import TestData from 'app/test/TestData';
@@ -80,6 +81,7 @@ const COMPONENTS = {
   OutOfService,
   Unauthorized,
   Feedback,
+  UnderConstruction,
   Hearings,
   PerformanceDegradationBanner,
   Help,
@@ -91,7 +93,7 @@ const COMPONENTS = {
   Inbox,
   Explain,
   MPISearch,
-  Admin
+  Admin,
 };
 
 const componentWrapper = (component) => (props, railsContext, domNodeId) => {
diff --git a/client/app/nonComp/components/Alerts.jsx b/client/app/nonComp/components/Alerts.jsx
index 63e2386ae46..065823620d5 100644
--- a/client/app/nonComp/components/Alerts.jsx
+++ b/client/app/nonComp/components/Alerts.jsx
@@ -59,6 +59,8 @@ export class FlashAlerts extends React.PureComponent {
         flashMsg = <Alert key={idx} title="Edit Completed" type="success" lowerMargin>{flash[1]}</Alert>;
       } else if (flash[0] === 'show_vha_org_join_info') {
         flashMsg = <VhaJoinOrgAlert />;
+      } else if (flash[0] === 'correspondence_intake_success') {
+        flashMsg = <Alert key={idx} title={flash[1][0]} type="success" lowerMargin>{flash[1][1]}</Alert>;
       }
 
       return flashMsg;
diff --git a/client/app/queue/CaseDetailsLink.jsx b/client/app/queue/CaseDetailsLink.jsx
index 46c9c043837..588ec37ee38 100644
--- a/client/app/queue/CaseDetailsLink.jsx
+++ b/client/app/queue/CaseDetailsLink.jsx
@@ -3,11 +3,12 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import { css } from 'glamor';
-
+import { ICON_SIZES, COLORS } from 'app/constants/AppConstants';
 import { onReceiveAmaTasks } from './QueueActions';
 import COPY from '../../COPY';
 import { subHeadTextStyle } from './constants';
 import Link from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/Link';
+import { ExternalLinkIcon } from '../components/icons/ExternalLinkIcon';
 
 class CaseDetailsLink extends React.PureComponent {
   onClick = (...args) => this.props.onClick ? this.props.onClick(args) : true;
@@ -38,12 +39,24 @@ class CaseDetailsLink extends React.PureComponent {
     } = this.props;
 
     return <React.Fragment>
-      <Link
-        href={`/queue/appeals/${appeal.externalId}`}
-        disabled={disabled}
-        onClick={this.onClick}>
-        {this.getLinkText()}
-      </Link>
+      {this.props.linkOpensInNewTab ?
+        <Link
+          href={`/queue/appeals/${appeal.externalId}`}
+          target="_blank"
+          disabled={disabled}
+          onClick={this.onClick}>
+          <strong>{this.getLinkText()}</strong>
+          <span className="cf-pdf-external-link-icon">
+            &nbsp;
+            <ExternalLinkIcon color={COLORS.PRIMARY} size={ICON_SIZES.SMALL} />
+          </span>
+        </Link> :
+        <Link
+          href={`/queue/appeals/${appeal.externalId}`}
+          disabled={disabled}
+          onClick={this.onClick}>
+          {this.getLinkText()}
+        </Link>}
       {appeal.isPaperCase && <React.Fragment>
         <br />
         <span {...subHeadTextStyle}>{COPY.IS_PAPER_CASE}</span>
@@ -58,7 +71,8 @@ CaseDetailsLink.propTypes = {
   disabled: PropTypes.bool,
   userRole: PropTypes.string,
   getLinkText: PropTypes.func,
-  onClick: PropTypes.func
+  onClick: PropTypes.func,
+  linkOpensInNewTab: PropTypes.bool
 };
 
 const mapDispatchToProps = (dispatch) => bindActionCreators({
diff --git a/client/app/queue/CaseListTable.jsx b/client/app/queue/CaseListTable.jsx
index ef5c5eeef2a..3bb574a610c 100644
--- a/client/app/queue/CaseListTable.jsx
+++ b/client/app/queue/CaseListTable.jsx
@@ -9,25 +9,56 @@ import DocketTypeBadge from '../components/DocketTypeBadge';
 import Table from '../components/Table';
 import BadgeArea from 'app/components/badges/BadgeArea';
 import { clearCaseListSearch } from './CaseList/CaseListActions';
+import { Checkbox } from '../components/Checkbox';
 
 import { DateString } from '../util/DateUtil';
 import { statusLabel, labelForLocation, renderAppealType, mostRecentHeldHearingForAppeal } from './utils';
 import COPY from '../../COPY';
+import Pagination from 'app/components/Pagination/Pagination';
 
 class CaseListTable extends React.PureComponent {
+
+  state = { currentPage: this.props.currentPage };
+
   componentWillUnmount = () => this.props.clearCaseListSearch();
 
   getKeyForRow = (rowNumber, object) => object.id;
 
   getColumns = () => {
-    const columns = [
+    const columns = [];
+
+    if (this.props.showCheckboxes) {
+      columns.push(
+        {
+          header: '',
+          valueFunction: (appeal) => {
+            return (
+              <Checkbox
+                name={`${appeal.id}`}
+                id={`${appeal.id}`}
+                defaultValue={this.props.taskRelatedAppealIds.includes(appeal.id)}
+                hideLabel
+                onChange={(checked) => this.props.checkboxOnChange(appeal.id, checked)}
+              />
+            );
+          }
+        }
+      );
+    }
+
+    columns.push(
       {
         header: COPY.CASE_LIST_TABLE_DOCKET_NUMBER_COLUMN_TITLE,
         valueFunction: (appeal) => {
           return (
             <React.Fragment>
               <DocketTypeBadge name={appeal.docketName} number={appeal.docketNumber} />
-              <CaseDetailsLink appeal={appeal} userRole={this.props.userRole} getLinkText={() => appeal.docketNumber} />
+              <CaseDetailsLink
+                appeal={appeal}
+                userRole={this.props.userRole}
+                getLinkText={() => appeal.docketNumber}
+                linkOpensInNewTab={this.props.linkOpensInNewTab}
+              />
             </React.Fragment>
           );
         }
@@ -56,7 +87,7 @@ class CaseListTable extends React.PureComponent {
         header: COPY.CASE_LIST_TABLE_APPEAL_LOCATION_COLUMN_TITLE,
         valueFunction: (appeal) => labelForLocation(appeal, this.props.userCssId)
       }
-    ];
+    );
 
     const anyAppealsHaveFnod = Boolean(
       find(this.props.appeals, (appeal) => appeal.veteranAppellantDeceased)
@@ -91,24 +122,70 @@ class CaseListTable extends React.PureComponent {
       return <p>{COPY.CASE_LIST_TABLE_EMPTY_TEXT}</p>;
     }
 
+    const updatePageHandler = (idx) => {
+      const newCurrentPage = idx + 1;
+
+      this.setState({ currentPage: newCurrentPage });
+
+      if (typeof this.props.updatePageHandlerCallback !== 'undefined') {
+        this.props.updatePageHandlerCallback(newCurrentPage);
+      }
+    };
+    const totalPages = Math.ceil(this.props.appeals.length / 5);
+    const startIndex = (this.state.currentPage * 5) - 5;
+    const endIndex = (this.state.currentPage * 5);
+
     return (
-      <Table
-        className="cf-case-list-table"
-        columns={this.getColumns}
-        rowObjects={this.props.appeals}
-        getKeyForRow={this.getKeyForRow}
-        styling={this.props.styling}
-      />
+      this.props.paginate ?
+        <div>
+          <Pagination
+            pageSize={5}
+            currentPage={this.state.currentPage}
+            currentCases={this.props.appeals.slice(startIndex, endIndex).length}
+            totalPages={totalPages}
+            totalCases={this.props.appeals.length}
+            updatePage={updatePageHandler}
+            table={
+              <Table
+                className="cf-case-list-table"
+                columns={this.getColumns}
+                rowObjects={this.props.appeals.slice(startIndex, endIndex)}
+                getKeyForRow={this.getKeyForRow}
+                styling={this.props.styling}
+              />
+            }
+          />
+        </div> :
+        <Table
+          className="cf-case-list-table"
+          columns={this.getColumns}
+          rowObjects={this.props.appeals}
+          getKeyForRow={this.getKeyForRow}
+          styling={this.props.styling}
+        />
     );
   };
 }
 
 CaseListTable.propTypes = {
   appeals: PropTypes.arrayOf(PropTypes.object).isRequired,
+  taskRelatedAppealIds: PropTypes.array,
+  showCheckboxes: PropTypes.bool,
+  paginate: PropTypes.bool,
+  linkOpensInNewTab: PropTypes.bool,
+  checkboxOnChange: PropTypes.func,
   styling: PropTypes.object,
   clearCaseListSearch: PropTypes.func,
   userRole: PropTypes.string,
-  userCssId: PropTypes.string
+  userCssId: PropTypes.string,
+  currentPage: PropTypes.number,
+  updatePageHandlerCallback: PropTypes.func
+};
+
+CaseListTable.defaultProps = {
+  showCheckboxes: false,
+  paginate: false,
+  currentPage: 1
 };
 
 const mapStateToProps = (state) => ({
diff --git a/client/app/queue/OrganizationQueue.jsx b/client/app/queue/OrganizationQueue.jsx
index a8db8bc118f..79ee4a78b73 100644
--- a/client/app/queue/OrganizationQueue.jsx
+++ b/client/app/queue/OrganizationQueue.jsx
@@ -23,12 +23,12 @@ class OrganizationQueue extends React.PureComponent {
   }
 
   render = () => {
-    const { success } = this.props;
+    const { success, featureToggles } = this.props;
 
     return <React.Fragment>
       {success && <Alert styling={alertPaddingStyles} type="success" title={success.title} message={success.detail} />}
       <AppSegment filledBackground styling={containerStyles}>
-        <QueueTableBuilder />
+        <QueueTableBuilder featureToggles={featureToggles} />
       </AppSegment>
     </React.Fragment>;
   };
@@ -36,7 +36,8 @@ class OrganizationQueue extends React.PureComponent {
 
 OrganizationQueue.propTypes = {
   clearCaseSelectSearch: PropTypes.func,
-  success: PropTypes.object
+  success: PropTypes.object,
+  featureToggles: PropTypes.object
 };
 
 const mapStateToProps = (state) => ({ success: state.ui.messages.success });
diff --git a/client/app/queue/QueueApp.jsx b/client/app/queue/QueueApp.jsx
index 31c01fdf65d..5ea3a72a15d 100644
--- a/client/app/queue/QueueApp.jsx
+++ b/client/app/queue/QueueApp.jsx
@@ -8,6 +8,7 @@ import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 import { Route, Switch } from 'react-router-dom';
 import StringUtil from '../util/StringUtil';
+import CorrespondenceCases from './correspondence/CorrespondenceCases';
 
 import {
   setCanEditAod,
@@ -35,6 +36,7 @@ import Footer from '@department-of-veterans-affairs/caseflow-frontend-toolkit/co
 import AppFrame from '../components/AppFrame';
 import QueueLoadingScreen from './QueueLoadingScreen';
 import CaseDetailsLoadingScreen from './CaseDetailsLoadingScreen';
+import ReviewPackageLoadingScreen from './correspondence/review_package/ReviewPackageLoadingScreen';
 import AttorneyTaskListView from './AttorneyTaskListView';
 import ColocatedTaskListView from './ColocatedTaskListView';
 import JudgeDecisionReviewTaskListView from './JudgeDecisionReviewTaskListView';
@@ -85,6 +87,8 @@ import OrganizationUsers from './OrganizationUsers';
 import OrganizationQueueLoadingScreen from './OrganizationQueueLoadingScreen';
 import TeamManagement from './teamManagement/TeamManagement';
 import UserManagement from './UserManagement';
+import CorrespondenceReviewPackage from './correspondence/review_package/CorrespondenceReviewPackage';
+import CorrespondenceIntake from './correspondence/intake/components/CorrespondenceIntake';
 
 import { LOGO_COLORS } from '../constants/AppConstants';
 import { PAGE_TITLES } from './constants';
@@ -612,6 +616,12 @@ class QueueApp extends React.PureComponent {
     <PostponeHearingTaskModal {...props.match.params} />
   );
 
+  routedReviewPackage = (props) => (
+    <ReviewPackageLoadingScreen {...props.match.params}>
+      <CorrespondenceReviewPackage {...props.match.params} />
+    </ReviewPackageLoadingScreen>
+  );
+
   routedStartHoldModal = (props) => <StartHoldModal {...props.match.params} />;
 
   routedEndHoldModal = (props) => <EndHoldModal {...props.match.params} />;
@@ -661,6 +671,14 @@ class QueueApp extends React.PureComponent {
     <CompleteHearingPostponementRequestModal {...props.match.params} />
   );
 
+  routedCorrespondenceIntake = (props) => (
+    <CorrespondenceIntake autoTexts={this.props.autoTexts} {...props.match.params} veteranInformation={this.props.veteranInformation} />
+  );
+
+  routedCorrespondenceCase = () => (
+    <CorrespondenceCases {...this.props} />
+  );
+
   routedCompleteHearingWithdrawalRequest = (props) => (
     <CompleteHearingWithdrawalRequestModal {...props.match.params} />
   );
@@ -718,6 +736,14 @@ class QueueApp extends React.PureComponent {
               title={`${this.queueName()}  | Caseflow`}
               render={this.routedQueueList}
             />
+
+            <PageRoute
+              exact
+              path="/queue/correspondence"
+              title={`${PAGE_TITLES.CORRESPONDENCE_CASES_LIST}`}
+              render={this.routedCorrespondenceCase}
+            />
+
             <PageRoute
               exact
               path="/queue/:userId"
@@ -874,6 +900,13 @@ class QueueApp extends React.PureComponent {
               render={this.routedEditAppellantInformation}
             />
 
+            <PageRoute
+              exact
+              path="/queue/correspondence/:correspondence_uuid/review_package"
+              title={`${PAGE_TITLES.REVIEW_PACKAGE}`}
+              render={this.routedReviewPackage}
+            />
+
             <PageRoute
               exact
               path="/queue/appeals/:appealId/edit_poa_information"
@@ -891,6 +924,17 @@ class QueueApp extends React.PureComponent {
               title={`${PAGE_TITLES.USER_MANAGEMENT} | Caseflow`}
               render={this.routedUserManagement}
             />
+            <PageRoute
+              path="/queue/correspondence/:correspondence_uuid/intake"
+              title={`${PAGE_TITLES.USER_MANAGEMENT} | Caseflow`}
+              render={this.routedCorrespondenceIntake}
+            />
+
+            <PageRoute
+              path="/queue/correspondence/:correspondence_uuid/intake"
+              title={`${PAGE_TITLES.CORRESPONDENCE_INTAKE}`}
+              render={this.routedCorrespondenceIntake}
+            />
 
             {motionToVacateRoutes.page}
 
@@ -1402,7 +1446,6 @@ class QueueApp extends React.PureComponent {
               path="/team_management/lookup_participant_id"
               render={this.routedLookupParticipantIdModal}
             />
-
             {motionToVacateRoutes.modal}
           </Switch>
         </div>
@@ -1459,6 +1502,9 @@ QueueApp.propTypes = {
   canEditCavcDashboards: PropTypes.bool,
   canViewCavcDashboards: PropTypes.bool,
   userIsCobAdmin: PropTypes.bool,
+  correspondence: PropTypes.object,
+  autoTexts: PropTypes.array,
+  veteranInformation: PropTypes.object,
 };
 
 const mapStateToProps = (state) => ({
diff --git a/client/app/queue/QueueTableBuilder.jsx b/client/app/queue/QueueTableBuilder.jsx
index 251dfce526c..9d421e23f0f 100644
--- a/client/app/queue/QueueTableBuilder.jsx
+++ b/client/app/queue/QueueTableBuilder.jsx
@@ -250,7 +250,7 @@ const QueueTableBuilder = (props) => {
 
   return <div className={rootStyles}>
     <h1 {...css({ display: 'inline-block' })}>{config.table_title}</h1>
-    <QueueOrganizationDropdown organizations={props.organizations} />
+    <QueueOrganizationDropdown organizations={props.organizations} featureToggles = {props.featureToggles} />
     <TabWindow
       name="tasks-tabwindow"
       tabs={tabsFromConfig(config)}
@@ -278,6 +278,7 @@ QueueTableBuilder.propTypes = {
   requireDasRecord: PropTypes.bool,
   userCanBulkAssign: PropTypes.bool,
   isVhaOrg: PropTypes.bool,
+  featureToggles: PropTypes.object
 };
 
 export default connect(mapStateToProps)(QueueTableBuilder);
diff --git a/client/app/queue/components/QueueOrganizationDropdown.jsx b/client/app/queue/components/QueueOrganizationDropdown.jsx
index f5f4756e25c..13b89541774 100644
--- a/client/app/queue/components/QueueOrganizationDropdown.jsx
+++ b/client/app/queue/components/QueueOrganizationDropdown.jsx
@@ -11,6 +11,7 @@ export default class QueueOrganizationDropdown extends React.Component {
     const url = window.location.pathname.split('/');
     const location = url[url.length - 1];
     const queueHref = (location === 'queue') ? '#' : '/queue';
+    let correspondenceItems = {};
 
     if (organizations.length < 1) {
       return null;
@@ -33,7 +34,19 @@ export default class QueueOrganizationDropdown extends React.Component {
       };
     });
 
-    const items = [queueItem, ...organizationItems];
+    let items = [queueItem, ...organizationItems];
+
+    if (organizations[0].name === 'Mail' || organizations[0].name === 'Mail Team Supervisor') {
+      const orgHref = '/queue/correspondence';
+
+      correspondenceItems = {
+        key: (2).toString(),
+        href: orgHref,
+        label: sprintf(COPY.CASE_LIST_TABLE_QUEUE_DROPDOWN_CORRESPONDENCE_CASES)
+      };
+
+      items = [...items, correspondenceItems];
+    }
 
     return <QueueSelectorDropdown items={items} />;
   }
@@ -43,5 +56,5 @@ QueueOrganizationDropdown.propTypes = {
   organizations: PropTypes.arrayOf(PropTypes.shape({
     name: PropTypes.string.isRequired,
     url: PropTypes.string.isRequired
-  }))
+  })),
 };
diff --git a/client/app/queue/constants.js b/client/app/queue/constants.js
index a2cae86e8e7..159b930fe93 100644
--- a/client/app/queue/constants.js
+++ b/client/app/queue/constants.js
@@ -11,6 +11,7 @@ import { COLORS as COMMON_COLORS } from '@department-of-veterans-affairs/caseflo
 import COPY from '../../COPY';
 import VACOLS_COLUMN_MAX_LENGTHS from '../../constants/VACOLS_COLUMN_MAX_LENGTHS';
 import LEGACY_APPEAL_TYPES_BY_ID from '../../constants/LEGACY_APPEAL_TYPES_BY_ID';
+import QUEUE_INTAKE_FORM_TASK_TYPES from '../../constants/QUEUE_INTAKE_FORM_TASK_TYPES';
 
 export const COLORS = {
   QUEUE_LOGO_PRIMARY: '#11598D',
@@ -164,6 +165,8 @@ export const LEGACY_APPEAL_TYPES = _.fromPairs(_.zip(
   _.values(LEGACY_APPEAL_TYPES_BY_ID)
 ));
 
+export const INTAKE_FORM_TASK_TYPES = QUEUE_INTAKE_FORM_TASK_TYPES;
+
 export const ISSUE_DESCRIPTION_MAX_LENGTH = VACOLS_COLUMN_MAX_LENGTHS.ISSUES.ISSDESC;
 export const ATTORNEY_COMMENTS_MAX_LENGTH = VACOLS_COLUMN_MAX_LENGTHS.DECASS.DEATCOM;
 export const DOCUMENT_ID_MAX_LENGTH = VACOLS_COLUMN_MAX_LENGTHS.DECASS.DEDOCID;
@@ -212,7 +215,10 @@ export const PAGE_TITLES = {
   CONVERT_HEARING_TO_VIDEO: 'Change Hearing Request Type to Video',
   CONVERT_HEARING_TO_CENTRAL: 'Change Hearing Request Type to Central',
   COMPLETE_HEARING_POSTPONEMENT_REQUEST: 'Complete Hearing Postponement Request',
-  COMPLETE_HEARING_WITHDRAWAL_REQUEST: 'Complete Hearing Withdrawal Request'
+  COMPLETE_HEARING_WITHDRAWAL_REQUEST: 'Complete Hearing Withdrawal Request',
+  REVIEW_PACKAGE: 'Review Package',
+  CORRESPONDENCE_CASES_LIST: 'Correspondence Cases',
+  CORRESPONDENCE_INTAKE: 'Correspondence Intake'
 };
 
 export const CUSTOM_HOLD_DURATION_TEXT = 'Custom';
diff --git a/client/app/queue/correspondence/CorrespondenceCases.jsx b/client/app/queue/correspondence/CorrespondenceCases.jsx
new file mode 100644
index 00000000000..7ad68873b3c
--- /dev/null
+++ b/client/app/queue/correspondence/CorrespondenceCases.jsx
@@ -0,0 +1,82 @@
+import * as React from 'react';
+import { connect } from 'react-redux';
+import { bindActionCreators } from 'redux';
+import ApiUtil from '../../util/ApiUtil';
+import { loadVetCorrespondence } from './correspondenceReducer/correspondenceActions';
+import AppSegment from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/AppSegment';
+import PropTypes from 'prop-types';
+import COPY from '../../../COPY';
+import { css } from 'glamor';
+import CorrespondenceTable from './CorrespondenceTable';
+import QueueOrganizationDropdown from '../components/QueueOrganizationDropdown';
+
+// import {
+//   initialAssignTasksToUser,
+//   initialCamoAssignTasksToVhaProgramOffice
+// } from '../QueueActions';
+
+class CorrespondenceCases extends React.PureComponent {
+
+  // grabs correspondences and loads into intakeCorrespondence redux store.
+  getVeteransWithCorrespondence() {
+    return ApiUtil.get('/queue/correspondence?json').then((response) => {
+      const returnedObject = response.body;
+      const vetCorrespondences = returnedObject.vetCorrespondences;
+
+      this.props.loadVetCorrespondence(vetCorrespondences);
+    }).
+      catch((err) => {
+        // allow HTTP errors to fall on the floor via the console.
+        console.error(new Error(`Problem with GET /queue/correspondence?json ${err}`));
+      });
+  }
+
+  // load veteran correspondence info on page load
+  componentDidMount() {
+    // Retry the request after a delay
+    setTimeout(() => {
+      this.getVeteransWithCorrespondence();
+    }, 1000);
+  }
+
+  render = () => {
+    const {
+      organizations
+    } = this.props;
+
+    return (
+      <React.Fragment>
+        <AppSegment filledBackground>
+          <h1 {...css({ display: 'inline-block' })}>{COPY.CASE_LIST_TABLE_QUEUE_DROPDOWN_CORRESPONDENCE_CASES}</h1>
+          <QueueOrganizationDropdown organizations={organizations} />
+          {this.props.vetCorrespondences &&
+          <CorrespondenceTable
+            vetCorrespondences={this.props.vetCorrespondences}
+          />
+          }
+        </AppSegment>
+      </React.Fragment>
+    );
+  }
+}
+
+CorrespondenceCases.propTypes = {
+  organizations: PropTypes.array,
+  loadVetCorrespondence: PropTypes.func,
+  vetCorrespondences: PropTypes.array
+};
+
+const mapStateToProps = (state) => ({
+  vetCorrespondences: state.intakeCorrespondence.vetCorrespondences
+});
+
+const mapDispatchToProps = (dispatch) => (
+  bindActionCreators({
+    loadVetCorrespondence
+  }, dispatch)
+);
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(CorrespondenceCases);
diff --git a/client/app/queue/correspondence/CorrespondencePaginationWrapper.jsx b/client/app/queue/correspondence/CorrespondencePaginationWrapper.jsx
new file mode 100644
index 00000000000..4f67c537658
--- /dev/null
+++ b/client/app/queue/correspondence/CorrespondencePaginationWrapper.jsx
@@ -0,0 +1,52 @@
+import React, { useState } from 'react';
+import PropTypes, { object } from 'prop-types';
+import CorrespondencePagination from '../../components/Pagination/CorrespondencePagination';
+const CorrespondencePaginationWrapper = (props) => {
+
+  const [currentPage, setCurrentPage] = useState(1);
+
+  const totalPages = Math.ceil(props.rowObjects.length / props.columnsToDisplay);
+  const startIndex = (currentPage * props.columnsToDisplay) - 15;
+  const endIndex = (currentPage * props.columnsToDisplay);
+
+  return <React.Fragment>
+    <CorrespondencePagination
+    // displayed label for beginning range of total items
+      pageSize={props.columnsToDisplay}
+      // index user  is on
+      currentPage={currentPage}
+      // displayed label for items on page
+      currentItems={props.rowObjects.slice(startIndex, endIndex).length}
+      // displayed pages user can click
+      totalPages={totalPages}
+      // displayed label for total items
+      totalItems={props.rowObjects.length}
+      columns={props.columns}
+      rowObjects={props.rowObjects.slice(startIndex, endIndex)}
+      summary={props.summary}
+      className={props.className}
+      headerClassName={props.headerClassName}
+      bodyClassName={props.bodyClassName}
+      tbodyId={props.tbodyId}
+      getKeyForRow={props.getKeyForRow}
+      updatePage={(incoming) => {
+        setCurrentPage(incoming + 1);
+      }}
+    />
+  </React.Fragment>;
+};
+
+CorrespondencePaginationWrapper.propTypes = {
+  children: PropTypes.node,
+  columnsToDisplay: PropTypes.number,
+  rowObjects: PropTypes.arrayOf(object),
+  columns: PropTypes.func,
+  summary: PropTypes.string,
+  className: PropTypes.string,
+  headerClassName: PropTypes.string,
+  bodyClassName: PropTypes.string,
+  tbodyId: PropTypes.string,
+  getKeyForRow: PropTypes.func
+};
+
+export default React.memo(CorrespondencePaginationWrapper);
diff --git a/client/app/queue/correspondence/CorrespondenceTable.jsx b/client/app/queue/correspondence/CorrespondenceTable.jsx
new file mode 100644
index 00000000000..7f828b94e1b
--- /dev/null
+++ b/client/app/queue/correspondence/CorrespondenceTable.jsx
@@ -0,0 +1,71 @@
+import React from 'react';
+import QueueTable from '../QueueTable';
+import PropTypes from 'prop-types';
+import Link from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/Link';
+
+class CorrespondenceTable extends React.Component {
+
+  render() {
+
+    const columns = [
+      {
+        name: 'veteranDetails',
+        header: 'Veteran Details',
+        align: 'left',
+        valueName: 'veteranDetails',
+        getSortValue: (row) => row.firstName,
+        backendCanSort: true,
+        valueFunction: (row) => (
+          <Link href={`/queue/correspondence/${row.correspondenceUuid}/review_package`}>
+            {`${row.firstName} ${row.lastName} (${row.fileNumber})`}
+          </Link>
+        )
+      },
+      {
+        name: 'packageDocumentType',
+        header: 'Package Document Type ',
+        align: 'left',
+        valueName: 'packageDocumentType',
+        enableFilter: true,
+        getSortValue: (row) => row.packageDocumentType,
+        backendCanSort: true
+      },
+      {
+        name: 'cmPacketNumber',
+        header: 'CM Packet Number ',
+        align: 'left',
+        valueName: 'cmPacketNumber',
+        getSortValue: (row) => row.cmPacketNumber,
+        backendCanSort: true
+      }
+    ];
+    const tabPaginationOptions = {
+      onPageLoaded: this.onPageLoaded
+    };
+
+    return (
+      <QueueTable
+        className="assign-correspondence-table"
+        columns={columns}
+        rowObjects={this.props.vetCorrespondences}
+        summary="scheduled-hearings-table"
+        enablePagination
+        tabPaginationOptions={tabPaginationOptions}
+      />
+    );
+  }
+}
+
+CorrespondenceTable.propTypes = {
+  hearingScheduleColumns: PropTypes.array,
+  hearingScheduleRows: PropTypes.array,
+  onApply: PropTypes.func,
+  loadVetCorrespondence: PropTypes.func,
+  vetCorrespondences: PropTypes.array,
+  history: PropTypes.object,
+  user: PropTypes.shape({
+    userCanBuildHearingSchedule: PropTypes.bool
+  })
+};
+
+export default CorrespondenceTable;
diff --git a/client/app/queue/correspondence/component/EditDocumentTypeModal.jsx b/client/app/queue/correspondence/component/EditDocumentTypeModal.jsx
new file mode 100644
index 00000000000..e1954d53e5a
--- /dev/null
+++ b/client/app/queue/correspondence/component/EditDocumentTypeModal.jsx
@@ -0,0 +1,123 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ApiUtil from '../../../util/ApiUtil';
+import { sprintf } from 'sprintf-js';
+import SearchableDropdown from 'app/components/SearchableDropdown';
+import { connect } from 'react-redux';
+import { bindActionCreators } from 'redux';
+import { updateDocumentTypeName } from '../correspondenceReducer/reviewPackageActions';
+import { css } from 'glamor';
+import COPY from '../../../../COPY';
+import Modal from '../../../components/Modal';
+import Button from '../../../components/Button';
+
+const modalStyle = css({
+  width: '32%'
+});
+
+class EditDocumentTypeModal extends React.Component {
+
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      packageDocument: {},
+      disabledSaveButton: true,
+      packageOptions: {},
+    };
+  }
+
+  componentDidMount() {
+    setTimeout(this.getPackages, 0);
+  }
+
+  getPackages = () => {
+    ApiUtil.get('/queue/correspondence/edit_document_type_correspondence').then((resp) => {
+      const documents = resp.body.data.map((doc) => ({
+        label: doc.name,
+        value: doc.id
+      }));
+
+      this.setState({ packageOptions: documents });
+    });
+  }
+
+  packageDocumentOnChange = (value) => {
+    this.setState({
+      packageDocument: value,
+      disabledSaveButton: false
+    });
+  };
+
+  updateDocumentType = async () => {
+    try {
+      ApiUtil.patch(`/queue/correspondence/${this.props.document.id}/update_document`, {
+        data: {
+          vbms_document_type_id: this.state.packageDocument.value
+        }
+      });
+      this.props.updateDocumentTypeName(this.state.packageDocument, this.props.indexDoc);
+      this.props.setModalState(false);
+    } catch (error) {
+      console.error(error);
+    }
+  }
+
+  render() {
+    const { onCancel, document } = this.props;
+    const { packageDocument } = this.state;
+
+    const submit = () => {
+      this.updateDocumentType();
+    };
+    const originalDocumentTitle = document.document_title;
+
+    return (
+      <Modal
+        customStyles = {modalStyle}
+        title= {sprintf(COPY.TITLE_MODAL_EDIT_DOCUMENT_TYPE_CORRESPONDENCE)}
+        closeHandler={onCancel}
+        confirmButton={<Button disabled={this.state.disabledSaveButton}
+          onClick={submit}>Save</Button>}
+        cancelButton={<Button linkStyling onClick={onCancel}>Cancel</Button>}
+      >
+        <p>{sprintf(COPY.TEXT_MODAL_EDIT_DOCUMENT_TYPE_CORRESPONDENCE)}</p>
+        <div style={{ fontWeight: 'bold' }}>
+          {sprintf(COPY.ORIGINAL_DOC_EDIT_DOCUMENT_TYPE_CORRESPONDENCE)}
+        </div>
+        <p>{originalDocumentTitle}</p>
+
+        <SearchableDropdown
+          name = "issue-category"
+          label = {sprintf(COPY.NEW_DOC_EDIT_DOCUMENT_TYPE_CORRESPONDENCE)}
+          strongLabel = {false}
+          placeholder = "Select or enter..."
+          options = {this.state.packageOptions}
+          value = {packageDocument}
+          onChange = {this.packageDocumentOnChange}
+        />
+
+      </Modal>
+    );
+
+  }
+}
+
+EditDocumentTypeModal.propTypes = {
+  modalState: PropTypes.bool,
+  onCancel: PropTypes.func,
+  document: PropTypes.object,
+  onSaveValue: PropTypes.func,
+  updateDocumentTypeName: PropTypes.func,
+  setModalState: PropTypes.func,
+  indexDoc: PropTypes.number
+};
+
+const mapDispatchToProps = (dispatch) => bindActionCreators({
+  updateDocumentTypeName
+}, dispatch);
+
+export default connect(
+  null,
+  mapDispatchToProps,
+)(EditDocumentTypeModal);
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
new file mode 100644
index 00000000000..d54bfd7d238
--- /dev/null
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
@@ -0,0 +1,126 @@
+import { ACTIONS } from './correspondenceConstants';
+
+export const loadCurrentCorrespondence = (currentCorrespondence) =>
+  (dispatch) => {
+    dispatch({
+      type: ACTIONS.LOAD_CURRENT_CORRESPONDENCE,
+      payload: {
+        currentCorrespondence
+      }
+    });
+  };
+
+export const loadCorrespondences = (correspondences) =>
+  (dispatch) => {
+    dispatch({
+      type: ACTIONS.LOAD_CORRESPONDENCES,
+      payload: {
+        correspondences
+      }
+    });
+  };
+
+export const loadVeteranInformation = (veteranInformation) =>
+  (dispatch) => {
+    dispatch({
+      type: ACTIONS.LOAD_VETERAN_INFORMATION,
+      payload: {
+        veteranInformation
+      }
+    });
+  };
+
+export const loadVetCorrespondence = (vetCorrespondences) =>
+  (dispatch) => {
+    dispatch({
+      type: ACTIONS.LOAD_VET_CORRESPONDENCE,
+      payload: {
+        vetCorrespondences
+      }
+    });
+  };
+
+export const updateRadioValue = (value) =>
+  (dispatch) => {
+    dispatch({
+      type: ACTIONS.UPDATE_RADIO_VALUE,
+      payload: value
+    });
+  };
+
+export const saveCheckboxState = (correspondence, isChecked) =>
+  (dispatch) => {
+    dispatch({
+      type: ACTIONS.SAVE_CHECKBOX_STATE,
+      payload: {
+        correspondence, isChecked
+      }
+    });
+  };
+
+export const clearCheckboxState = () =>
+  (dispatch) => {
+    dispatch({
+      type: ACTIONS.CLEAR_CHECKBOX_STATE,
+    });
+  };
+
+export const setTaskRelatedAppealIds = (appealIds) =>
+  (dispatch) => {
+    dispatch({
+      type: ACTIONS.SET_TASK_RELATED_APPEAL_IDS,
+      payload: {
+        appealIds
+      }
+    });
+  };
+
+export const setUnrelatedTasks = (tasks) =>
+  (dispatch) => {
+    dispatch({
+      type: ACTIONS.SET_UNRELATED_TASKS,
+      payload: {
+        tasks
+      }
+    });
+  };
+
+export const setFetchedAppeals = (appeals) =>
+  (dispatch) => {
+    dispatch({
+      type: ACTIONS.SET_FETCHED_APPEALS,
+      payload: {
+        appeals
+      }
+    });
+  };
+
+export const saveMailTaskState = (name, isChecked) =>
+  (dispatch) => {
+    dispatch({
+      type: ACTIONS.SAVE_MAIL_TASK_STATE,
+      payload: {
+        name,
+        isChecked
+      }
+    });
+  };
+
+export const setNewAppealRelatedTasks = (newAppealRelatedTasks) =>
+  (dispatch) => {
+    dispatch({
+      type: ACTIONS.SET_NEW_APPEAL_RELATED_TASKS,
+      payload: {
+        newAppealRelatedTasks
+      }
+    });
+  };
+
+export const setWaivedEvidenceTasks = (task) => (dispatch) => {
+  dispatch({
+    type: ACTIONS.SET_WAIVED_EVIDENCE_TASKS,
+    payload: {
+      task
+    }
+  });
+};
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
new file mode 100644
index 00000000000..5ccbf472a5b
--- /dev/null
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
@@ -0,0 +1,15 @@
+export const ACTIONS = {
+  LOAD_CURRENT_CORRESPONDENCE: 'LOAD_CURRENT_CORRESPONDENCE',
+  LOAD_CORRESPONDENCES: 'LOAD_CORRESPONDENCES',
+  LOAD_VETERAN_INFORMATION: 'LOAD_VETERAN_INFORMATION',
+  LOAD_VET_CORRESPONDENCE: 'LOAD_VET_CORRESPONDENCE',
+  UPDATE_RADIO_VALUE: 'UPDATE_RADIO_VALUE',
+  SAVE_CHECKBOX_STATE: 'SAVE_CHECKBOX_STATE',
+  CLEAR_CHECKBOX_STATE: 'CLEAR_CHECKBOX_STATE',
+  SAVE_MAIL_TASK_STATE: 'SAVE_MAIL_TASK_STATE',
+  SET_TASK_RELATED_APPEAL_IDS: 'SET_TASK_RELATED_APPEAL_IDS',
+  SET_UNRELATED_TASKS: 'SET_UNRELATED_TASKS',
+  SET_FETCHED_APPEALS: 'SET_FETCHED_APPEALS',
+  SET_NEW_APPEAL_RELATED_TASKS: 'SET_NEW_APPEAL_RELATED_TASKS',
+  SET_WAIVED_EVIDENCE_TASKS: 'SET_WAIVED_EVIDENCE_TASKS',
+};
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
new file mode 100644
index 00000000000..ff021b34f25
--- /dev/null
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
@@ -0,0 +1,126 @@
+import { update } from '../../../util/ReducerUtil';
+import { ACTIONS } from './correspondenceConstants';
+
+export const initialState = {
+  taskRelatedAppealIds: [],
+  newAppealRelatedTasks: [],
+  fetchedAppeals: [],
+  correspondences: [],
+  radioValue: '0',
+  relatedCorrespondences: [],
+  mailTasks: {},
+  unrelatedTasks: [],
+  currentCorrespondence: [],
+  veteranInformation: [],
+  waivedEvidenceTasks: [],
+};
+
+export const intakeCorrespondenceReducer = (state = initialState, action = {}) => {
+  switch (action.type) {
+  case ACTIONS.LOAD_CURRENT_CORRESPONDENCE:
+    return update(state, {
+      currentCorrespondence: {
+        $set: action.payload.currentCorrespondence
+      }
+    });
+
+  case ACTIONS.LOAD_CORRESPONDENCES:
+    return update(state, {
+      correspondences: {
+        $set: action.payload.correspondences
+      }
+    });
+
+  case ACTIONS.LOAD_VETERAN_INFORMATION:
+    return update(state, {
+      veteranInformation: {
+        $set: action.payload.veteranInformation
+      }
+    });
+
+  case ACTIONS.LOAD_VET_CORRESPONDENCE:
+    return update(state, {
+      vetCorrespondences: {
+        $set: action.payload.vetCorrespondences
+      }
+    });
+
+  case ACTIONS.UPDATE_RADIO_VALUE:
+    return update(state, {
+      radioValue: {
+        $set: action.payload.radioValue
+      }
+    });
+
+  case ACTIONS.SAVE_CHECKBOX_STATE:
+    if (action.payload.isChecked) {
+      return update(state, {
+        relatedCorrespondences: {
+          $push: [action.payload.correspondence]
+        }
+      });
+    }
+
+    return update(state, {
+      relatedCorrespondences: {
+        $set: state.relatedCorrespondences.filter((corr) => corr.id !== action.payload.correspondence.id)
+      }
+    });
+
+  case ACTIONS.CLEAR_CHECKBOX_STATE:
+    return update(state, {
+      relatedCorrespondences: {
+        $set: []
+      }
+    });
+
+  case ACTIONS.SET_UNRELATED_TASKS:
+    return update(state, {
+      unrelatedTasks: {
+        $set: [...action.payload.tasks]
+      }
+    });
+
+  case ACTIONS.SET_FETCHED_APPEALS:
+    return update(state, {
+      fetchedAppeals: {
+        $set: [...action.payload.appeals]
+      }
+    });
+
+  case ACTIONS.SAVE_MAIL_TASK_STATE:
+    return update(state, {
+      mailTasks: {
+        [action.payload.name]: {
+          $set: action.payload.isChecked
+        }
+      }
+    });
+
+  case ACTIONS.SET_TASK_RELATED_APPEAL_IDS:
+    return update(state, {
+      taskRelatedAppealIds: {
+        $set: [...action.payload.appealIds]
+      }
+    });
+
+  case ACTIONS.SET_NEW_APPEAL_RELATED_TASKS:
+    return update(state, {
+      newAppealRelatedTasks: {
+        $set: [...action.payload.newAppealRelatedTasks]
+      }
+    });
+
+  case ACTIONS.SET_WAIVED_EVIDENCE_TASKS:
+    return update(state, {
+      waivedEvidenceTasks: {
+        $set: [...action.payload.task]
+      }
+    });
+
+  default:
+    return state;
+  }
+};
+
+export default intakeCorrespondenceReducer;
diff --git a/client/app/queue/correspondence/correspondenceReducer/reviewPackageActions.js b/client/app/queue/correspondence/correspondenceReducer/reviewPackageActions.js
new file mode 100644
index 00000000000..90cfa557c87
--- /dev/null
+++ b/client/app/queue/correspondence/correspondenceReducer/reviewPackageActions.js
@@ -0,0 +1,63 @@
+import { ACTIONS } from './reviewPackageConstants';
+
+export const setCorrespondence = (correspondence) =>
+  (dispatch) => {
+    dispatch({
+      type: ACTIONS.SET_CORRESPONDENCE,
+      payload: {
+        correspondence
+      }
+    });
+  };
+
+export const setCorrespondenceDocuments = (correspondenceDocuments) =>
+  (dispatch) => {
+    dispatch({
+      type: ACTIONS.SET_CORRESPONDENCE_DOCUMENTS,
+      payload: {
+        correspondenceDocuments
+      }
+    });
+  };
+
+export const setPackageDocumentType = (packageDocumentType) =>
+  (dispatch) => {
+    dispatch({
+      type: ACTIONS.SET_PACKAGE_DOCUMENT_TYPE,
+      payload: {
+        packageDocumentType
+      }
+    });
+  };
+
+export const setVeteranInformation = (veteranInfo) =>
+  (dispatch) => {
+    dispatch({
+      type: ACTIONS.SET_VETERAN_INFORMATION,
+      payload: {
+        veteranInfo
+      }
+    });
+  };
+
+export const updateCmpInformation = (packageDocumentType, date) =>
+  (dispatch) => {
+    dispatch({
+      type: ACTIONS.UPDATE_CMP_INFORMATION,
+      payload: {
+        packageDocumentType,
+        date
+      }
+    });
+  };
+
+export const updateDocumentTypeName = (newName, index) =>
+  (dispatch) => {
+    dispatch({
+      type: ACTIONS.UPDATE_DOCUMENT_TYPE_NAME,
+      payload: {
+        newName,
+        index
+      }
+    });
+  };
diff --git a/client/app/queue/correspondence/correspondenceReducer/reviewPackageConstants.js b/client/app/queue/correspondence/correspondenceReducer/reviewPackageConstants.js
new file mode 100644
index 00000000000..153378f6c91
--- /dev/null
+++ b/client/app/queue/correspondence/correspondenceReducer/reviewPackageConstants.js
@@ -0,0 +1,8 @@
+export const ACTIONS = {
+  SET_CORRESPONDENCE: 'SET_CORRESPONDENCE',
+  SET_CORRESPONDENCE_DOCUMENTS: 'SET_CORRESPONDENCE_DOCUMENTS',
+  SET_PACKAGE_DOCUMENT_TYPE: 'SET_PACKAGE_DOCUMENT_TYPE',
+  SET_VETERAN_INFORMATION: 'SET_VETERAN_INFORMATION',
+  UPDATE_CMP_INFORMATION: 'UPDATE_CMP_INFORMATION',
+  UPDATE_DOCUMENT_TYPE_NAME: 'UPDATE_DOCUMENT_TYPE_NAME',
+};
diff --git a/client/app/queue/correspondence/correspondenceReducer/reviewPackageReducer.js b/client/app/queue/correspondence/correspondenceReducer/reviewPackageReducer.js
new file mode 100644
index 00000000000..44a3f937954
--- /dev/null
+++ b/client/app/queue/correspondence/correspondenceReducer/reviewPackageReducer.js
@@ -0,0 +1,77 @@
+import { update } from '../../../util/ReducerUtil';
+import { ACTIONS } from './reviewPackageConstants';
+
+export const initialState = {
+  correspondence: {},
+  correspondenceDocuments: [],
+  packageDocumentType: {},
+  veteranInformation: {}
+};
+
+export const reviewPackageReducer = (state = initialState, action = {}) => {
+  switch (action.type) {
+  case ACTIONS.SET_CORRESPONDENCE:
+    return update(state, {
+      correspondence: {
+        $set: action.payload.correspondence
+      }
+    });
+
+  case ACTIONS.SET_CORRESPONDENCE_DOCUMENTS:
+    return update(state, {
+      correspondenceDocuments: {
+        $set: action.payload.correspondenceDocuments
+      }
+    });
+
+  case ACTIONS.SET_PACKAGE_DOCUMENT_TYPE:
+    return update(state, {
+      packageDocumentType: {
+        $set: action.payload.packageDocumentType
+      }
+    });
+
+  case ACTIONS.SET_VETERAN_INFORMATION:
+    return update(state, {
+      veteranInformation: {
+        $set: action.payload.veteranInfo
+      }
+    });
+
+  case ACTIONS.UPDATE_CMP_INFORMATION:
+    return update(state, {
+      correspondence: {
+        va_date_of_receipt: {
+          $set: action.payload.date
+        }
+      },
+      packageDocumentType: {
+        id: {
+          $set: action.payload.packageDocumentType.value
+        },
+        name: {
+          $set: action.payload.packageDocumentType.label
+        }
+      }
+    });
+
+  case ACTIONS.UPDATE_DOCUMENT_TYPE_NAME:
+    return update(state, {
+      correspondenceDocuments: {
+        [action.payload.index]: {
+          vbms_document_type_id: {
+            $set: action.payload.newName.value
+          },
+          document_title: {
+            $set: action.payload.newName.label
+          }
+        }
+      }
+    });
+
+  default:
+    return state;
+  }
+};
+
+export default reviewPackageReducer;
diff --git a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx
new file mode 100644
index 00000000000..6ec5c8d04d2
--- /dev/null
+++ b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx
@@ -0,0 +1,271 @@
+/* eslint-disable max-lines */
+import React from 'react';
+import PropTypes from 'prop-types';
+import { connect } from 'react-redux';
+import { bindActionCreators } from 'redux';
+import Checkbox from '../../../../../components/Checkbox';
+import RadioField from '../../../../../components/RadioField';
+import ApiUtil from '../../../../../util/ApiUtil';
+import CorrespondencePaginationWrapper from '../../../CorrespondencePaginationWrapper';
+import {
+  loadCurrentCorrespondence,
+  loadCorrespondences,
+  loadVeteranInformation,
+  updateRadioValue,
+  saveCheckboxState,
+  clearCheckboxState
+} from '../../../correspondenceReducer/correspondenceActions';
+
+const RELATED_NO = '0';
+const RELATED_YES = '1';
+
+class AddCorrespondenceView extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      veteran_id: '',
+      va_date_of_receipt: '',
+      source_type: '',
+      package_document_type: '',
+      correspondence_type_id: '',
+      notes: '',
+      selectedCheckboxes: []
+    };
+  }
+
+  // grabs correspondences and loads into intakeCorrespondence redux store.
+  getRowObjects(correspondenceUuid) {
+    return ApiUtil.get(`/queue/correspondence/${correspondenceUuid}/intake?json`).then((response) => {
+      const returnedObject = response.body;
+      const currentCorrespondence = returnedObject.currentCorrespondence;
+      const correspondences = returnedObject.correspondence;
+      const veteranInformation = returnedObject.veteranInformation;
+
+      this.props.loadCurrentCorrespondence(currentCorrespondence);
+      this.props.loadCorrespondences(correspondences);
+      this.props.loadVeteranInformation(veteranInformation);
+
+    }).
+      catch((err) => {
+        // allow HTTP errors to fall on the floor via the console.
+        console.error(new Error(`Problem with GET /queue/correspondence/${correspondenceUuid}/intake?json ${err}`));
+      });
+  }
+
+  componentDidMount() {
+    this.getRowObjects(this.props.correspondenceUuid);
+  }
+
+  onChange = (value) => {
+    this.props.updateRadioValue({ radioValue: value });
+    this.props.onContinueStatusChange(value === RELATED_NO);
+    this.props.clearCheckboxState();
+  }
+
+  onChangeCheckbox = (correspondence, isChecked) => {
+    this.props.saveCheckboxState(correspondence, isChecked);
+    let selectedCheckboxes = this.props.checkboxes;
+
+    if (isChecked) {
+      selectedCheckboxes.push(correspondence.id);
+    } else {
+      selectedCheckboxes = selectedCheckboxes.filter((checkboxId) => checkboxId !== correspondence.id);
+    }
+
+    const isAnyCheckboxSelected = selectedCheckboxes.length > 0;
+
+    this.props.onCheckboxChange(isAnyCheckboxSelected);
+
+  }
+
+  getKeyForRow = (index, { id }) => {
+    return `${id}`;
+  };
+
+  // eslint-disable-next-line max-statements
+  getDocumentColumns = (correspondence) => {
+    return [
+      {
+        cellClass: 'checkbox-column',
+        valueFunction: () => (
+          <Checkbox
+            name={correspondence.id.toString()}
+            id={correspondence.id.toString()}
+            hideLabel
+            defaultValue={this.props.checkboxes.some((el) => el.id === correspondence.id)}
+            onChange={(checked) => this.onChangeCheckbox(correspondence, checked)}
+          />
+        ),
+      },
+      {
+        cellClass: 'va-dor-column',
+        ariaLabel: 'va-dor-header-label',
+        header: (
+          <div id="va-dor-header">
+            <span id="va-dor-header-label" className="table-header-label">
+              VA DOR
+            </span>
+          </div>
+        ),
+        valueFunction: () => {
+          const date = new Date(correspondence.va_date_of_receipt);
+
+          return (
+            <span className="va-dor-item">
+              <p>{date.toLocaleDateString('en-US')}</p>
+            </span>
+          );
+        }
+      },
+      {
+        cellClass: 'source-type-column',
+        ariaLabel: 'source-type-header-label',
+        header: (
+          <div id="source-type-header">
+            <span id="source-type-header-label" className="table-header-label">
+              Source Type
+            </span>
+          </div>
+        ),
+        valueFunction: () => (
+          <span className="va-source-type-item">
+            <p>{correspondence.source_type}</p>
+          </span>
+        )
+      },
+      {
+        cellClass: 'package-document-type-column',
+        ariaLabel: 'package-document-type-header-label',
+        header: (
+          <div id="package-document-type-header">
+            <span id="package-document-type-header-label" className="table-header-label">
+              Package Document Type
+            </span>
+          </div>
+        ),
+        valueFunction: () => (
+          <span className="va-package-document-type-item">
+            <p>{correspondence.package_document_type_id}</p>
+          </span>
+        )
+      },
+      {
+        cellClass: 'correspondence-type-column',
+        ariaLabel: 'correspondence-type-header-label',
+        header: (
+          <div id="correspondence-type-header">
+            <span id="correspondence-type-header-label" className="table-header-label">
+              Correspondence Type
+            </span>
+          </div>
+        ),
+        valueFunction: () => (
+          <span className="va-correspondence-type-item">
+            <p>{correspondence.correspondence_type_id}</p>
+          </span>
+        )
+      },
+      {
+        cellClass: 'notes-column',
+        ariaLabel: 'notes-header-label',
+        header: (
+          <div id="notes-header">
+            <span id="notes-header-label" className="table-header-label">
+              Notes
+            </span>
+          </div>
+        ),
+        valueFunction: () => (
+          <span className="va-notes-item">
+            <p>{correspondence.notes}</p>
+          </span>
+        )
+      },
+    ];
+  };
+
+  render() {
+    const priorMailAnswer = [
+      { displayText: 'Yes',
+        value: RELATED_YES },
+      { displayText: 'No',
+        value: RELATED_NO }
+    ];
+
+    return (
+      <div className="cf-app-segment cf-app-segment--alt">
+        <h1>Add Related Correspondence</h1>
+        <p>Add any related correspondence to the mail package that is in progress.</p>
+        <br></br>
+        <h2>Associate with prior Mail</h2>
+        <p>Is this correspondence related to prior mail?</p>
+        <RadioField
+          name=""
+          options={priorMailAnswer}
+          value={this.props.radioValue}
+          onChange={this.onChange} />
+        {this.props.radioValue === RELATED_YES && (
+          <div className="cf-app-segment cf-app-segment--alt">
+            <p>Please select the prior mail to link to this correspondence</p>
+            {/* <p>Viewing {this.props.correspondences.length} out of {this.props.correspondences.length} total</p> */}
+            <div>
+              <CorrespondencePaginationWrapper
+                columns={this.getDocumentColumns}
+                columnsToDisplay={15}
+                rowObjects={this.props.correspondences}
+                summary="Correspondence list"
+                className="correspondence-table"
+                headerClassName="cf-correspondence-list-header-row"
+                bodyClassName="cf-correspondence-list-body"
+                tbodyId="correspondence-table-body"
+                getKeyForRow={this.getKeyForRow}
+              />
+
+            </div>
+          </div>
+        )}
+      </div>
+    );
+  }
+}
+
+AddCorrespondenceView.propTypes = {
+  correspondence: PropTypes.arrayOf(PropTypes.object),
+  featureToggles: PropTypes.object,
+  correspondenceUuid: PropTypes.string,
+  loadVeteranInformation: PropTypes.func,
+  loadCurrentCorrespondence: PropTypes.func,
+  loadCorrespondences: PropTypes.func,
+  updateRadioValue: PropTypes.func,
+  radioValue: PropTypes.string,
+  saveCheckboxState: PropTypes.func,
+  correspondences: PropTypes.array,
+  onContinueStatusChange: PropTypes.func,
+  onCheckboxChange: PropTypes.func.isRequired,
+  clearCheckboxState: PropTypes.func.isRequired,
+  checkboxes: PropTypes.array
+};
+
+const mapStateToProps = (state) => ({
+  currentCorrespondence: state.intakeCorrespondence.currentCorrespondence,
+  veteranInformation: state.intakeCorrespondence.veteranInformation,
+  correspondences: state.intakeCorrespondence.correspondences,
+  radioValue: state.intakeCorrespondence.radioValue,
+  checkboxes: state.intakeCorrespondence.relatedCorrespondences,
+});
+
+const mapDispatchToProps = (dispatch) => (
+  bindActionCreators({
+    loadCurrentCorrespondence,
+    loadCorrespondences,
+    loadVeteranInformation,
+    updateRadioValue,
+    saveCheckboxState,
+    clearCheckboxState
+  }, dispatch)
+);
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(AddCorrespondenceView);
diff --git a/client/app/queue/correspondence/intake/components/CheckboxModal.jsx b/client/app/queue/correspondence/intake/components/CheckboxModal.jsx
new file mode 100644
index 00000000000..214777b5489
--- /dev/null
+++ b/client/app/queue/correspondence/intake/components/CheckboxModal.jsx
@@ -0,0 +1,100 @@
+import React, { useState } from 'react';
+import PropTypes, { string } from 'prop-types';
+import Modal from '../../../../components/Modal';
+import Checkbox from '../../../../components/Checkbox';
+import { css } from 'glamor';
+
+const CheckboxModal = (props) => {
+
+  const [toggledCheckBoxes, setToggledCheckboxes] = useState([]);
+
+  const handleToggleCheckbox = (checkboxId) => {
+    const index = toggledCheckBoxes.indexOf(checkboxId);
+    const checkboxes = [...toggledCheckBoxes];
+
+    // remove it if checkboxes contains it, append it if it doesn't
+    if (index === -1) {
+      checkboxes.push(checkboxId);
+    } else {
+      checkboxes.splice(index, 1);
+    }
+    setToggledCheckboxes(checkboxes);
+  };
+
+  const handleClear = () => {
+    setToggledCheckboxes([]);
+  };
+
+  const checkboxSizeStyling = css({
+    transform: 'scale(1.3)',
+    translate: '11%',
+  });
+
+  return (
+    <Modal
+      id="autotextModal"
+      title="Add autotext"
+      customStyles={{ style: { width: '50%', minWidth: '750px' } }}
+      closeHandler={props.closeHandler}
+      buttons={[
+        {
+          id: 'cancel-button',
+          classNames: ['cf-modal-link', 'cf-btn-link'],
+          name: 'Cancel',
+          onClick: props.closeHandler,
+          disabled: false,
+        },
+        {
+          id: 'add-autotext-button',
+          classNames: ['usa-button', 'usa-button-primary', 'cf-margin-left-2rem'],
+          name: 'Add',
+          onClick: () => props.handleAccept(toggledCheckBoxes),
+          disabled: toggledCheckBoxes.length === 0,
+        },
+        {
+          id: 'clear-checkboxes-button',
+          classNames: ['usa-button', 'usa-button-secondary', 'cf-margin-left-2rem'],
+          name: 'Clear all',
+          onClick: handleClear,
+          disabled: false,
+        }
+      ]}>
+      <div style={{
+        display: 'flex',
+        flexDirection: 'column',
+        overflowY: 'scroll',
+        maxHeight: '500px',
+        paddingLeft: '5%',
+        marginLeft: '1%',
+        paddingRight: '5%',
+        width: '100%',
+        overflowX: 'hidden' }}>
+        {props.checkboxData.map((checkboxText, index) => (
+          <Checkbox
+            name={checkboxText}
+            styling={checkboxSizeStyling}
+            onChange={() => handleToggleCheckbox(index)}
+            value={toggledCheckBoxes.indexOf(index) > -1}
+          />))
+        }
+      </div>
+    </Modal>
+  );
+};
+
+CheckboxModal.propTypes = {
+  // the method which the modal executes when the ok button is pressed.
+  handleAccept: PropTypes.func,
+
+  // responsible for closing the modal. Occurs on both the close button and the X in the top right.
+  closeHandler: PropTypes.func,
+
+  // method to be called when the clear button is pressed.
+  handleClear: PropTypes.func,
+
+  // the values that will be used as names for the checkboxes.
+  checkboxData: PropTypes.arrayOf(string)
+
+};
+
+export default CheckboxModal;
diff --git a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmCorrespondenceView.jsx b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmCorrespondenceView.jsx
new file mode 100644
index 00000000000..fb894d8294f
--- /dev/null
+++ b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmCorrespondenceView.jsx
@@ -0,0 +1,241 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { css } from 'glamor';
+import { PencilIcon } from '../../../../../components/icons/PencilIcon';
+import Button from '../../../../../components/Button';
+import { useSelector } from 'react-redux';
+import CorrespondenceDetailsTable from './CorrespondenceDetailsTable';
+import ConfirmTasksNotRelatedToAnAppeal from './ConfirmTasksNotRelatedToAnAppeal';
+import Table from '../../../../../components/Table';
+import ConfirmTasksRelatedToAnAppeal from './ConfirmTasksRelatedToAnAppeal';
+
+const bodyStyling = css({
+  '& > tr > td': {
+    backgroundColor: '#f5f5f5',
+    borderBottom: 'none',
+    borderColor: '#d6d7d9',
+    paddingTop: '0vh',
+    paddingBottom: '0vh',
+  },
+});
+
+const tableStyling = css({
+  marginBottom: '-2vh',
+  marginTop: '2vh'
+});
+const bottonStyling = css({
+  paddingRight: '0px'
+});
+
+export const ConfirmCorrespondenceView = (props) => {
+
+  const checkedMailTasks = Object.keys(props.mailTasks).filter((name) => props.mailTasks[name]);
+  const relatedCorrespondences = useSelector((state) => state.intakeCorrespondence.relatedCorrespondences);
+
+  // eslint-disable-next-line max-statements
+  const getDocumentColumns = (correspondence) => {
+
+    return [
+      {
+        cellClass: 'va-dor-column',
+        ariaLabel: 'va-dor-header-label',
+        header: (
+          <div id="va-dor-header">
+            <span id="va-dor-header-label" className="table-header-label">
+              VA DOR
+            </span>
+          </div>
+        ),
+        valueFunction: () => {
+          const date = new Date(correspondence.va_date_of_receipt);
+
+          return (
+            <span className="va-dor-item">
+              <p>{date.toLocaleDateString('en-US')}</p>
+            </span>
+          );
+        }
+      },
+      {
+        cellClass: 'source-type-column',
+        ariaLabel: 'source-type-header-label',
+        header: (
+          <div id="source-type-header">
+            <span id="source-type-header-label" className="table-header-label">
+              Source Type
+            </span>
+          </div>
+        ),
+        valueFunction: () => (
+          <span className="va-source-type-item">
+            <p>{correspondence.source_type}</p>
+          </span>
+        )
+      },
+      {
+        cellClass: 'package-document-type-column',
+        ariaLabel: 'package-document-type-header-label',
+        header: (
+          <div id="package-document-type-header">
+            <span id="package-document-type-header-label" className="table-header-label">
+              Package Document Type
+            </span>
+          </div>
+        ),
+        valueFunction: () => (
+          <span className="va-package-document-type-item">
+            <p>{correspondence.package_document_type_id}</p>
+          </span>
+        )
+      },
+      {
+        cellClass: 'correspondence-type-column',
+        ariaLabel: 'correspondence-type-header-label',
+        header: (
+          <div id="correspondence-type-header">
+            <span id="correspondence-type-header-label" className="table-header-label">
+              Correspondence Type
+            </span>
+          </div>
+        ),
+        valueFunction: () => (
+          <span className="va-correspondence-type-item">
+            <p>{correspondence.correspondence_type_id}</p>
+          </span>
+        )
+      },
+      {
+        cellClass: 'notes-column',
+        ariaLabel: 'notes-header-label',
+        header: (
+          <div id="notes-header">
+            <span id="notes-header-label" className="table-header-label">
+              Notes
+            </span>
+          </div>
+        ),
+        valueFunction: () => (
+          <span className="va-notes-item">
+            <p>{correspondence.notes}</p>
+          </span>
+        )
+      },
+    ];
+  };
+
+  return (
+    <div className="gray-border" style={{ marginBottom: '2rem', padding: '3rem 4rem' }}>
+      <h1 style={{ marginBottom: '10px' }}>Review and Confirm Correspondence</h1>
+      <p style={{ fontSize: '.85em' }}>
+        Review the details below to make sure the information is correct before submitting.
+        If you need to make changes, please go back to the associated section.
+      </p>
+      <br></br>
+      <div>
+        <CorrespondenceDetailsTable />
+      </div>
+      <div>
+        <div style={{ display: 'flex' }}>
+          <h2 style={{ margin: '1px 0 15px 0',
+            display: 'inline-block' }}>
+                Associated Prior Mail
+          </h2>
+          <div style={{ marginLeft: 'auto' }}>
+            <Button styling={bottonStyling} linkStyling onClick={() => props.goToStep(1)}>
+              <div style={{ marginLeft: 'auto' }}>
+                <span {...css({ position: 'absolute' })}><PencilIcon /></span>
+                <span {...css({ marginLeft: '20px' })}>Edit Section</span>
+              </div>
+            </Button>
+          </div>
+        </div>
+
+        <div {...css({ backgroundColor: '#f5f5f5', marginBottom: '20px' })}>
+
+          <div {...css({ backgroundColor: '#f5f5f5', padding: '20px' })}>
+            <Table
+              columns={getDocumentColumns}
+              // columnsToDisplay={15}
+              rowObjects={relatedCorrespondences}
+              bodyStyling= {bodyStyling}
+              styling={tableStyling}
+            />
+
+          </div>
+        </div>
+        <div style={{ display: 'flex' }}>
+          <h2 style={{
+            margin: '1px 0 15px 0',
+            display: 'inline-block',
+            marginLeft: '0px'
+          }}>Completed Mail Tasks</h2>
+          <div style={{ marginLeft: 'auto' }}>
+            <Button name="EditMailTasks" styling={bottonStyling} linkStyling onClick={() => props.goToStep(2)}>
+              <span {...css({ position: 'absolute' })}><PencilIcon /></span>
+              <span {...css({ marginLeft: '20px' })}>Edit Section</span>
+            </Button>
+          </div>
+        </div>
+        <div {...css({ backgroundColor: '#f5f5f5', padding: '20px', marginBottom: '20px' })}>
+          <div {...css({
+            borderBottom: '1px solid #d6d7d9',
+            padding: '10px 0px',
+            marginBottom: '20px',
+            fontWeight: 'bold'
+          })}>
+            Completed Mail Tasks
+          </div>
+          {checkedMailTasks.map((name, index, array) => (
+            <div
+              key={index}
+              {...css({
+                borderBottom: index === array.length - 1 ? 'none' : '1px solid #d6d7d9',
+                padding: '10px 10px',
+                marginBottom: '10px',
+              })}
+            >
+              {props.mailTasks[name] && <span>{name}</span>}
+            </div>
+          ))}
+        </div>
+      </div>
+      <div>
+        <div style={{ display: 'flex' }}>
+          <h2 style={{
+            margin: '1px 0 15px 0',
+            display: 'inline-block',
+            marginLeft: '0px'
+          }}>Tasks not related to an Appeal</h2>
+          <div style={{ marginLeft: 'auto' }}>
+            <Button styling={bottonStyling} linkStyling onClick={() => props.goToStep(2)}>
+              <span {...css({ position: 'absolute' })}><PencilIcon /></span>
+              <span {...css({ marginLeft: '20px' })}>Edit Section</span>
+            </Button>
+          </div>
+        </div>
+        <ConfirmTasksNotRelatedToAnAppeal />
+        <div style={{ display: 'flex' }}>
+          <h2 style={{
+            margin: '1px 0 15px 0',
+            display: 'inline-block',
+            marginLeft: '0px'
+          }}>Linked Appeals & New Tasks</h2>
+          <div style={{ marginLeft: 'auto' }}>
+            <Button styling={bottonStyling} linkStyling onClick={() => props.goToStep(2)}>
+              <span {...css({ position: 'absolute' })}><PencilIcon /></span>
+              <span {...css({ marginLeft: '20px' })}>Edit Section</span>
+            </Button>
+          </div>
+        </div>
+        <ConfirmTasksRelatedToAnAppeal />
+
+      </div>
+    </div>
+  );
+};
+
+ConfirmCorrespondenceView.propTypes = {
+  goToStep: PropTypes.func,
+  mailTasks: PropTypes.objectOf(PropTypes.bool)
+};
+export default ConfirmCorrespondenceView;
diff --git a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmTasksNotRelatedToAnAppeal.jsx b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmTasksNotRelatedToAnAppeal.jsx
new file mode 100644
index 00000000000..a869e57c8ac
--- /dev/null
+++ b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmTasksNotRelatedToAnAppeal.jsx
@@ -0,0 +1,45 @@
+import React from 'react';
+import { useSelector } from 'react-redux';
+
+const styling = { backgroundColor: '#f5f5f5' };
+
+const ConfirmTasksNotRelatedToAnAppeal = () => {
+  const tasks = useSelector((state) => state.intakeCorrespondence.unrelatedTasks);
+
+  const rowObjects = tasks.map((task) => {
+    return (
+      <tr key={task.id}>
+        <td
+          style={{ backgroundColor: '#f5f5f5', borderTop: '1px solid #dee2e6', width: '20%' }}>
+          {task.label}
+        </td>
+        <td style={{ backgroundColor: '#f5f5f5', borderTop: '1px solid #dee2e6' }}>
+          {task.content}
+        </td>
+      </tr>
+    );
+  });
+
+  return (
+    <div>
+      <div style={{ position: 'relative', display: 'flex', justifyContent: 'space-between', alignItems: 'flex-end' }}>
+      </div>
+      <div
+        style={{ background: '#f5f5f5', padding: '2rem', paddingTop: '0.5rem', marginBottom: '2rem' }}>
+        <table className="usa-table-borderless">
+          <thead>
+            <tr>
+              <th style={styling}>Tasks</th>
+              <th style={styling}>Task Instructions or Context</th>
+            </tr>
+          </thead>
+          <tbody>
+            {rowObjects}
+          </tbody>
+        </table>
+      </div>
+    </div>
+  );
+};
+
+export default ConfirmTasksNotRelatedToAnAppeal;
diff --git a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmTasksRelatedToAnAppeal.jsx b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmTasksRelatedToAnAppeal.jsx
new file mode 100644
index 00000000000..8e32582dd9a
--- /dev/null
+++ b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmTasksRelatedToAnAppeal.jsx
@@ -0,0 +1,154 @@
+import React from 'react';
+import { useSelector } from 'react-redux';
+import { COLORS } from 'app/constants/AppConstants';
+import DocketTypeBadge from '../../../../../components/DocketTypeBadge';
+import { ExternalLinkIcon } from '../../../../../components/icons/ExternalLinkIcon';
+import PropTypes from 'prop-types';
+
+const borderlessTd = {
+  borderTop: 'none',
+  borderBottom: 'none',
+  backgroundColor: COLORS.GREY_BACKGROUND,
+};
+
+const ConfirmTasksRelatedToAnAppeal = () => {
+  const tasks = useSelector((state) => state.intakeCorrespondence.newAppealRelatedTasks);
+  const taskIds = useSelector((state) => state.intakeCorrespondence.taskRelatedAppealIds).
+    sort((first, second) => first - second);
+  const fetchedAppeals = useSelector((state) => state.intakeCorrespondence.fetchedAppeals);
+  const waivedEvidenceTasks = useSelector((state) => state.intakeCorrespondence.waivedEvidenceTasks);
+
+  const rowObjects = taskIds.map((task, index) => {
+    const evidenceSubmission = (fetchedAppeals.find((appeal) => appeal.id === task).evidenceSubmissionTask);
+    const waivedEvidenceTask = (waivedEvidenceTasks.find((waivedEvTask) => waivedEvTask.id === evidenceSubmission.id));
+
+    const formatDocketName = () => {
+      const currentAppeal = fetchedAppeals.find((appeal) => appeal.id === task);
+
+      if (currentAppeal && evidenceSubmission) {
+        let unformattedText = currentAppeal.docketName;
+
+        unformattedText = unformattedText.replace('_', ' ');
+
+        // Capitalize the first character of each string
+        const formattedText = unformattedText.split(' ').map((text) =>
+          text.charAt(0).toUpperCase() + text.slice(1)).
+          join(' ').
+          trim();
+
+        return formattedText;
+      }
+
+      return '';
+    };
+
+    // Handles what to display for EvidenceW Window Waived? column
+    const getYesOrNo = () => {
+      if (waivedEvidenceTask) {
+        return `Yes - ${waivedEvidenceTask.waiveReason}`;
+      }
+
+      if (evidenceSubmission) {
+        return 'No';
+      }
+
+      return '';
+    };
+
+    // Gives less space to the first appeal, and more to all after.
+    const paddingAmount = index === 0 ? '5px' : '35px';
+
+    return (
+      <>
+        <tr>
+          <td style={{ ...borderlessTd, ...{ paddingBottom: '0px', paddingTop: paddingAmount } }}>
+            <h3 style={{ lineHeight: '10%' }}>Appeal {index + 1} Tasks</h3>
+          </td>
+        </tr>
+        <tr rowSpan="4">
+          <td style={{ ...borderlessTd, ...{ paddingBottom: '10px' } }}>
+            <b style={{ marginTop: '40px' }}>Linked Appeal</b>
+          </td>
+          <td style={borderlessTd}>
+            <b>{evidenceSubmission && 'Currently Active Task'}</b>
+          </td>
+          <td style={borderlessTd}>
+            <b>{evidenceSubmission && 'Evidence Window Waived?'}</b>
+          </td>
+          <td style={borderlessTd}>
+            <b>{evidenceSubmission && 'Assigned To'}</b>
+          </td>
+        </tr>
+        <tr>
+          <td style={borderlessTd}>
+            <div style={{ width: 'fit-content',
+              padding: '3px',
+              backgroundColor: 'white',
+              border: `1px solid ${COLORS.COLOR_COOL_BLUE_LIGHTER}`,
+              whiteSpace: 'nowrap'
+            }}>
+              <a
+                href={`/queue/appeals/${fetchedAppeals.find((appeal) => appeal.id === task).externalId}`}
+                target="_blank"
+                rel="noopener noreferrer">
+                <DocketTypeBadge name={(fetchedAppeals.find((appeal) => appeal.id === task).docketName)} />
+                <b>{fetchedAppeals.find((appeal) => appeal.id === task).docketNumber}</b>
+                <ExternalLinkIcon size={15} className="cf-pdf-external-link-icon" color={COLORS.FOCUS_OUTLINE} />
+              </a>
+            </div>
+          </td>
+          <td style={borderlessTd}>{formatDocketName()}</td>
+          <td style={borderlessTd}>{getYesOrNo()}</td>
+          <td style={borderlessTd}>{evidenceSubmission ? evidenceSubmission.assigned_to_type : ''}</td>
+        </tr>
+        <tr>
+          <td
+            style={{ backgroundColor: COLORS.GREY_BACKGROUND,
+              borderTop: 'none',
+              borderSpacing: '0px' }}>
+            <b>Additional Tasks</b>
+          </td>
+          <td
+            colSpan="3"
+            style={{ backgroundColor: COLORS.GREY_BACKGROUND,
+              borderTop: 'none',
+              borderSpacing: '0px' }}>
+            <b>Task Instructions or Context</b>
+          </td>
+        </tr>
+        {tasks.filter((taskById) => taskById.appealId === task).map((taskById) =>
+          <tr>
+            <td
+              style={{ backgroundColor: COLORS.GREY_BACKGROUND, borderTop: '1px solid #dee2e6', width: '20%' }}>
+              {taskById.label}
+            </td>
+            <td colSpan={3} style={{ backgroundColor: COLORS.GREY_BACKGROUND, borderTop: '1px solid #dee2e6' }}>
+              {taskById.content}
+            </td>
+          </tr>)}
+
+      </>
+    );
+  });
+
+  return (
+    <>
+      <div style={{ marginLeft: 'auto' }}>
+        <div
+          style={{ background: COLORS.GREY_BACKGROUND, padding: '2rem', paddingTop: '0.5rem', marginBottom: '2rem' }}>
+          <table className="usa-table-borderless">
+            <tbody>
+              {rowObjects}
+            </tbody>
+          </table>
+        </div>
+      </div></>
+  );
+};
+
+ConfirmTasksRelatedToAnAppeal.propTypes = {
+  bottonStyling: PropTypes.object,
+  goToStepTwo: PropTypes.func.isRequired
+};
+
+export default ConfirmTasksRelatedToAnAppeal;
diff --git a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/CorrespondenceDetailsTable.jsx b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/CorrespondenceDetailsTable.jsx
new file mode 100644
index 00000000000..310ec9467e2
--- /dev/null
+++ b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/CorrespondenceDetailsTable.jsx
@@ -0,0 +1,53 @@
+import React from 'react';
+import moment from 'moment';
+import { useSelector } from 'react-redux';
+
+export const CorrespondenceDetailsTable = () => {
+
+  const currentCorrespondence = useSelector((state) => state.intakeCorrespondence.currentCorrespondence);
+  const veteranInformation = useSelector((state) => state.intakeCorrespondence.veteranInformation);
+
+  return (
+    <div>
+      <h2 className="cf-review-about-correspondence">About the Correspondence</h2>
+      <table className="usa-table-alternate-borderless">
+        <tbody>
+          <tr>
+            <th><strong>Portal Entry Date</strong></th>
+            <th><strong>Source Type</strong></th>
+            <th><strong>Package Document Type</strong></th>
+            <th><strong>CM Packet Number</strong></th>
+            <th><strong>CMP Queue Name</strong></th>
+            <th><strong>VA DOR</strong></th>
+          </tr>
+          <tr>
+            <td>{moment(currentCorrespondence.portal_entry_date).format('MM/DD/YYYY')}</td>
+            <td>{currentCorrespondence.source_type}</td>
+            <td>{currentCorrespondence.package_document_type_id}</td>
+            <td>{currentCorrespondence.cmp_packet_number}</td>
+            <td>{currentCorrespondence.cmp_queue_id}</td>
+            <td>{moment(currentCorrespondence.va_date_of_receipt).format('MM/DD/YYYY')}</td>
+          </tr>
+          <tr>
+            <th colSpan={2}><strong>Veteran</strong></th>
+            <th><strong>Correspondence Type</strong></th>
+          </tr>
+          <tr>
+            <td colSpan={2}>
+              {veteranInformation.first_name} {veteranInformation.last_name} ({veteranInformation.file_number})
+            </td>
+            <td>{currentCorrespondence.correspondence_type_id}</td>
+          </tr>
+          <tr>
+            <th colSpan={6}><strong>Notes</strong></th>
+          </tr>
+          <tr>
+            <td colSpan={6}>{currentCorrespondence.notes}</td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+  );
+};
+
+export default CorrespondenceDetailsTable;
diff --git a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/SubmitCorrespondenceModal.jsx b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/SubmitCorrespondenceModal.jsx
new file mode 100644
index 00000000000..e15f671d3ae
--- /dev/null
+++ b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/SubmitCorrespondenceModal.jsx
@@ -0,0 +1,101 @@
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+import Modal from 'app/components/Modal';
+import { useSelector } from 'react-redux';
+import ApiUtil from 'app/util/ApiUtil';
+import {
+  CORRESPONDENCE_INTAKE_FORM_SUBMIT_MODAL_TITLE,
+  CORRESPONDENCE_INTAKE_FORM_SUBMIT_MODAL_BODY,
+} from 'app/../COPY';
+
+export const SubmitCorrespondenceModal = ({ setSubmitCorrespondenceModalVisible, setErrorBannerVisible }) => {
+
+  const correspondence = useSelector((state) => state.intakeCorrespondence.currentCorrespondence);
+  const relatedCorrespondences = useSelector((state) => state.intakeCorrespondence.relatedCorrespondences);
+  const waivedEvidenceTasks = useSelector((state) => state.intakeCorrespondence.waivedEvidenceTasks);
+  const relatedAppealIds = useSelector((state) => state.intakeCorrespondence.taskRelatedAppealIds);
+  const tasksRelatedToAppeal = useSelector((state) => state.intakeCorrespondence.newAppealRelatedTasks);
+  const [loading, setLoading] = useState(false);
+
+  const onCancel = () => {
+    setSubmitCorrespondenceModalVisible(false);
+  };
+
+  const handleRouting = (status) => {
+    if (status === 201) {
+      window.location.href = '/queue/correspondence';
+    } else {
+      setErrorBannerVisible(true);
+      onCancel();
+    }
+  };
+
+  const onSubmit = async() => {
+    const relatedUuids = relatedCorrespondences.map((corr) => corr.uuid);
+    const serializedWaivedEvidenceTasks = waivedEvidenceTasks.map((task) => (
+      { task_id: task.id, waive_reason: task.waiveReason }
+    ));
+    const serializedTasksRelatedToAppeal = tasksRelatedToAppeal.map((task) => ({
+      appeal_id: task.appealId,
+      klass: task.type.klass,
+      assigned_to: task.type.assigned_to,
+      content: task.content
+    })
+    );
+    const submitData = {
+      related_correspondence_uuids: relatedUuids,
+      tasks_related_to_appeal: serializedTasksRelatedToAppeal,
+      waived_evidence_submission_window_tasks: serializedWaivedEvidenceTasks,
+      related_appeal_ids: relatedAppealIds
+    };
+
+    setLoading(true);
+    // Where data goes to be submitted before redirecting back to correspondence queue
+    let status;
+
+    await ApiUtil.post(`/queue/correspondence/${correspondence.uuid}`, { data: submitData }).
+      then((response) => {
+        status = response.status;
+      }).
+      // eslint-disable-next-line no-console
+      catch((error) => console.log(error.message));
+
+    setLoading(false);
+    handleRouting(status);
+  };
+
+  const buttons = [
+    {
+      classNames: ['cf-modal-link', 'cf-btn-link'],
+      name: 'Cancel',
+      onClick: onCancel,
+    },
+    {
+      classNames: ['usa-button', 'usa-button-primary'],
+      name: 'Confirm',
+      loading,
+      onClick: onSubmit
+    },
+  ];
+
+  /* eslint-disable camelcase */
+  return (
+    <Modal
+      title={CORRESPONDENCE_INTAKE_FORM_SUBMIT_MODAL_TITLE}
+      buttons={buttons}
+      closeHandler={onCancel}
+      id="submit-correspondence-intake-modal"
+    >
+      {CORRESPONDENCE_INTAKE_FORM_SUBMIT_MODAL_BODY}
+    </Modal>
+  );
+  /* eslint-enable camelcase */
+};
+
+SubmitCorrespondenceModal.propTypes = {
+  onCancel: PropTypes.func,
+  onSubmit: PropTypes.func,
+  loading: PropTypes.bool,
+  setSubmitCorrespondenceModalVisible: PropTypes.func,
+  setErrorBannerVisible: PropTypes.func,
+};
diff --git a/client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx b/client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx
new file mode 100644
index 00000000000..c242b3862db
--- /dev/null
+++ b/client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx
@@ -0,0 +1,228 @@
+import React, { useState, useEffect } from 'react';
+import ProgressBar from 'app/components/ProgressBar';
+import Button from '../../../../components/Button';
+import PropTypes from 'prop-types';
+import AddCorrespondenceView from './AddCorrespondence/AddCorrespondenceView';
+import { AddTasksAppealsView } from './TasksAppeals/AddTasksAppealsView';
+import { connect, useSelector } from 'react-redux';
+import { bindActionCreators } from 'redux';
+import { setUnrelatedTasks } from '../../correspondenceReducer/correspondenceActions';
+import { useHistory, useLocation } from 'react-router-dom';
+import { ConfirmCorrespondenceView } from './ConfirmCorrespondence/ConfirmCorrespondenceView';
+import { SubmitCorrespondenceModal } from './ConfirmCorrespondence/SubmitCorrespondenceModal';
+import Alert from 'app/components/Alert';
+import ApiUtil from '../../../../util/ApiUtil';
+import {
+  CORRESPONDENCE_INTAKE_FORM_ERROR_BANNER_TITLE,
+  CORRESPONDENCE_INTAKE_FORM_ERROR_BANNER_TEXT
+} from '../../../../../COPY';
+
+const progressBarSections = [
+  {
+    title: '1. Add Related Correspondence',
+    step: 1
+  },
+  {
+    title: '2. Review Tasks & Appeals',
+    step: 2
+  },
+  {
+    title: '3. Confirm',
+    step: 3
+  },
+];
+
+export const CorrespondenceIntake = (props) => {
+  const intakeCorrespondence = useSelector((state) => state.intakeCorrespondence);
+  const [currentStep, setCurrentStep] = useState(1);
+  const [isContinueEnabled, setContinueEnabled] = useState(true);
+  const [addTasksVisible, setAddTasksVisible] = useState(false);
+  const [submitCorrespondenceModalVisible, setSubmitCorrespondenceModalVisible] = useState(false);
+  const [errorBannerVisible, setErrorBannerVisible] = useState(false);
+  const { pathname, hash, key } = useLocation();
+  const history = useHistory();
+  // For hash routing - Add element id and which step it lives on here
+  const SECTION_MAP = { 'task-not-related-to-an-appeal': 2 };
+
+  const handleContinueStatusChange = (isEnabled) => {
+    setContinueEnabled(isEnabled);
+  };
+
+  const handleCheckboxChange = (isSelected) => {
+    setContinueEnabled(isSelected);
+  };
+
+  const nextStep = () => {
+    if (currentStep < 3) {
+      setCurrentStep(currentStep + 1);
+      window.scrollTo(0, 0);
+      history.replace({ hash: '' });
+    }
+  };
+
+  const handleContinueAfterBack = () => {
+    setContinueEnabled(true);
+  };
+
+  const prevStep = () => {
+    if (currentStep > 1) {
+      setCurrentStep(currentStep - 1);
+      handleContinueAfterBack();
+      window.scrollTo(0, 0);
+      history.replace({ hash: '' });
+    }
+  };
+
+  const sections = progressBarSections.map(({ title, step }) => ({
+    title,
+    current: (step === currentStep)
+  }),
+  );
+
+  useEffect(() => {
+    const data = {
+      correspondence_uuid: props.correspondence_uuid,
+      current_step: currentStep,
+      redux_store: intakeCorrespondence
+    };
+
+    ApiUtil.post(`/queue/correspondence/${props.correspondence_uuid}/current_step`, { data }).
+      then(
+        (response) => {
+          if (!response.ok) {
+            console.error(response);
+          }
+        }
+      );
+  }, [currentStep]);
+
+  useEffect(() => {
+    if (hash === '') {
+      window.scrollTo(0, 0);
+    } else {
+      setTimeout(() => {
+        const id = hash.replace('#', '');
+
+        setCurrentStep(SECTION_MAP[id]);
+        const element = document.getElementById(id);
+
+        if (element) {
+          element.scrollIntoView();
+        }
+      }, 0);
+    }
+  }, [pathname, hash, key]);
+
+  return <div>
+    { errorBannerVisible &&
+      <Alert title={CORRESPONDENCE_INTAKE_FORM_ERROR_BANNER_TITLE} type="error">
+        {CORRESPONDENCE_INTAKE_FORM_ERROR_BANNER_TEXT}
+      </Alert>
+    }
+    <ProgressBar
+      sections={sections}
+      classNames={['cf-progress-bar', 'cf-']}
+      styling={{ style: { marginBottom: '5rem', float: 'right' } }} />
+    {currentStep === 1 &&
+      <AddCorrespondenceView
+        correspondenceUuid={props.correspondence_uuid}
+        onContinueStatusChange={handleContinueStatusChange}
+        onCheckboxChange={handleCheckboxChange}
+      />
+    }
+    {currentStep === 2 &&
+      <AddTasksAppealsView
+        addTasksVisible={addTasksVisible}
+        setAddTasksVisible={setAddTasksVisible}
+        disableContinue={handleContinueStatusChange}
+        unrelatedTasks={props.unrelatedTasks}
+        setUnrelatedTasks={props.setUnrelatedTasks}
+        correspondenceUuid={props.correspondence_uuid}
+        onContinueStatusChange={handleContinueStatusChange}
+        autoTexts={props.autoTexts}
+        veteranInformation={props.veteranInformation}
+      />
+    }
+    {currentStep === 3 &&
+      <div>
+        <ConfirmCorrespondenceView
+          mailTasks={props.mailTasks}
+          goToStep={setCurrentStep}
+          toggledCorrespondences={props.toggledCorrespondences}
+          selectedCorrespondences={props.correspondences.filter((currentCorrespondence) =>
+            props.toggledCorrespondences.indexOf(String(currentCorrespondence.id)) !== -1)}
+        />
+      </div>
+    }
+    <div>
+      <a href="/queue/correspondence">
+        <Button
+          name="Cancel"
+          styling={{ style: { paddingLeft: '0rem', paddingRight: '0rem' } }}
+          href="/queue/correspondence"
+          classNames={['cf-btn-link', 'cf-left-side']} />
+      </a>
+      {currentStep < 3 &&
+      <Button
+        type="button"
+        onClick={nextStep}
+        name="continue"
+        classNames={['cf-right-side']} disabled={!isContinueEnabled}>
+          Continue
+      </Button>}
+      {currentStep === 3 &&
+      <Button
+        type="button"
+        onClick={() => setSubmitCorrespondenceModalVisible(true)}
+        name="Submit"
+        classNames={['cf-right-side']}>
+          Submit
+      </Button>}
+      {currentStep > 1 &&
+      <Button
+        type="button"
+        onClick={prevStep}
+        name="back-button"
+        styling={{ style: { marginRight: '2rem' } }}
+        classNames={['usa-button-secondary', 'cf-right-side', 'usa-back-button']}>
+          Back
+      </Button>}
+      {currentStep === 3 && submitCorrespondenceModalVisible &&
+        <SubmitCorrespondenceModal
+          setSubmitCorrespondenceModalVisible={setSubmitCorrespondenceModalVisible}
+          setErrorBannerVisible={setErrorBannerVisible}
+        />
+      }
+    </div>
+  </div>;
+};
+
+CorrespondenceIntake.propTypes = {
+  correspondence_uuid: PropTypes.string,
+  currentCorrespondence: PropTypes.object,
+  veteranInformation: PropTypes.object,
+  toggledCorrespondences: PropTypes.array,
+  correspondences: PropTypes.array,
+  unrelatedTasks: PropTypes.arrayOf(Object),
+  setUnrelatedTasks: PropTypes.func,
+  mailTasks: PropTypes.objectOf(PropTypes.bool),
+  autoTexts: PropTypes.arrayOf(PropTypes.string)
+};
+
+const mapStateToProps = (state) => ({
+  correspondences: state.intakeCorrespondence.correspondences,
+  unrelatedTasks: state.intakeCorrespondence.unrelatedTasks,
+  mailTasks: state.intakeCorrespondence.mailTasks,
+  toggledCorrespondences: state.intakeCorrespondence.relatedCorrespondences
+});
+
+const mapDispatchToProps = (dispatch) => (
+  bindActionCreators({
+    setUnrelatedTasks
+  }, dispatch)
+);
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(CorrespondenceIntake);
diff --git a/client/app/queue/correspondence/intake/components/TasksAppeals/AddAppealRelatedTaskView.jsx b/client/app/queue/correspondence/intake/components/TasksAppeals/AddAppealRelatedTaskView.jsx
new file mode 100644
index 00000000000..68989009b90
--- /dev/null
+++ b/client/app/queue/correspondence/intake/components/TasksAppeals/AddAppealRelatedTaskView.jsx
@@ -0,0 +1,213 @@
+import React, { useEffect, useState } from 'react';
+import { useSelector, useDispatch } from 'react-redux';
+import PropTypes from 'prop-types';
+import CaseListTable from '../../../../CaseListTable';
+import ApiUtil from '../../../../../util/ApiUtil';
+import { prepareAppealForStore } from '../../../../utils';
+import LoadingContainer from '../../../../../components/LoadingContainer';
+import { LOGO_COLORS } from '../../../../../constants/AppConstants';
+import RadioField from '../../../../../components/RadioField';
+import ExistingAppealTasksView from './ExistingAppealTasksView';
+import {
+  setFetchedAppeals,
+  setNewAppealRelatedTasks,
+  setTaskRelatedAppealIds,
+  setWaivedEvidenceTasks
+} from '../../../correspondenceReducer/correspondenceActions';
+
+const RELATED_NO = '0';
+const RELATED_YES = '1';
+
+const existingAppealAnswer = [
+  { displayText: 'Yes',
+    value: RELATED_YES },
+  { displayText: 'No',
+    value: RELATED_NO }
+];
+
+export const AddAppealRelatedTaskView = (props) => {
+  const appeals = useSelector((state) => state.intakeCorrespondence.fetchedAppeals);
+  const [taskRelatedAppeals, setTaskRelatedAppeals] =
+    useState(useSelector((state) => state.intakeCorrespondence.taskRelatedAppealIds));
+  const [newTasks, setNewTasks] = useState(useSelector((state) => state.intakeCorrespondence.newAppealRelatedTasks));
+  const [waivedTasks, setWaivedTasks] =
+    useState(useSelector((state) => state.intakeCorrespondence.waivedEvidenceTasks));
+  const [existingAppealRadio, setExistingAppealRadio] =
+    useState(taskRelatedAppeals.length ? RELATED_YES : RELATED_NO);
+  const [loading, setLoading] = useState(false);
+  const [nextTaskId, setNextTaskId] = useState(newTasks.length);
+  const [currentAppealPage, setCurrentAppealPage] = useState(1);
+  const [tableUpdateTrigger, setTableUpdateTrigger] = useState(1);
+
+  const dispatch = useDispatch();
+
+  const appealById = (appealId) => {
+    return appeals.find((el) => el.id === appealId);
+  };
+
+  const appealsPageUpdateHandler = (newCurrentPage) => {
+    setCurrentAppealPage(newCurrentPage);
+    setTableUpdateTrigger((prev) => prev + 1);
+  };
+
+  useEffect(() => {
+    dispatch(setTaskRelatedAppealIds(taskRelatedAppeals));
+  }, [taskRelatedAppeals]);
+
+  useEffect(() => {
+    setNextTaskId((prevId) => prevId + 1);
+    dispatch(setNewAppealRelatedTasks(newTasks));
+  }, [newTasks]);
+
+  useEffect(() => {
+    dispatch(setWaivedEvidenceTasks(waivedTasks));
+  }, [waivedTasks]);
+
+  const appealCheckboxOnChange = (appealId, isChecked) => {
+    if (isChecked) {
+      if (!taskRelatedAppeals.includes(appealId)) {
+        setTaskRelatedAppeals([...taskRelatedAppeals, appealId]);
+      }
+    } else {
+      const selectedAppeals = taskRelatedAppeals.filter((checkedId) => checkedId !== appealId);
+      const filteredNewTasks = newTasks.filter((task) => task.appealId !== appealId);
+      const waivedEvidenceTasks = filteredNewTasks.filter((taskEvidence) => taskEvidence.isWaived);
+
+      setTaskRelatedAppeals(selectedAppeals);
+      setNewTasks(filteredNewTasks);
+      setTableUpdateTrigger((prev) => prev + 1);
+      setWaivedTasks(waivedEvidenceTasks);
+    }
+  };
+
+  useEffect(() => {
+    // Clear the selected appeals and any tasks when the user toggles the radio button
+    if (existingAppealRadio === RELATED_NO) {
+      setTaskRelatedAppeals([]);
+      setNewTasks([]);
+      setWaivedTasks([]);
+    }
+  }, [existingAppealRadio]);
+
+  useEffect(() => {
+    let canContinue = true;
+
+    newTasks.forEach((task) => {
+      canContinue = canContinue && ((task.content !== '') && (task.type !== ''));
+    });
+
+    waivedTasks.forEach((task) => {
+      canContinue = canContinue && (task.isWaived ? (task.waiveReason !== '') : true);
+    });
+
+    props.setRelatedTasksCanContinue(canContinue);
+  }, [newTasks, waivedTasks]);
+
+  const veteranFileNumber = props.veteranInformation.file_number;
+
+  useEffect(() => {
+  // Don't refetch (use cache)
+    if (appeals.length) {
+      return;
+    }
+
+    if (veteranFileNumber) {
+    // Visually indicate that we are fetching data
+      setLoading(true);
+
+      ApiUtil.get('/appeals', { headers: { 'case-search': veteranFileNumber } }).
+        then((appealResponse) => {
+          const appealsForStore = prepareAppealForStore(appealResponse.body.appeals);
+
+          const appealArr = Object.values(appealsForStore.appeals).sort((first, second) => first.id - second.id);
+
+          dispatch(setFetchedAppeals(appealArr));
+          setLoading(false);
+        });
+    }
+  }, [veteranFileNumber]);
+
+  return (
+    <div>
+      <RadioField
+        name=""
+        value={existingAppealRadio}
+        options={existingAppealAnswer}
+        onChange={(val) => setExistingAppealRadio(val)}
+      />
+      {existingAppealRadio === RELATED_YES && loading &&
+        <LoadingContainer color={LOGO_COLORS.QUEUE.ACCENT}>
+          <div className="loading-div">
+          </div>
+        </LoadingContainer>
+      }
+      {existingAppealRadio === RELATED_YES && !loading &&
+        <div className="gray-border"
+          style={{ padding: '0rem 0rem', display: 'flex', flexWrap: 'wrap', flexDirection: 'column' }}>
+          <div style={{ width: '100%', height: 'auto', backgroundColor: 'white', paddingBottom: '3rem' }}>
+            <div style={{ backgroundColor: '#f1f1f1', width: '100%', height: '50px', paddingTop: '1.5rem' }}>
+              <b style={{
+                verticalAlign: 'center',
+                paddingLeft: '2.5rem',
+                paddingTop: '1.5rem',
+                border: '0',
+                paddingBottom: '1.5rem',
+                paddingRigfht: '5.5rem'
+              }}>Existing Appeals</b>
+            </div>
+            <ul style={{ paddingLeft: '4.2rem' }}>
+              Please select prior appeal(s) to link to this correspondence
+            </ul>
+            <ul>
+              <div style={{ padding: '1rem' }}>
+                <CaseListTable
+                  // Need to use this as key to force React to re-render checkboxes
+                  key={tableUpdateTrigger}
+                  appeals={appeals}
+                  showCheckboxes
+                  paginate
+                  linkOpensInNewTab
+                  checkboxOnChange={appealCheckboxOnChange}
+                  taskRelatedAppealIds={taskRelatedAppeals}
+                  currentPage={currentAppealPage}
+                  updatePageHandlerCallback={appealsPageUpdateHandler}
+                />
+              </div>
+            </ul>
+          </div>
+          <div>
+            {taskRelatedAppeals.toSorted().map((appealId, index) => {
+              return (
+                <ExistingAppealTasksView
+                  key={index}
+                  appeal={appealById(appealId)}
+                  newTasks={newTasks}
+                  setNewTasks={setNewTasks}
+                  waivedTasks={waivedTasks}
+                  setWaivedTasks={setWaivedTasks}
+                  nextTaskId={nextTaskId}
+                  setRelatedTasksCanContinue={props.setRelatedTasksCanContinue}
+                  unlinkAppeal={appealCheckboxOnChange}
+                  allTaskTypeOptions={props.allTaskTypeOptions}
+                  filterUnavailableTaskTypeOptions={props.filterUnavailableTaskTypeOptions}
+                  autoTexts={props.autoTexts}
+                />
+              );
+            })}
+          </div>
+        </div>
+      }
+    </div>
+  );
+};
+
+AddAppealRelatedTaskView.propTypes = {
+  correspondenceUuid: PropTypes.string.isRequired,
+  setRelatedTasksCanContinue: PropTypes.func.isRequired,
+  filterUnavailableTaskTypeOptions: PropTypes.func.isRequired,
+  allTaskTypeOptions: PropTypes.array.isRequired,
+  autoTexts: PropTypes.arrayOf(PropTypes.string).isRequired,
+  veteranInformation: PropTypes.object.isRequired
+};
+
+export default AddAppealRelatedTaskView;
diff --git a/client/app/queue/correspondence/intake/components/TasksAppeals/AddEvidenceSubmissionTaskView.jsx b/client/app/queue/correspondence/intake/components/TasksAppeals/AddEvidenceSubmissionTaskView.jsx
new file mode 100644
index 00000000000..2e073abc424
--- /dev/null
+++ b/client/app/queue/correspondence/intake/components/TasksAppeals/AddEvidenceSubmissionTaskView.jsx
@@ -0,0 +1,86 @@
+import React from 'react';
+import TextareaField from '../../../../../components/TextareaField';
+import ReactSelectDropdown from '../../../../../components/ReactSelectDropdown';
+import Checkbox from '../../../../../components/Checkbox';
+import PropTypes from 'prop-types';
+import { css } from 'glamor';
+
+const AddEvidenceSubmissionTaskView = (props) => {
+  const task = props.task;
+
+  const handleIsWaivedChange = (newIsWaved) => {
+    const newTask = { id: task.id, isWaived: newIsWaved, waiveReason: task.waiveReason };
+
+    // Parent will add/remove task from list based on isWaived
+    props.taskUpdatedCallback(newTask);
+  };
+
+  const handleReasonChange = (newReason) => {
+    const newTask = { id: task.id, isWaived: task.isWaived, waiveReason: newReason };
+
+    props.taskUpdatedCallback(newTask);
+  };
+
+  const dropdownOptions = [
+    { value: 'evidence_submission', label: 'Evidence Window Submission Task', isDisabled: true },
+  ];
+
+  return (
+    <div key={task.id} style={{ display: 'block', marginRight: '2rem' }}>
+      <div
+        className="gray-border"
+        style={{
+          display: 'block',
+          padding: '2rem 2rem',
+          marginLeft: '3rem',
+          marginBottom: '3rem',
+          width: '50rem'
+        }}
+      >
+        <div
+          style={{
+            width: '45rem',
+          }}
+        >
+          <div id="reactSelectContainer">
+            <ReactSelectDropdown
+              options={dropdownOptions}
+              label="Task"
+              defaultValue={dropdownOptions[0]}
+              disabled
+            />
+          </div>
+          <div style={{ padding: '1.5rem' }} />
+          <TextareaField
+            name="content"
+            label="Provide context and instruction on this task"
+            disabled
+            textAreaStyling={css({ cursor: 'not-allowed' })}
+          />
+          <Checkbox
+            name={`${task.id}`}
+            id={`${task.id}`}
+            defaultValue={task.isWaived}
+            label="Waive Evidence Window"
+            onChange={(checked) => handleIsWaivedChange(checked)}
+          />
+          {task.isWaived && (
+            <TextareaField
+              name="waiveReason"
+              label="Provide a reason for waiving the evidence window"
+              onChange={handleReasonChange}
+              value={task.waiveReason}
+            />
+          )}
+        </div>
+      </div>
+    </div>
+  );
+};
+
+AddEvidenceSubmissionTaskView.propTypes = {
+  task: PropTypes.object.isRequired,
+  taskUpdatedCallback: PropTypes.func.isRequired
+};
+
+export default AddEvidenceSubmissionTaskView;
diff --git a/client/app/queue/correspondence/intake/components/TasksAppeals/AddTaskView.jsx b/client/app/queue/correspondence/intake/components/TasksAppeals/AddTaskView.jsx
new file mode 100644
index 00000000000..642dc1201a4
--- /dev/null
+++ b/client/app/queue/correspondence/intake/components/TasksAppeals/AddTaskView.jsx
@@ -0,0 +1,203 @@
+import React, { useState } from 'react';
+import TextareaField from '../../../../../components/TextareaField';
+import CheckboxModal from '../CheckboxModal';
+import Button from '../../../../../components/Button';
+import Select from 'react-select';
+import { css } from 'glamor';
+import PropTypes from 'prop-types';
+
+const customSelectStyless = {
+  dropdownIndicator: () => ({
+    width: '80%'
+  }),
+
+  control: (styles) => {
+    return {
+      ...styles,
+      alignContent: 'center',
+      borderRadius: 0,
+      border: '1px solid black'
+    };
+  },
+
+  menu: () => ({
+    boxShadow: '1px 1px 10px grey',
+  }),
+
+  valueContainer: (styles) => ({
+
+    ...styles,
+    lineHeight: 'normal',
+    // this is a hack to fix a problem with changing the height of the dropdown component.
+    // Changing the height causes problems with text shifting.
+    marginTop: '-10%',
+    marginBottom: '-10%',
+    paddingTop: '-10%',
+    minHeight: '140px',
+    borderRadius: 50
+
+  }),
+  singleValue: (styles) => {
+    return {
+      ...styles,
+      alignContent: 'center',
+    };
+  },
+
+  placeholder: (styles) => ({
+    ...styles,
+    color: 'black',
+  }),
+
+  option: (styles, { isFocused }) => ({
+    color: 'black',
+    fontSize: '25px',
+    paddingTop: '10px',
+    paddingBottom: '10px',
+    paddingLeft: '20px',
+    backgroundColor: isFocused ? 'white' : 'null',
+    ':hover': {
+      ...styles[':hover'],
+      backgroundColor: '#5c9ceb',
+      color: 'black',
+    }
+  })
+};
+const selectContainerStyless = css({
+  width: '100%',
+  display: 'inline-block',
+});
+
+const AddTaskView = (props) => {
+  const task = props.task;
+  const [modalVisible, setModalVisible] = useState(false);
+
+  const objectForSelectedTaskType = () => {
+    return props.allTaskTypeOptions.find((option) => {
+      return option.value === task.type;
+    });
+  };
+
+  const updateTaskContent = (newContent) => {
+    const newTask = { id: task.id, appealId: task.appealId, type: task.type, label: task.label, content: newContent };
+
+    props.taskUpdatedCallback(newTask);
+  };
+
+  const updateTaskType = (newType) => {
+    const newTask =
+      { id: task.id, appealId: task.appealId, type: newType.value, label: newType.label, content: task.content };
+
+    props.taskUpdatedCallback(newTask);
+  };
+
+  const handleModalToggle = () => {
+    setModalVisible(!modalVisible);
+  };
+
+  const handleAutotext = (autoTextValues) => {
+    let autoTextOutput = '';
+
+    if (task.content) {
+      autoTextOutput = task.content;
+    }
+
+    if (autoTextValues.length > 0) {
+      autoTextValues.forEach((id) => {
+        autoTextOutput += `${props.autoTexts[id] }\n`;
+      });
+    }
+    updateTaskContent(autoTextOutput);
+    handleModalToggle();
+  };
+
+  return (
+    <div key={task.id} style={{ display: 'block', marginRight: '2rem' }}>
+      {modalVisible &&
+        <CheckboxModal
+          checkboxData={props.autoTexts}
+          toggleModal={handleModalToggle}
+          closeHandler={handleModalToggle}
+          handleAccept={handleAutotext}
+          handleClear={props.handleClear}
+        />
+      }
+      <div className="gray-border"
+        style={
+          { display: 'block', padding: '2rem 2rem', marginLeft: '3rem', marginBottom: '3rem', width: '50rem' }
+        }>
+        <div
+          style={
+            { width: '45rem' }
+          }
+        >
+
+          <div id="reactSelectContainer"
+            {...selectContainerStyless}>
+
+            <label style={{ marginTop: '5px', marginBottom: '5px', marginLeft: '1px' }}>Task</label>
+            <Select
+              placeholder="Select..."
+              options={props.availableTaskTypeOptions}
+              defaultValue={objectForSelectedTaskType()}
+              onChange={(selectedOption) => updateTaskType(selectedOption)}
+              styles={customSelectStyless}
+              className="add-task-dropdown-style"
+              aria-label="dropdown"
+            />
+          </div>
+          <div style={{ padding: '1.5rem' }} />
+          <TextareaField
+            name="content"
+            label="Provide context and instruction on this task"
+            value={task.content}
+            onChange={updateTaskContent}
+          />
+          <Button
+            id="addAutotext"
+            name="Add"
+            styling={{ style: { paddingLeft: '0rem', paddingRight: '0rem' } }}
+            classNames={['cf-btn-link', 'cf-left-side']}
+            onClick={handleModalToggle}
+          >
+            Add autotext
+          </Button>
+          {props.displayRemoveCheck &&
+            <Button
+              name="Remove"
+              styling={{ style: { paddingLeft: '0rem', paddingRight: '0rem' } }}
+              onClick={() => props.removeTask(task.id)}
+              classNames={['cf-btn-link', 'cf-right-side']}
+            >
+              <i className="fa fa-trash-o" aria-hidden="true"></i>&nbsp;Remove task
+            </Button>
+          }
+        </div>
+      </div>
+    </div>
+  );
+};
+
+AddTaskView.propTypes = {
+  removeTask: PropTypes.func.isRequired,
+  task: PropTypes.object.isRequired,
+  taskUpdatedCallback: PropTypes.func.isRequired,
+  displayRemoveCheck: PropTypes.bool.isRequired,
+  allTaskTypeOptions: PropTypes.array.isRequired,
+  availableTaskTypeOptions: PropTypes.array.isRequired,
+  onChange: PropTypes.func,
+  options: PropTypes.arrayOf(
+    PropTypes.shape({
+      value: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+      displayText: PropTypes.string,
+    })
+  ),
+  defaultValue: PropTypes.object,
+  label: PropTypes.string,
+  onChangeMethod: PropTypes.func,
+  className: PropTypes.string,
+  autoTexts: PropTypes.arrayOf(PropTypes.string).isRequired,
+  handleClear: PropTypes.func
+};
+
+export default AddTaskView;
diff --git a/client/app/queue/correspondence/intake/components/TasksAppeals/AddTasksAppealsView.jsx b/client/app/queue/correspondence/intake/components/TasksAppeals/AddTasksAppealsView.jsx
new file mode 100644
index 00000000000..fdbb9beed04
--- /dev/null
+++ b/client/app/queue/correspondence/intake/components/TasksAppeals/AddTasksAppealsView.jsx
@@ -0,0 +1,134 @@
+import React, { useEffect, useState } from 'react';
+import { useSelector, useDispatch } from 'react-redux';
+import PropTypes from 'prop-types';
+import Checkbox from '../../../../../components/Checkbox';
+import AddAppealRelatedTaskView from './AddAppealRelatedTaskView';
+import AddUnrelatedTaskView from './AddUnrelatedTaskView';
+import { saveMailTaskState } from '../../../correspondenceReducer/correspondenceActions';
+import { INTAKE_FORM_TASK_TYPES } from '../../../../constants';
+
+const mailTasksLeft = [
+  'Change of address',
+  'Evidence or argument',
+  'Returned or undeliverable mail'
+];
+
+const mailTasksRight = [
+  'Sent to ROJ',
+  'VACOLS updated',
+  'Associated with Claims Folder'
+];
+
+const relatedTaskTypes = INTAKE_FORM_TASK_TYPES.relatedToAppeal;
+const unrelatedTaskTypes = INTAKE_FORM_TASK_TYPES.unrelatedToAppeal;
+
+export const AddTasksAppealsView = (props) => {
+  const mailTasks = useSelector((state) => state.intakeCorrespondence.mailTasks);
+  const [relatedTasksCanContinue, setRelatedTasksCanContinue] = useState(true);
+  const [unrelatedTasksCanContinue, setUnrelatedTasksCanContinue] = useState(true);
+
+  const dispatch = useDispatch();
+
+  const filterUnavailableTaskTypeOptions = (tasks, options) => {
+    let otherMotionCount = 0;
+
+    const filteredTaskNames = tasks.map((task) => {
+      if (task.label === 'Other motion') {
+        otherMotionCount += 1;
+      }
+
+      return task.label;
+    });
+
+    return options.filter((option) => {
+      // Up to 2 other motion tasks can be created in the workflow
+      // so only filter 'other motion' if there are 2 other motion tasks already created
+      if (option.label === 'Other motion' && otherMotionCount < 2) {
+        return true;
+      }
+
+      return !filteredTaskNames.includes(option.label);
+    });
+  };
+
+  useEffect(() => {
+    props.onContinueStatusChange(relatedTasksCanContinue && unrelatedTasksCanContinue);
+  }, [relatedTasksCanContinue, unrelatedTasksCanContinue]);
+
+  return (
+    <div className="gray-border" style={{ marginBottom: '2rem', padding: '3rem 4rem' }}>
+      <h1 style={{ marginBottom: '10px' }}>Review Tasks & Appeals</h1>
+      <p>Review any previously completed tasks by the mail team and add new tasks for
+      either the mail package or for linked appeals, if any.</p>
+      <div>
+        <h2 style={{ margin: '25px auto 15px auto' }}>Mail Tasks</h2>
+        <div className="gray-border" style={{ padding: '0rem 2rem' }}>
+          <p style={{ marginBottom: '0.5rem' }}>Select any tasks completed by the Mail team for this correspondence.</p>
+          <div id="mail-tasks-left" style={{ display: 'inline-block', marginRight: '14rem' }}>
+            {mailTasksLeft.map((name, index) => {
+              return (
+                <Checkbox
+                  key={index}
+                  name={name}
+                  label={name}
+                  defaultValue={mailTasks[name] || false}
+                  onChange={(isChecked) => dispatch(saveMailTaskState(name, isChecked))}
+                />
+              );
+            })}
+          </div>
+          <div id="mail-tasks-right" style={{ display: 'inline-block' }}>
+            {mailTasksRight.map((name, index) => {
+              return (
+                <Checkbox
+                  key={index}
+                  name={name}
+                  label={name}
+                  defaultValue={mailTasks[name] || false}
+                  onChange={(isChecked) => dispatch(saveMailTaskState(name, isChecked))}
+                />
+              );
+            })}
+          </div>
+        </div>
+
+        <div id="task-not-related-to-an-appeal">
+          <h2 style={{ margin: '3rem auto 1rem auto' }}>Tasks not related to an Appeal</h2>
+          <p style={{ marginTop: '0rem', marginBottom: '2rem' }}>
+            Add new tasks related to this correspondence or to an appeal not yet created in Caseflow.
+          </p>
+          <div>
+            <AddUnrelatedTaskView
+              setUnrelatedTasksCanContinue={setUnrelatedTasksCanContinue}
+              filterUnavailableTaskTypeOptions={filterUnavailableTaskTypeOptions}
+              allTaskTypeOptions={unrelatedTaskTypes}
+              autoTexts={props.autoTexts}
+            />
+          </div>
+        </div>
+
+        <div id="task-related-to-an-appeal" style={{ marginTop: '3.8rem' }}>
+          <h2 style={{ margin: '3rem auto 1rem auto' }}>Tasks related to an existing Appeal</h2>
+          <p style={{ marginBottom: '0rem' }}>Is this correspondence related to an existing appeal?</p>
+          <AddAppealRelatedTaskView
+            correspondenceUuid={props.correspondenceUuid}
+            setRelatedTasksCanContinue={setRelatedTasksCanContinue}
+            filterUnavailableTaskTypeOptions={filterUnavailableTaskTypeOptions}
+            allTaskTypeOptions={relatedTaskTypes}
+            autoTexts={props.autoTexts}
+            veteranInformation={props.veteranInformation}
+          />
+        </div>
+      </div>
+    </div>
+  );
+};
+
+AddTasksAppealsView.propTypes = {
+  correspondenceUuid: PropTypes.string.isRequired,
+  onContinueStatusChange: PropTypes.func.isRequired,
+  autoTexts: PropTypes.arrayOf(PropTypes.string).isRequired,
+  veteranInformation: PropTypes.object.isRequired
+};
+
+export default AddTasksAppealsView;
diff --git a/client/app/queue/correspondence/intake/components/TasksAppeals/AddUnrelatedTaskView.jsx b/client/app/queue/correspondence/intake/components/TasksAppeals/AddUnrelatedTaskView.jsx
new file mode 100644
index 00000000000..4e86b5d151c
--- /dev/null
+++ b/client/app/queue/correspondence/intake/components/TasksAppeals/AddUnrelatedTaskView.jsx
@@ -0,0 +1,144 @@
+import React, { useEffect, useState } from 'react';
+import { useSelector, useDispatch } from 'react-redux';
+import Button from '../../../../../components/Button';
+import AddTaskView from './AddTaskView';
+import { setUnrelatedTasks } from '../../../correspondenceReducer/correspondenceActions';
+import PropTypes from 'prop-types';
+
+const MAX_NUM_TASKS = 4;
+
+export const AddUnrelatedTaskView = (props) => {
+  const [newTasks, setNewTasks] = useState(useSelector((state) => state.intakeCorrespondence.unrelatedTasks));
+  const [nextTaskId, setNextTaskId] = useState(newTasks.length);
+  const [addTasksVisible, setAddTasksVisible] = useState(false);
+  const [availableTaskTypeOptions, setavailableTaskTypeOptions] = useState([]);
+
+  const dispatch = useDispatch();
+
+  useEffect(() => {
+    setNextTaskId((prevId) => prevId + 1);
+    dispatch(setUnrelatedTasks(newTasks));
+  }, [newTasks]);
+
+  const clickAddTask = () => {
+    const newTask = { id: nextTaskId, type: '', label: '', content: '' };
+
+    setNewTasks([...newTasks, newTask]);
+  };
+
+  const removeTask = (id) => {
+    const filtered = newTasks.filter((task) => task.id !== id);
+
+    setNewTasks(filtered);
+  };
+
+  const taskUpdatedCallback = (updatedTask) => {
+    const filtered = newTasks.filter((task) => task.id !== updatedTask.id);
+
+    setNewTasks([...filtered, updatedTask]);
+  };
+
+  useEffect(() => {
+    if (newTasks.length) {
+      setAddTasksVisible(true);
+    } else {
+      setAddTasksVisible(false);
+    }
+  }, [newTasks]);
+
+  useEffect(() => {
+    let canContinue = true;
+
+    newTasks.forEach((task) => {
+      canContinue = canContinue && ((task.content !== '') && (task.type !== ''));
+    });
+
+    props.setUnrelatedTasksCanContinue(canContinue);
+  }, [newTasks]);
+
+  useEffect(() => {
+    if (!addTasksVisible) {
+      props.setUnrelatedTasksCanContinue(true);
+    }
+  }, [addTasksVisible]);
+
+  useEffect(() => {
+    setavailableTaskTypeOptions(props.filterUnavailableTaskTypeOptions(newTasks, props.allTaskTypeOptions));
+  }, [newTasks]);
+
+  const getTasks = () => {
+    return newTasks.toSorted((t1, t2) => {
+      if (t1.id < t2.id) {
+        return -1;
+      }
+      if (t1.id > t2.id) {
+        return 1;
+      }
+
+      return 0;
+    });
+  };
+
+  return (
+    <div>
+      {!addTasksVisible && <Button
+        type="button"
+        onClick={clickAddTask}
+        name="addTaskOpen"
+        classNames={['cf-left-side']}>
+          + Add tasks
+      </Button>}
+      {addTasksVisible && <div
+        className="gray-border"
+        style={{ padding: '0rem 0rem', display: 'flex', flexWrap: 'wrap', flexDirection: 'column' }}
+      >
+        <div style={{ width: '100%', height: 'auto', backgroundColor: 'white', paddingBottom: '3rem' }}>
+          <div style={{ backgroundColor: '#f1f1f1', width: '100%', height: '50px', paddingTop: '1.5rem' }}>
+            <b style={{
+              verticalAlign: 'center',
+              paddingLeft: '2.5rem',
+              paddingTop: '1.5rem',
+              border: '0',
+              paddingBottom: '1.5rem',
+              paddingRigfht: '5.5rem'
+            }}>New Tasks</b>
+          </div>
+          <div style={{ width: '100%', height: '3rem' }} />
+          <div style={{ display: 'flex', flexWrap: 'wrap' }}>
+            {getTasks().map((task) => (
+              <AddTaskView
+                key={task.id}
+                task={task}
+                removeTask={removeTask}
+                taskUpdatedCallback={taskUpdatedCallback}
+                displayRemoveCheck
+                allTaskTypeOptions={props.allTaskTypeOptions}
+                availableTaskTypeOptions={availableTaskTypeOptions}
+                autoTexts={props.autoTexts}
+              />
+            ))}
+          </div>
+          <div style={{ padding: '2.5rem 2.5rem' }} >
+            <Button
+              type="button"
+              onClick={clickAddTask}
+              disabled={newTasks.length === MAX_NUM_TASKS}
+              name="addTasks"
+              classNames={['cf-left-side']}>
+                + Add tasks
+            </Button>
+          </div>
+        </div>
+      </div>}
+    </div>
+  );
+};
+
+AddUnrelatedTaskView.propTypes = {
+  setUnrelatedTasksCanContinue: PropTypes.func.isRequired,
+  filterUnavailableTaskTypeOptions: PropTypes.func.isRequired,
+  allTaskTypeOptions: PropTypes.array.isRequired,
+  autoTexts: PropTypes.arrayOf(PropTypes.string).isRequired
+};
+
+export default AddUnrelatedTaskView;
diff --git a/client/app/queue/correspondence/intake/components/TasksAppeals/ExistingAppealTasksView.jsx b/client/app/queue/correspondence/intake/components/TasksAppeals/ExistingAppealTasksView.jsx
new file mode 100644
index 00000000000..e52bb0f1008
--- /dev/null
+++ b/client/app/queue/correspondence/intake/components/TasksAppeals/ExistingAppealTasksView.jsx
@@ -0,0 +1,147 @@
+import React, { useEffect, useState } from 'react';
+import PropTypes from 'prop-types';
+import AddTaskView from './AddTaskView';
+import AddEvidenceSubmissionTaskView from './AddEvidenceSubmissionTaskView';
+import Button from '../../../../../components/Button';
+import CaseDetailsLink from '../../../../CaseDetailsLink';
+import Link from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/Link';
+
+const MAX_NUM_TASKS = 4;
+
+export const ExistingAppealTasksView = (props) => {
+  const [availableTaskTypeOptions, setavailableTaskTypeOptions] = useState([]);
+
+  const getTasksForAppeal = () => {
+    const filtered = props.newTasks.filter((el) => el.appealId === props.appeal.id);
+
+    return filtered.sort((t1, t2) => {
+      if (t1.id < t2.id) {
+        return -1;
+      }
+      if (t1.id > t2.id) {
+        return 1;
+      }
+
+      return 0;
+    });
+  };
+
+  const getWaivedTaskForAppeal = () => {
+    const taskId = props.appeal.evidenceSubmissionTask.id;
+
+    let task = props.waivedTasks.find((el) => el.id === taskId);
+
+    if (typeof task === 'undefined') {
+      task = { id: taskId, isWaived: false, waiveReason: '' };
+    }
+
+    return task;
+  };
+
+  const addTask = () => {
+    const newTask = { id: props.nextTaskId, appealId: props.appeal.id, type: '', label: '', content: '' };
+
+    props.setNewTasks([...props.newTasks, newTask]);
+  };
+
+  const removeTask = (id) => {
+    const newTasks = props.newTasks.filter((task) => task.id !== id);
+
+    props.setNewTasks(newTasks);
+  };
+
+  const taskUpdatedCallback = (updatedTask) => {
+    const filtered = props.newTasks.filter((task) => task.id !== updatedTask.id);
+
+    props.setNewTasks([...filtered, updatedTask]);
+  };
+
+  const waivedTaskUpdatedCallback = (updatedTask) => {
+    const filtered = props.waivedTasks.filter((task) => task.id !== updatedTask.id);
+
+    if (updatedTask.isWaived) {
+      props.setWaivedTasks([...filtered, updatedTask]);
+    } else {
+      props.setWaivedTasks(filtered);
+    }
+  };
+
+  useEffect(() => {
+    setavailableTaskTypeOptions(props.filterUnavailableTaskTypeOptions(getTasksForAppeal(), props.allTaskTypeOptions));
+  }, [props.newTasks]);
+
+  return (
+    <div>
+      <div style={{ marginLeft: '2%', marginBottom: '2%' }}>
+        <strong>Tasks: Appeal </strong>
+        <CaseDetailsLink appeal={props.appeal}
+          getLinkText={() => {
+            return `#${props.appeal.docketNumber}`;
+          }}
+          linkOpensInNewTab
+        />
+      </div>
+
+      <div style={{ display: 'flex', flexWrap: 'wrap' }}>
+        {props.appeal.hasEvidenceSubmissionTask &&
+          <AddEvidenceSubmissionTaskView
+            key={props.appeal.evidenceSubmissionTask.id}
+            task={getWaivedTaskForAppeal()}
+            taskUpdatedCallback={waivedTaskUpdatedCallback}
+          />
+        }
+        {getTasksForAppeal().map((task) => {
+          return (
+            <AddTaskView
+              key={task.id}
+              task={task}
+              removeTask={removeTask}
+              taskUpdatedCallback={taskUpdatedCallback}
+              displayRemoveCheck
+              allTaskTypeOptions={props.allTaskTypeOptions}
+              availableTaskTypeOptions={availableTaskTypeOptions}
+              autoTexts={props.autoTexts}
+            />
+          );
+        })}
+      </div>
+
+      <div style={{ padding: '2.5rem 2.5rem', display: 'flex', justifyContent: 'space-between' }}>
+        <div style={{ width: '80%' }}>
+          <Button
+            type="button"
+            onClick={addTask}
+            disabled={getTasksForAppeal().length === MAX_NUM_TASKS}
+            name="addTasks"
+            className={['cf-left-side']}>
+          + Add tasks
+          </Button>
+        </div>
+
+        <div style={{ cursor: 'pointer' }}>
+          <Link
+            name={`unlink-${props.appeal.id}`}
+            onClick={() => props.unlinkAppeal(props.appeal.id, false)}
+          >
+            <p className="fa fa-unlink"></p>&nbsp;Unlink appeal
+          </Link>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+ExistingAppealTasksView.propTypes = {
+  appeal: PropTypes.object.isRequired,
+  newTasks: PropTypes.array.isRequired,
+  setNewTasks: PropTypes.func.isRequired,
+  waivedTasks: PropTypes.array.isRequired,
+  setWaivedTasks: PropTypes.func.isRequired,
+  nextTaskId: PropTypes.number.isRequired,
+  unlinkAppeal: PropTypes.func.isRequired,
+  allTaskTypeOptions: PropTypes.array.isRequired,
+  filterUnavailableTaskTypeOptions: PropTypes.func.isRequired,
+  autoTexts: PropTypes.arrayOf(PropTypes.string).isRequired
+};
+
+export default ExistingAppealTasksView;
diff --git a/client/app/queue/correspondence/modals/PackageActionModal.jsx b/client/app/queue/correspondence/modals/PackageActionModal.jsx
new file mode 100644
index 00000000000..724511106b3
--- /dev/null
+++ b/client/app/queue/correspondence/modals/PackageActionModal.jsx
@@ -0,0 +1,213 @@
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+import Modal from '../../../components/Modal';
+import TextareaField from '../../../components/TextareaField';
+import RadioField from '../../../components/RadioField';
+import Table from '../../../components/Table';
+import { connect } from 'react-redux';
+import ApiUtil from '../../../util/ApiUtil';
+import { getPackageActionColumns, getModalInformation } from '../review_package/utils';
+import { useHistory } from 'react-router';
+
+const PackageActionModal = (props) => {
+  const {
+    packageActionModal,
+    correspondence,
+    packageDocumentType,
+    veteranInformation,
+    closeHandler,
+  } = props;
+
+  const modalInfo = getModalInformation(packageActionModal);
+  const history = useHistory();
+
+  const [textInputReason, setTextInputReason] = useState('');
+  const [mergePackageReason, setMergePackageReason] = useState('');
+  const [isOtherOption, setIsOtherOption] = useState(false);
+  const [radioValue, setRadioValue] = useState('');
+
+  const rows = [
+    {
+      correspondence,
+      packageDocumentType,
+      veteranInformation
+    }
+  ];
+
+  const mergePackageReasonOptions = [
+    { displayText: 'Duplicate documents',
+      value: 'Duplicate documents' },
+    { displayText: 'Documents received on the same date relating to the same issue(s)/appeal(s)',
+      value: 'Documents received' },
+    { displayText: 'Other',
+      value: 'other' }
+  ];
+
+  const RadioOptions = [
+    { displayText: 'Package contains documents related to more than one person.',
+      value: 'Package contains documents related to more than one person.' },
+    { displayText: 'Package contains documents that must be processed by multiple business lines.',
+      value: 'Package contains documents that must be processed by multiple business lines.' },
+    { displayText: 'Other',
+      value: 'Other' }
+  ];
+
+  // Disable submit button unless conditional input is met
+  const disableSubmit = () => {
+    switch (packageActionModal) {
+    case 'mergePackage':
+      if (mergePackageReason === 'other') {
+        return textInputReason === '';
+      }
+
+      return mergePackageReason === '';
+    case 'removePackage':
+    case 'reassignPackage':
+      return textInputReason === '';
+    case 'splitPackage': {
+      const isRadioDisabled = radioValue === '' || radioValue === 'Other';
+
+      return isRadioDisabled ? textInputReason === '' : false;
+    }
+    default:
+      return true;
+    }
+  };
+
+  const handleMergeReason = (value) => {
+    setMergePackageReason(value);
+    setIsOtherOption(false);
+    if (value === 'other') {
+      setIsOtherOption(true);
+    }
+  };
+
+  const onChange = (event) => {
+    setRadioValue(event);
+  };
+
+  const submitHandler = async () => {
+    const data = {
+      correspondence_id: correspondence.id,
+      type: packageActionModal,
+      instructions: []
+    };
+
+    if (packageActionModal === 'removePackage' || packageActionModal === 'reassignPackage') {
+      data.instructions.push(textInputReason);
+    }
+
+    if (radioValue && radioValue !== 'Other') {
+      data.instructions.push(radioValue);
+    }
+
+    if (
+      (isOtherOption ||
+        packageActionModal === 'removePackage' ||
+        packageActionModal === 'reassignPackage' ||
+        packageActionModal === 'splitPackage') &&
+      textInputReason !== ''
+    ) {
+      data.instructions.push(textInputReason);
+    }
+
+    if (
+      (packageActionModal === 'removePackage' ||
+        packageActionModal === 'reassignPackage' ||
+        packageActionModal === 'splitPackage') &&
+      textInputReason !== ''
+    ) {
+      data.instructions.push(textInputReason);
+    }
+    ApiUtil.post(`/queue/correspondence/${correspondence.uuid}/task`, { data }).then((response) => {
+      props.closeHandler(null);
+      if (response.ok) {
+        history.push('/queue/correspondence');
+      }
+    }
+    ).
+      catch(() => {
+        console.error('Review Package Action already exists');
+      });
+    setTextInputReason('');
+  };
+
+  return (
+    <Modal
+      title={modalInfo.title}
+      buttons={[
+        {
+          classNames: ['cf-modal-link', 'cf-btn-link'],
+          name: 'Cancel',
+          onClick: () => closeHandler(null)
+        },
+        {
+          classNames: ['usa-button'],
+          name: 'Confirm request',
+          disabled: disableSubmit(),
+          onClick: submitHandler,
+        }
+      ]}
+      closeHandler={() => props.closeHandler(null)}
+    >
+      <span className="usa-input" style={{ marginBottom: '5px' }}>
+        {modalInfo.description}
+      </span>
+      <Table
+        columns={getPackageActionColumns(packageActionModal)}
+        rowObjects={rows}
+        slowReRendersAreOk
+        summary="Request Package Action Modal"
+      />
+      {
+        (packageActionModal === 'mergePackage') &&
+        <RadioField
+          label={modalInfo.radioLabel}
+          name="merge-package"
+          value={mergePackageReason}
+          options={mergePackageReasonOptions}
+          onChange={handleMergeReason}
+        />
+      }
+      {(packageActionModal === 'splitPackage') && <RadioField
+        name="Select a reason for splitting this package"
+        options={RadioOptions}
+        onChange={onChange}
+      />}
+      {(isOtherOption ||
+        packageActionModal === 'removePackage' ||
+        packageActionModal === 'reassignPackage' ||
+        radioValue === 'Other') && (
+        <TextareaField
+          label={modalInfo.label}
+          name={modalInfo.label}
+          aria-label={modalInfo.label}
+          value={textInputReason}
+          placeholder={modalInfo.placeholder}
+          onChange={(value) => setTextInputReason(value)}
+        />
+      )}
+    </Modal>
+  );
+};
+
+PackageActionModal.propTypes = {
+  correspondence: PropTypes.object,
+  packageDocumentType: PropTypes.string,
+  veteranInformation: PropTypes.object,
+  columns: PropTypes.arrayOf(PropTypes.object),
+  modalInfo: PropTypes.object,
+  packageActionModal: PropTypes.string,
+  closeHandler: PropTypes.func
+};
+
+const mapStateToProps = (state) => ({
+  correspondence: state.reviewPackage.correspondence,
+  packageDocumentType: state.reviewPackage.packageDocumentType.name,
+  veteranInformation: state.reviewPackage.veteranInformation
+});
+
+export default connect(
+  mapStateToProps,
+  null,
+)(PackageActionModal);
diff --git a/client/app/queue/correspondence/modals/editModal.jsx b/client/app/queue/correspondence/modals/editModal.jsx
new file mode 100644
index 00000000000..481b56cb48d
--- /dev/null
+++ b/client/app/queue/correspondence/modals/editModal.jsx
@@ -0,0 +1,214 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Modal from 'app/components/Modal';
+import SearchableDropdown from 'app/components/SearchableDropdown';
+import DateSelector from 'app/components/DateSelector';
+import { validateDateNotInFuture } from '../../../intake/util/issues';
+import Button from '../../../components/Button';
+import ApiUtil from '../../../util/ApiUtil';
+import _ from 'lodash';
+import { connect } from 'react-redux';
+import { bindActionCreators } from 'redux';
+import { updateCmpInformation } from '../correspondenceReducer/reviewPackageActions';
+import moment from 'moment';
+/* eslint-disable camelcase, max-len */
+class EditModal extends React.Component {
+
+  constructor(props) {
+    super(props);
+    this.state = {
+      VADORDate: '',
+      packageDocument: '',
+      dateError: '',
+      showEditModal: false,
+      packageOptions: '',
+      defaultVADORDate: '',
+      defaultPackageDocument: '',
+      saveButtonDisabled: true,
+      canEditVADOR: true
+    };
+  }
+
+  componentDidMount() {
+    setTimeout(this.getPackages, 0);
+    setTimeout(this.getCorrespondenceData, 0);
+  }
+
+  getCorrespondenceData = async() => {
+    const locationPath = location.pathname.split('/');
+    const correspondenceId = locationPath[3];
+
+    await ApiUtil.get(`/queue/correspondence/${correspondenceId}`).then((response) => {
+
+      const formattedVADORDate = moment.utc(response.body.correspondence?.va_date_of_receipt).format('YYYY-MM-DD');
+      const packageDocumentTypeName = { label: response.body.package_document_type?.name, value: response.body.package_document_type?.id };
+
+      if (response.body.user_can_edit_vador) {
+        this.setState({
+          canEditVADOR: false
+        });
+      }
+
+      this.setState({
+        VADORDate: formattedVADORDate,
+        packageDocument: packageDocumentTypeName,
+        defaultVADORDate: formattedVADORDate,
+        defaultPackageDocument: packageDocumentTypeName
+      });
+    });
+  }
+
+  onClickEditCMP = () => {
+    this.setState({ showEditModal: true });
+  };
+
+  onClickCancel = () => {
+    this.setState({
+      showEditModal: false,
+      packageDocument: this.state.defaultPackageDocument,
+      VADORDate: this.state.defaultVADORDate,
+      saveButtonDisabled: true
+    });
+  };
+
+  handleCMPSave = async(props) => {
+    const locationPath = location.pathname.split('/');
+    const correspondenceId = locationPath[3];
+
+    const {
+      VADORDate,
+      packageDocument
+    } = props.state;
+
+    await ApiUtil.put(`/queue/correspondence/${correspondenceId}/update_cmp`, { data: { packageDocument, VADORDate } }).
+      then((response) => {
+        if (response.status === 200) {
+          this.props.updateCmpInformation(packageDocument, VADORDate);
+          props.onClickCancel();
+          setTimeout(this.getCorrespondenceData, 0);
+        }
+      });
+  }
+
+  getModalButtons() {
+    const btns = [
+      {
+        classNames: ['cf-modal-link', 'cf-btn-link', 'close-modal'],
+        name: 'Cancel',
+        onClick: this.onClickCancel
+      },
+      {
+        classNames: ['usa-button', 'add-issue'],
+        name: 'Save',
+        onClick: this.handleCMPSave.bind(this, this),
+        disabled: this.state.saveButtonDisabled || this.requiredFieldsMissing() || Boolean(this.state.dateError)
+      }
+    ];
+
+    return btns;
+  }
+
+  requiredFieldsMissing() {
+    const {
+      VADORDate,
+      packageDocument
+    } = this.state;
+
+    return (
+      !VADORDate ||
+      !packageDocument
+    );
+  }
+
+  packageDocumentOnChange = (value) => {
+    this.setState({
+      packageDocument: value,
+      saveButtonDisabled: false
+    });
+  };
+
+  VADORDateOnChange = (value) => {
+    this.setState({
+      VADORDate: value,
+      dateError: this.errorOnVADORDate(value),
+      saveButtonDisabled: false
+    });
+  };
+
+  errorOnVADORDate = (value) => {
+    if (value.length === 10) {
+      const error = validateDateNotInFuture(value) ? null : 'Decision date cannot be in the future';
+
+      return error;
+    }
+  };
+
+  getPackages = async() => {
+    await ApiUtil.get('/queue/correspondence/packages').then((resp) => {
+      const packageTypeOptions = _.values(ApiUtil.convertToCamelCase(resp.body.package_document_types)).map((packages) => ({
+        label: packages.name,
+        value: packages.id.toString()
+      }));
+
+      packageTypeOptions.sort((first, second) => (first.label - second.label));
+      this.setState({ packageOptions: packageTypeOptions });
+    });
+  }
+
+  render() {
+    const { VADORDate, packageDocument, showEditModal } = this.state;
+
+    return (
+      <div>
+        <Button
+          name="Edit"
+          onClick={() => this.onClickEditCMP()}
+          classNames={['usa-button-primary']}
+        />
+        {showEditModal && (
+          <Modal buttons={this.getModalButtons()} visible closeHandler={this.onClickCancel} title="Edit CMP information">
+            <div>
+              <div className="va-dor">
+                <DateSelector
+                  name="va-dor-input"
+                  label="VA DOR"
+                  readOnly={this.state.canEditVADOR}
+                  strongLabel
+                  value={VADORDate}
+                  errorMessage={this.state.dateError}
+                  onChange={this.VADORDateOnChange}
+                  type="date"
+                />
+              </div>
+              <br />
+              <SearchableDropdown
+                name="package-document-type-input"
+                label="Package document type"
+                placeholder="Select or enter..."
+                options={this.state.packageOptions}
+                value={packageDocument}
+                onChange={this.packageDocumentOnChange}
+              />
+            </div>
+          </Modal>
+        )}
+      </div>
+    );
+  }
+}
+
+EditModal.propTypes = {
+  onCancel: PropTypes.func,
+  updateCmpInformation: PropTypes.func
+};
+
+const mapDispatchToProps = (dispatch) => (
+  bindActionCreators({
+    updateCmpInformation
+  }, dispatch)
+);
+
+export default connect(
+  null,
+  mapDispatchToProps
+)(EditModal);
diff --git a/client/app/queue/correspondence/pdfPreview/CorrespondencePdfFooter.jsx b/client/app/queue/correspondence/pdfPreview/CorrespondencePdfFooter.jsx
new file mode 100644
index 00000000000..2c74b5e312f
--- /dev/null
+++ b/client/app/queue/correspondence/pdfPreview/CorrespondencePdfFooter.jsx
@@ -0,0 +1,50 @@
+// External Dependencies
+import React from 'react';
+import PropTypes from 'prop-types';
+
+// Local Dependencies
+import NumberField from '../../../components/NumberField';
+
+/**
+ * Document Footer displays the PDF footer controls
+ * @param {Object} pdfDocProxy - Information about the pdf document
+ */
+export const CorrespondencePdfFooter = ({
+  currentPage,
+  pdfDocProxy,
+  handleSetCurrentPage
+}) => {
+  return (
+    <div className="cf-pdf-footer cf-pdf-toolbar">
+      <div className="cf-pdf-buttons-center">
+        <span className="page-progress-indicator">
+          {pdfDocProxy.numPages ? (
+            <>
+              <div id="pdf-preview-footer-input-field" style={{ display: 'inline-block' }}>
+                <NumberField
+                  maxLength={4}
+                  name="page-progress-indicator-input"
+                  label="Page"
+                  onChange={handleSetCurrentPage}
+                  value={currentPage}
+                  required={false}
+                  className={['page-progress-indicator-input']}
+                />
+              </div>
+              of {pdfDocProxy.numPages}
+            </>
+          ) : (
+            <em>Loading document...</em>
+          )}
+        </span>
+      </div>
+    </div>
+  );
+};
+
+CorrespondencePdfFooter.propTypes = {
+  currentPage: PropTypes.number,
+  handleSetCurrentPage: PropTypes.func,
+  pdfDocProxy: PropTypes.object,
+};
+
diff --git a/client/app/queue/correspondence/pdfPreview/CorrespondencePdfPage.jsx b/client/app/queue/correspondence/pdfPreview/CorrespondencePdfPage.jsx
new file mode 100644
index 00000000000..3f551747813
--- /dev/null
+++ b/client/app/queue/correspondence/pdfPreview/CorrespondencePdfPage.jsx
@@ -0,0 +1,45 @@
+import React, { useEffect } from 'react';
+import PropTypes from 'prop-types';
+
+const CorrespondencePdfPage = (props) => {
+  const { page, scale, rotation, canvasRefs, index, viewportRef } = props;
+
+  useEffect(() => {
+    const canvas = document.getElementById(`canvas-${page.pageNumber}`);
+    const context = canvas.getContext('2d');
+    const viewport = page.getViewport({
+      scale,
+      rotation,
+    });
+
+    canvas.width = viewport.width;
+    canvas.height = viewport.height;
+    viewportRef.current.height = viewport.height;
+    viewportRef.current.width = viewport.width;
+
+    const renderOptions = {
+      canvasContext: context,
+      viewport,
+    };
+
+    page.render(renderOptions);
+  }, [scale, rotation, page]);
+
+  return (
+    <canvas
+      id={`canvas-${page.pageNumber}`}
+      className="canvasWrapper"
+      ref={(ref) => (canvasRefs.current[index] = ref)} />
+  );
+};
+
+CorrespondencePdfPage.propTypes = {
+  page: PropTypes.object,
+  scale: PropTypes.number,
+  rotation: PropTypes.number,
+  canvasRefs: PropTypes.object,
+  index: PropTypes.number,
+  viewportRef: PropTypes.object
+};
+
+export default CorrespondencePdfPage;
diff --git a/client/app/queue/correspondence/pdfPreview/CorrespondencePdfToolBar.jsx b/client/app/queue/correspondence/pdfPreview/CorrespondencePdfToolBar.jsx
new file mode 100644
index 00000000000..1cf28b6ada0
--- /dev/null
+++ b/client/app/queue/correspondence/pdfPreview/CorrespondencePdfToolBar.jsx
@@ -0,0 +1,113 @@
+import { css } from 'glamor';
+import React from 'react';
+import PropTypes from 'prop-types';
+import Link from '../../../components/Link';
+import { ExternalLinkIcon } from '../../../components/icons/ExternalLinkIcon';
+import Button from '../../../components/Button';
+import { RotateIcon } from '../../../components/icons/RotateIcon';
+import { FitToScreenIcon } from '../../../components/icons/FitToScreenIcon';
+
+const CorrespondencePdfToolBar = (props) => {
+  const {
+    doc,
+    documentPathBase,
+    zoomIn,
+    zoomOut,
+    fitToScreen,
+    handleDocumentRotation
+  } = props;
+
+  // In-Line CSS Styles
+  // PDF Document Viewer is 800px wide or less.
+  const pdfWrapperSmall = 1165;
+  const pdfToolbarStyles = {
+    toolbar: css({ width: '33%' }),
+    toolbarLeft: css({
+      '&&': { [`@media(max-width:${pdfWrapperSmall}px)`]: {
+        width: '18%' }
+      }
+    }),
+    toolbarCenter: css({
+      '&&': { [`@media(max-width:${pdfWrapperSmall}px)`]: {
+        width: '24%' }
+      }
+    }),
+    toolbarRight: css({
+      textAlign: 'right',
+      '&&': { [`@media(max-width:${pdfWrapperSmall}px)`]: {
+        width: '44%',
+        '& .cf-pdf-button-text': { display: 'none' } }
+      }
+    }),
+    footer: css({
+      position: 'absolute',
+      bottom: 0,
+      display: 'flex',
+      alignItems: 'center',
+      '&&': { [`@media(max-width:${pdfWrapperSmall}px)`]: {
+        '& .left-button-label': { display: 'none' },
+        '& .right-button-label': { display: 'none' }
+      } }
+    })
+  };
+
+  return (
+    <div className="cf-pdf-preview-header cf-pdf-toolbar">
+      <span className="cf-pdf-preview-doc-type-button-container">
+        <Link
+          name="newTab"
+          ariaLabel="open document in new tab"
+          target="_blank"
+          button="matte"
+          href={`/reader/appeal${documentPathBase}/${doc.id}`}>
+          <h1 className="cf-pdf-vertically-center cf-non-stylized-header">
+            <span title="Open in new tab">{doc.type}</span>
+            <span className="cf-pdf-external-link-icon"><ExternalLinkIcon /></span>
+          </h1>
+        </Link>
+      </span>
+      <span {...pdfToolbarStyles.toolbar} {...pdfToolbarStyles.toolbarRight}>
+        <span className="cf-pdf-button-text">Zoom:</span>
+        <Button
+          name="zoomOut"
+          classNames={['cf-pdf-button cf-pdf-spaced-buttons']}
+          onClick={zoomOut}
+          ariaLabel="zoom out">
+          <i className="fa fa-minus" aria-hidden="true" />
+        </Button>
+        <Button
+          name="zoomIn"
+          classNames={['cf-pdf-button cf-pdf-spaced-buttons']}
+          onClick={zoomIn}
+          ariaLabel="zoom in">
+          <i className="fa fa-plus" aria-hidden="true" />
+        </Button>
+        <Button
+          name="fit"
+          classNames={['cf-pdf-button cf-pdf-spaced-buttons']}
+          onClick={fitToScreen}
+          ariaLabel="fit to screen">
+          <FitToScreenIcon />
+        </Button>
+        <Button
+          name="rotation"
+          classNames={['cf-pdf-button cf-pdf-spaced-buttons']}
+          onClick={handleDocumentRotation}
+          ariaLabel="rotate document">
+          <RotateIcon />
+        </Button>
+      </span>
+    </div>
+  );
+};
+
+CorrespondencePdfToolBar.propTypes = {
+  doc: PropTypes.object,
+  documentPathBase: PropTypes.string,
+  zoomIn: PropTypes.func,
+  zoomOut: PropTypes.func,
+  fitToScreen: PropTypes.func,
+  handleDocumentRotation: PropTypes.func,
+};
+
+export default CorrespondencePdfToolBar;
diff --git a/client/app/queue/correspondence/pdfPreview/CorrespondencePdfUI.jsx b/client/app/queue/correspondence/pdfPreview/CorrespondencePdfUI.jsx
new file mode 100644
index 00000000000..c75c6f12807
--- /dev/null
+++ b/client/app/queue/correspondence/pdfPreview/CorrespondencePdfUI.jsx
@@ -0,0 +1,267 @@
+import React, { useEffect, useMemo, useRef, useState } from 'react';
+import PropTypes from 'prop-types';
+import * as pdfjs from 'pdfjs-dist';
+import pdfjsWorker from 'pdfjs-dist/build/pdf.worker.entry';
+import { css } from 'glamor';
+import _ from 'lodash';
+import CorrespondencePdfToolBar from './CorrespondencePdfToolBar';
+import ApiUtil from '../../../util/ApiUtil';
+import { pageNumberOfPageIndex } from '../../../reader/utils';
+import { PDF_PAGE_HEIGHT, PDF_PAGE_WIDTH } from '../../../reader/constants';
+import { CorrespondencePdfFooter } from './CorrespondencePdfFooter';
+import CorrespondencePdfPage from './CorrespondencePdfPage';
+
+pdfjs.GlobalWorkerOptions.workerSrc = pdfjsWorker;
+
+/**
+ * Represents the root layout and component structure for viewing PDF files
+ * @param {Object} documents - Document metadata obtained from Document Controller
+ * @param {string} documentPathBase - String path containing appeal Id. Directs to /:appeal_id/documents
+ */
+const CorrespondencePdfUI = (props) => {
+  // Note: Replace hard-coded data objects to dynamically include actual API request data
+
+  // Destructured Props and State
+  const {
+    documents,
+    selectedId
+  } = props;
+
+  const mappedMockDocumentData = documents.map((doc, index) => {
+    return (
+      {
+        id: doc.correspondence_id,
+        type: doc.document_title,
+        content_url: `/queue/correspondence/${index + 1}/pdf`
+      }
+    );
+  });
+  // Hard Coded Temp Data Objects
+  const documentPathBase = '/2941741/documents';
+
+  // useRefs (persist data through React render cycle)
+  // Contains a ref to each canvas DOM element generated after document loads
+  const canvasRefs = useRef([]);
+  const gridRef = useRef(null);
+  const scrollViewRef = useRef(null);
+  const viewportRef = useRef({
+    height: PDF_PAGE_HEIGHT,
+    width: PDF_PAGE_WIDTH
+  });
+
+  // useStates (re-renders components on change)
+
+  const [scale, setScale] = useState(1);
+  const [rotation, setRotation] = useState(0);
+  const [pdfDocProxy, setPdfDocProxy] = useState(null);
+  const [pdfPageProxies, setPdfPageProxies] = useState(null);
+  const [currentPage, setCurrentPage] = useState(1);
+  const [loadError, setLoadError] = useState(false);
+
+  // Once the component loads, we fetch the document from the Document Controller
+  // and retrieve the document content via pdfjs library's PdfDocumentProxy object.
+  // See https://mozilla.github.io/pdf.js/api/draft/module-pdfjsLib-PDFDocumentProxy.html
+  useEffect(() => {
+
+    // Retrieves all pdfPageProxy objects from pdfDocumentProxy
+    const getAllPages = async (pdfDocument) => {
+      const promises = _.range(0, pdfDocument?.numPages).map((index) => {
+        return pdfDocument.getPage(pageNumberOfPageIndex(index));
+      });
+
+      return Promise.all(promises);
+    };
+
+    // Note: Refactor when CorrespondenceDocument controller is created
+    // Note: Need to add error handling
+    const loadPdf = async () => {
+      try {
+        const response = await ApiUtil.get(`${mappedMockDocumentData[selectedId].content_url}`, {
+          cache: true,
+          withCredentials: true,
+          timeout: true,
+          responseType: 'arraybuffer',
+        });
+
+        const loadingTask = pdfjs.getDocument({ data: response.body });
+        const pdfDocument = await loadingTask.promise;
+
+        const pages = await getAllPages(pdfDocument);
+
+        setPdfDocProxy(pdfDocument);
+        setPdfPageProxies(pages);
+        setLoadError(false);
+      } catch (error) {
+        setLoadError(true);
+      }
+    };
+
+    loadPdf();
+
+  }, [selectedId]);
+
+  // ////////////// //
+  //   Constants    //
+  // ////////////// //
+  const ZOOM_RATE = 0.3;
+  const MINIMUM_ZOOM = 0.4;
+  const MAXIMUM_ZOOM = 5.0;
+
+  // Once the scrollview div containers exceeds 1300px, it will run a css container query to render a 2 column grid
+  const OFFSET_WIDTH = 1300;
+  const isScrollViewAGrid = scrollViewRef?.current?.offsetWidth >= OFFSET_WIDTH;
+
+  const ROTATION_INCREMENTS = 90;
+  const COMPLETE_ROTATION = 360;
+
+  const pdfWrapper = css({
+    '@media(max-width: 920px)': {
+      width: 'unset',
+      right: '250px' },
+    '@media(min-width: 1240px )': {
+      width: 'unset',
+      right: '380px' }
+  });
+
+  // ////////////// //
+  // PDF Functions  //
+  // ////////////// //
+
+  // Zoom
+  const zoomOut = () => {
+    const nextScale = Math.max(MINIMUM_ZOOM, _.round(scale - ZOOM_RATE, 2));
+
+    setScale(nextScale);
+  };
+
+  const zoomIn = () => {
+    const nextScale = Math.min(MAXIMUM_ZOOM, _.round(scale + ZOOM_RATE, 2));
+
+    setScale(nextScale);
+  };
+
+  const fitToScreen = () => {
+    setScale(1);
+  };
+
+  // Rotations
+  const handleDocumentRotation = () => {
+    //
+    setRotation((prev) => (prev + ROTATION_INCREMENTS) % COMPLETE_ROTATION);
+  };
+
+  // Footer Pagination
+  const handleSetCurrentPage = (pageInput) => {
+    // PageInput must be a valid integer within the range of the document pages
+    // Check the canvasRefs to ensure that this function is ran after the canvases have been rendered
+    if ((canvasRefs.current.length > 0) && (pdfDocProxy.numPages >= pageInput > 0) && Number.isInteger(pageInput)) {
+      const selectedPage = document.getElementById(`canvas-${pageInput}`);
+
+      selectedPage.scrollIntoView();
+    }
+    setCurrentPage(pageInput);
+  };
+
+  // Scrolling
+  const handleScroll = () => {
+    // Amount of Pixels that have been scrolled already from the top
+    const scrolledHeight = scrollViewRef.current.scrollTop;
+    const pageOffset = Math.floor(scrolledHeight / viewportRef.current.height);
+
+    // Scrollheight - 750px (height set by CSS) represents the maximum scrollable height of the grid container
+    // When we hit the maximum scrollable height, the last page number should be displayed
+    if ((scrollViewRef.current.scrollHeight - 750 === scrolledHeight) && (currentPage !== pdfDocProxy.numPages)) {
+      setCurrentPage(pdfDocProxy.numPages);
+    } else {
+      const pageNumber = pageOffset + 1;
+
+      setCurrentPage(pageNumber);
+    }
+  };
+
+  const handleGridScroll = () => {
+    // Amount of Pixels that have been scrolled already from the top
+    const scrolledHeight = scrollViewRef.current.scrollTop;
+    let currentRowNumber = 1;
+
+    // Scrollheight - 750px (height set by CSS) represents the maximum scrollable height of the grid container
+    // When we hit the maximum scrollable height, the first page number of the last row should be displayed
+    if ((scrollViewRef.current.scrollHeight - 749 === scrolledHeight)) {
+      currentRowNumber = Math.ceil(pdfDocProxy.numPages / 2);
+
+    // Correct for "page 0" base case
+    } else if (scrolledHeight > viewportRef.current.height) {
+      // Calculates the current visible rowNumber starting from 1, which contains two pages
+      currentRowNumber = Math.ceil(scrolledHeight / viewportRef.current.height);
+    }
+
+    // By default, we will display the page number of the first page in each row
+    const pageNumber = (currentRowNumber * 2) - 1;
+
+    // We only set the page number if it is not equal to either pages in the row
+    if ((currentPage !== pageNumber) && (currentPage !== (pageNumber + 1))) {
+      setCurrentPage(pageNumber);
+    }
+  };
+
+  // Memoize components after render to keep canvas references
+  const generatePdfPages = useMemo(() => pdfPageProxies?.map((page, index) => {
+    // Make generic key to map
+    const key = index + 123;
+
+    return (
+      <CorrespondencePdfPage
+        key={`pdf-page-key-${key}`}
+        canvasRefs={canvasRefs}
+        page={page}
+        index={index}
+        scale={scale}
+        rotation={rotation}
+        viewportRef={viewportRef}
+      />
+    );
+  }, [pdfDocProxy, pdfPageProxies]));
+
+  if (!pdfDocProxy || !pdfPageProxies) {
+    return <div>Loading...</div>;
+  }
+
+  if (loadError) {
+    return <div>Document could not be loaded, please try again later</div>;
+  }
+
+  return (
+    <div className="cf-pdf-preview-container" {...pdfWrapper}>
+      <CorrespondencePdfToolBar
+        doc={mappedMockDocumentData[selectedId]}
+        documentPathBase={documentPathBase}
+        zoomIn={zoomIn}
+        zoomOut={zoomOut}
+        fitToScreen={fitToScreen}
+        handleDocumentRotation={handleDocumentRotation}
+      />
+      <div>
+        <div className="cf-pdf-preview-scrollview"
+          ref={scrollViewRef}
+          onScroll={isScrollViewAGrid ? handleGridScroll : handleScroll}
+        >
+          <div className="cf-pdf-preview-grid" ref={gridRef}>
+            { generatePdfPages }
+          </div>
+        </div>
+        <CorrespondencePdfFooter
+          currentPage={currentPage}
+          pdfDocProxy={pdfDocProxy}
+          handleSetCurrentPage={handleSetCurrentPage}
+        />
+      </div>
+    </div>
+  );
+};
+
+CorrespondencePdfUI.propTypes = {
+  documents: PropTypes.array,
+  selectedId: PropTypes.number
+};
+
+export default CorrespondencePdfUI;
diff --git a/client/app/queue/correspondence/review_package/CmpDocuments.jsx b/client/app/queue/correspondence/review_package/CmpDocuments.jsx
new file mode 100644
index 00000000000..b117587a934
--- /dev/null
+++ b/client/app/queue/correspondence/review_package/CmpDocuments.jsx
@@ -0,0 +1,100 @@
+/* eslint-disable camelcase */
+
+import { css } from 'glamor';
+import PropTypes from 'prop-types';
+import React, { useState } from 'react';
+import COPY from 'app/../COPY';
+import Button from 'app/components/Button';
+import EditDocumentTypeModal from '../component/EditDocumentTypeModal';
+import CorrespondencePdfUI from '../pdfPreview/CorrespondencePdfUI';
+
+const cmpDocumentStyling = css({
+  marginTop: '2%'
+});
+
+const correspondenceStyling = css({
+  border: '1px solid #dee2e6'
+});
+
+const paginationStyle = css({
+  marginTop: '2%',
+  marginLeft: '1.5%'
+});
+
+export const CmpDocuments = (props) => {
+  const { documents } = props;
+
+  const [selectedId, setSelectedId] = useState(0);
+
+  const paginationText = `Viewing 1-${documents.length} out of ${documents.length} total documents`;
+
+  const setCurrentDocument = (index) => {
+    setSelectedId(index);
+  };
+
+  const [modalState, setModalState] = useState(false);
+
+  const openModal = () => {
+    setModalState(true);
+  };
+  const closeModal = () => {
+    setModalState(false);
+  };
+
+  return (
+    <div {...cmpDocumentStyling} >
+      <h2> {COPY.DOCUMENT_PREVIEW} </h2>
+      <div {...correspondenceStyling}>
+        <div {...paginationStyle}> {paginationText} </div>
+        <table className="correspondence-document-table">
+          <tbody>
+            <tr>
+              <th > Document Type </th>
+              <th className="cf-txt-c"> Action </th>
+            </tr>
+          </tbody>
+          {modalState &&
+            <EditDocumentTypeModal
+              modalState={modalState}
+              setModalState={setModalState}
+              onCancel={closeModal}
+              document={documents[selectedId]}
+              indexDoc={selectedId}
+            />
+          }
+          { documents?.map((document, index) => {
+            return (
+              <tbody key={index}>
+                <tr>
+                  <td style={{ background: selectedId === index ? '#0071bc' : 'white',
+                    color: selectedId === index ? 'white' : '#0071bc' }}
+                  onClick={() => setCurrentDocument(index)}> {document?.document_title}
+                  </td>
+                  <td className="cf-txt-c">
+                    <Button
+                      linkStyling
+                      onClick={() => {
+                        setCurrentDocument(index);
+                        openModal();
+                      }}>
+                      <span>Edit</span>
+                    </Button>
+                  </td>
+                </tr>
+              </tbody>
+            );
+          })}
+        </table>
+      </div>
+      <CorrespondencePdfUI documents={documents} selectedId={selectedId} />
+    </div>
+  );
+};
+
+CmpDocuments.propTypes = {
+  documents: PropTypes.array,
+  setSelectedId: PropTypes.func,
+  selectedId: PropTypes.number
+};
+
+export default CmpDocuments;
diff --git a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
new file mode 100644
index 00000000000..5305cfce32d
--- /dev/null
+++ b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
@@ -0,0 +1,235 @@
+import AppSegment from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/AppSegment';
+import React, { useEffect, useState } from 'react';
+import ReviewPackageData from './ReviewPackageData';
+import ReviewPackageCaseTitle from './ReviewPackageCaseTitle';
+import Button from '../../../components/Button';
+import ReviewForm from './ReviewForm';
+import { CmpDocuments } from './CmpDocuments';
+import ApiUtil from '../../../util/ApiUtil';
+import PropTypes from 'prop-types';
+import { setFileNumberSearch, doFileNumberSearch } from '../../../intake/actions/intake';
+import { connect } from 'react-redux';
+import { bindActionCreators } from 'redux';
+import { useHistory } from 'react-router';
+import PackageActionModal from '../modals/PackageActionModal';
+import ReviewPackageNotificationBanner from './ReviewPackageNotificationBanner';
+import {
+  CORRESPONDENCE_DOC_UPLOAD_FAILED_HEADER,
+  CORRESPONDENCE_DOC_UPLOAD_FAILED_MESSAGE }
+  from '../../../../COPY';
+
+export const CorrespondenceReviewPackage = (props) => {
+  const [reviewDetails, setReviewDetails] = useState({
+    veteran_name: {},
+    dropdown_values: [],
+  });
+  const [editableData, setEditableData] = useState({
+    notes: '',
+    veteran_file_number: '',
+    default_select_value: null
+  });
+  const [apiResponse, setApiResponse] = useState(null);
+  const [disableButton, setDisableButton] = useState(false);
+  const [showModal, setShowModal] = useState(false);
+  const [packageActionModal, setPackageActionModal] = useState(null);
+  const [errorMessage, setErrorMessage] = useState('');
+  const [selectedId, setSelectedId] = useState(0);
+  const [bannerInformation, setBannerInformation] = useState(null);
+
+  const history = useHistory();
+  const fetchData = async () => {
+    const correspondence = props;
+
+    try {
+      const response = await ApiUtil.get(
+        `/queue/correspondence/${correspondence.correspondence_uuid}`
+      );
+
+      setApiResponse(response.body.general_information);
+      const data = response.body.general_information;
+
+      setReviewDetails({
+        veteran_name: data.veteran_name || {},
+        dropdown_values: data.correspondence_types || [],
+      });
+
+      setEditableData({
+        notes: data.notes,
+        veteran_file_number: data.file_number,
+        default_select_value: data.correspondence_type_id,
+      });
+    } catch (error) {
+      throw error();
+    }
+  };
+
+  useEffect(() => {
+    fetchData();
+  }, []);
+
+  const handleModalClose = () => {
+    setShowModal(!showModal);
+  };
+
+  const handlePackageActionModal = (value) => {
+    setPackageActionModal(value);
+  };
+
+  const handleReview = () => {
+    history.push('/queue/correspondence');
+  };
+
+  const isEditableDataChanged = () => {
+    const notesChanged = editableData.notes !== apiResponse.notes;
+    const fileNumberChanged = editableData.veteran_file_number !== apiResponse.file_number;
+    const selectValueChanged = editableData.default_select_value !== apiResponse.correspondence_type_id;
+
+    return notesChanged || fileNumberChanged || selectValueChanged;
+  };
+
+  const intakeAppeal = async () => {
+    props.setFileNumberSearch(editableData.veteran_file_number);
+    try {
+      await props.doFileNumberSearch('appeal', editableData.veteran_file_number, true);
+      await ApiUtil.patch(`/queue/correspondence/${props.correspondence_uuid}/intake_update`);
+      window.location.href = '/intake/review_request';
+    } catch (error) {
+      console.error(error);
+      setBannerInformation({
+        title: CORRESPONDENCE_DOC_UPLOAD_FAILED_HEADER,
+        message: CORRESPONDENCE_DOC_UPLOAD_FAILED_MESSAGE,
+        bannerType: 'error'
+      });
+    }
+  };
+
+  const intakeLink = async () => {
+    const data = {
+      id: props.correspondence.id
+    };
+
+    try {
+      await ApiUtil.post(`/queue/correspondence/${props.correspondence_uuid}/correspondence_intake_task`, { data });
+      window.location.href = `/queue/correspondence/${props.correspondence_uuid}/intake`;
+    } catch (error) {
+      console.error(error);
+    }
+  };
+
+  useEffect(() => {
+    if (apiResponse) {
+      const hasChanged = isEditableDataChanged();
+
+      setDisableButton(hasChanged);
+      setErrorMessage('');
+    }
+  }, [editableData, apiResponse]);
+
+  return (
+    <div>
+      { bannerInformation && (
+        <ReviewPackageNotificationBanner
+          title={bannerInformation.title}
+          message={bannerInformation.message}
+          type={bannerInformation.bannerType}
+        />
+      )}
+      <React.Fragment>
+        <AppSegment filledBackground>
+          <ReviewPackageCaseTitle
+            handlePackageActionModal={handlePackageActionModal}
+            packageActionModal={packageActionModal}
+          />
+          <ReviewPackageData
+            correspondence={props.correspondence}
+            packageDocumentType={props.packageDocumentType}
+          />
+          {packageActionModal &&
+            <PackageActionModal
+              packageActionModal={packageActionModal}
+              closeHandler={handlePackageActionModal}
+            />
+          }
+          <ReviewForm
+            {...{
+              reviewDetails,
+              setReviewDetails,
+              editableData,
+              setEditableData,
+              disableButton,
+              setDisableButton,
+              fetchData,
+              showModal,
+              handleModalClose,
+              handleReview,
+              errorMessage,
+              setErrorMessage
+            }}
+            {...props}
+          />
+          <CmpDocuments
+            documents={props.correspondenceDocuments}
+            selectedId={selectedId}
+            setSelectedId={setSelectedId}
+          />
+
+        </AppSegment>
+        <div className="cf-app-segment">
+          <div className="cf-push-left">
+            <Button
+              name="Return to queue"
+              classNames={['cf-btn-link']}
+              onClick={handleModalClose}
+            />
+          </div>
+          <div className="cf-push-right">
+            { (props.packageDocumentType.name === '10182') && (
+              <Button
+                name="Intake appeal"
+                styling={{ style: { marginRight: '2rem' } }}
+                classNames={['usa-button-secondary']}
+                onClick={intakeAppeal}
+                disabled={disableButton}
+              />
+            )}
+            <a href={intakeLink}>
+              <Button
+                name="Create record"
+                classNames={['usa-button-primary']}
+                onClick={intakeLink}
+                disabled={disableButton}
+              />
+            </a>
+          </div>
+        </div>
+      </React.Fragment>
+    </div>
+  );
+};
+
+CorrespondenceReviewPackage.propTypes = {
+  correspondence_uuid: PropTypes.string,
+  correspondence: PropTypes.object,
+  correspondenceDocuments: PropTypes.arrayOf(PropTypes.object),
+  packageDocumentType: PropTypes.object,
+  veteranInformation: PropTypes.object,
+  setFileNumberSearch: PropTypes.func,
+  doFileNumberSearch: PropTypes.func
+};
+
+const mapStateToProps = (state) => ({
+  correspondence: state.reviewPackage.correspondence,
+  correspondenceDocuments: state.reviewPackage.correspondenceDocuments,
+  packageDocumentType: state.reviewPackage.packageDocumentType,
+  veteranInformation: state.reviewPackage.veteranInformation
+});
+
+const mapDispatchToProps = (dispatch) => bindActionCreators({
+  setFileNumberSearch,
+  doFileNumberSearch
+}, dispatch);
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps,
+)(CorrespondenceReviewPackage);
diff --git a/client/app/queue/correspondence/review_package/ReviewForm.jsx b/client/app/queue/correspondence/review_package/ReviewForm.jsx
new file mode 100644
index 00000000000..bb5485e1c93
--- /dev/null
+++ b/client/app/queue/correspondence/review_package/ReviewForm.jsx
@@ -0,0 +1,295 @@
+import AppSegment from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/AppSegment';
+import React from 'react';
+import { css } from 'glamor';
+import TextField from '../../../components/TextField';
+import SearchableDropdown from '../../../components/SearchableDropdown';
+import TextareaField from '../../../components/TextareaField';
+import Button from '../../../components/Button';
+import ApiUtil from '../../../util/ApiUtil';
+import PropTypes from 'prop-types';
+import Modal from '../../../components/Modal';
+
+const flexDivStyling = css({
+  display: 'flex',
+});
+
+const mainDiv = css(flexDivStyling, {
+  justifyContent: 'space-between',
+  width: '100%',
+  gap: '3%',
+  '@media (max-width: 600px)': {
+    flexDirection: 'column'
+  }
+});
+
+const divideStyling = css(flexDivStyling, {
+  width: '50%',
+  flexDirection: 'column',
+  gap: '12%',
+  '@media (max-width: 600px)': {
+    width: '100%'
+  }
+});
+
+const divideTextareaStyling = css(flexDivStyling, {
+  width: '50%',
+  flexDirection: 'column',
+  '@media (max-width: 600px)': {
+    width: '100%'
+  }
+});
+
+const veternalFileStyling = css({
+  width: '40%',
+  '@media (max-width: 1081px)': {
+    width: '100%',
+  }
+});
+
+const errorVeternalFileStyling = css({
+  width: '48%',
+  marginTop: '-6.4rem',
+  '@media (max-width: 1599px)': {
+    width: '58%'
+  }
+});
+
+const veternalNameStyling = css({
+  width: '60%',
+  '@media (max-width: 1081px)': {
+    width: '100%'
+  }
+});
+
+const inputStyling = css(flexDivStyling, {
+  gap: '5%',
+  '@media (max-width: 1081px)': {
+    flexDirection: 'column'
+  },
+});
+
+const tagStyling = css({
+  '& .cf-select__control': {
+    maxWidth: '63rem !important',
+  },
+});
+
+const textareaStyling = css({
+  maxWidth: '60rem'
+
+});
+
+const textareaWidth = css({
+  height: '15rem',
+  resize: 'none'
+
+});
+
+export const ReviewForm = (props) => {
+  const handleFileNumber = (value) => {
+    const isNumeric = value === '' || (/^\d{0,9}$/).test(value);
+
+    if (isNumeric) {
+      const updatedReviewDetails = {
+        ...props.editableData,
+        veteran_file_number: value,
+      };
+
+      props.setEditableData(updatedReviewDetails);
+    }
+  };
+
+  const handleChangeNotes = (value) => {
+    const updatedNotes = {
+      ...props.editableData,
+      notes: value,
+    };
+
+    props.setEditableData(updatedNotes);
+  };
+
+  const findDefaultVal = (array, id) => {
+    const foundItem = array.find((item) => item.id === id);
+
+    return foundItem ? { label: foundItem.name, value: foundItem.name } : null;
+  };
+
+  const defaultSelectedValue = findDefaultVal(
+    props.reviewDetails.dropdown_values,
+    props.editableData.default_select_value
+  );
+
+  const generateOptions = (options) =>
+    options.map((option) => ({
+      value: option.name,
+      label: option.name,
+      id: option.id,
+    }));
+
+  const fullName = (vetaranName) => {
+    const {
+      first_name: firstName = '',
+      middle_initial: middleInitial = '',
+      last_name: lastName = '',
+    } = vetaranName;
+
+    return `${firstName} ${middleInitial} ${lastName}`;
+  };
+
+  const handleSelect = (val) => {
+    const updatedSelectedValue = {
+      ...props.editableData,
+      default_select_value: val.id,
+    };
+
+    props.setEditableData(updatedSelectedValue);
+  };
+
+  const handleSubmit = async () => {
+    const correspondence = props;
+    const payloadData = {
+      data: {
+        correspondence: {
+          notes: props.editableData.notes,
+          correspondence_type_id: props.editableData.default_select_value,
+        },
+        veteran: {
+          file_number: props.editableData.veteran_file_number,
+        },
+      },
+    };
+
+    try {
+      const response = await ApiUtil.patch(
+        `/queue/correspondence/${correspondence.correspondence_uuid}`,
+        payloadData
+      );
+
+      const { body } = response;
+
+      if (body.status === 'ok') {
+        props.fetchData();
+        props.setDisableButton((current) => !current);
+        props.setErrorMessage('');
+      }
+    } catch (error) {
+      const { body } = error.response;
+
+      props.setErrorMessage(body.error);
+    }
+  };
+
+  return (
+    <React.Fragment>
+      <div {...flexDivStyling} style={{ gap: '20px', marginTop: '20px' }}>
+        <h2>General Information</h2>
+        <Button
+          name="Save changes"
+          href="/queue/correspondence/12/intake"
+          classNames={['usa-button-primary']}
+          disabled={!props.disableButton}
+          onClick={handleSubmit}
+        />
+      </div>
+      <AppSegment filledBackground noMarginTop>
+        <main {...mainDiv}>
+          <div {...divideStyling}>
+            <div {...inputStyling}>
+              <div {...props.errorMessage ? { ...errorVeternalFileStyling } : { ...veternalFileStyling }}>
+                <TextField
+                  label="Veteran file number"
+                  value={props.editableData.veteran_file_number}
+                  onChange={handleFileNumber}
+                  name="veteran-file-number-input"
+                  useAriaLabel
+                  errorMessage={props.errorMessage}
+                />
+              </div>
+
+              <div {...veternalNameStyling}>
+                <TextField
+                  label="Veteran name"
+                  value={fullName(props.reviewDetails.veteran_name)}
+                  readOnly
+                  name="Veteran-name-display"
+                  useAriaLabel
+                />
+              </div>
+
+            </div>
+            <div >
+
+              <SearchableDropdown
+                name="correspondence-dropdown"
+                label="Correspondence type"
+                styling={tagStyling}
+                value={defaultSelectedValue}
+                options={generateOptions(props.reviewDetails.dropdown_values)}
+                onChange={handleSelect}
+              />
+            </div>
+
+          </div>
+          <div {...divideTextareaStyling}>
+            <div>
+              <TextareaField
+                name="Notes"
+                styling={textareaStyling}
+                textAreaStyling={textareaWidth}
+                value={props.editableData.notes}
+                onChange={handleChangeNotes}
+              />
+            </div>
+          </div>
+          {props.showModal && (
+            <Modal
+              buttons={[
+                {
+                  classNames: ['cf-modal-link', 'cf-btn-link'],
+                  name: 'Close',
+                  onClick: props.handleModalClose },
+                {
+                  classNames: ['usa-button'],
+                  name: 'Confirm',
+                  onClick: props.handleReview,
+                }
+              ]}
+              title="Return to queue"
+              closeHandler={props.handleModalClose}>
+              <span className="usa-input" style={{ marginBottom: '5px' }} tabIndex={0}>
+                All unsaved changes made to this mail package will be lost<br />upon returning to your queue.
+              </span>
+            </Modal>
+          )}
+        </main>
+      </AppSegment>
+    </React.Fragment>
+  );
+};
+
+ReviewForm.propTypes = {
+  reviewDetails: PropTypes.shape({
+    veteran_name: PropTypes.shape({
+      first_name: PropTypes.string,
+      middle_initial: PropTypes.string,
+      last_name: PropTypes.string,
+    }),
+    dropdown_values: PropTypes.array,
+  }),
+  editableData: PropTypes.shape({
+    notes: PropTypes.string,
+    veteran_file_number: PropTypes.string,
+    default_select_value: PropTypes.number,
+  }),
+  disableButton: PropTypes.bool,
+  setEditableData: PropTypes.func,
+  setDisableButton: PropTypes.func,
+  setErrorMessage: PropTypes.func,
+  fetchData: PropTypes.func,
+  showModal: PropTypes.bool,
+  handleModalClose: PropTypes.func,
+  handleReview: PropTypes.func,
+  errorMessage: PropTypes.string
+};
+
+export default ReviewForm;
diff --git a/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx b/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx
new file mode 100644
index 00000000000..ecc223b8060
--- /dev/null
+++ b/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx
@@ -0,0 +1,96 @@
+import { css } from 'glamor';
+import PropTypes from 'prop-types';
+import React from 'react';
+import COPY from 'app/../COPY';
+import SearchableDropdown from '../../../components/SearchableDropdown';
+
+const containingDivStyling = css({
+  display: 'block',
+  // Offsets the padding from .cf-app-segment--alt to make the bottom border full width.
+  margin: '-2rem -4rem 0 -4rem',
+  padding: '0 0 1.5rem 4rem',
+
+  '& > *': {
+    display: 'inline-block',
+    margin: '0'
+  }
+});
+
+const headerStyling = css({
+  paddingRight: '2.5rem'
+});
+
+const listStyling = css({
+  listStyleType: 'none',
+  verticalAlign: 'super',
+  padding: '0 0 4rem 0',
+  display: 'flex',
+  flexWrap: 'wrap'
+});
+
+const columnStyling = css({
+  flexBasis: '0',
+  webkitBoxFlex: '1',
+  msFlexPositive: '1',
+  flexGrow: '1',
+  maxWidth: '100%'
+});
+
+const dropDownDiv = css({
+  marginTop: '-10px',
+  flexBasis: '0',
+  webkitBoxFlex: '1',
+  msFlexPositive: '1',
+  flexGrow: '1',
+  maxWidth: '100%'
+});
+
+const ReviewPackageCaseTitle = (props) => {
+  return (
+    <div>
+      <CaseTitleScaffolding />
+      <CaseSubTitleScaffolding {...props} />
+    </div>
+  );
+};
+
+const CaseTitleScaffolding = () => (
+  <div {...containingDivStyling}>
+    <h1 {...headerStyling}>{COPY.CORRESPONDENCE_REVIEW_PACKAGE_TITLE}</h1>
+  </div>
+);
+
+const CaseSubTitleScaffolding = (props) => (
+  <div {...listStyling}>
+    <div {...columnStyling}>
+      {COPY.CORRESPONDENCE_REVIEW_PACKAGE_SUB_TITLE}
+    </div>
+    <div {...dropDownDiv} style = {{ maxWidth: '25%' }}>
+      <SearchableDropdown
+        options={[
+          { value: 'splitPackage', label: 'Split package' },
+          { value: 'mergePackage', label: 'Merge package' },
+          { value: 'removePackage', label: 'Remove package from Caseflow' },
+          { value: 'reassignPackage', label: 'Reassign package' }
+        ]}
+        onChange={(option) => props.handlePackageActionModal(option.value)}
+        placeholder="Request package action"
+        label="Request package action dropdown"
+        hideLabel
+        name=""
+        value={props.packageActionModal}
+      />
+    </div>
+  </div>
+);
+
+ReviewPackageCaseTitle.propTypes = {
+  handlePackageActionModal: PropTypes.func
+};
+
+CaseSubTitleScaffolding.propTypes = {
+  handlePackageActionModal: PropTypes.func,
+  packageActionModal: PropTypes.string
+};
+
+export default ReviewPackageCaseTitle;
diff --git a/client/app/queue/correspondence/review_package/ReviewPackageData.jsx b/client/app/queue/correspondence/review_package/ReviewPackageData.jsx
new file mode 100644
index 00000000000..b8474e45c06
--- /dev/null
+++ b/client/app/queue/correspondence/review_package/ReviewPackageData.jsx
@@ -0,0 +1,111 @@
+/* eslint-disable camelcase */
+
+import { css } from 'glamor';
+import PropTypes from 'prop-types';
+import React from 'react';
+import COPY from 'app/../COPY';
+import { TitleDetailsSubheader } from 'app/components/TitleDetailsSubheader';
+import EditModal from '../modals/editModal';
+import { useSelector } from 'react-redux';
+import moment from 'moment';
+
+const listItemStyling = css({
+  display: 'inline-block',
+  padding: '0.5rem 1.5rem 0.5rem 0',
+  ':not(:last-child)': {
+    '& > div': {
+    },
+    '& > *': {
+      paddingRight: '1.5rem'
+    }
+  },
+  '& > p': {
+    fontWeight: 'bold',
+    fontSize: '17px',
+    marginBottom: '12px',
+    marginTop: '0',
+    color: '#323a45',
+    lineHeight: '1.3'
+  },
+  '& > div': { minHeight: '22px' }
+});
+
+export const TitleDetailsSubheaderSection = ({ title, children }) => (
+  <div {...listItemStyling}>
+    <p>{title}</p>
+    <div>
+      {children}
+    </div>
+  </div>
+);
+
+class ReviewPackageData extends React.PureComponent {
+  render = () => {
+    return (
+      <div>
+        <CmpInfoScaffolding
+          correspondence={this.props.correspondence}
+          packageDocumentType = {this.props.packageDocumentType} />
+      </div>
+    );
+  };
+}
+
+const CmpInfoScaffolding = () => {
+  const correspondence = useSelector(
+    (state) => state.reviewPackage.correspondence
+  );
+  const packageDocumentType = useSelector(
+    (state) => state.reviewPackage.packageDocumentType
+  );
+
+  const formattedVaDateOfReceipt = moment.utc(correspondence?.va_date_of_receipt).format('MM/DD/YYYY');
+  const formattedPortalEntryDate = moment.utc(correspondence?.portal_entry_date).format('MM/DD/YYYY');
+
+  return (
+    <div>
+      <div style={{ display: 'inline-flex' }}>
+        <h2 style={{ marginRight: '20px' }}> {COPY.CORRESPONDENCE_REVIEW_CMP_INFO_TITLE}</h2>
+        <EditModal />
+      </div>
+
+      <TitleDetailsSubheader id="caseTitleDetailsSubheader">
+        <TitleDetailsSubheaderSection title="VA DOR">
+          {formattedVaDateOfReceipt}
+        </TitleDetailsSubheaderSection>
+        <TitleDetailsSubheaderSection title="Source Type">
+          {correspondence?.source_type}
+        </TitleDetailsSubheaderSection>
+        <TitleDetailsSubheaderSection title="Package Document Type">
+          {packageDocumentType?.name}
+        </TitleDetailsSubheaderSection>
+        <TitleDetailsSubheaderSection title="CM Packet Number">
+          {correspondence?.cmp_packet_number}
+        </TitleDetailsSubheaderSection>
+        <TitleDetailsSubheaderSection title="CMP Queue Name">
+          BVA Intake
+        </TitleDetailsSubheaderSection>
+        <TitleDetailsSubheaderSection title="Portal Entry Date">
+          {formattedPortalEntryDate}
+        </TitleDetailsSubheaderSection>
+      </TitleDetailsSubheader>
+    </div>
+  );
+};
+
+CmpInfoScaffolding.propTypes = {
+  packageDocumentType: PropTypes.object,
+  correspondence: PropTypes.object
+};
+
+TitleDetailsSubheaderSection.propTypes = {
+  children: PropTypes.node,
+  title: PropTypes.string.isRequired
+};
+
+ReviewPackageData.propTypes = {
+  correspondence: PropTypes.object,
+  packageDocumentType: PropTypes.object
+};
+
+export default ReviewPackageData;
diff --git a/client/app/queue/correspondence/review_package/ReviewPackageLoadingScreen.jsx b/client/app/queue/correspondence/review_package/ReviewPackageLoadingScreen.jsx
new file mode 100644
index 00000000000..6b48cb0faed
--- /dev/null
+++ b/client/app/queue/correspondence/review_package/ReviewPackageLoadingScreen.jsx
@@ -0,0 +1,81 @@
+import * as React from 'react';
+import PropTypes from 'prop-types';
+import { connect } from 'react-redux';
+import { bindActionCreators } from 'redux';
+
+import LoadingDataDisplay from '../../../components/LoadingDataDisplay';
+import { LOGO_COLORS } from '../../../constants/AppConstants';
+import ApiUtil from '../../../util/ApiUtil';
+
+import {
+  setCorrespondence,
+  setCorrespondenceDocuments,
+  setPackageDocumentType,
+  setVeteranInformation
+} from '../correspondenceReducer/reviewPackageActions';
+import WindowUtil from '../../../util/WindowUtil';
+
+class ReviewPackageLoadingScreen extends React.PureComponent {
+
+  createLoadPromise = async () => {
+    return await ApiUtil.get(
+      `/queue/correspondence/${this.props.correspondence_uuid}`).then(
+      (response) => {
+        /* eslint-disable no-unused-vars, camelcase */
+        const {
+          correspondence,
+          correspondence_documents,
+          package_document_type,
+          general_information
+        } = response.body;
+
+        this.props.setCorrespondence(correspondence);
+        this.props.setCorrespondenceDocuments(correspondence_documents);
+        this.props.setPackageDocumentType(package_document_type);
+        this.props.setVeteranInformation(general_information);
+      }
+    );
+  }
+
+  render = () => {
+    const failStatusMessageChildren = <div>
+      It looks like Caseflow was unable to load this correspondence<br />
+      Please <a onClick={WindowUtil.reloadWithPOST}>refresh the page</a> and try again.
+    </div>;
+
+    const loadingDataDisplay = <LoadingDataDisplay
+      createLoadPromise={this.createLoadPromise}
+      loadingComponentProps={{
+        spinnerColor: LOGO_COLORS.QUEUE.ACCENT,
+        message: 'Loading review package...'
+      }}
+      failStatusMessageProps={{
+        title: 'Unable to load correspondence'
+      }}
+      failStatusMessageChildren={failStatusMessageChildren}>
+      {this.props.children}
+    </LoadingDataDisplay>;
+
+    return <div className="usa-grid">
+      {loadingDataDisplay}
+    </div>;
+  };
+}
+
+ReviewPackageLoadingScreen.propTypes = {
+  correspondence_uuid: PropTypes.string,
+  children: PropTypes.node,
+  setCorrespondence: PropTypes.func,
+  setCorrespondenceDocuments: PropTypes.func,
+  setPackageDocumentType: PropTypes.func,
+  setVeteranInformation: PropTypes.func
+};
+
+const mapDispatchToProps = (dispatch) => bindActionCreators({
+  setCorrespondence,
+  setCorrespondenceDocuments,
+  setPackageDocumentType,
+  setVeteranInformation
+}, dispatch);
+
+export default (connect(null, mapDispatchToProps)(ReviewPackageLoadingScreen));
diff --git a/client/app/queue/correspondence/review_package/ReviewPackageNotificationBanner.jsx b/client/app/queue/correspondence/review_package/ReviewPackageNotificationBanner.jsx
new file mode 100644
index 00000000000..f07efc5d43c
--- /dev/null
+++ b/client/app/queue/correspondence/review_package/ReviewPackageNotificationBanner.jsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import Alert from '../../../components/Alert';
+import PropTypes from 'prop-types';
+
+const ReviewPackageNotificationBanner = (props) => {
+  return (
+    <div>
+      <Alert
+        message={props.message}
+        title={props.title}
+        type={props.type}
+      />
+      <br />
+    </div>
+  );
+};
+
+ReviewPackageNotificationBanner.propTypes = {
+  message: PropTypes.string,
+  title: PropTypes.string,
+  type: PropTypes.string
+};
+
+export default ReviewPackageNotificationBanner;
diff --git a/client/app/queue/correspondence/review_package/utils.js b/client/app/queue/correspondence/review_package/utils.js
new file mode 100644
index 00000000000..5ed0485602e
--- /dev/null
+++ b/client/app/queue/correspondence/review_package/utils.js
@@ -0,0 +1,136 @@
+import React from 'react';
+import moment from 'moment';
+import {
+  PACKAGE_ACTION_MERGE_DESCRIPTION,
+  PACKAGE_ACTION_MERGE_TITLE,
+  PACKAGE_ACTION_MERGE_TEXTAREA_LABEL,
+  PACKAGE_ACTION_MERGE_RADIO_LABEL,
+  PACKAGE_ACTION_MODAL_DESCRIPTION,
+  PACKAGE_ACTION_REMOVAL_TITLE,
+  PACKAGE_ACTION_REMOVAL_TEXTAREA_LABEL,
+  PACKAGE_ACTION_REASSIGN_DESCRIPTION,
+  PACKAGE_ACTION_REASSIGN_TITLE,
+  PACKAGE_ACTION_REASSIGN_TEXTAREA_LABEL,
+  PACKAGE_ACTION_SPLIT_TITLE,
+  PACKAGE_ACTION_SPLIT_TEXTAREA_LABEL
+} from '../../../../COPY';
+
+export const getPackageActionColumns = (dropdownType) => {
+  const baseColumns = [
+    {
+      cellClass: 'cm-packet-number-column',
+      header: (
+        <span id="cm-packet-number-label">
+          CM Packet Number
+        </span>
+      ),
+      valueFunction: (row) => (
+        <span className="cm-packet-number-value">
+          <p>{row.correspondence.cmp_packet_number}</p>
+        </span>
+      )
+    },
+    {
+      cellClass: 'package-document-type-column',
+      header: (
+        <span id="package-document-type-label">
+          Package Document Type
+        </span>
+      ),
+      valueFunction: (row) => (
+        <span className="package-document-value">
+          <p>{row.packageDocumentType}</p>
+        </span>
+      )
+    },
+  ];
+
+  if (dropdownType === 'removePackage' || dropdownType === 'reassignPackage' || dropdownType === 'splitPackage') {
+    baseColumns.push(
+      {
+        cellClass: 'veteran-details-column',
+        header: (
+          <span id="veteran-details-label">
+            Veteran Details
+          </span>
+        ),
+        valueFunction: (row) => {
+          const firstName = row.veteranInformation.veteran_name.first_name;
+          const lastName = row.veteranInformation.veteran_name.last_name;
+          const fileNumber = row.veteranInformation.file_number;
+
+          return (
+            <span className="veteran-info-value">
+              <p>
+                {`${firstName} ${lastName}\n(${fileNumber})`}
+              </p>
+            </span>
+          );
+        }
+      }
+    );
+  }
+
+  if (dropdownType === 'mergePackage') {
+    baseColumns.push(
+      {
+        cellClass: 'vador-details-column',
+        header: (
+          <span id="vador-details-label">
+            VA DOR
+          </span>
+        ),
+        valueFunction: (row) => {
+          const vaDate = moment.utc(row.correspondence.va_date_of_receipt).format('MM/DD/YYYY');
+
+          return (
+            <span className="veteran-info-value">
+              <p>
+                {`${vaDate}`}
+              </p>
+            </span>
+          )
+        }
+      }
+    );
+  }
+
+  return baseColumns;
+};
+
+export const getModalInformation = (dropdownType) => {
+  switch (dropdownType) {
+  case 'mergePackage':
+    return {
+      title: PACKAGE_ACTION_MERGE_TITLE,
+      description: PACKAGE_ACTION_MERGE_DESCRIPTION,
+      label: PACKAGE_ACTION_MERGE_TEXTAREA_LABEL,
+      radioLabel: PACKAGE_ACTION_MERGE_RADIO_LABEL,
+      placeholder: 'This is a reason for merge',
+    };
+  case 'removePackage':
+    return {
+      title: PACKAGE_ACTION_REMOVAL_TITLE,
+      description: PACKAGE_ACTION_MODAL_DESCRIPTION,
+      label: PACKAGE_ACTION_REMOVAL_TEXTAREA_LABEL
+    };
+  case 'reassignPackage':
+    return {
+      title: PACKAGE_ACTION_REASSIGN_TITLE,
+      description: PACKAGE_ACTION_REASSIGN_DESCRIPTION,
+      label: PACKAGE_ACTION_REASSIGN_TEXTAREA_LABEL
+    };
+  case 'splitPackage':
+    return {
+      title: PACKAGE_ACTION_SPLIT_TITLE,
+      description: PACKAGE_ACTION_MODAL_DESCRIPTION,
+      label: PACKAGE_ACTION_SPLIT_TEXTAREA_LABEL
+    };
+  default:
+    return {
+      title: '',
+      description: '',
+      label: ''
+    };
+  }
+};
diff --git a/client/app/queue/reducers.js b/client/app/queue/reducers.js
index 1fa4850fa4c..17dc90fa971 100644
--- a/client/app/queue/reducers.js
+++ b/client/app/queue/reducers.js
@@ -23,6 +23,8 @@ import caseSelectReducer from '../reader/CaseSelect/CaseSelectReducer';
 
 import editClaimantReducer from './editAppellantInformation/editAppellantInformationSlice';
 import cavcDashboardReducer from './cavcDashboard/cavcDashboardReducer';
+import intakeCorrespondenceReducer from './correspondence/correspondenceReducer/correspondenceReducer';
+import reviewPackageReducer from './correspondence/correspondenceReducer/reviewPackageReducer';
 
 export const initialState = {
   judges: {},
@@ -807,7 +809,9 @@ const rootReducer = combineReducers({
   substituteAppellant: substituteAppellantReducer,
   cavcRemand: editCavRemandReducer,
   editClaimantReducer,
-  cavcDashboard: cavcDashboardReducer
+  cavcDashboard: cavcDashboardReducer,
+  intakeCorrespondence: intakeCorrespondenceReducer,
+  reviewPackage: reviewPackageReducer
 });
 
 export default timeFunction(
diff --git a/client/app/queue/utils.js b/client/app/queue/utils.js
index fa47501515f..67b49d19d4e 100644
--- a/client/app/queue/utils.js
+++ b/client/app/queue/utils.js
@@ -48,6 +48,10 @@ export const getUndecidedIssues = (issues) =>
   });
 
 export const mostRecentHeldHearingForAppeal = (appeal) => {
+  if (appeal.hearings === undefined) {
+    return null;
+  }
+
   const hearings = appeal.hearings.
     filter((hearing) => hearing.disposition === HEARING_DISPOSITION_TYPES.held).
     sort((h1, h2) => (h1.date < h2.date ? 1 : -1));
@@ -439,6 +443,8 @@ export const prepareAppealForStore = (appeals) => {
         appeal.attributes.readable_original_hearing_request_type,
       vacateType: appeal.attributes.vacate_type,
       cavcRemandsWithDashboard: appeal.attributes.cavc_remands_with_dashboard,
+      evidenceSubmissionTask: appeal.attributes.evidence_submission_task,
+      hasEvidenceSubmissionTask: appeal.attributes.evidence_submission_task !== null,
     };
 
     return accumulator;
diff --git a/client/app/styles/_main.scss b/client/app/styles/_main.scss
index 9f62a821db6..0dcb18e5e20 100644
--- a/client/app/styles/_main.scss
+++ b/client/app/styles/_main.scss
@@ -405,3 +405,7 @@ select {
     transform: translateX(0);
   }
 }
+
+.gray-border {
+  border: 2px solid $color-gray-lighter;
+}
diff --git a/client/app/styles/_table.scss b/client/app/styles/_table.scss
index b647e30137e..342e26f451f 100644
--- a/client/app/styles/_table.scss
+++ b/client/app/styles/_table.scss
@@ -25,6 +25,41 @@
   margin-bottom: 1em;
 }
 
+.correspondence-document-table {
+  table {
+    width: 100%;
+  }
+
+  th {
+    width: 100%;
+    font-weight: bold;
+
+    &:first-child {
+      padding-left: 1.5%;
+    }
+  }
+
+  tr,
+  th,
+  td {
+    position: relative;
+    border: none;
+
+    &::after {
+      content: '';
+      position: absolute;
+      bottom: 0;
+      width: 95%;
+      left: 1%;
+      border-bottom: 1px solid $color-gray-lighter;
+    }
+  }
+
+  td:first-child {
+    padding-left: 1.5%;
+  }
+}
+
 .cf-filter-option-row {
   margin: 0;
 
@@ -144,3 +179,26 @@
     }
   }
 }
+
+// ===========================*
+// Alternate Borderless (no bottom border)
+// ===========================*
+.usa-table-alternate-borderless {
+  background-color: $color-gray-lightest;
+
+  width: 100%;
+
+  th,
+  td {
+    border: 0;
+    background-color: $color-gray-lightest;
+    padding-top: 2rem;
+    padding-bottom: 0;
+  }
+
+  td {
+    margin: 2px;
+    padding-top: 0;
+    padding-bottom: 25px;
+    }
+}
diff --git a/client/app/styles/app.scss b/client/app/styles/app.scss
index 1ca5de5849e..9750ded2c95 100644
--- a/client/app/styles/app.scss
+++ b/client/app/styles/app.scss
@@ -23,6 +23,7 @@
 @import 'queue/_assigned_cases.scss';
 @import 'queue/assign_to_view';
 @import 'queue/_cavc_dashboard.scss';
+@import 'queue/_correspondence.scss';
 @import '_task_tree.scss';
 @import 'react/_react_styles_root.scss';
 @import '_team_management.scss';
diff --git a/client/app/styles/queue/_correspondence.scss b/client/app/styles/queue/_correspondence.scss
new file mode 100644
index 00000000000..6e4774d2176
--- /dev/null
+++ b/client/app/styles/queue/_correspondence.scss
@@ -0,0 +1,96 @@
+.cf-pdf-preview-header {
+  opacity: 1;
+  padding: 15px 23px 15px 15px;
+  // .cf-pdf-scroll-view is 5, .cf-search-bar is 6
+  // z-index: 7;
+
+  .category-icons-and-doc-type {
+    display: flex;
+    justify-content: center;
+  }
+}
+
+.cf-pdf-preview-container {
+  width: 100%;
+  max-width: 1800px;
+  text-align: center;
+  margin: 3rem auto;
+}
+
+// scss-lint:disable PropertySpelling
+.cf-pdf-preview-scrollview {
+  container-name: pdf-preview-scrollview-container;
+  container-type: size;
+  background-color: $color-gray;
+  width: 100%;
+  height: 750px;
+  text-align: center;
+  z-index: 5;
+  overflow-y: scroll;
+}
+
+.cf-pdf-preview-doc-type-button-container {
+  flex: 0 1 auto;
+  min-width: 80px;
+  width: 100%;
+}
+
+// scss-lint:disable PropertySpelling
+.cf-pdf-preview-grid {
+  width: fit-content;
+  height: 100%;
+  display: grid;
+  place-items: center;
+  margin: auto;
+  grid-row-gap: 10px;
+  grid-column-gap: 10px;
+}
+
+// scss-lint:disable PropertySpelling
+// scss-lint:disable IdSelector
+#pdf-preview-footer-input-field {
+  height: 100%;
+  display: inline-block;
+  width: 50%;
+
+  div {
+    height: 100%;
+    display: inline-block;
+
+    .page-progress-indicator-input {
+      .input-container {
+        width: 50%;
+        margin: auto;
+        place-items: center;
+
+        input {
+          color: $color-white;
+          height: 3rem;
+          margin-top: 1rem;
+          text-align: center;
+          background-color: $color-gray;
+          border: 2px $color-white solid;
+        }
+      }
+
+      label {
+        margin-right: 10px;
+      }
+    }
+  }
+}
+
+// scss-lint:disable PropertySpelling
+@container pdf-preview-scrollview-container (min-width: 1300px) {
+  .cf-pdf-preview-grid {
+    width: fit-content;
+    height: 100%;
+    display: grid;
+    place-items: center;
+    margin: auto;
+    grid-row-gap: 10px;
+    grid-column-gap: 10px;
+    grid-template-columns: repeat(2, 1fr);
+    grid-template-rows: repeat(auto-fill, 1fr);
+  }
+}
diff --git a/client/constants/QUEUE_INTAKE_FORM_TASK_TYPES.json b/client/constants/QUEUE_INTAKE_FORM_TASK_TYPES.json
new file mode 100644
index 00000000000..8828134b71c
--- /dev/null
+++ b/client/constants/QUEUE_INTAKE_FORM_TASK_TYPES.json
@@ -0,0 +1,194 @@
+{
+  "unrelatedToAppeal": [
+    {
+      "value": {
+        "klass": "CavcCorrespondenceMailTask",
+        "assigned_to": "CavcLitigationSupport"
+        },
+      "label": "CAVC Correspondence"
+    }, {
+      "value": {
+        "klass": "CongressionalInterestMailTask",
+        "assigned_to": "LitigationSupport"
+        },
+      "label": "Congressional interest"
+    }, {
+      "value": {
+        "klass": "DeathCertificateMailTask",
+        "assigned_to": "Colocated"
+        },
+      "label": "Death certificate"
+    }, {
+      "value": {
+        "klass": "FoiaRequestMailTask",
+        "assigned_to": "PrivacyTeam"
+        },
+      "label": "FOIA request"
+    }, {
+      "value": {
+        "klass": "OtherMotionMailTask",
+        "assigned_to": "LitigationSupport"
+        },
+      "label": "Other motion"
+    }, {
+      "value": {
+        "klass": "PowerOfAttorneyRelatedMailTask",
+        "assigned_to": "HearingAdmin"
+        },
+      "label": "Power of attorney-related"
+    }, {
+      "value": {
+        "klass": "PrivacyActRequestMailTask",
+        "assigned_to": "PrivacyTeam"
+        },
+      "label": "Privacy act request"
+    }, {
+      "value": {
+        "klass": "PrivacyComplaintMailTask",
+        "assigned_to": "PrivacyTeam"
+        },
+      "label": "Privacy complaint"
+    }, {
+      "value": {
+        "klass": "StatusInquiryMailTask",
+        "assigned_to": "LitigationSupport"
+        },
+      "label": "Status inquiry"
+    }
+  ],
+  "relatedToAppeal": [
+    {
+      "value": {
+        "klass": "CavcCorrespondenceMailTask",
+        "assigned_to": "CavcLitigationSupport"
+        },
+      "label": "CAVC Correspondence"
+    }, {
+      "value": {
+        "klass": "ClearAndUnmistakeableErrorMailTask",
+        "assigned_to": "LitigationSupport"
+        },
+      "label": "CUE-related"
+    }, {
+      "value": {
+        "klass": "AddressChangeMailTask",
+        "assigned_to": "HearingAdmin"
+        },
+      "label": "Change of address"
+    }, {
+      "value": {
+        "klass": "CongressionalInterestMailTask",
+        "assigned_to": "LitigationSupport"
+        },
+      "label": "Congressional interest"
+    }, {
+      "value": {
+        "klass": "ControlledCorrespondenceMailTask",
+        "assigned_to": "LitigationSupport"
+        },
+      "label": "Controlled Correspondence"
+    }, {
+      "value": {
+        "klass": "DeathCertificateMailTask",
+        "assigned_to": "Colocated"
+        },
+      "label": "Death certificate"
+    }, {
+      "value": {
+        "klass": "DocketSwitchMailTask",
+        "assigned_to": "ClerkOfTheBoard"
+        },
+      "label": "Docket switch"
+    }, {
+      "value": {
+        "klass": "EvidenceOrArgumentMailTask",
+        "assigned_to": "Colocated"
+        },
+      "label": "Evidence or argument"
+    }, {
+      "value": {
+        "klass": "ExtensionRequestMailTask",
+        "assigned_to": "Colocated"
+        },
+      "label": "Extension request"
+    }, {
+      "value": {
+        "klass": "FoiaRequestMailTask",
+        "assigned_to": "PrivacyTeam"
+        },
+      "label": "FOIA request"
+    }, {
+      "value": {
+        "klass": "HearingPostponementRequestMailTask",
+        "assigned_to": "HearingAdmin"
+        },
+      "label": "Hearing Postponement Request"
+    }, {
+      "value": {
+        "klass": "HearingRelatedMailTask",
+        "assigned_to": "HearingAdmin"
+        },
+      "label": "Hearing-related"
+    }, {
+      "value": {
+        "klass": "HearingWithdrawalRequestMailTask",
+        "assigned_to": "HearingAdmin"
+        },
+      "label": "Hearing Withdrawal Request"
+    }, {
+      "value": {
+        "klass": "ReconsiderationMotionMailTask",
+        "assigned_to": "LitigationSupport"
+        },
+      "label": "Motion for reconsideration"
+    }, {
+      "value": {
+        "klass": "AodMotionMailTask",
+        "assigned_to": "AodTeam"
+        },
+      "label": "Motion to Advance on Docket"
+    }, {
+      "value": {
+        "klass": "OtherMotionMailTask",
+        "assigned_to": "LitigationSupport"
+        },
+      "label": "Other motion"
+    }, {
+      "value": {
+        "klass": "PowerOfAttorneyRelatedMailTask",
+        "assigned_to": "HearingAdmin"
+        },
+      "label": "Power of attorney-related"
+    }, {
+      "value": {
+        "klass": "PrivacyActRequestMailTask",
+        "assigned_to": "PrivacyTeam"
+        },
+      "label": "Privacy act request"
+    }, {
+      "value": {
+        "klass": "PrivacyComplaintMailTask",
+        "assigned_to": "PrivacyTeam"
+        },
+      "label": "Privacy complaint"
+    }, {
+      "value": {
+        "klass": "ReturnedUndeliverableCorrespondenceMailTask",
+        "assigned_to": "BvaDispatch"
+        },
+      "label": "Returned or undeliverable mail"
+    }, {
+      "value": {
+        "klass": "StatusInquiryMailTask",
+        "assigned_to": "LitigationSupport"
+        },
+      "label": "Status inquiry"
+    }, {
+      "value": {
+        "klass": "AppealWithdrawalMailTask",
+        "assigned_to": "CaseReview"
+        },
+      "label": "Withdrawal of appeal"
+    }
+  ]
+}
diff --git a/client/constants/TASK_ACTIONS.json b/client/constants/TASK_ACTIONS.json
index 9e3d9d8789e..3f32b0bcc68 100644
--- a/client/constants/TASK_ACTIONS.json
+++ b/client/constants/TASK_ACTIONS.json
@@ -538,5 +538,9 @@
     "label": "Mark as complete and withdraw",
     "value": "modal/complete_and_withdraw",
     "func": "withdraw_hearing_data"
+  },
+  "CORRESPONDENCE_REMOVE_PACKAGE": {
+    "label": "Request to remove package",
+    "value": "temp"
   }
 }
diff --git a/client/constants/TASK_STATUSES.json b/client/constants/TASK_STATUSES.json
index 1745fd0c53a..f387c5d8e6e 100644
--- a/client/constants/TASK_STATUSES.json
+++ b/client/constants/TASK_STATUSES.json
@@ -4,5 +4,6 @@
   "on_hold": "on_hold",
   "completed": "completed",
   "cancelled": "cancelled",
-  "splited": "splited"
+  "splited": "splited",
+  "unassigned": "unassigned"
 }
diff --git a/client/test/app/queue/correspondences/CmpDocuments.test.js b/client/test/app/queue/correspondences/CmpDocuments.test.js
new file mode 100644
index 00000000000..0fee5f38691
--- /dev/null
+++ b/client/test/app/queue/correspondences/CmpDocuments.test.js
@@ -0,0 +1,19 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import CmpDocuments from '../../../../app/queue/correspondence/review_package/CmpDocuments';
+import { correspondenceDocumentsData } from '../../../data/correspondence';
+
+const renderCmpDocuments = () => {
+  return render(<CmpDocuments documents={correspondenceDocumentsData} />);
+};
+
+describe('CmpDocuments', () => {
+  it('renders Preview Document Section', () => {
+    renderCmpDocuments();
+    expect(screen.getByText('Document Type')).toBeInTheDocument();
+    expect(screen.getByText('Action')).toBeInTheDocument();
+
+    expect(screen.getByText('VA Form 10182 Notice of Disagreement')).toBeInTheDocument();
+    expect(screen.getByText('Exam Request')).toBeInTheDocument();
+  });
+});
diff --git a/client/test/app/queue/correspondences/CorrespondencePdfUI.test.js b/client/test/app/queue/correspondences/CorrespondencePdfUI.test.js
new file mode 100644
index 00000000000..5f3eff56787
--- /dev/null
+++ b/client/test/app/queue/correspondences/CorrespondencePdfUI.test.js
@@ -0,0 +1,69 @@
+import React from 'react';
+import { screen, render, waitFor } from '@testing-library/react';
+import CorrespondencePdfUI from '../../../../app/queue/correspondence/pdfPreview/CorrespondencePdfUI';
+import { correspondenceDocumentsData } from '../../../data/correspondence';
+import * as PDFJS from 'pdfjs-dist';
+import ApiUtil from '../../../../app/util/ApiUtil';
+import pdfjsWorker from 'pdfjs-dist/build/pdf.worker.entry';
+
+PDFJS.GlobalWorkerOptions.workerSrc = pdfjsWorker;
+
+jest.mock('pdfjs-dist');
+
+const renderCorrespondencePdfUI = () => {
+  render(<CorrespondencePdfUI selectedId={1} documents={correspondenceDocumentsData} />);
+};
+
+const createSpyGet = () => {
+  return jest.spyOn(ApiUtil, 'get').mockImplementation(
+    () =>
+      new Promise((resolve) =>
+        resolve({
+          body: new ArrayBuffer(715640),
+        })
+      )
+  );
+};
+
+describe('CorrespondencePdfUI', () => {
+
+  beforeEach(() => {
+    createSpyGet();
+  });
+
+  it('renders loading state initially', () => {
+    renderCorrespondencePdfUI();
+    expect(screen.getByText('Loading...')).toBeInTheDocument();
+  });
+
+  it('renders the Pdf UI', async () => {
+    const mockGetViewport = jest.fn(() => ({
+      height: 100,
+      width: 100,
+      scale: 1,
+      rotation: 0
+    }));
+
+    const mockGetPage = jest.fn(() => ({
+      promise: Promise.resolve({
+        getViewport: mockGetViewport
+      })
+    }));
+
+    const mockDocumentProxy = jest.fn(() => ({
+      numPages: 3,
+      getPage: mockGetPage
+    }));
+
+    PDFJS.getDocument.mockImplementation(() => ({
+      promise: Promise.resolve(mockDocumentProxy)
+    }));
+
+    renderCorrespondencePdfUI();
+
+    await waitFor(() => expect(PDFJS.getDocument).toHaveBeenCalledTimes(1));
+    // if toolbar loads then the UI has succesfully loaded
+    expect(screen.getByText('Zoom:')).toBeInTheDocument();
+    expect(screen.getByText('Exam Request')).toBeInTheDocument();
+  });
+});
diff --git a/client/test/app/queue/correspondences/CorrespondenceReviewPackage.test.js b/client/test/app/queue/correspondences/CorrespondenceReviewPackage.test.js
new file mode 100644
index 00000000000..12a83ac3d08
--- /dev/null
+++ b/client/test/app/queue/correspondences/CorrespondenceReviewPackage.test.js
@@ -0,0 +1,124 @@
+// Import your actual component and dependencies
+import React from 'react';
+import { render, fireEvent, screen, waitFor } from '@testing-library/react';
+import { MemoryRouter, Route, useHistory, Router } from 'react-router-dom';
+import { createMemoryHistory } from 'history';
+import ApiUtil from '../../../../app/util/ApiUtil';
+import CorrespondenceReviewPackage
+  from '../../../../app/queue/correspondence/review_package/CorrespondenceReviewPackage';
+import { Provider } from 'react-redux';
+import { createStore, applyMiddleware } from 'redux';
+import thunk from 'redux-thunk';
+import rootReducer from 'app/queue/reducers';
+
+jest.mock('redux', () => ({
+  ...jest.requireActual('redux'),
+  bindActionCreators: () => jest.fn().mockImplementation(() => Promise.resolve(true)),
+}));
+
+const createSpyGet = () => {
+  return jest.spyOn(ApiUtil, 'get').mockImplementation(
+    () =>
+      new Promise((resolve) =>
+        resolve({
+          body: { general_information: {}, correspondence_documents: [] },
+        })
+      )
+  );
+};
+
+const store = createStore(rootReducer, applyMiddleware(thunk));
+
+const LocationDisplay = () => {
+  const history = useHistory();
+
+  return <div data-testid="location-display">{history.location.pathname}</div>;
+};
+
+describe('CorrespondenceReviewPackage', () => {
+  let props;
+
+  beforeEach(() => {
+    createSpyGet();
+    props = {
+      correspondenceId: '123',
+    };
+  });
+  test('render modal', async () => {
+    render(
+      <Provider store={store}>
+        <MemoryRouter>
+          <CorrespondenceReviewPackage {...props} />
+        </MemoryRouter>
+      </Provider>
+    );
+
+    expect(screen.queryByText('All unsaved changes made to this mail package will be lost')).not.toBeInTheDocument();
+
+    const button = screen.getByRole('button', { name: 'Return to queue' });
+
+    expect(screen.queryByRole('heading', { name: 'Return to queue' })).not.toBeInTheDocument();
+    fireEvent.click(button);
+
+    expect(screen.queryByRole('heading', { name: 'Return to queue' })).toBeInTheDocument();
+    expect(screen.getByText(/All unsaved changes made to this mail package will be lost/)).toBeInTheDocument();
+    const closeButton = screen.getByRole('button', { name: 'Close' });
+
+    expect(closeButton).toBeInTheDocument();
+    fireEvent.click(closeButton);
+    expect(screen.queryByText('All unsaved changes made to this mail package will be lost')).not.toBeInTheDocument();
+
+  });
+
+  test('renders modal with correct title, buttons, and text', async () => {
+    render(
+      <Provider store={store}>
+        <MemoryRouter>
+          <Route >
+            <CorrespondenceReviewPackage {...props} />
+          </Route>
+        </MemoryRouter>
+      </Provider>
+    );
+
+    expect(screen.queryByText('All unsaved changes made to this mail package will be lost')).not.toBeInTheDocument();
+    fireEvent.click(screen.getByText('Return to queue'));
+
+    expect(screen.getByText(/All unsaved changes made to this mail package will be lost/)).toBeInTheDocument();
+    const closeButton = screen.getByRole('button', { name: 'Close' });
+    const cancelReviewButton = screen.getByRole('button', { name: 'Confirm' });
+
+    expect(closeButton).toBeInTheDocument();
+    expect(cancelReviewButton).toBeInTheDocument();
+  });
+
+  test('redirect page when Cancel review is clicked', async () => {
+    const history = createMemoryHistory({ initialEntries: ['/queue/correspondence'] });
+
+    render(
+      <Provider store={store}>
+        <Router history={history}>
+          <Route path="/queue/correspondence">
+            <CorrespondenceReviewPackage {...props} />
+            <LocationDisplay />
+          </Route>
+        </Router>
+      </Provider>
+    );
+
+    expect(screen.queryByText('All unsaved changes made to this mail package will be lost')).not.toBeInTheDocument();
+    fireEvent.click(screen.getByText('Return to queue'));
+
+    expect(screen.getByText(/All unsaved changes made to this mail package will be lost/)).toBeInTheDocument();
+    const cancelReviewButton = screen.getByRole('button', { name: 'Confirm' });
+
+    expect(cancelReviewButton).toBeInTheDocument();
+    fireEvent.click(cancelReviewButton);
+
+    await waitFor(() => {
+      expect(history.location.pathname).toBe('/queue/correspondence');
+    });
+  });
+
+});
+
diff --git a/client/test/app/queue/correspondences/ReviewForm.test.js b/client/test/app/queue/correspondences/ReviewForm.test.js
new file mode 100644
index 00000000000..39d339a7390
--- /dev/null
+++ b/client/test/app/queue/correspondences/ReviewForm.test.js
@@ -0,0 +1,49 @@
+import React from 'react';
+import { render, screen, fireEvent } from '@testing-library/react';
+import ReviewForm from '../../../../app/queue/correspondence/review_package/ReviewForm';
+describe('ReviewForm', () => {
+  let props;
+
+  beforeEach(() => {
+    props = {
+      editableData: {
+        veteran_file_number: '500000004',
+        notes: 'This is a note from CMP.',
+      },
+      reviewDetails: {
+        veteran_name: 'Bob  Smithbaumbach',
+        dropdown_values: ['Option 1', 'Option 2'],
+      },
+      disableButton: false,
+    };
+  });
+
+  it('renders the component', () => {
+    render(<ReviewForm {...props} />);
+
+    expect(screen.getByText('General Information')).toBeInTheDocument();
+    expect(screen.getByText('Veteran file number')).toBeInTheDocument();
+    expect(screen.getByText('Veteran name')).toBeInTheDocument();
+    expect(screen.getByText('Correspondence type')).toBeInTheDocument();
+    expect(screen.getByText('Notes')).toBeInTheDocument();
+  });
+
+  it('check if button is disabled', () => {
+    render(<ReviewForm {...props} />);
+    const button = screen.getByText('Save changes');
+
+    expect(button).toBeDisabled();
+  });
+
+  it('check if button is enable', () => {
+    const mockFunction = jest.fn();
+
+    props.setEditableData = mockFunction;
+    render(<ReviewForm {...props} />);
+    const inputNode = screen.getByRole('textbox', { name: 'veteran-file-number-input' });
+
+    fireEvent.change(inputNode, { target: { value: '12345678' } });
+    expect(mockFunction).toHaveBeenCalledTimes(1);
+  });
+
+});
diff --git a/client/test/app/queue/correspondences/ReviewPackageData.test.js b/client/test/app/queue/correspondences/ReviewPackageData.test.js
new file mode 100644
index 00000000000..4ce9080f090
--- /dev/null
+++ b/client/test/app/queue/correspondences/ReviewPackageData.test.js
@@ -0,0 +1,35 @@
+import React from 'react';
+import * as redux from 'react-redux';
+import { render, screen } from '@testing-library/react';
+import ReviewPackageData from '../../../../app/queue/correspondence/review_package/ReviewPackageData';
+import { correspondenceData, packageDocumentTypeData } from '../../../data/correspondence';
+jest.mock('../../../../app/queue/correspondence/modals/editModal');
+
+const renderReviewPackageData = () => {
+  return render(
+    <ReviewPackageData correspondence={correspondenceData} packageDocumentType={packageDocumentTypeData} />
+  );
+};
+
+describe('ReviewPackageData', () => {
+  const useSelectorMock = jest.spyOn(redux, 'useSelector');
+
+  it('renders ReviewPackageData component', () => {
+    useSelectorMock.mockReturnValueOnce(correspondenceData);
+    useSelectorMock.mockReturnValueOnce(packageDocumentTypeData);
+    renderReviewPackageData();
+    expect(screen.getByText('Portal Entry Date')).toBeInTheDocument();
+    expect(screen.getByText('Source Type')).toBeInTheDocument();
+    expect(screen.getByText('Package Document Type')).toBeInTheDocument();
+    expect(screen.getByText('CM Packet Number')).toBeInTheDocument();
+    expect(screen.getByText('CMP Queue Name')).toBeInTheDocument();
+    expect(screen.getByText('VA DOR')).toBeInTheDocument();
+
+    expect(screen.getByText('11/16/2023')).toBeInTheDocument();
+    expect(screen.getByText('Mail')).toBeInTheDocument();
+    expect(screen.getByText('10182')).toBeInTheDocument();
+    expect(screen.getByText('5555555555')).toBeInTheDocument();
+    expect(screen.getByText('BVA Intake')).toBeInTheDocument();
+    expect(screen.getByText('11/15/2023')).toBeInTheDocument();
+  });
+});
diff --git a/client/test/app/queue/correspondences/modals/PackageActionModal.test.js b/client/test/app/queue/correspondences/modals/PackageActionModal.test.js
new file mode 100644
index 00000000000..56691dbb3cd
--- /dev/null
+++ b/client/test/app/queue/correspondences/modals/PackageActionModal.test.js
@@ -0,0 +1,158 @@
+import React from 'react';
+import { Provider } from 'react-redux';
+import { createStore, applyMiddleware } from 'redux';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import PackageActionModal from '../../../../../app/queue/correspondence/modals/PackageActionModal';
+import thunk from 'redux-thunk';
+import rootReducer from 'app/queue/reducers';
+import { correspondenceData, packageDocumentTypeData, veteranInformation } from '../../../../data/correspondence';
+
+jest.mock('react-router', () => ({
+  useHistory: () => ({
+    push: jest.fn()
+  })
+}));
+
+const mockCloseHandler = jest.fn();
+let initialState = {
+  reviewPackage: {
+    correspondence: correspondenceData,
+    packageDocumentType: packageDocumentTypeData,
+    veteranInformation
+  }
+};
+
+const store = createStore(rootReducer, initialState, applyMiddleware(thunk));
+
+const renderPackageActionModal = (dropdownType) => {
+  render(
+    <Provider store={store}>
+      <PackageActionModal packageActionModal={dropdownType} closerhandler={mockCloseHandler} />
+    </Provider>
+  );
+};
+
+describe('PackageActionModal rendering', () => {
+  it('renders the remove package action modal', () => {
+    const firstName = veteranInformation.veteran_name.first_name.toString();
+    const lastName = veteranInformation.veteran_name.last_name.toString();
+    const fileNumber = veteranInformation.file_number.toString();
+
+    renderPackageActionModal('removePackage');
+
+    expect(screen.getByText('Request package removal')).toBeInTheDocument();
+    expect(screen.getByText('Veteran Details')).toBeInTheDocument();
+    expect(screen.getByText('Provide a reason for removal')).toBeInTheDocument();
+    expect(screen.getByText(correspondenceData.cmp_packet_number.toString())).toBeInTheDocument();
+    expect(screen.getByText(packageDocumentTypeData.name)).toBeInTheDocument();
+    // hacky way to match multi line dynamic text
+    expect(screen.getByText(`${firstName} ${lastName}`, { exact: false })).toBeInTheDocument();
+    expect(screen.getByText(`${fileNumber}`, { exact: false })).toBeInTheDocument();
+
+    expect(screen.getByRole('button', { name: 'Confirm request' })).toBeDisabled();
+    const textbox = screen.getByRole('textbox', { name: 'Provide a reason for removal' });
+
+    userEvent.type(textbox, 'very good reason haha');
+    expect(screen.getByRole('button', { name: 'Confirm request' })).not.toBeDisabled();
+
+  });
+
+  it('renders the reassign package action modal', () => {
+    const firstName = veteranInformation.veteran_name.first_name.toString();
+    const lastName = veteranInformation.veteran_name.last_name.toString();
+    const fileNumber = veteranInformation.file_number.toString();
+
+    renderPackageActionModal('reassignPackage');
+
+    expect(screen.getByText('Request package reassignment')).toBeInTheDocument();
+    expect(screen.getByText('Veteran Details')).toBeInTheDocument();
+    expect(screen.getByText('Provide a reason for reassignment')).toBeInTheDocument();
+    expect(screen.getByText(correspondenceData.cmp_packet_number.toString())).toBeInTheDocument();
+    expect(screen.getByText(packageDocumentTypeData.name)).toBeInTheDocument();
+    // hacky way to match multi line dynamic text
+    expect(screen.getByText(`${firstName} ${lastName}`, { exact: false })).toBeInTheDocument();
+    expect(screen.getByText(`${fileNumber}`, { exact: false })).toBeInTheDocument();
+
+    expect(screen.getByRole('button', { name: 'Confirm request' })).toBeDisabled();
+    const textbox = screen.getByRole('textbox', { name: 'Provide a reason for reassignment' });
+
+    userEvent.type(textbox, 'very good reason haha');
+    expect(screen.getByRole('button', { name: 'Confirm request' })).not.toBeDisabled();
+
+  });
+
+  it('renders the split package action modal', () => {
+
+    const firstName = veteranInformation.veteran_name.first_name.toString();
+    const lastName = veteranInformation.veteran_name.last_name.toString();
+    const fileNumber = veteranInformation.file_number.toString();
+
+    renderPackageActionModal('splitPackage');
+
+    expect(screen.getByText('Request split package')).toBeInTheDocument();
+    expect(screen.getByText('Veteran Details')).toBeInTheDocument();
+    expect(screen.getByText('Select a reason for splitting this package')).toBeInTheDocument();
+    expect(screen.getByText(correspondenceData.cmp_packet_number.toString())).toBeInTheDocument();
+    expect(screen.getByText(packageDocumentTypeData.name)).toBeInTheDocument();
+
+    expect(screen.getByText(`${firstName} ${lastName}`, { exact: false })).toBeInTheDocument();
+    expect(screen.getByText(`${fileNumber}`, { exact: false })).toBeInTheDocument();
+
+    expect(screen.getByRole('button', { name: 'Confirm request' })).toBeDisabled();
+
+    const radio1 = screen.getByRole('radio', { name: 'Package contains documents related to more than one person.' });
+
+    userEvent.click(radio1);
+    expect(radio1).toBeChecked();
+
+    const radio2 = screen.getByRole('radio',
+      { name: 'Package contains documents that must be processed by multiple business lines.' });
+
+    userEvent.click(radio2);
+    expect(radio2).toBeChecked();
+
+    const otherRadioOption = screen.getByRole('radio', { name: 'Other' });
+
+    userEvent.click(otherRadioOption);
+    const textbox = screen.getByRole('textbox', { name: 'Reason for split' });
+
+    expect(textbox).toBeInTheDocument();
+    userEvent.type(textbox, 'test text for check');
+    expect(screen.getByRole('button', { name: 'Confirm request' })).not.toBeDisabled();
+
+  });
+
+  it('renders the merge package action modal', () => {
+
+    renderPackageActionModal('mergePackage');
+
+    expect(screen.getByText('Request merge')).toBeInTheDocument();
+    expect(screen.getByText('Reason for merge')).toBeInTheDocument();
+    expect(screen.getByText(correspondenceData.cmp_packet_number.toString())).toBeInTheDocument();
+    expect(screen.getByText(packageDocumentTypeData.name)).toBeInTheDocument();
+
+    expect(screen.getByRole('button', { name: 'Confirm request' })).toBeDisabled();
+
+    const radio1 = screen.getByRole('radio', { name: 'Duplicate documents' });
+
+    userEvent.click(radio1);
+    expect(radio1).toBeChecked();
+
+    const radio2 = screen.getByRole('radio',
+      { name: 'Documents received on the same date relating to the same issue(s)/appeal(s)' });
+
+    userEvent.click(radio2);
+    expect(radio2).toBeChecked();
+
+    const otherRadioOption = screen.getByRole('radio', { name: 'Other' });
+
+    userEvent.click(otherRadioOption);
+    const textbox = screen.getByRole('textbox', { name: 'Reason for merge' });
+
+    expect(textbox).toBeInTheDocument();
+    userEvent.type(textbox, 'test text for check');
+    expect(screen.getByRole('button', { name: 'Confirm request' })).not.toBeDisabled();
+
+  });
+});
diff --git a/client/test/data/correspondence.js b/client/test/data/correspondence.js
new file mode 100644
index 00000000000..85ce46eb5ac
--- /dev/null
+++ b/client/test/data/correspondence.js
@@ -0,0 +1,65 @@
+export const veteranInformation = {
+  id: 1928,
+  notes: 'This is a note from CMP',
+  veteran_name: {
+    first_name: 'Bob',
+    middle_name: '',
+    last_name: 'Vetner',
+  },
+  file_number: '998877665',
+  correspondence_type_id: 8
+};
+
+export const correspondenceData = {
+  id: 1,
+  assigned_by_id: 81,
+  cmp_packet_number: 5555555555,
+  cmp_queue_id: 1,
+  correspondence_type_id: 8,
+  created_at: '2023-11-16 01:44:47.094786',
+  notes: 'Some CMP notes here',
+  package_document_type_id: 15,
+  portal_entry_date: '2023-11-16 01:44:47.080996',
+  source_type: 'Mail',
+  updated_at: '2023-11-16 01:44:47.094786',
+  updated_by_id: null,
+  uuid: 'f67702ec-65fb-4b1e-b7c7-d493f7add9e9',
+  va_date_of_receipt: '2023-11-15 00:00:00',
+  veteran_id: 1928,
+};
+
+export const packageDocumentTypeData = {
+  id: 15,
+  active: true,
+  name: '10182',
+};
+
+export const correspondenceDocumentsData = [
+  {
+    correspondence_id: 1,
+    document_file_number: veteranInformation.file_number,
+    pages: 30,
+    vbms_document_type_id: 1,
+    uuid: null,
+    document_type: 1250,
+    document_title: 'VA Form 10182 Notice of Disagreement'
+  },
+  {
+    correspondence_id: 1,
+    document_file_number: veteranInformation.file_number,
+    pages: 20,
+    vbms_document_type_id: 1,
+    uuid: null,
+    document_type: 719,
+    document_title: 'Exam Request'
+  }
+];
+
+export const reviewPackageDataResponse = {
+  body: {
+    correspondence: correspondenceData,
+    package_document_type: packageDocumentTypeData,
+    correspondence_documents: correspondenceDocumentsData,
+    general_information: veteranInformation
+  }
+};
diff --git a/config/brakeman.ignore b/config/brakeman.ignore
index 475b41bb5d0..41a0ecdaa4c 100644
--- a/config/brakeman.ignore
+++ b/config/brakeman.ignore
@@ -20,6 +20,26 @@
       "confidence": "Medium",
       "note": ""
     },
+    {
+      "warning_type": "File Access",
+      "warning_code": 16,
+      "fingerprint": "423f180bb8e4dc3808789fd57fdea4b6fb50ac23eb024d1ab4bbf706938fea41",
+      "check_name": "SendFile",
+      "message": "Model attribute used in file name",
+      "file": "app/controllers/correspondence_controller.rb",
+      "line": 99,
+      "link": "https://brakemanscanner.org/docs/warning_types/file_access/",
+      "code": "send_file(Document.find(params[:pdf_id]).serve, :type => \"application/pdf\", :disposition => ((\"inline\" or \"attachment; filename='#{params[:type]}-#{params[:id]}.pdf'\")))",
+      "render_path": null,
+      "location": {
+        "type": "method",
+        "class": "CorrespondenceController",
+        "method": "pdf"
+      },
+      "user_input": "Document.find(params[:pdf_id]).serve",
+      "confidence": "Medium",
+      "note": ""
+    },
     {
       "warning_type": "File Access",
       "warning_code": 16,
@@ -47,7 +67,7 @@
       "check_name": "SQL",
       "message": "Possible SQL injection",
       "file": "app/jobs/ama_notification_efolder_sync_job.rb",
-      "line": 105,
+      "line": 111,
       "link": "https://brakemanscanner.org/docs/warning_types/sql_injection/",
       "code": "Appeal.find_by_sql(\"          SELECT appeals.* FROM appeals\\n          JOIN tasks t ON appeals.id = t.appeal_id\\n          AND t.appeal_type = 'Appeal'\\n          JOIN (#{appeals_on_latest_notifications(ids)}) AS notifs ON\\n            notifs.appeals_id = appeals.\\\"uuid\\\"::text AND notifs.appeals_type = 'Appeal'\\n          JOIN (#{appeals_on_latest_doc_uploads(ids)}) AS vbms_uploads ON\\n            vbms_uploads.appeal_id = appeals.id AND vbms_uploads.appeal_type = 'Appeal'\\n          WHERE (\\n            notifs.notified_at > vbms_uploads.attempted_at\\n          OR\\n            notifs.created_at > vbms_uploads.attempted_at\\n          )\\n          AND t.TYPE = 'RootTask' AND t.status NOT IN ('completed', 'cancelled')\\n          GROUP BY appeals.id\\n\")",
       "render_path": null,
@@ -67,7 +87,7 @@
       "check_name": "SQL",
       "message": "Possible SQL injection",
       "file": "app/jobs/legacy_notification_efolder_sync_job.rb",
-      "line": 106,
+      "line": 112,
       "link": "https://brakemanscanner.org/docs/warning_types/sql_injection/",
       "code": "LegacyAppeal.find_by_sql(\"              SELECT la.* FROM legacy_appeals la\\n              JOIN tasks t ON la.id = t.appeal_id\\n              AND t.appeal_type = 'LegacyAppeal'\\n              JOIN (#{appeals_on_latest_notifications(ids)}) AS notifs ON\\n                notifs.appeals_id = la.vacols_id AND notifs.appeals_type = 'LegacyAppeal'\\n              JOIN (#{appeals_on_latest_doc_uploads(ids)}) AS vbms_uploads ON\\n                vbms_uploads.appeal_id = la.id AND vbms_uploads.appeal_type = 'LegacyAppeal'\\n              WHERE (\\n                notifs.notified_at > vbms_uploads.attempted_at\\n              OR\\n                notifs.created_at > vbms_uploads.attempted_at\\n              )\\n              AND t.type = 'RootTask' AND t.status NOT IN ('completed', 'cancelled')\\n              GROUP BY la.id\\n\")",
       "render_path": null,
@@ -121,6 +141,6 @@
       "note": ""
     }
   ],
-  "updated": "2023-07-18 18:21:26 -0400",
+  "updated": "2023-12-12 16:28:43 -0500",
   "brakeman_version": "4.7.1"
 }
diff --git a/config/routes.rb b/config/routes.rb
index 62ca38fab2d..926cb4a5a6f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -172,6 +172,8 @@
 
   get '/explain/appeals/:appeal_id' => 'explain#show'
 
+  get '/appeals/:appeal_id/active_evidence_submissions' => 'appeals#active_evidence_submissions'
+
   resources :regional_offices, only: [:index]
   get '/regional_offices/:regional_office/hearing_dates', to: "regional_offices#hearing_dates"
 
@@ -293,6 +295,22 @@
 
   scope path: '/queue' do
     get '/', to: 'queue#index'
+    get '/correspondence', to: 'correspondence#correspondence_cases'
+    get '/correspondence/:correspondence_uuid/intake', to: 'correspondence#intake', as: :queue_correspondence_intake
+    post '/correspondence/:correspondence_uuid/current_step', to: 'correspondence#current_step', as: :queue_correspondence_intake_current_step
+    post '/correspondence/:correspondence_uuid/correspondence_intake_task', to: 'correspondence_tasks#create_correspondence_intake_task'
+    get '/correspondence/:correspondence_uuid/review_package', to: 'correspondence#review_package'
+    get '/correspondence/edit_document_type_correspondence', to: 'correspondence#document_type_correspondence'
+    patch '/correspondence/:correspondence_uuid/intake_update', to: 'correspondence#intake_update'
+    get '/correspondence/:correspondence_uuid/veteran', to: 'correspondence#veteran'
+    put '/correspondence/:correspondence_uuid/update_cmp', to: 'correspondence#update_cmp'
+    get '/correspondence/packages', to: 'correspondence#package_documents'
+    get '/correspondence/:correspondence_uuid', to: 'correspondence#show'
+    get '/correspondence/:pdf_id/pdf', to: 'correspondence#pdf'
+    patch '/correspondence/:correspondence_uuid', to: 'correspondence#update'
+    patch '/correspondence/:id/update_document', to: 'correspondence_document#update_document'
+    post '/correspondence/:correspondence_uuid', to: 'correspondence#process_intake'
+    post "/correspondence/:correspondence_uuid/task", to: "correspondence_tasks#create_package_action_task"
     get '/appeals/:vacols_id', to: 'queue#index'
     get '/appeals/:appealId/notifications', to: 'queue#index'
     get '/appeals/:appeal_id/cavc_dashboard', to: 'cavc_dashboard#index'
@@ -300,6 +318,7 @@
     get '/appeals/:vacols_id/*all', to: redirect('/queue/appeals/%{vacols_id}')
     get '/:user_id(*rest)', to: 'legacy_tasks#index'
   end
+  match '/explain/correspondence/:correspondence_uuid/:any' => 'explain#show', via: [:get]
 
   # requests to CAVC Dashboard that don't require an appeal_id should go here
   scope path: "/cavc_dashboard" do
@@ -382,6 +401,8 @@
 
   get "feedback" => "application#feedback"
 
+  get "under_construction" => "application#under_construction"
+
   %w[403 404 500].each do |code|
     get code, to: "errors#show", status_code: code
   end
diff --git a/db/migrate/20231018185238_create_correspondence.rb b/db/migrate/20231018185238_create_correspondence.rb
new file mode 100644
index 00000000000..0f6cd535248
--- /dev/null
+++ b/db/migrate/20231018185238_create_correspondence.rb
@@ -0,0 +1,25 @@
+class CreateCorrespondence < Caseflow::Migration
+  def change
+    create_table :correspondences do |t|
+      t.timestamps null: false, comment: "Standard created_at/updated_at timestamps"
+
+      t.uuid :uuid, comment: "Unique identifier"
+      t.datetime :portal_entry_date, comment: "Time when correspondence is created in Caseflow"
+      t.string :source_type, comment: "An information identifier we get from CMP"
+      t.integer :package_document_type_id, comment: "Represents entire CMP package document type"
+      t.string :cmp_packet_number, comment: "Included in CMP mail package"
+
+      t.integer :cmp_queue_id, index: true, foreign_key: true, comment: "Foreign key to CMP queues table"
+
+      t.datetime :va_date_of_receipt, comment: "Date package delivered"
+      t.bigint :veteran_id, index: true, foreign_key: true, comment: "Foreign key to veterans table"
+      t.text :notes, comment: "Comes from CMP; can be updated by user"
+
+      t.integer :correspondence_type_id, index: true, foreign_key: true, foreign_key:{to_table: :correspondence_types}, comment: "Foreign key for correspondence_types table"
+
+      t.bigint :assigned_by_id, index: true, foreign_key: true, foreign_key:{to_table: :users}, comment: "Foreign key to users table"
+      t.bigint :updated_by_id, index: true, foreign_key: true, foreign_key:{to_table: :users}, comment: "Foreign key to users table"
+
+    end
+  end
+end
diff --git a/db/migrate/20231018192834_create_correspondence_document.rb b/db/migrate/20231018192834_create_correspondence_document.rb
new file mode 100644
index 00000000000..4b24d10fd22
--- /dev/null
+++ b/db/migrate/20231018192834_create_correspondence_document.rb
@@ -0,0 +1,10 @@
+class CreateCorrespondenceDocument < Caseflow::Migration
+  def change
+    create_table :correspondence_documents do |t|
+      t.belongs_to :correspondence, index: true, foreign_key: true
+      t.uuid :uuid, comment:"Reference to document in AWS S3"
+      t.string :document_file_number, comment:"From CMP documents table"
+      t.string :vbms_document_id, comment:"From CMP documents table"
+    end
+  end
+end
diff --git a/db/migrate/20231023155854_update_cmp_packet_number_type.rb b/db/migrate/20231023155854_update_cmp_packet_number_type.rb
new file mode 100644
index 00000000000..557f00ceaad
--- /dev/null
+++ b/db/migrate/20231023155854_update_cmp_packet_number_type.rb
@@ -0,0 +1,13 @@
+class UpdateCmpPacketNumberType < Caseflow::Migration
+  def up
+    safety_assured do
+      change_column :correspondences, :cmp_packet_number, 'bigint USING CAST(cmp_packet_number AS bigint)'
+    end
+  end
+
+  def down
+    safety_assured do
+      change_column :correspondences, :cmp_packet_number, 'character varying USING CAST(cmp_packet_number AS character varying)'
+    end
+  end
+end
diff --git a/db/migrate/20231024151721_add_prior_correspondence_reference_to_correspondences.rb b/db/migrate/20231024151721_add_prior_correspondence_reference_to_correspondences.rb
new file mode 100644
index 00000000000..19db874d75b
--- /dev/null
+++ b/db/migrate/20231024151721_add_prior_correspondence_reference_to_correspondences.rb
@@ -0,0 +1,8 @@
+class AddPriorCorrespondenceReferenceToCorrespondences < Caseflow::Migration
+  disable_ddl_transaction!
+
+  def change
+    add_column :correspondences, :prior_correspondence_id, :integer, null: false
+    add_safe_index :correspondences, [:prior_correspondence_id], name: "index_on_prior_correspondence_id"
+  end
+end
diff --git a/db/migrate/20231024162133_add_timestamps_to_correspondence_document.rb b/db/migrate/20231024162133_add_timestamps_to_correspondence_document.rb
new file mode 100644
index 00000000000..020a4575ffe
--- /dev/null
+++ b/db/migrate/20231024162133_add_timestamps_to_correspondence_document.rb
@@ -0,0 +1,6 @@
+class AddTimestampsToCorrespondenceDocument < Caseflow::Migration
+  def change
+    add_column :correspondence_documents, :created_at, :datetime, null: false, comment: "Date and Time of creation."
+    add_column :correspondence_documents, :updated_at, :datetime, null: false, comment: "Date and Time of last update."
+  end
+end
diff --git a/db/migrate/20231026122835_create_correspondence_intakes.rb b/db/migrate/20231026122835_create_correspondence_intakes.rb
new file mode 100644
index 00000000000..7a3e8b706cb
--- /dev/null
+++ b/db/migrate/20231026122835_create_correspondence_intakes.rb
@@ -0,0 +1,17 @@
+class CreateCorrespondenceIntakes < Caseflow::Migration
+  def change
+    create_table :correspondence_intakes do |t|
+      t.integer :current_step, comment: "Tracks users progress on intake workflow"
+      t.bigint :related_appeals, array: true, comment: "Will be used to populate correspondence_appeals db table"
+      t.jsonb :added_tasks, array: true, comment: "Each object in the array will contain all relevant information to create the specific Task for either the Correspondence or the Related Appeal"
+      t.datetime :errored_at, comment: "Timestamp of when correspondence intake failed due to error"
+      t.string :error_reason, comment: "Exception details of when correspondence intake failed due to error"
+      t.datetime :canceled_at, comment: "Timestamp of when user cancelled correspondence intake"
+      t.string :canceled_reason, comment: "Details of reason user cancelled correspondence intake"
+      t.timestamps
+
+      t.references :user, foreign_key: true, index: false, comment: "Foreign key on users table"
+      t.references :correspondence, foreign_key: true, index: false, comment: "Foreign key on correspondences table"
+    end
+  end
+end
diff --git a/db/migrate/20231026123217_add_indexes_to_correspondence_intakes.rb b/db/migrate/20231026123217_add_indexes_to_correspondence_intakes.rb
new file mode 100644
index 00000000000..613c1e85fb9
--- /dev/null
+++ b/db/migrate/20231026123217_add_indexes_to_correspondence_intakes.rb
@@ -0,0 +1,6 @@
+class AddIndexesToCorrespondenceIntakes < Caseflow::Migration
+  def change
+    add_safe_index :correspondence_intakes, [:user_id], name: "index_on_user_id"
+    add_safe_index :correspondence_intakes, [:correspondence_id], name: "index_on_correspondence_id"
+  end
+end
diff --git a/db/migrate/20231027193346_create_correspondence_types_table.rb b/db/migrate/20231027193346_create_correspondence_types_table.rb
new file mode 100644
index 00000000000..3fc4ad6e5c1
--- /dev/null
+++ b/db/migrate/20231027193346_create_correspondence_types_table.rb
@@ -0,0 +1,13 @@
+class CreateCorrespondenceTypesTable < Caseflow::Migration
+  def change
+    create_table :correspondence_types do |t|
+
+      t.string :name, null:false
+
+      t.timestamps
+
+      t.boolean :active, default: true, null:false
+
+    end
+  end
+end
diff --git a/db/migrate/20231031041759_create_package_document_types.rb b/db/migrate/20231031041759_create_package_document_types.rb
new file mode 100644
index 00000000000..5b055812c4f
--- /dev/null
+++ b/db/migrate/20231031041759_create_package_document_types.rb
@@ -0,0 +1,9 @@
+class CreatePackageDocumentTypes < Caseflow::Migration
+  def change
+    create_table :package_document_types do |t|
+      t.string :name
+      t.boolean :active, default: true
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20231101163717_change_prior_correspondence_id_on_correspondences.rb b/db/migrate/20231101163717_change_prior_correspondence_id_on_correspondences.rb
new file mode 100644
index 00000000000..5d85040372f
--- /dev/null
+++ b/db/migrate/20231101163717_change_prior_correspondence_id_on_correspondences.rb
@@ -0,0 +1,5 @@
+class ChangePriorCorrespondenceIdOnCorrespondences < Caseflow::Migration
+  def change
+    change_column_null :correspondences, :prior_correspondence_id, true
+  end
+end
diff --git a/db/migrate/20231107103628_create_vbms_document_types.rb b/db/migrate/20231107103628_create_vbms_document_types.rb
new file mode 100644
index 00000000000..849a24fb767
--- /dev/null
+++ b/db/migrate/20231107103628_create_vbms_document_types.rb
@@ -0,0 +1,8 @@
+class CreateVbmsDocumentTypes < Caseflow::Migration
+  def change
+    create_table :vbms_document_types do |t|
+      t.integer :doc_type_id
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20231108075643_add_document_type_pages_to_correspondence_documents.rb b/db/migrate/20231108075643_add_document_type_pages_to_correspondence_documents.rb
new file mode 100644
index 00000000000..cebe6374483
--- /dev/null
+++ b/db/migrate/20231108075643_add_document_type_pages_to_correspondence_documents.rb
@@ -0,0 +1,6 @@
+class AddDocumentTypePagesToCorrespondenceDocuments < Caseflow::Migration
+  def change
+    add_column :correspondence_documents, :document_type, :integer, comment: "ID of the doc to lookup VBMS Doc Type"
+    add_column :correspondence_documents, :pages, :integer, comment: "Number of pages in the CMP Document"
+  end
+end
diff --git a/db/migrate/20231115170454_update_vbms_doc_type_id_in_correspondence_documents.rb b/db/migrate/20231115170454_update_vbms_doc_type_id_in_correspondence_documents.rb
new file mode 100644
index 00000000000..072da10249b
--- /dev/null
+++ b/db/migrate/20231115170454_update_vbms_doc_type_id_in_correspondence_documents.rb
@@ -0,0 +1,15 @@
+class UpdateVbmsDocTypeIdInCorrespondenceDocuments < Caseflow::Migration
+  def up
+    safety_assured do
+      add_column :correspondence_documents, :vbms_document_type_id, :bigint, comment: "From CMP documents table"
+      remove_column :correspondence_documents, :vbms_document_id
+    end
+  end
+
+  def down
+    safety_assured do
+      add_column :correspondence_documents, :vbms_document_id, :string, comment: "From CMP documents table"
+      remove_column :correspondence_documents, :vbms_document_type_id
+    end
+  end
+end
diff --git a/db/migrate/20231121184716_create_auto_text.rb b/db/migrate/20231121184716_create_auto_text.rb
new file mode 100644
index 00000000000..8d1a7da4edd
--- /dev/null
+++ b/db/migrate/20231121184716_create_auto_text.rb
@@ -0,0 +1,7 @@
+class CreateAutoText < Caseflow::Migration
+  def change
+    create_table :auto_texts do |t|
+      t.string :name
+    end
+  end
+end
diff --git a/db/migrate/20231204193100_create_correspondences_appeals.rb b/db/migrate/20231204193100_create_correspondences_appeals.rb
new file mode 100644
index 00000000000..f995ba770c6
--- /dev/null
+++ b/db/migrate/20231204193100_create_correspondences_appeals.rb
@@ -0,0 +1,10 @@
+class CreateCorrespondencesAppeals < Caseflow::Migration
+  def change
+    create_table :correspondences_appeals do |t|
+      t.references :correspondence, foreign_key: true, index: false
+      t.references :appeal, foreign_key: true, index: false
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20231204195133_add_safe_indices_to_correspondences_appeals.rb b/db/migrate/20231204195133_add_safe_indices_to_correspondences_appeals.rb
new file mode 100644
index 00000000000..d679cc06c70
--- /dev/null
+++ b/db/migrate/20231204195133_add_safe_indices_to_correspondences_appeals.rb
@@ -0,0 +1,6 @@
+class AddSafeIndicesToCorrespondencesAppeals < Caseflow::Migration
+  def change
+    add_safe_index :correspondences_appeals, [:correspondence_id], name: "index on correspondence_id"
+    add_safe_index :correspondences_appeals, [:appeal_id], name: "index on appeal_id"
+  end
+end
diff --git a/db/migrate/20231205160831_create_correspondence_relations.rb b/db/migrate/20231205160831_create_correspondence_relations.rb
new file mode 100644
index 00000000000..9d96367a8c8
--- /dev/null
+++ b/db/migrate/20231205160831_create_correspondence_relations.rb
@@ -0,0 +1,10 @@
+class CreateCorrespondenceRelations < Caseflow::Migration
+  def change
+    create_table :correspondence_relations do |t|
+      t.references :correspondence, foreign_key: true, index: false
+      t.references :related_correspondence, foreign_key: { to_table: :correspondences }, index:false
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20231205161301_add_safe_indices_to_correspondence_relations.rb b/db/migrate/20231205161301_add_safe_indices_to_correspondence_relations.rb
new file mode 100644
index 00000000000..8294a3b6207
--- /dev/null
+++ b/db/migrate/20231205161301_add_safe_indices_to_correspondence_relations.rb
@@ -0,0 +1,6 @@
+class AddSafeIndicesToCorrespondenceRelations < Caseflow::Migration
+  def change
+    add_safe_index :correspondence_relations, [:correspondence_id, :related_correspondence_id], unique: true, name: 'index_correspondence_relations_on_correspondences'
+    add_safe_index :correspondence_relations, [:related_correspondence_id, :correspondence_id], unique: true, name: 'index_correspondence_relations_on_related_correspondences'
+  end
+end
diff --git a/db/migrate/20231205171256_remove_prior_correspondence_id_from_correspondences.rb b/db/migrate/20231205171256_remove_prior_correspondence_id_from_correspondences.rb
new file mode 100644
index 00000000000..24bc7b973c2
--- /dev/null
+++ b/db/migrate/20231205171256_remove_prior_correspondence_id_from_correspondences.rb
@@ -0,0 +1,5 @@
+class RemovePriorCorrespondenceIdFromCorrespondences < Caseflow::Migration
+  def change
+    safety_assured { remove_column :correspondences, :prior_correspondence_id, :integer }
+  end
+end
diff --git a/db/migrate/20231214200955_drop_correspondence_intakes.rb b/db/migrate/20231214200955_drop_correspondence_intakes.rb
new file mode 100644
index 00000000000..ca2c334617e
--- /dev/null
+++ b/db/migrate/20231214200955_drop_correspondence_intakes.rb
@@ -0,0 +1,21 @@
+class DropCorrespondenceIntakes < ActiveRecord::Migration[5.2]
+  def up
+    drop_table :correspondence_intakes
+  end
+
+  def down
+    create_table :correspondence_intakes do |t|
+      t.integer :current_step, comment: "Tracks users progress on intake workflow"
+      t.bigint :related_appeals, array: true, comment: "Will be used to populate correspondence_appeals db table"
+      t.jsonb :added_tasks, array: true, comment: "Each object in the array will contain all relevant information to create the specific Task for either the Correspondence or the Related Appeal"
+      t.datetime :errored_at, comment: "Timestamp of when correspondence intake failed due to error"
+      t.string :error_reason, comment: "Exception details of when correspondence intake failed due to error"
+      t.datetime :canceled_at, comment: "Timestamp of when user cancelled correspondence intake"
+      t.string :canceled_reason, comment: "Details of reason user cancelled correspondence intake"
+      t.timestamps
+
+      t.references :user, foreign_key: true, index: false, comment: "Foreign key on users table"
+      t.references :correspondence, foreign_key: true, index: false, comment: "Foreign key on correspondences table"
+    end
+  end
+end
diff --git a/db/migrate/20231214201518_recreate_correspondence_intakes.rb b/db/migrate/20231214201518_recreate_correspondence_intakes.rb
new file mode 100644
index 00000000000..7b714e00c02
--- /dev/null
+++ b/db/migrate/20231214201518_recreate_correspondence_intakes.rb
@@ -0,0 +1,16 @@
+class RecreateCorrespondenceIntakes < Caseflow::Migration
+  def change
+    create_table :correspondence_intakes do |t|
+      t.integer :current_step, null: false, comment: "Tracks users progress on intake workflow"
+      t.jsonb :redux_store, null: false, comment: "JSON representation of the data for the current step"
+
+      t.references :correspondence, foreign_key: true, index: false, comment: "Foreign key on correspondences table"
+      t.references :user, foreign_key: true, index: false, comment: "Foreign key on users table"
+
+      t.timestamps
+    end
+
+    add_safe_index :correspondence_intakes, [:user_id], name: "index_on_user_id"
+    add_safe_index :correspondence_intakes, [:correspondence_id], name: "index_on_correspondence_id"
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 1de2cb0944b..8522e89213c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2023_10_16_132819) do
+ActiveRecord::Schema.define(version: 2023_12_14_201518) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -200,6 +200,10 @@
     t.index ["updated_at"], name: "index_attorney_case_reviews_on_updated_at"
   end
 
+  create_table "auto_texts", force: :cascade do |t|
+    t.string "name"
+  end
+
   create_table "available_hearing_locations", force: :cascade do |t|
     t.string "address", comment: "Full address of the location"
     t.integer "appeal_id", comment: "Appeal/LegacyAppeal ID; use as FK to appeals/legacy_appeals"
@@ -220,7 +224,7 @@
     t.index ["veteran_file_number"], name: "index_available_hearing_locations_on_veteran_file_number"
   end
 
-  create_table "batch_processes", primary_key: "batch_id", id: :uuid, default: -> { "uuid_generate_v4()" }, comment: "The unique id of the created batch", comment: "A generalized table for batching and processing records within caseflow", force: :cascade do |t|
+  create_table "batch_processes", primary_key: "batch_id", id: :uuid, default: -> { "uuid_generate_v4()" }, comment: "A generalized table for batching and processing records within caseflow", force: :cascade do |t|
     t.string "batch_type", null: false, comment: "Indicates what type of record is being batched"
     t.datetime "created_at", null: false, comment: "Date and Time that batch was created."
     t.datetime "ended_at", comment: "The date/time that the batch finsished processing"
@@ -589,6 +593,76 @@
     t.index ["updated_by_id"], name: "index_updated_by_id"
   end
 
+  create_table "correspondence_documents", force: :cascade do |t|
+    t.bigint "correspondence_id"
+    t.datetime "created_at", null: false, comment: "Date and Time of creation."
+    t.string "document_file_number", comment: "From CMP documents table"
+    t.integer "document_type", comment: "ID of the doc to lookup VBMS Doc Type"
+    t.integer "pages", comment: "Number of pages in the CMP Document"
+    t.datetime "updated_at", null: false, comment: "Date and Time of last update."
+    t.uuid "uuid", comment: "Reference to document in AWS S3"
+    t.bigint "vbms_document_type_id", comment: "From CMP documents table"
+    t.index ["correspondence_id"], name: "index_correspondence_documents_on_correspondence_id"
+  end
+
+  create_table "correspondence_intakes", force: :cascade do |t|
+    t.bigint "correspondence_id", comment: "Foreign key on correspondences table"
+    t.datetime "created_at", null: false
+    t.integer "current_step", null: false, comment: "Tracks users progress on intake workflow"
+    t.jsonb "redux_store", null: false, comment: "JSON representation of the data for the current step"
+    t.datetime "updated_at", null: false
+    t.bigint "user_id", comment: "Foreign key on users table"
+    t.index ["correspondence_id"], name: "index_on_correspondence_id"
+    t.index ["user_id"], name: "index_on_user_id"
+  end
+
+  create_table "correspondence_relations", force: :cascade do |t|
+    t.bigint "correspondence_id"
+    t.datetime "created_at", null: false
+    t.bigint "related_correspondence_id"
+    t.datetime "updated_at", null: false
+    t.index ["correspondence_id", "related_correspondence_id"], name: "index_correspondence_relations_on_correspondences", unique: true
+    t.index ["related_correspondence_id", "correspondence_id"], name: "index_correspondence_relations_on_related_correspondences", unique: true
+  end
+
+  create_table "correspondence_types", force: :cascade do |t|
+    t.boolean "active", default: true, null: false
+    t.datetime "created_at", null: false
+    t.string "name", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  create_table "correspondences", force: :cascade do |t|
+    t.bigint "assigned_by_id", comment: "Foreign key to users table"
+    t.bigint "cmp_packet_number", comment: "Included in CMP mail package"
+    t.integer "cmp_queue_id", comment: "Foreign key to CMP queues table"
+    t.integer "correspondence_type_id", comment: "Foreign key for correspondence_types table"
+    t.datetime "created_at", null: false, comment: "Standard created_at/updated_at timestamps"
+    t.text "notes", comment: "Comes from CMP; can be updated by user"
+    t.integer "package_document_type_id", comment: "Represents entire CMP package document type"
+    t.datetime "portal_entry_date", comment: "Time when correspondence is created in Caseflow"
+    t.string "source_type", comment: "An information identifier we get from CMP"
+    t.datetime "updated_at", null: false, comment: "Standard created_at/updated_at timestamps"
+    t.bigint "updated_by_id", comment: "Foreign key to users table"
+    t.uuid "uuid", comment: "Unique identifier"
+    t.datetime "va_date_of_receipt", comment: "Date package delivered"
+    t.bigint "veteran_id", comment: "Foreign key to veterans table"
+    t.index ["assigned_by_id"], name: "index_correspondences_on_assigned_by_id"
+    t.index ["cmp_queue_id"], name: "index_correspondences_on_cmp_queue_id"
+    t.index ["correspondence_type_id"], name: "index_correspondences_on_correspondence_type_id"
+    t.index ["updated_by_id"], name: "index_correspondences_on_updated_by_id"
+    t.index ["veteran_id"], name: "index_correspondences_on_veteran_id"
+  end
+
+  create_table "correspondences_appeals", force: :cascade do |t|
+    t.bigint "appeal_id"
+    t.bigint "correspondence_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["appeal_id"], name: "index on appeal_id"
+    t.index ["correspondence_id"], name: "index on correspondence_id"
+  end
+
   create_table "decision_documents", force: :cascade do |t|
     t.bigint "appeal_id", null: false
     t.string "appeal_type"
@@ -1374,6 +1448,13 @@
     t.index ["user_id", "organization_id"], name: "index_organizations_users_on_user_id_and_organization_id", unique: true
   end
 
+  create_table "package_document_types", force: :cascade do |t|
+    t.boolean "active", default: true
+    t.datetime "created_at", null: false
+    t.string "name"
+    t.datetime "updated_at", null: false
+  end
+
   create_table "people", force: :cascade do |t|
     t.datetime "created_at", null: false
     t.date "date_of_birth", comment: "PII"
@@ -1926,6 +2007,52 @@
     t.index ["vbms_communication_package_id"], name: "index_vbms_distributions_on_vbms_communication_package_id"
   end
 
+  create_table "vbms_document_types", force: :cascade do |t|
+    t.datetime "created_at", null: false
+    t.integer "doc_type_id"
+    t.datetime "updated_at", null: false
+  end
+
+  create_table "vbms_ext_claim", primary_key: "CLAIM_ID", id: :decimal, precision: 38, force: :cascade do |t|
+    t.string "ALLOW_POA_ACCESS", limit: 5
+    t.decimal "CLAIMANT_PERSON_ID", precision: 38
+    t.datetime "CLAIM_DATE"
+    t.string "CLAIM_SOJ", limit: 25
+    t.integer "CONTENTION_COUNT"
+    t.datetime "CREATEDDT", null: false
+    t.string "EP_CODE", limit: 25
+    t.datetime "ESTABLISHMENT_DATE"
+    t.datetime "EXPIRATIONDT"
+    t.string "INTAKE_SITE", limit: 25
+    t.datetime "LASTUPDATEDT", null: false
+    t.string "LEVEL_STATUS_CODE", limit: 25
+    t.datetime "LIFECYCLE_STATUS_CHANGE_DATE"
+    t.string "LIFECYCLE_STATUS_NAME", limit: 50
+    t.string "ORGANIZATION_NAME", limit: 100
+    t.string "ORGANIZATION_SOJ", limit: 25
+    t.string "PAYEE_CODE", limit: 25
+    t.string "POA_CODE", limit: 25
+    t.integer "PREVENT_AUDIT_TRIG", limit: 2, default: 0, null: false
+    t.string "PRE_DISCHARGE_IND", limit: 5
+    t.string "PRE_DISCHARGE_TYPE_CODE", limit: 10
+    t.string "PRIORITY", limit: 10
+    t.string "PROGRAM_TYPE_CODE", limit: 10
+    t.string "RATING_SOJ", limit: 25
+    t.string "SERVICE_TYPE_CODE", limit: 10
+    t.string "SUBMITTER_APPLICATION_CODE", limit: 25
+    t.string "SUBMITTER_ROLE_CODE", limit: 25
+    t.datetime "SUSPENSE_DATE"
+    t.string "SUSPENSE_REASON_CODE", limit: 25
+    t.string "SUSPENSE_REASON_COMMENTS", limit: 1000
+    t.decimal "SYNC_ID", precision: 38, null: false
+    t.string "TEMPORARY_CLAIM_SOJ", limit: 25
+    t.string "TYPE_CODE", limit: 25
+    t.decimal "VERSION", precision: 38, null: false
+    t.decimal "VETERAN_PERSON_ID", precision: 15
+    t.index ["CLAIM_ID"], name: "claim_id_index"
+    t.index ["LEVEL_STATUS_CODE"], name: "level_status_code_index"
+  end
+
   create_table "vbms_uploaded_documents", force: :cascade do |t|
     t.bigint "appeal_id", comment: "Appeal/LegacyAppeal ID; use as FK to appeals/legacy_appeals"
     t.string "appeal_type", comment: "'Appeal' or 'LegacyAppeal'"
@@ -2121,6 +2248,13 @@
   add_foreign_key "conference_links", "hearing_days"
   add_foreign_key "conference_links", "users", column: "created_by_id"
   add_foreign_key "conference_links", "users", column: "updated_by_id"
+  add_foreign_key "correspondence_documents", "correspondences"
+  add_foreign_key "correspondence_intakes", "correspondences"
+  add_foreign_key "correspondence_intakes", "users"
+  add_foreign_key "correspondence_relations", "correspondences"
+  add_foreign_key "correspondence_relations", "correspondences", column: "related_correspondence_id"
+  add_foreign_key "correspondences_appeals", "appeals"
+  add_foreign_key "correspondences_appeals", "correspondences"
   add_foreign_key "dispatch_tasks", "legacy_appeals", column: "appeal_id"
   add_foreign_key "dispatch_tasks", "users"
   add_foreign_key "distributed_cases", "distributions"
diff --git a/db/seeds.rb b/db/seeds.rb
index a143a3fbf03..a6d92b34bc1 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -63,9 +63,15 @@ def seed
     call_and_log_seed_step Seeds::VbmsExtClaim
     call_and_log_seed_step Seeds::RemandedAmaAppeals
     call_and_log_seed_step Seeds::RemandedLegacyAppeals
+    call_and_log_seed_step Seeds::Correspondence
+    call_and_log_seed_step Seeds::CorrespondenceTypes
+    call_and_log_seed_step Seeds::PackageDocumentTypes
+    call_and_log_seed_step Seeds::MultiCorrespondences
+    call_and_log_seed_step Seeds::VbmsDocumentTypes
     # Always run this as last one
     call_and_log_seed_step Seeds::StaticTestCaseData
     call_and_log_seed_step Seeds::StaticDispatchedAppealsTestData
+    call_and_log_seed_step Seeds::AutoTexts
   end
 end
 
diff --git a/db/seeds/auto_texts.rb b/db/seeds/auto_texts.rb
new file mode 100644
index 00000000000..58bc2ff79e9
--- /dev/null
+++ b/db/seeds/auto_texts.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+# Create correspondence type seeds
+
+module Seeds
+  class AutoTexts < Base
+    def seed!
+      create_auto_text_data
+    end
+
+    private
+
+    def create_auto_text_data
+      auto_texts_values =
+          ["Address updated in VACOLS",
+          "Decision sent to Senator or Congressman mm/dd/yy",
+          "Interest noted in telephone call of mm/dd/yy",
+          "Interest noted in evidence file regarding current appeal",
+          "Email - responded via email on mm/dd/yy",
+          "Email - written response req; confirmed receipt via email to Congress office on mm/dd/yy",
+          "Possible motion pursuant to BVA decision dated mm/dd/yy",
+          "Motion pursuant to BVA decision dated mm/dd/yy",
+          "Statement in support of appeal by appellant",
+          "Statement in support of appeal by rep",
+          "Medical evidence X-Rays submitted or referred by",
+          "Medical evidence clinical reports submitted or referred by",
+          "Medical evidence examination reports submitted or referred by",
+          "Medical evidence progress notes submitted or referred by",
+          "Medical evidence physician's medical statement submitted or referred by",
+          "C&P exam report",
+          "Consent form (specify)",
+          "Withdrawal of issues",
+          "Response to BVA solicitation letter dated mm/dd/yy",
+          "VAF 9 (specify)"]
+
+          auto_texts_values.each do |text|
+        AutoText.find_or_create_by(name: text)
+      end
+    end
+  end
+end
diff --git a/db/seeds/correspondence.rb b/db/seeds/correspondence.rb
new file mode 100644
index 00000000000..74163327481
--- /dev/null
+++ b/db/seeds/correspondence.rb
@@ -0,0 +1,185 @@
+# frozen_string_literal: true
+
+module Seeds
+  # :reek:InstanceVariableAssumption
+  class Correspondence < Base
+    def initialize
+      initial_id_values
+    end
+
+    def seed!
+      create_correspondences
+    end
+
+    private
+
+    def initial_id_values
+      @file_number ||= 500_000_000
+      @participant_id ||= 850_000_000
+      while Veteran.find_by(file_number: format("%<n>09d", n: @file_number + 1))
+        @file_number += 100
+        @participant_id += 100
+      end
+
+      @cmp_packet_number ||= 1_000_000_000
+      @cmp_packet_number += 10_000 while ::Correspondence.find_by(cmp_packet_number: @cmp_packet_number + 1)
+    end
+
+    def create_veteran(options = {})
+      @file_number += 1
+      @participant_id += 1
+      params = {
+        file_number: format("%<n>09d", n: @file_number),
+        participant_id: format("%<n>09d", n: @participant_id)
+      }
+      veteran = create(:veteran, params.merge(options))
+      5.times do
+        create(:appeal, veteran_file_number: veteran.file_number)
+      end
+      veteran
+    end
+
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+    def create_correspondences
+      # correspondences with multiple documents
+      10.times do
+        veteran = create_veteran
+        corres = ::Correspondence.create!(
+          uuid: SecureRandom.uuid,
+          portal_entry_date: Time.zone.now,
+          source_type: "Mail",
+          package_document_type_id: 15,
+          correspondence_type_id: 8,
+          cmp_queue_id: 1,
+          cmp_packet_number: @cmp_packet_number,
+          va_date_of_receipt: Time.zone.yesterday,
+          notes: "This is a note from CMP.",
+          assigned_by_id: 81,
+          veteran_id: veteran.id,
+        )
+        create_multiple_docs(corres, veteran)
+        @cmp_packet_number += 1
+      end
+
+      (1..77).each do |package_doc_id|
+        veteran = create_veteran
+        corres = ::Correspondence.create!(
+          uuid: SecureRandom.uuid,
+          portal_entry_date: Time.zone.now,
+          source_type: "Mail",
+          package_document_type_id: package_doc_id,
+          correspondence_type_id: 8,
+          cmp_queue_id: 1,
+          cmp_packet_number: @cmp_packet_number,
+          va_date_of_receipt: Time.zone.yesterday,
+          notes: "This is a note from CMP.",
+          assigned_by_id: 81,
+          veteran_id: veteran.id,
+        )
+        CorrespondenceDocument.find_or_create_by(
+          document_file_number: veteran.file_number,
+          uuid: SecureRandom.uuid,
+          vbms_document_type_id: 1250,
+          document_type: 1250,
+          pages: 30,
+          correspondence_id: corres.id
+        )
+        @cmp_packet_number += 1
+      end
+
+      (1..24).each do |corres_type_id|
+        veteran = create_veteran
+        corres = ::Correspondence.create!(
+          uuid: SecureRandom.uuid,
+          portal_entry_date: Time.zone.now,
+          source_type: "Mail",
+          package_document_type_id: 15,
+          correspondence_type_id: corres_type_id,
+          cmp_queue_id: 1,
+          cmp_packet_number: @cmp_packet_number,
+          va_date_of_receipt: Time.zone.yesterday,
+          notes: "This is a note from CMP.",
+          assigned_by_id: 81,
+          veteran_id: veteran.id,
+        )
+        CorrespondenceDocument.find_or_create_by(
+          document_file_number: veteran.file_number,
+          uuid: SecureRandom.uuid,
+          vbms_document_type_id: 1250,
+          document_type: 1250,
+          pages: 30,
+          correspondence_id: corres.id
+        )
+        @cmp_packet_number += 1
+      end
+
+      (1..17).each do |cmp_queue_id|
+        veteran = create_veteran
+        corres = ::Correspondence.create!(
+          uuid: SecureRandom.uuid,
+          portal_entry_date: Time.zone.now,
+          source_type: "Mail",
+          package_document_type_id: 15,
+          correspondence_type_id: 8,
+          cmp_queue_id: cmp_queue_id,
+          cmp_packet_number: @cmp_packet_number,
+          va_date_of_receipt: Time.zone.yesterday,
+          notes: "This is a note from CMP.",
+          assigned_by_id: 81,
+          veteran_id: veteran.id,
+        )
+        CorrespondenceDocument.find_or_create_by(
+          document_file_number: veteran.file_number,
+          uuid: SecureRandom.uuid,
+          vbms_document_type_id: 1250,
+          document_type: 1250,
+          pages: 30,
+          correspondence_id: corres.id
+        )
+        @cmp_packet_number += 1
+      end
+    end
+
+    def create_multiple_docs(corres, veteran)
+      CorrespondenceDocument.find_or_create_by(
+        document_file_number: veteran.file_number,
+        uuid: SecureRandom.uuid,
+        correspondence_id: corres.id,
+        document_type: 1250,
+        pages: 30,
+        vbms_document_type_id: 1250
+      )
+      CorrespondenceDocument.find_or_create_by(
+        document_file_number: veteran.file_number,
+        uuid: SecureRandom.uuid,
+        correspondence_id: corres.id,
+        document_type: 719,
+        pages: 20,
+        vbms_document_type_id: 719
+      )
+      CorrespondenceDocument.find_or_create_by(
+        document_file_number: veteran.file_number,
+        uuid: SecureRandom.uuid,
+        correspondence_id: corres.id,
+        document_type: 672,
+        pages: 10,
+        vbms_document_type_id: 672
+      )
+      CorrespondenceDocument.find_or_create_by(
+        document_file_number: veteran.file_number,
+        uuid: SecureRandom.uuid,
+        correspondence_id: corres.id,
+        document_type: 18,
+        pages: 5,
+        vbms_document_type_id: 18
+      )
+    end
+
+    # Note: Remove after document controller is implemented
+    def create_static_documents
+      Document.create!(vbms_document_id: 3)
+      Document.create!(vbms_document_id: 4)
+    end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+  end
+end
diff --git a/db/seeds/correspondence_types.rb b/db/seeds/correspondence_types.rb
new file mode 100644
index 00000000000..91074e7e822
--- /dev/null
+++ b/db/seeds/correspondence_types.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+# Create correspondence type seeds
+
+module Seeds
+  class CorrespondenceTypes < Base
+    def seed!
+      create_correspondence_types
+    end
+
+    private
+
+    def create_correspondence_types
+      correspondence_types_list =
+        ["Abeyance",
+         "Attorney Inquiry",
+         "CAVC Correspondence",
+         "Change of address",
+         "Congressional interest",
+         "CUE related",
+         "Death certificate",
+         "Evidence or argument",
+         "Extension request",
+         "FOIA request",
+         "Hearing Postponement Request",
+         "Hearing related",
+         "Hearing Withdrawal Request",
+         "Advance on docket",
+         "Motion for reconsideration",
+         "Motion to vacate",
+         "Other motions",
+         "Power of attorney related",
+         "Privacy Act complaints",
+         "Privacy Act request",
+         "Returned as undeliverable mail",
+         "Status Inquiry",
+         "Thurber",
+         "Withdrawal of appeal"]
+
+      correspondence_types_list.each do |type|
+        CorrespondenceType.find_or_create_by(name: type)
+      end
+    end
+  end
+end
diff --git a/db/seeds/multi_correspondences.rb b/db/seeds/multi_correspondences.rb
new file mode 100644
index 00000000000..4a47fdb1202
--- /dev/null
+++ b/db/seeds/multi_correspondences.rb
@@ -0,0 +1,167 @@
+# frozen_string_literal :true
+
+# create correspondence seeds
+module Seeds
+  class MultiCorrespondences < Base
+
+    def initialize
+      initial_id_values
+      RequestStore[:current_user] = User.find_by_css_id("BVADWISE")
+    end
+
+    def seed!
+      create_multi_correspondences
+    end
+
+    private
+
+    def initial_id_values
+      @file_number ||= 550_000_000
+      @participant_id ||= 650_000_000
+      while Veteran.find_by(file_number: format("%<n>09d", n: @file_number + 1))
+        @file_number += 100
+        @participant_id += 100
+      end
+
+      @cmp_packet_number ||= 2_000_000_000
+      @cmp_packet_number += 10_000 while ::Correspondence.find_by(cmp_packet_number: @cmp_packet_number + 1)
+    end
+
+    def create_veteran(options = {})
+      @file_number += 1
+      @participant_id += 1
+      params = {
+        file_number: format("%<n>09d", n: @file_number),
+        participant_id: format("%<n>09d", n: @participant_id)
+      }
+      create(:veteran, params.merge(options))
+    end
+
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+    def create_multi_correspondences
+      veteran = create_veteran(first_name: "Adam", last_name: "West")
+      5.times do
+        appeal = create(
+          :appeal,
+          veteran_file_number: veteran.file_number
+          )
+        InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
+      end
+      5.times do
+        appeal = create(
+          :appeal,
+          veteran_file_number: veteran.file_number,
+          docket_type: Constants.AMA_DOCKETS.direct_review
+          )
+        InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
+      end
+      21.times do
+        corres = ::Correspondence.create!(
+          uuid: SecureRandom.uuid,
+          portal_entry_date: Time.zone.now,
+          source_type: "Mail",
+          package_document_type_id: (1..20).to_a.sample,
+          correspondence_type_id: 4,
+          cmp_queue_id: 1,
+          cmp_packet_number: @cmp_packet_number,
+          va_date_of_receipt: Time.zone.yesterday,
+          notes: "Notes from CMP - Multi Correspondence Seed",
+          assigned_by_id: 81,
+          veteran_id: veteran.id,
+        )
+        CorrespondenceDocument.find_or_create_by(
+          document_file_number: veteran.file_number,
+          uuid: SecureRandom.uuid,
+          vbms_document_type_id: 1250,
+          document_type: 1250,
+          pages: 30,
+          correspondence_id: corres.id
+        )
+        @cmp_packet_number += 1
+      end
+
+      veteran = create_veteran(first_name: "Michael", last_name: "Keaton")
+      2.times do
+        appeal = create(
+          :appeal,
+          veteran_file_number: veteran.file_number
+          )
+        InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
+      end
+      5.times do
+        appeal = create(
+          :appeal,
+          veteran_file_number: veteran.file_number,
+          docket_type: Constants.AMA_DOCKETS.direct_review
+          )
+        InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
+      end
+      31.times do
+        corres = ::Correspondence.create!(
+          uuid: SecureRandom.uuid,
+          portal_entry_date: Time.zone.now,
+          source_type: "Mail",
+          package_document_type_id: (1..20).to_a.sample,
+          correspondence_type_id: 4,
+          cmp_queue_id: 1,
+          cmp_packet_number: @cmp_packet_number,
+          va_date_of_receipt: Time.zone.yesterday,
+          notes: "Notes from CMP - Multi Correspondence Seed",
+          assigned_by_id: 81,
+          veteran_id: veteran.id,
+        )
+        CorrespondenceDocument.find_or_create_by(
+          document_file_number: veteran.file_number,
+          uuid: SecureRandom.uuid,
+          vbms_document_type_id: 1250,
+          document_type: 1250,
+          pages: 30,
+          correspondence_id: corres.id
+        )
+        @cmp_packet_number += 1
+      end
+
+
+      veteran = create_veteran(first_name: "Christian", last_name: "Bale")
+      1.times do
+        appeal = create(
+          :appeal,
+          veteran_file_number: veteran.file_number
+          )
+        InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
+      end
+      10.times do
+        appeal = create(
+          :appeal,
+          veteran_file_number: veteran.file_number,
+          docket_type: Constants.AMA_DOCKETS.direct_review
+          )
+        InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
+      end
+      101.times do
+        corres = ::Correspondence.create!(
+          uuid: SecureRandom.uuid,
+          portal_entry_date: Time.zone.now,
+          source_type: "Mail",
+          package_document_type_id: (1..20).to_a.sample,
+          correspondence_type_id: 4,
+          cmp_queue_id: 1,
+          cmp_packet_number: @cmp_packet_number,
+          va_date_of_receipt: Time.zone.yesterday,
+          notes: "Notes from CMP - Multi Correspondence Seed",
+          assigned_by_id: 81,
+          veteran_id: veteran.id,
+        )
+        CorrespondenceDocument.find_or_create_by(
+          document_file_number: veteran.file_number,
+          uuid: SecureRandom.uuid,
+          vbms_document_type_id: 1250,
+          document_type: 1250,
+          pages: 30,
+          correspondence_id: corres.id
+        )
+        @cmp_packet_number += 1
+      end
+    end
+  end
+end
diff --git a/db/seeds/package_document_types.rb b/db/seeds/package_document_types.rb
new file mode 100644
index 00000000000..b042ecf1ed9
--- /dev/null
+++ b/db/seeds/package_document_types.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Seeds
+  class PackageDocumentTypes
+    def seed!
+      perform_seeding_correspondence_types
+    end
+
+    private
+
+    def perform_seeding_correspondence_types
+      # Active Jobs which populate tables based on seed data
+      [
+        "0304", "0779", "0781", "0781a", "0820a", "0820b", "0820c", "0820e", "0820f", "082d", "0966", "0995", "0996",
+        "10007", "10182", "1330", "1330m", "1900", "1905", "1905c", "1905m", "1995", "1999", "1999b", "21-22",
+        "21-22a", "247", "2680", "296", "4138", "4142", "4706b", "4706c", "4718a", "516", "518", "526", "526b",
+        "526c", "526ez", "527", "527EZ", "530", "530a", "535", "537", "5490", "5495", "601", "674", "674c",
+        "8049", "820", "8416", "8940", "BENE TRVL", "CH 31 APP", "CH36 APP", "CONG INQ", "CONSNT",
+        "DBQ", "Debt Dispute", "GRADES/DEGREE", "IU", "NOD", "OMPF", "PMR", "RAMP", "REHAB PLAN", "RFA", "RM",
+        "RNI", "SF180", "STR", "VA 9", "VCAA", "VRE INV"
+      ].each do |package_document_type|
+        PackageDocumentType.find_or_create_by(name: package_document_type)
+      end
+    end
+  end
+end
diff --git a/db/seeds/users.rb b/db/seeds/users.rb
index fb3687a78a4..7f4dc0c33f6 100644
--- a/db/seeds/users.rb
+++ b/db/seeds/users.rb
@@ -82,6 +82,7 @@ def create_users
       create_lit_support_user
       create_oai_team_user
       create_occ_team_user
+      create_mail_team_supervisor_user
       create_cavc_lit_support_user
       create_pulac_cerullo_user
       create_mail_team_user
@@ -340,6 +341,15 @@ def create_occ_team_user
       OaiTeam.singleton.add_user(u)
     end
 
+    def create_mail_team_supervisor_user
+      u = User.create!(station_id: 101, css_id: "MAIL_TEAM_SUPERVISOR_ADMIN_USER", full_name: "Jon MailTeam Snow Admin")
+      MailTeamSupervisor.singleton.add_user(u)
+      OrganizationsUser.make_user_admin(u, MailTeamSupervisor.singleton)
+      u = User.create!(station_id: 101, css_id: "MAIL_TEAM_SUPERVISOR_MAIL_INTAKE_USER",
+                       full_name: "Jon MailTeam Snow Mail Intake", roles: ["Mail Intake"])
+      MailTeamSupervisor.singleton.add_user(u)
+    end
+
     def create_cavc_lit_support_user
       users_info = [
         { css_id: "CAVC_LIT_SUPPORT_ADMIN", full_name: "Diego CAVCLitSupportAdmin Christiansen" },
diff --git a/db/seeds/vbms_document_types.rb b/db/seeds/vbms_document_types.rb
new file mode 100644
index 00000000000..d365ea25f36
--- /dev/null
+++ b/db/seeds/vbms_document_types.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Seeds
+  class VbmsDocumentTypes < Base
+    def seed!
+      create_document_types
+    end
+
+    private
+
+    def create_document_types
+      # Caseflow keeps track of VBMS Document Types at Caseflow::DocumentTypes::TYPES
+      # https://github.com/department-of-veterans-affairs/caseflow-commons/blob/master/app/models/caseflow/document_types.rb
+
+      # if VbmsDocumentType table is not empty we should only add the document types we are missing (recently added)
+      # else the table is empty, so we should add all the document types
+      # This is implemented this way so that if a new document type is added to the module,
+      # we do not have to clear the table before running this seed file
+
+      doc_types = []
+      if VbmsDocumentType.count > 0
+        doc_types = Caseflow::DocumentTypes::TYPES.reject { |key, _value| VbmsDocumentType.exists?(doc_type_id: key) }
+      else
+        Caseflow::DocumentTypes::TYPES.each do |key, _value|
+          doc_types << VbmsDocumentType.new(doc_type_id: key)
+        end
+      end
+      VbmsDocumentType.import(doc_types, validate: false) unless doc_types.empty?
+    end
+  end
+end
diff --git a/lib/tasks/correspondence.rake b/lib/tasks/correspondence.rake
new file mode 100644
index 00000000000..945e857f875
--- /dev/null
+++ b/lib/tasks/correspondence.rake
@@ -0,0 +1,561 @@
+# frozen_string_literal: true
+
+require_relative "../../db/seeds/base"
+require_relative "../../db/seeds/correspondence"
+require_relative "../../db/seeds/vbms_document_types"
+require_relative "../../db/seeds/correspondence_types"
+require_relative "../../db/seeds/package_document_types"
+require_relative "../../db/seeds/multi_correspondences"
+
+namespace :correspondence do
+  desc "setup data for intake correspondence (autotext and correspondence type)in UAT/PROD"
+  task :setup_correspondence_data, [] => :environment do |_|
+    STDOUT.puts("Creating data for Auto Text Tables")
+    # creates intiial values for auto text table
+    auto_texts_values = [
+      "Address updated in VACOLS",
+      "Decision sent to Senator or Congressman mm/dd/yy",
+      "Interest noted in telephone call of mm/dd/yy",
+      "Interest noted in evidence file regarding current appeal",
+      "Email - responded via email on mm/dd/yy",
+      "Email - written response req; confirmed receipt via email to Congress office on mm/dd/yy",
+      "Possible motion pursuant to BVA decision dated mm/dd/yy",
+      "Motion pursuant to BVA decision dated mm/dd/yy",
+      "Statement in support of appeal by appellant",
+      "Statement in support of appeal by rep",
+      "Medical evidence X-Rays submitted or referred by",
+      "Medical evidence clinical reports submitted or referred by",
+      "Medical evidence examination reports submitted or referred by",
+      "Medical evidence progress notes submitted or referred by",
+      "Medical evidence physician's medical statement submitted or referred by",
+      "C&P exam report",
+      "Consent form (specify)",
+      "Withdrawal of issues",
+      "Response to BVA solicitation letter dated mm/dd/yy",
+      "VAF 9 (specify)"
+    ]
+
+    auto_texts_values.each do |text|
+      AutoText.find_or_create_by(name: text)
+    end
+
+    correspondence_types_list = [
+      "Abeyance",
+      "Attorney Inquiry",
+      "CAVC Correspondence",
+      "Change of address",
+      "Congressional interest",
+      "CUE related",
+      "Death certificate",
+      "Evidence or argument",
+      "Extension request",
+      "FOIA request",
+      "Hearing Postponement Request",
+      "Hearing related",
+      "Hearing Withdrawal Request",
+      "Advance on docket",
+      "Motion for reconsideration",
+      "Motion to vacate",
+      "Other motions",
+      "Power of attorney related",
+      "Privacy Act complaints",
+      "Privacy Act request",
+      "Returned as undeliverable mail",
+      "Status Inquiry",
+      "Thurber",
+      "Withdrawal of appeal"
+    ]
+
+    correspondence_types_list.each do |type|
+      CorrespondenceType.find_or_create_by(name: type)
+    end
+  end
+
+  task :correspondences_with_multiple_documents, [] => :environment do |_|
+    @file_number ||= 500_000_000
+    @participant_id ||= 850_000_000
+    while Veteran.find_by(file_number: format("%<n>09d", n: @file_number + 1))
+      @file_number += 100
+      @participant_id += 100
+    end
+
+    @cmp_packet_number ||= 1_000_000_000
+    @cmp_packet_number += 10_000 while ::Correspondence.find_by(cmp_packet_number: @cmp_packet_number + 1)
+    create_correspondences_with_documents
+  end
+
+  task :vbms_document_types, [] => :environment do |_|
+    create_document_types
+  end
+
+  task :correspondence_types, [] => :environment do |_|
+    create_correspondence_types
+  end
+
+  task :package_document_types, [] => :environment do |_|
+    create_package_document_types
+  end
+
+  task :multi_correspondences, [] => :environment do |_|
+    @file_number ||= 550_000_000
+    @participant_id ||= 650_000_000
+    while Veteran.find_by(file_number: format("%<n>09d", n: @file_number + 1))
+      @file_number += 100
+      @participant_id += 100
+    end
+
+    @cmp_packet_number ||= 2_000_000_000
+    @cmp_packet_number += 10_000 while ::Correspondence.find_by(cmp_packet_number: @cmp_packet_number + 1)
+    RequestStore[:current_user] = User.find_by_css_id("BVADWISE")
+    create_multi_correspondences
+  end
+
+  desc "creates a 20 correspondence and correspondence_document for a veteran"
+  task :create_correspondence, [:veteran_file_number] => :environment do |_, args|
+    veteran = Veteran.find_by(file_number: args[:veteran_file_number].to_i)
+
+    20.times do |package_doc_id|
+      corres = ::Correspondence.create!(
+        uuid: SecureRandom.uuid,
+        portal_entry_date: Time.zone.now,
+        source_type: "Mail",
+        package_document_type_id: package_doc_id,
+        correspondence_type_id: 4,
+        cmp_queue_id: 1,
+        cmp_packet_number: rand(2_000_000..2_999_999),
+        va_date_of_receipt: Time.zone.yesterday,
+        notes: "Notes from CMP - Multi Correspondence Seed",
+        assigned_by_id: 81,
+        veteran_id: veteran.id
+      )
+      CorrespondenceDocument.find_or_create_by(
+        document_file_number: veteran.file_number,
+        uuid: SecureRandom.uuid,
+        vbms_document_type_id: 1250,
+        document_type: 1250,
+        pages: 30,
+        correspondence_id: corres.id
+      )
+    end
+  end
+
+  desc "create correspondence data in UAT given a veteran file number"
+  task :create_correspondence_data, [] => :environment do |_|
+    STDOUT.puts("This script will create 20 new correspondence and
+      correspondence_document for a veteran based off their file number")
+    STDOUT.puts("Enter the veteran's file number")
+    veteran_file_number = STDIN.gets.chomp
+
+    if veteran_file_number.to_i.is_a? Integer
+      STDOUT.puts("Creating correspondences")
+      Rake.application.invoke_task("correspondence:create_correspondence[#{veteran_file_number}]")
+      Rake::Task["correspondence:create_correspondence"].reenable
+      STDOUT.puts("Correspondences created!")
+    else
+      STDOUT.puts("Improper input...")
+    end
+  end
+
+  desc "creates 10 appeals for a vetean: 5 with evidence submission tasks and 5 without"
+  task :create_test_appeals, [] => :environment do |_|
+    STDOUT.puts("This script will create 5 evidence appeals and 5 direct review appeals for a veteran.")
+    STDOUT.puts("Enter the veteran's file number")
+    veteran_file_number = STDIN.gets.chomp
+
+    if veteran_file_number.to_i.is_a? Integer
+      veteran = Veteran.find_by(file_number: veteran_file_number.to_i)
+      # evidence appeals
+      5.times do
+        appeal = Appeal.create!(
+          veteran_file_number: veteran.file_number,
+          receipt_date: Time.zone.now,
+          established_at: Time.zone.now,
+          docket_type: Constants.AMA_DOCKETS.evidence_submission
+        )
+        InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
+      end
+
+      # direct review appeals.
+      5.times do
+        appeal = Appeal.create!(
+          veteran_file_number: veteran.file_number,
+          receipt_date: Time.zone.now,
+          established_at: Time.zone.now,
+          docket_type: Constants.AMA_DOCKETS.direct_review
+        )
+        InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
+      end
+    else
+      STDOUT.puts("Improper input...")
+    end
+  end
+end
+
+def initial_id_values
+  @file_number ||= 500_000_000
+  @participant_id ||= 850_000_000
+  while Veteran.find_by(file_number: format("%<n>09d", n: @file_number + 1))
+    @file_number += 100
+    @participant_id += 100
+  end
+
+  @cmp_packet_number ||= 1_000_000_000
+  @cmp_packet_number += 10_000 while ::Correspondence.find_by(cmp_packet_number: @cmp_packet_number + 1)
+end
+
+def create_veteran(options = {})
+  @file_number += 1
+  @participant_id += 1
+  params = {
+    file_number: format("%<n>09d", n: @file_number),
+    participant_id: format("%<n>09d", n: @participant_id)
+  }
+  veteran = FactoryBot.create(:veteran, params.merge(options))
+  5.times do
+    FactoryBot.create(:appeal, veteran_file_number: veteran.file_number)
+  end
+  veteran
+end
+
+# rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+def create_correspondences_with_documents
+  # correspondences with multiple documents
+  10.times do
+    veteran = create_veteran
+    corres = ::Correspondence.create!(
+      uuid: SecureRandom.uuid,
+      portal_entry_date: Time.zone.now,
+      source_type: "Mail",
+      package_document_type_id: 15,
+      correspondence_type_id: 8,
+      cmp_queue_id: 1,
+      cmp_packet_number: @cmp_packet_number,
+      va_date_of_receipt: Time.zone.yesterday,
+      notes: "This is a note from CMP.",
+      assigned_by_id: 81,
+      veteran_id: veteran.id
+    )
+    create_multiple_docs(corres, veteran)
+    @cmp_packet_number += 1
+  end
+
+  (1..77).each do |package_doc_id|
+    veteran = create_veteran
+    corres = ::Correspondence.create!(
+      uuid: SecureRandom.uuid,
+      portal_entry_date: Time.zone.now,
+      source_type: "Mail",
+      package_document_type_id: package_doc_id,
+      correspondence_type_id: 8,
+      cmp_queue_id: 1,
+      cmp_packet_number: @cmp_packet_number,
+      va_date_of_receipt: Time.zone.yesterday,
+      notes: "This is a note from CMP.",
+      assigned_by_id: 81,
+      veteran_id: veteran.id
+    )
+    CorrespondenceDocument.find_or_create_by(
+      document_file_number: veteran.file_number,
+      uuid: SecureRandom.uuid,
+      vbms_document_type_id: 1250,
+      document_type: 1250,
+      pages: 30,
+      correspondence_id: corres.id
+    )
+    @cmp_packet_number += 1
+  end
+
+  (1..24).each do |corres_type_id|
+    veteran = create_veteran
+    corres = ::Correspondence.create!(
+      uuid: SecureRandom.uuid,
+      portal_entry_date: Time.zone.now,
+      source_type: "Mail",
+      package_document_type_id: 15,
+      correspondence_type_id: corres_type_id,
+      cmp_queue_id: 1,
+      cmp_packet_number: @cmp_packet_number,
+      va_date_of_receipt: Time.zone.yesterday,
+      notes: "This is a note from CMP.",
+      assigned_by_id: 81,
+      veteran_id: veteran.id
+    )
+    CorrespondenceDocument.find_or_create_by(
+      document_file_number: veteran.file_number,
+      uuid: SecureRandom.uuid,
+      vbms_document_type_id: 1250,
+      document_type: 1250,
+      pages: 30,
+      correspondence_id: corres.id
+    )
+    @cmp_packet_number += 1
+  end
+
+  (1..17).each do |cmp_queue_id|
+    veteran = create_veteran
+    corres = ::Correspondence.create!(
+      uuid: SecureRandom.uuid,
+      portal_entry_date: Time.zone.now,
+      source_type: "Mail",
+      package_document_type_id: 15,
+      correspondence_type_id: 8,
+      cmp_queue_id: cmp_queue_id,
+      cmp_packet_number: @cmp_packet_number,
+      va_date_of_receipt: Time.zone.yesterday,
+      notes: "This is a note from CMP.",
+      assigned_by_id: 81,
+      veteran_id: veteran.id
+    )
+    CorrespondenceDocument.find_or_create_by(
+      document_file_number: veteran.file_number,
+      uuid: SecureRandom.uuid,
+      vbms_document_type_id: 1250,
+      document_type: 1250,
+      pages: 30,
+      correspondence_id: corres.id
+    )
+    @cmp_packet_number += 1
+  end
+end
+
+def create_multiple_docs(corres, veteran)
+  CorrespondenceDocument.find_or_create_by(
+    document_file_number: veteran.file_number,
+    uuid: SecureRandom.uuid,
+    correspondence_id: corres.id,
+    document_type: 1250,
+    pages: 30,
+    vbms_document_type_id: 1250
+  )
+  CorrespondenceDocument.find_or_create_by(
+    document_file_number: veteran.file_number,
+    uuid: SecureRandom.uuid,
+    correspondence_id: corres.id,
+    document_type: 719,
+    pages: 20,
+    vbms_document_type_id: 719
+  )
+  CorrespondenceDocument.find_or_create_by(
+    document_file_number: veteran.file_number,
+    uuid: SecureRandom.uuid,
+    correspondence_id: corres.id,
+    document_type: 672,
+    pages: 10,
+    vbms_document_type_id: 672
+  )
+  CorrespondenceDocument.find_or_create_by(
+    document_file_number: veteran.file_number,
+    uuid: SecureRandom.uuid,
+    correspondence_id: corres.id,
+    document_type: 18,
+    pages: 5,
+    vbms_document_type_id: 18
+  )
+end
+
+# Note: Remove after document controller is implemented
+def create_static_documents
+  Document.create!(vbms_document_id: 3)
+  Document.create!(vbms_document_id: 4)
+end
+
+def create_document_types
+  # Caseflow keeps track of VBMS Document Types at Caseflow::DocumentTypes::TYPES
+  # https://github.com/department-of-veterans-affairs/caseflow-commons/blob/master/app/models/caseflow/document_types.rb
+
+  # if VbmsDocumentType table is not empty we should only add the document types we are missing (recently added)
+  # else the table is empty, so we should add all the document types
+  # This is implemented this way so that if a new document type is added to the module,
+  # we do not have to clear the table before running this seed file
+
+  doc_types = []
+  if VbmsDocumentType.count > 0
+    doc_types = Caseflow::DocumentTypes::TYPES.reject { |key, _value| VbmsDocumentType.exists?(doc_type_id: key) }
+  else
+    Caseflow::DocumentTypes::TYPES.each do |key, _value|
+      doc_types << VbmsDocumentType.new(doc_type_id: key)
+    end
+  end
+  VbmsDocumentType.import(doc_types, validate: false) unless doc_types.empty?
+end
+
+def create_correspondence_types
+  correspondence_types_list =
+    ["Abeyance",
+     "Attorney Inquiry",
+     "CAVC Correspondence",
+     "Change of address",
+     "Congressional interest",
+     "CUE related",
+     "Death certificate",
+     "Evidence or argument",
+     "Extension request",
+     "FOIA request",
+     "Hearing Postponement Request",
+     "Hearing related",
+     "Hearing Withdrawal Request",
+     "Advance on docket",
+     "Motion for reconsideration",
+     "Motion to vacate",
+     "Other motions",
+     "Power of attorney related",
+     "Privacy Act complaints",
+     "Privacy Act request",
+     "Returned as undeliverable mail",
+     "Status Inquiry",
+     "Thurber",
+     "Withdrawal of appeal"]
+
+  correspondence_types_list.each do |type|
+    CorrespondenceType.find_or_create_by(name: type)
+  end
+end
+
+def create_package_document_types
+  [
+    "0304", "0779", "0781", "0781a", "0820a", "0820b", "0820c", "0820e", "0820f", "082d", "0966", "0995", "0996",
+    "10007", "10182", "1330", "1330m", "1900", "1905", "1905c", "1905m", "1995", "1999", "1999b", "21-22",
+    "21-22a", "247", "2680", "296", "4138", "4142", "4706b", "4706c", "4718a", "516", "518", "526", "526b",
+    "526c", "526ez", "527", "527EZ", "530", "530a", "535", "537", "5490", "5495", "601", "674", "674c",
+    "8049", "820", "8416", "8940", "BENE TRVL", "CH 31 APP", "CH36 APP", "CONG INQ", "CONSNT",
+    "DBQ", "Debt Dispute", "GRADES/DEGREE", "IU", "NOD", "OMPF", "PMR", "RAMP", "REHAB PLAN", "RFA", "RM",
+    "RNI", "SF180", "STR", "VA 9", "VCAA", "VRE INV"
+  ].each do |package_document_type|
+    PackageDocumentType.find_or_create_by(name: package_document_type)
+  end
+end
+
+def create_correspondence_veteran(options = {})
+  @file_number += 1
+  @participant_id += 1
+  params = {
+    file_number: format("%<n>09d", n: @file_number),
+    participant_id: format("%<n>09d", n: @participant_id)
+  }
+  FactoryBot.create(:veteran, params.merge(options))
+end
+
+def create_multi_correspondences
+  veteran = create_correspondence_veteran(first_name: "Adam", last_name: "West")
+  5.times do
+    appeal = FactoryBot.create(
+      :appeal,
+      veteran_file_number: veteran.file_number
+    )
+    InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
+  end
+  5.times do
+    appeal = FactoryBot.create(
+      :appeal,
+      veteran_file_number: veteran.file_number,
+      docket_type: Constants.AMA_DOCKETS.direct_review
+    )
+    InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
+  end
+  21.times do
+    corres = ::Correspondence.create!(
+      uuid: SecureRandom.uuid,
+      portal_entry_date: Time.zone.now,
+      source_type: "Mail",
+      package_document_type_id: (1..20).to_a.sample,
+      correspondence_type_id: 4,
+      cmp_queue_id: 1,
+      cmp_packet_number: @cmp_packet_number,
+      va_date_of_receipt: Time.zone.yesterday,
+      notes: "Notes from CMP - Multi Correspondence Seed",
+      assigned_by_id: 81,
+      veteran_id: veteran.id
+    )
+    CorrespondenceDocument.find_or_create_by(
+      document_file_number: veteran.file_number,
+      uuid: SecureRandom.uuid,
+      vbms_document_type_id: 1250,
+      document_type: 1250,
+      pages: 30,
+      correspondence_id: corres.id
+    )
+    @cmp_packet_number += 1
+  end
+
+  veteran = create_correspondence_veteran(first_name: "Michael", last_name: "Keaton")
+  2.times do
+    appeal = FactoryBot.create(
+      :appeal,
+      veteran_file_number: veteran.file_number
+    )
+    InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
+  end
+  5.times do
+    appeal = FactoryBot.create(
+      :appeal,
+      veteran_file_number: veteran.file_number,
+      docket_type: Constants.AMA_DOCKETS.direct_review
+    )
+    InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
+  end
+  31.times do
+    corres = ::Correspondence.create!(
+      uuid: SecureRandom.uuid,
+      portal_entry_date: Time.zone.now,
+      source_type: "Mail",
+      package_document_type_id: (1..20).to_a.sample,
+      correspondence_type_id: 4,
+      cmp_queue_id: 1,
+      cmp_packet_number: @cmp_packet_number,
+      va_date_of_receipt: Time.zone.yesterday,
+      notes: "Notes from CMP - Multi Correspondence Seed",
+      assigned_by_id: 81,
+      veteran_id: veteran.id
+    )
+    CorrespondenceDocument.find_or_create_by(
+      document_file_number: veteran.file_number,
+      uuid: SecureRandom.uuid,
+      vbms_document_type_id: 1250,
+      document_type: 1250,
+      pages: 30,
+      correspondence_id: corres.id
+    )
+    @cmp_packet_number += 1
+  end
+
+  veteran = create_correspondence_veteran(first_name: "Christian", last_name: "Bale")
+  1.times do
+    appeal = FactoryBot.create(
+      :appeal,
+      veteran_file_number: veteran.file_number
+    )
+    InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
+  end
+  10.times do
+    appeal = FactoryBot.create(
+      :appeal,
+      veteran_file_number: veteran.file_number,
+      docket_type: Constants.AMA_DOCKETS.direct_review
+    )
+    InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
+  end
+  101.times do
+    corres = ::Correspondence.create!(
+      uuid: SecureRandom.uuid,
+      portal_entry_date: Time.zone.now,
+      source_type: "Mail",
+      package_document_type_id: (1..20).to_a.sample,
+      correspondence_type_id: 4,
+      cmp_queue_id: 1,
+      cmp_packet_number: @cmp_packet_number,
+      va_date_of_receipt: Time.zone.yesterday,
+      notes: "Notes from CMP - Multi Correspondence Seed",
+      assigned_by_id: 81,
+      veteran_id: veteran.id
+    )
+    CorrespondenceDocument.find_or_create_by(
+      document_file_number: veteran.file_number,
+      uuid: SecureRandom.uuid,
+      vbms_document_type_id: 1250,
+      document_type: 1250,
+      pages: 30,
+      correspondence_id: corres.id
+    )
+    @cmp_packet_number += 1
+  end
+end
diff --git a/spec/controllers/correspondence_controller_spec.rb b/spec/controllers/correspondence_controller_spec.rb
new file mode 100644
index 00000000000..83b561587ef
--- /dev/null
+++ b/spec/controllers/correspondence_controller_spec.rb
@@ -0,0 +1,205 @@
+# frozen_string_literal: true
+
+RSpec.describe CorrespondenceController, :all_dbs, type: :controller do
+  let(:veteran) { create(:veteran) }
+  let(:correspondence) { create(:correspondence, veteran: veteran) }
+  let(:related_correspondence_uuids) do
+    (1..3).map { create(:correspondence) }.pluck(:uuid)
+  end
+  let (:esw_tasks) do
+    (1..3).map do
+      appeal = create(:appeal)
+      InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
+      {
+        task_id: EvidenceSubmissionWindowTask.find_by(appeal: appeal).id,
+        waive_reason: "This is a waive reason."
+      }
+    end
+  end
+  let(:veteran) { create(:veteran) }
+  let(:valid_params) { { notes: "Updated notes", correspondence_type_id: 12 } }
+  let(:new_file_number) { "50000005" }
+  let(:current_user) { create(:user) }
+
+  before do
+    Fakes::Initializer.load!
+    FeatureToggle.enable!(:correspondence_queue)
+    User.authenticate!(roles: ["Mail Intake"])
+    correspondence.update(veteran: veteran)
+  end
+
+  describe "GET #show" do
+    before do
+      MailTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+      get :show, params: { correspondence_uuid: correspondence.uuid }
+    end
+
+    it "returns a successful response" do
+      expect(response).to have_http_status(:ok)
+    end
+
+    it "returns the general information" do
+      json_response = JSON.parse(response.body)
+      correspondence_data = json_response["correspondence"]
+      general_info = json_response["general_information"]
+      expect(correspondence_data["notes"]).to eq(correspondence.notes)
+      expect(general_info["file_number"]).to eq(veteran.file_number)
+      expect(general_info["correspondence_type_id"]).to eq(correspondence.correspondence_type_id)
+    end
+  end
+
+  describe "GET #show" do
+    it "returns an unauthorized response" do
+      get :show, params: { correspondence_uuid: correspondence.uuid }
+      expect(response.status).to eq 302
+      expect(response.body).to match(/unauthorized/)
+    end
+
+    it "returns a success response when current user is part of MailTeamSupervisor" do
+      MailTeamSupervisor.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+      get :show, params: { correspondence_uuid: correspondence.uuid }
+      expect(response).to have_http_status(:ok)
+    end
+  end
+
+  describe "POST #process_intake" do
+    before do
+      MailTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+      correspondence.update(veteran: veteran)
+      appeal_ids = esw_tasks.map { |task| Task.find(task[:task_id]).appeal.id }
+      post :process_intake, params: {
+        correspondence_uuid: correspondence.uuid,
+        related_correspondence_uuids: related_correspondence_uuids,
+        waived_evidence_submission_window_tasks: esw_tasks,
+        related_appeal_ids: appeal_ids
+      }
+    end
+    it "responds with created status" do
+      expect(response).to have_http_status(:created)
+    end
+
+    it "relates the correspondence to related correpondences" do
+      rcs = related_correspondence_uuids.map do |uuid|
+        Correspondence.find_by(uuid: uuid)
+      end
+      expect(correspondence.related_correspondences).to eq(rcs)
+
+      rcs.each do |corr|
+        expect(corr.related_correspondences).to eq([correspondence])
+      end
+    end
+
+    it "completes evidence window submission tasks" do
+      esw_tasks.each do |esw_task|
+        task = Task.find(esw_task[:task_id])
+        expect(task.status).to eq("completed")
+        expect(task.instructions.include?("This is a waive reason.")).to eq(true)
+        expect(task.appeal.correspondences).to eq([correspondence])
+      end
+    end
+  end
+
+  describe "POST #process_intake sad path" do
+    before do
+      MailTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+      correspondence.update(veteran: veteran)
+    end
+
+    it "Rolls back db changes if there is an error" do
+      post :process_intake, params: {
+        correspondence_uuid: correspondence.uuid,
+        related_correspondence_uuids: (related_correspondence_uuids + [3])
+      }
+      expect(correspondence.related_correspondences.empty?).to be(true)
+    end
+
+    it "gives a 400 status if there is an error" do
+      post :process_intake, params: {
+        correspondence_uuid: correspondence.uuid,
+        related_correspondence_uuids: (related_correspondence_uuids + [3])
+      }
+      expect(response.status).to eq(400)
+    end
+  end
+
+  describe "PATCH #update" do
+    let(:veteran) { create(:veteran, file_number: new_file_number) }
+    before do
+      MailTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+      correspondence.update(veteran: veteran)
+      patch :update, params: {
+        correspondence_uuid: correspondence.uuid,
+        veteran: { file_number: new_file_number },
+        correspondence: valid_params
+      }
+    end
+
+    it "updates the general information" do
+      expect(response).to have_http_status(:ok)
+      expect(veteran.reload.file_number).to eq(new_file_number)
+      expect(correspondence.reload.notes).to eq("Updated notes")
+      expect(correspondence.reload.correspondence_type_id).to eq(12)
+      expect(correspondence.reload.updated_by_id).to eq(current_user.id)
+    end
+  end
+
+  describe "document_type_correspondence" do
+    let(:document_types_response) do
+      {
+        "documentTypes" => [
+          {
+            "id" => 150,
+            "createDateTime" => "2011-12-09",
+            "modifiedDateTime" => "2023-07-30T21:04:14",
+            "name" => "L141",
+            "description" => "VA Form 21-8056",
+            "isUserUploadable" => true,
+            "is526" => false,
+            "documentCategory" => {
+              "id" => 70,
+              "createDateTime" => "2011-12-09",
+              "modifiedDateTime" => "2014-04-21T11:49:07",
+              "description" => "Correspondence",
+              "subDescription" => "Miscellaneous"
+            }
+          },
+          {
+            "id" => 152,
+            "createDateTime" => "2011-12-09",
+            "modifiedDateTime" => "2023-07-30T21:04:14",
+            "name" => "L143",
+            "description" => "VA Form 21-8358",
+            "isUserUploadable" => true,
+            "is526" => false,
+            "documentCategory" => {
+              "id" => 70,
+              "createDateTime" => "2011-12-09",
+              "modifiedDateTime" => "2014-04-21T11:49:07",
+              "description" => "Correspondence",
+              "subDescription" => "Miscellaneous"
+            }
+          }
+        ]
+      }
+    end
+
+    before do
+      allow(ExternalApi::ClaimEvidenceService).to receive(:document_types).and_return(document_types_response)
+    end
+
+    it "returns an array of hashes with id and name" do
+      result = controller.send(:vbms_document_types)
+      expect(result).to eq(
+        [
+          { id: 150, name: "VA Form 21-8056" },
+          { id: 152, name: "VA Form 21-8358" }
+        ]
+      )
+    end
+  end
+end
diff --git a/spec/controllers/correspondence_document_controller_spec.rb b/spec/controllers/correspondence_document_controller_spec.rb
new file mode 100644
index 00000000000..a8a9c7d2451
--- /dev/null
+++ b/spec/controllers/correspondence_document_controller_spec.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+RSpec.describe CorrespondenceDocumentController, :all_dbs, type: :controller do
+  let(:correspondence) { create(:correspondence, :with_single_doc) }
+  let(:document) { correspondence.correspondence_documents.first }
+  let(:current_user) { create(:user) }
+  let(:mail_team) { MailTeam.singleton }
+
+  before do
+    Fakes::Initializer.load!
+    FeatureToggle.enable!(:correspondence_queue)
+    mail_team.add_user(current_user)
+    User.authenticate!(user: current_user)
+  end
+
+  describe "PATCH #update_document" do
+    before { patch :update_document, params: { id: document.id, vbms_document_type_id: 15 } }
+
+    it "updates document given vbms_document_type_id param" do
+      expect(response).to have_http_status(:ok)
+      expect(document.reload.vbms_document_type_id).to eq(15)
+    end
+  end
+end
diff --git a/spec/controllers/correspondence_tasks_controller_spec.rb b/spec/controllers/correspondence_tasks_controller_spec.rb
new file mode 100644
index 00000000000..342ed7c4031
--- /dev/null
+++ b/spec/controllers/correspondence_tasks_controller_spec.rb
@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+RSpec.describe CorrespondenceTasksController, :all_dbs, type: :controller do
+  let(:veteran) { create(:veteran) }
+  let(:correspondence) { create(:correspondence, veteran_id: veteran.id) }
+  let(:current_user) { create(:user) }
+  let(:task_creation_params) { { correspondence_uuid: correspondence.uuid, correspondence_id: correspondence.id } }
+
+  before do
+    Fakes::Initializer.load!
+    FeatureToggle.enable!(:correspondence_queue)
+    MailTeam.singleton.add_user(current_user)
+    User.authenticate!(user: current_user)
+  end
+
+  describe "POST #create_package_action_task" do
+    context "RemovePackageTask creation" do
+      before do
+        task_creation_params.merge!(type: "removePackage", instructions: ["please remove task, thanks"])
+        post :create_package_action_task, params: task_creation_params
+      end
+
+      it "creates remove package task successfully" do
+        expect(response).to have_http_status(:ok)
+        remove_package_task = RemovePackageTask.find_by(appeal_id: correspondence.id, type: RemovePackageTask.name)
+        parent = ReviewPackageTask.find_by(appeal_id: correspondence.id, type: ReviewPackageTask.name)
+        expect(remove_package_task.appeal).to eq(correspondence)
+        expect(remove_package_task.parent_id).to eq(parent.id)
+        expect(remove_package_task.instructions).to eq(["please remove task, thanks"])
+        expect(remove_package_task.status).to eq(Constants.TASK_STATUSES.assigned)
+        expect(parent.status).to eq(Constants.TASK_STATUSES.on_hold)
+      end
+    end
+
+    context "SplitPackageTask creation" do
+      before do
+        task_creation_params.merge!(type: "splitPackage", instructions: ["Reason for SplitPackage"])
+        post :create_package_action_task, params: task_creation_params
+      end
+
+      it "creates remove package task successfully" do
+        expect(response).to have_http_status(:ok)
+        split_package_task = SplitPackageTask.find_by(appeal_id: correspondence.id, type: SplitPackageTask.name)
+        parent = ReviewPackageTask.find_by(appeal_id: correspondence.id, type: ReviewPackageTask.name)
+        expect(split_package_task.appeal).to eq(correspondence)
+        expect(split_package_task.parent_id).to eq(parent.id)
+        expect(split_package_task.instructions).to eq(["Reason for SplitPackage"])
+        expect(split_package_task.status).to eq(Constants.TASK_STATUSES.assigned)
+        expect(parent.status).to eq(Constants.TASK_STATUSES.on_hold)
+      end
+    end
+
+    context "MergePackageTask creation" do
+      before do
+        task_creation_params.merge!(type: "mergePackage", instructions: ["Reason for MergePackage"])
+        post :create_package_action_task, params: task_creation_params
+      end
+
+      it "creates merge package task successfully" do
+        expect(response).to have_http_status(:ok)
+        merge_package_task = MergePackageTask.find_by(appeal_id: correspondence.id, type: MergePackageTask.name)
+        parent = ReviewPackageTask.find_by(appeal_id: correspondence.id, type: ReviewPackageTask.name)
+        expect(merge_package_task.appeal).to eq(correspondence)
+        expect(merge_package_task.parent_id).to eq(parent.id)
+        expect(merge_package_task.instructions).to eq(["Reason for MergePackage"])
+        expect(merge_package_task.status).to eq(Constants.TASK_STATUSES.assigned)
+        expect(parent.status).to eq(Constants.TASK_STATUSES.on_hold)
+      end
+    end
+  end
+
+  describe "POST #create_correspondence_intake_task" do
+    context "Create correspondece intake task" do
+      before do
+        task_creation_params[:id] = correspondence.id
+        post :create_correspondence_intake_task, params: task_creation_params
+      end
+
+      it "creates remove package task successfully" do
+        expect(response).to have_http_status(:ok)
+        cit = CorrespondenceIntakeTask.find_by(appeal_id: correspondence.id, type: CorrespondenceIntakeTask.name)
+        review_package_task = ReviewPackageTask.find_by(appeal_id: correspondence.id, type: ReviewPackageTask.name)
+        parent = cit.parent
+        expect(cit.status).to eq(Constants.TASK_STATUSES.assigned)
+        expect(cit.parent_id).to eq(parent.id)
+        expect(review_package_task.status).to eq(Constants.TASK_STATUSES.completed)
+        expect(review_package_task.parent_id).to eq(parent.id)
+      end
+    end
+  end
+end
diff --git a/spec/controllers/explain_controller_spec.rb b/spec/controllers/explain_controller_spec.rb
index e51c0422343..d220d6a4d03 100644
--- a/spec/controllers/explain_controller_spec.rb
+++ b/spec/controllers/explain_controller_spec.rb
@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require "helpers/sanitized_json_configuration.rb"
-require "helpers/sanitized_json_exporter.rb"
-require "helpers/intake_renderer.rb"
-require "helpers/hearing_renderer.rb"
+require "helpers/sanitized_json_configuration"
+require "helpers/sanitized_json_exporter"
+require "helpers/intake_renderer"
+require "helpers/hearing_renderer"
 
 describe ExplainController, :all_dbs, type: :controller do
   include TaskHelpers
@@ -144,4 +144,64 @@
       end
     end
   end
+
+  describe "GET explain/correspondence/:correspondence_uuid/:any" do
+    let(:user_roles) { ["System Admin"] }
+    let(:veteran) { create(:veteran) }
+    let(:package_document_type) do
+      PackageDocumentType.create(
+        id: 15,
+        active: true,
+        created_at: Time.zone.now,
+        name: "10182",
+        updated_at: Time.zone.now
+      )
+    end
+    let(:correspondence) do
+      create(
+        :correspondence,
+        :with_single_doc,
+        veteran_id: veteran.id,
+        package_document_type_id: package_document_type.id
+      )
+    end
+
+    subject do
+      get :show,
+          params: { correspondence_uuid: correspondence.uuid, any: "review_package" },
+          as: response_format
+    end
+
+    before do
+      User.authenticate!(roles: user_roles)
+    end
+
+    context ".html (default) request" do
+      let(:response_format) { :html }
+      it "responds without error" do
+        subject
+        expect(response).to be_ok
+      end
+    end
+
+    context ".json request" do
+      let(:response_format) { :json }
+      it "returns 'unsupported' string" do
+        subject
+        expect(JSON.parse(response.body)).to eq "(Correspondences are not yet supported)"
+      end
+    end
+
+    context ".text request" do
+      let(:response_format) { :text }
+      it "returns plain text task tree" do
+        subject
+        # task tree
+        expect(response.body).to include "Correspondence #{correspondence.id}"
+        expect(response.body).to include "CorrespondenceRootTask"
+        expect(response.body).to include "CorrespondenceTask"
+        expect(response.body).to include "ReviewPackageTask"
+      end
+    end
+  end
 end
diff --git a/spec/factories/correspondence.rb b/spec/factories/correspondence.rb
new file mode 100644
index 00000000000..23d5db83571
--- /dev/null
+++ b/spec/factories/correspondence.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :correspondence do
+    uuid { SecureRandom.uuid }
+    portal_entry_date { Time.zone.now }
+    source_type { "Mail" }
+    package_document_type_id { 15 }
+    correspondence_type_id { 9 }
+    cmp_queue_id { 1 }
+    cmp_packet_number { rand(1_000_000_000..9_999_999_999) }
+    va_date_of_receipt { Time.zone.yesterday }
+    notes { "This is a note from CMP." }
+    assigned_by_id { 81 }
+    veteran_id { 1 }
+
+    trait :with_single_doc do
+      after(:create) do |correspondence|
+        create(:correspondence_document, correspondence: correspondence)
+      end
+    end
+  end
+
+  factory :correspondence_document do
+    uuid { SecureRandom.uuid }
+    document_type { 1250 }
+    pages { 30 }
+    vbms_document_type_id { 1250 }
+    association :correspondence
+  end
+end
diff --git a/spec/feature/explain_spec.rb b/spec/feature/explain_spec.rb
index 025abddd8f2..b137ae91878 100644
--- a/spec/feature/explain_spec.rb
+++ b/spec/feature/explain_spec.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require "helpers/sanitized_json_configuration.rb"
-require "helpers/sanitized_json_exporter.rb"
-require "helpers/sanitized_json_importer.rb"
-require "helpers/intake_renderer.rb"
-require "helpers/hearing_renderer.rb"
+require "helpers/sanitized_json_configuration"
+require "helpers/sanitized_json_exporter"
+require "helpers/sanitized_json_importer"
+require "helpers/intake_renderer"
+require "helpers/hearing_renderer"
 
 RSpec.feature "Explain JSON" do
   let(:user_roles) { ["System Admin"] }
@@ -12,6 +12,38 @@
     User.authenticate!(roles: user_roles)
   end
 
+  context "given Correspondence" do
+    let(:veteran) { create(:veteran) }
+    let(:package_document_type) do
+      PackageDocumentType.create(
+        id: 15,
+        active: true,
+        created_at: Time.zone.now,
+        name: "10182",
+        updated_at: Time.zone.now
+      )
+    end
+    let(:correspondence) do
+      create(
+        :correspondence,
+        :with_single_doc,
+        veteran_id: veteran.id,
+        package_document_type_id: package_document_type.id
+      )
+    end
+
+    before do
+      FeatureToggle.enable!(:correspondence_queue)
+    end
+
+    scenario "admin visits explain page for correspondence" do
+      visit "explain/correspondence/#{correspondence.uuid}/review_package"
+      expect(page).to have_content("Correspondence #{correspondence.uuid}")
+      expect(page).to have_content("Task Tree")
+      expect(page).to have_content("Task Versions")
+    end
+  end
+
   context "given Legacy appeal" do
     let(:legacy_appeal) do
       create(:legacy_appeal, :with_veteran,
diff --git a/spec/feature/queue/correspondence/add_related_correspondence_spec.rb b/spec/feature/queue/correspondence/add_related_correspondence_spec.rb
new file mode 100644
index 00000000000..d35f075c537
--- /dev/null
+++ b/spec/feature/queue/correspondence/add_related_correspondence_spec.rb
@@ -0,0 +1,151 @@
+# frozen_string_literal: true
+
+RSpec.feature("Add Related Correspondence - Correspondence Intake page") do
+  include CorrespondenceHelpers
+
+  let(:organization) { MailTeam.singleton }
+  let(:bva_user) { User.authenticate!(roles: ["Mail Intake"]) }
+
+  before(:each) do
+    organization.add_user(bva_user)
+    bva_user.reload
+  end
+
+  context "No related correspondence" do
+    it "Displays the expected content" do
+      visit_intake_form
+
+      expect(page).to have_content("Add Related Correspondence")
+      expect(page).to have_content("Add any related correspondence to the mail package that is in progress.")
+      expect(page).to have_content("Is this correspondence related to prior mail?")
+      expect(page).to have_content("Associate with prior Mail")
+      expect(associate_with_prior_mail_radio_options[:yes]).to have_text("Yes")
+      expect(associate_with_prior_mail_radio_options[:no]).to have_text("No")
+    end
+
+    it "Continue button is active" do
+      visit_intake_form
+
+      expect(page.has_button?("Continue")).to be(true)
+    end
+  end
+
+  context "Yes - related correspondence" do
+    describe "the continue button" do
+      it "continue button is inactive if no checkboxes are checked" do
+        visit_intake_form_with_correspondence_load
+
+        associate_with_prior_mail_radio_options[:yes].click
+
+        expect(page.has_button?("Continue")).to be(false)
+      end
+
+      it "continue button is active if a checkbox is checked" do
+        visit_intake_form_with_correspondence_load
+
+        associate_with_prior_mail_radio_options[:yes].click
+        page.all(".cf-form-checkbox")[1].click
+
+        expect(page.has_button?("Continue")).to be(true)
+      end
+    end
+
+    describe "table of prior correspondences" do
+      it "table displays instructions" do
+        visit_intake_form_with_correspondence_load
+
+        associate_with_prior_mail_radio_options[:yes].click
+
+        expect(page).to have_content("Please select the prior mail to link to this correspondence")
+      end
+
+      it "table displays pagination summary" do
+        visit_intake_form_with_correspondence_load
+
+        associate_with_prior_mail_radio_options[:yes].click
+
+        expect(page).to have_content("Viewing 1-15 of 54 total")
+      end
+
+      it "table has column headers" do
+        visit_intake_form_with_correspondence_load
+
+        associate_with_prior_mail_radio_options[:yes].click
+
+        expect(page).to have_content("VA DOR")
+        expect(page).to have_content("Source Type")
+        expect(page).to have_content("Package Document Type")
+        expect(page).to have_content("Correspondence Type")
+        expect(page).to have_content("Notes")
+      end
+
+      it "rows display correspondence info" do
+        visit_intake_form_with_correspondence_load
+
+        associate_with_prior_mail_radio_options[:yes].click
+
+        expect(page).to have_content("1/1/2023")
+        expect(page).to have_content("Mail")
+        expect(page).to have_content("15")
+        expect(page).to have_content("9")
+        expect(page).to have_content("This is a note from CMP")
+      end
+
+      it "table displays 15 items per page" do
+        visit_intake_form_with_correspondence_load
+
+        associate_with_prior_mail_radio_options[:yes].click
+        expect(find_all(".cf-form-checkbox").count).to eq(15)
+      end
+
+      it "table incorporates pagination navigation" do
+        visit_intake_form_with_correspondence_load
+
+        associate_with_prior_mail_radio_options[:yes].click
+
+        expect(page.has_button?("Previous")).to be(false)
+        expect(page.has_button?("Next")).to be(true)
+
+        click_button("Next")
+
+        expect(page.has_button?("Previous")).to be(true)
+        expect(page.has_button?("Next")).to be(true)
+        expect(page).to have_content("Viewing 16-30 of 54 total")
+
+        click_button("4")
+
+        expect(page.has_button?("Next")).to be(false)
+        expect(page.has_button?("Previous")).to be(true)
+        expect(page).to have_content("Viewing 46-54 of 54 total")
+      end
+
+      it "Checkbox values persist through page navigation" do
+        visit_intake_form_with_correspondence_load
+
+        associate_with_prior_mail_radio_options[:yes].click
+
+        page.all(".cf-form-checkbox")[0..5].each { |cb| cb.set(true) }
+
+        click_button("Next")
+
+        click_button("Previous")
+
+        expect(page.has_button?("Continue")).to be(true)
+      end
+
+      it "Checkbox values are reset if user clicks No and then Yes" do
+        visit_intake_form_with_correspondence_load
+
+        associate_with_prior_mail_radio_options[:yes].click
+
+        page.all(".cf-form-checkbox")[0..5].each { |cb| cb.set(true) }
+
+        associate_with_prior_mail_radio_options[:no].click
+
+        associate_with_prior_mail_radio_options[:yes].click
+
+        expect(page.has_button?("Continue")).to be(false)
+      end
+    end
+  end
+end
diff --git a/spec/feature/queue/correspondence/correspondence_cases_spec.rb b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
new file mode 100644
index 00000000000..f8ac73fe4c3
--- /dev/null
+++ b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+RSpec.feature("The Correspondence Cases page") do
+  context "correspondece cases feature toggle" do
+    let(:current_user) { create(:user) }
+    before :each do
+      MailTeamSupervisor.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+      @correspondence_uuid = "123456789"
+    end
+
+    it "routes user to /unauthorized if the feature toggle is disabled" do
+      FeatureToggle.disable!(:correspondence_queue)
+      visit "/queue/correspondence"
+      expect(page).to have_current_path("/unauthorized")
+    end
+
+    it "routes to correspondence cases if feature toggle is enabled" do
+      FeatureToggle.enable!(:correspondence_queue)
+      visit "/queue/correspondence"
+      expect(page).to have_current_path("/queue/correspondence")
+    end
+  end
+
+  context "correspondence cases form shell" do
+    before :each do
+      FeatureToggle.enable!(:correspondence_queue)
+      User.authenticate!(user: current_user)
+      @correspondence_uuid = "123456789"
+    end
+  end
+end
diff --git a/spec/feature/queue/correspondence/edit_cmp_information_spec.rb b/spec/feature/queue/correspondence/edit_cmp_information_spec.rb
new file mode 100644
index 00000000000..3c2f05089d3
--- /dev/null
+++ b/spec/feature/queue/correspondence/edit_cmp_information_spec.rb
@@ -0,0 +1,155 @@
+# frozen_string_literal: true
+
+# rubocop:disable Layout/LineLength
+RSpec.feature("The Correspondence Review Package page") do
+  let(:veteran) { create(:veteran) }
+  let(:package_document_type) { PackageDocumentType.create(id: 15, active: true, created_at: Time.zone.now, name: 10_182, updated_at: Time.zone.now) }
+  let(:correspondence) { create(:correspondence, veteran_id: veteran.id, package_document_type_id: package_document_type.id) }
+  let(:correspondence_documents) { create(:correspondence_document, correspondence: correspondence, document_file_number: veteran.file_number) }
+  let(:mail_team_user) { create(:user) }
+  let(:mail_team_org) { MailTeam.singleton }
+  let(:current_user) { User.create!(station_id: 101, css_id: "MAIL_TEAM_SUPERVISOR_ADMIN_USER", full_name: "Jon MailTeam Snow Admin") }
+
+  context "Review package feature toggle" do
+    before :each do
+      # User.authenticate!(roles: ["Mail Intake"])
+      FeatureToggle.enable!(:correspondence_queue)
+      mail_team_org.add_user(mail_team_user)
+      User.authenticate!(user: mail_team_user)
+    end
+
+    it "routes user to /unauthorized if the feature toggle is disabled" do
+      FeatureToggle.disable!(:correspondence_queue)
+      visit "/queue/correspondence/#{correspondence.uuid}/review_package"
+      expect(page).to have_current_path("/unauthorized")
+    end
+  end
+
+  context "Review package form shell" do
+    before :each do
+      FeatureToggle.enable!(:correspondence_queue)
+      MailTeamSupervisor.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+      visit "/queue/correspondence/#{correspondence.uuid}/review_package"
+    end
+
+    it "the Review package page exists" do
+      expect(page).to have_current_path("/queue/correspondence/#{correspondence.uuid}/review_package")
+    end
+    it "check for CMP Edit button" do
+      expect(page).to have_content("Edit")
+      click_button "Edit"
+    end
+    it "the save button is disabled at first" do
+      click_button "Edit"
+      expect(page).to have_field("VA DOR")
+      expect(page).to have_field("Package document type")
+      expect(page).to have_button("Cancel")
+      expect(page).to have_button("Save", disabled: true)
+    end
+
+    it "Checking the VA DOR and Package document type values in modal" do
+      click_button "Edit"
+      expect(page).to have_content(correspondence.va_date_of_receipt.strftime("%m/%d/%Y"))
+      expect(page).to have_content(package_document_type.name.to_s)
+    end
+
+    it "Saving the VA DOR and Package document type values in modal" do
+      click_button "Edit"
+      fill_in "VA DOR", with: 6.days.ago.strftime("%m/%d/%Y")
+      expect(page).to have_button("Save", disabled: false)
+      click_button "Save"
+      expect(page).to have_content(6.days.ago.strftime("%m/%d/%Y"))
+    end
+
+    it "displays request package action dropdown" do
+      expect(page).to have_content("Request package action")
+    end
+
+    context "when request package action dropdown is clicked" do
+      before do
+        first(".cf-select__control").click
+      end
+
+      it "displays 4 package actions" do
+        expect(page).to have_content("Reassign package")
+        expect(page).to have_content("Remove package from Caseflow")
+        expect(page).to have_content("Split package")
+        expect(page).to have_content("Merge package")
+      end
+
+      context "when Reassign Package is selected" do
+        before do
+          find(:xpath, '//div[text()="Reassign package"]').click
+        end
+
+        it "modal opens with disabled confirm button" do
+          expect(page).to have_content(
+            "You have selected the following correspondence cases for reassignment to another users. Please confirm your selection(s) below:"
+          )
+          expect(page).to have_button("Confirm request", disabled: true)
+        end
+
+        it "providing a reason enables confirm button" do
+          fill_in "Provide a reason for reassignment", with: "Reason for reassignment"
+          expect(page).to have_button("Confirm request", disabled: false)
+        end
+      end
+
+      context "when Merge Package is selected" do
+        before do
+          find(:xpath, '//div[text()="Merge package"]').click
+        end
+
+        it "modal opens with disabled confirm button" do
+          expect(page).to have_content(
+            "By confirming, you will send a request for the supervisor to take action on the following package:"
+          )
+          expect(page).to have_button("Confirm request", disabled: true)
+        end
+
+        it "selecting a reason enables confirm button" do
+          page.all(".cf-form-radio-option > label")[1].click
+          expect(page).to have_button("Confirm request", disabled: false)
+          expect(page).not_to have_field("Reason for merge")
+        end
+
+        it "Selecting Other option should show instructions box to enter reason - enables confirm button" do
+          page.all(".cf-form-radio-option > label")[2].click
+          fill_in "Reason for merge", with: "Reason for merge"
+          expect(page).to have_button("Confirm request", disabled: false)
+        end
+      end
+    end
+  end
+
+  context "Checking VADOR field is enable for Mail Supervisor" do
+    before do
+      FeatureToggle.enable!(:correspondence_queue)
+      MailTeamSupervisor.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+      visit "/queue/correspondence/#{correspondence.uuid}/review_package"
+    end
+
+    it "Checking VADOR field is enabled for Mail Supervisor" do
+      click_button "Edit"
+      expect(page).to have_field("VA DOR", readonly: false)
+    end
+  end
+
+  context "Checking VADOR field is disabled for General mail user" do
+    before do
+      FeatureToggle.enable!(:correspondence_queue)
+      mail_team_org.add_user(mail_team_user)
+      User.authenticate!(user: mail_team_user)
+      visit "/queue/correspondence/#{correspondence.uuid}/review_package"
+    end
+
+    it "Checking VADOR field is disabled for General mail user" do
+      click_button "Edit"
+      expect(page).to have_field("VA DOR", readonly: true)
+    end
+  end
+end
+
+# rubocop:enable Layout/LineLength
diff --git a/spec/feature/queue/correspondence/intake_form_persistence.rb b/spec/feature/queue/correspondence/intake_form_persistence.rb
new file mode 100644
index 00000000000..068bc1370e3
--- /dev/null
+++ b/spec/feature/queue/correspondence/intake_form_persistence.rb
@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+RSpec.feature("Persistence of the intake correspondence page") do
+  let(:veteran) { create(:veteran, last_name: "Smith", file_number: "12345678") }
+  let(:correspondence) { create(:correspondence, veteran_id: veteran.id, uuid: SecureRandom.uuid) }
+  let(:current_user) { create(:intake_user) }
+
+  subject(:visit_intake_page) { visit queue_correspondence_intake_path(correspondence_uuid: correspondence.uuid) }
+
+  before do
+    FeatureToggle.enable!(:correspondence_queue)
+    MailTeam.singleton.add_user(current_user)
+    User.authenticate!(user: current_user)
+  end
+
+  context "step 1" do
+    it "creates a correspondence_intake record on page load" do
+      expect {
+        visit_intake_page
+      }.to change(CorrespondenceIntake, :count).by(1)
+
+      expect(CorrespondenceIntake.find_by(user: current_user, correspondence: correspondence).current_step).to eq(1)
+      expect(CorrespondenceIntake.find_by(user: current_user, correspondence: correspondence).redux_store).not_to be_nil
+    end
+  end
+
+  context "step 2" do
+    it "updates the correspondence_intake record when visiting step 2" do
+      visit_intake_page
+      click_button("Continue")
+
+      expect(page).to have_content("Continue")
+
+      expect(CorrespondenceIntake.find_by(user: current_user, correspondence: correspondence).current_step).to eq(2)
+      expect(CorrespondenceIntake.find_by(user: current_user, correspondence: correspondence).redux_store).not_to be_nil
+    end
+  end
+
+  context "step 3" do
+    it "updates the correspondence_intake record when visiting step 3" do
+      visit_intake_page
+      click_button("Continue")
+      click_button("Continue")
+
+      expect(page).to have_content("Submit")
+
+      expect(CorrespondenceIntake.find_by(user: current_user, correspondence: correspondence).current_step).to eq(3)
+      expect(CorrespondenceIntake.find_by(user: current_user, correspondence: correspondence).redux_store).not_to be_nil
+    end
+  end
+end
diff --git a/spec/feature/queue/correspondence/intake_form_spec.rb b/spec/feature/queue/correspondence/intake_form_spec.rb
new file mode 100644
index 00000000000..e00ef2008bd
--- /dev/null
+++ b/spec/feature/queue/correspondence/intake_form_spec.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+RSpec.feature("The Correspondence Intake page") do
+  let(:organization) { MailTeam.singleton }
+  let(:mail_user) { User.authenticate!(roles: ["Mail Team"]) }
+
+  before do
+    organization.add_user(mail_user)
+    mail_user.reload
+  end
+
+  context "intake form shell" do
+    before :each do
+      FeatureToggle.enable!(:correspondence_queue)
+      @correspondence_uuid = "123456789"
+      visit "/queue/correspondence/#{@correspondence_uuid}/intake"
+    end
+
+    it "the intake page exists" do
+      expect(page).to have_current_path("/queue/correspondence/#{@correspondence_uuid}/intake")
+    end
+
+    it "displays the correspondence header" do
+      expect(page).to have_content("Add Related Correspondence")
+    end
+
+    it "displays the added related instruction string" do
+      expect(page).to have_content("Add any related correspondence to the mail package that is in progress.")
+    end
+
+    it "displays the Associate with prior Mail header" do
+      expect(page).to have_content("Associate with prior Mail")
+    end
+
+    it "displays the question about correspondence related to prior mail string" do
+      expect(page).to have_content("Is this correspondence related to prior mail?")
+    end
+
+    it "shows related to prior mail yes & no radio buttons" do
+      radio_choices = page.all(".cf-form-radio-option > label")
+      expect(radio_choices[0]).to have_content("Yes")
+      expect(radio_choices[1]).to have_content("No")
+    end
+  end
+end
diff --git a/spec/feature/queue/correspondence/intake_spec.rb b/spec/feature/queue/correspondence/intake_spec.rb
new file mode 100644
index 00000000000..fd6c725b85c
--- /dev/null
+++ b/spec/feature/queue/correspondence/intake_spec.rb
@@ -0,0 +1,343 @@
+# frozen_string_literal: true
+
+RSpec.feature("The Correspondence Intake page") do
+  include CorrespondenceHelpers
+  let(:organization) { MailTeam.singleton }
+  let(:mail_user) { User.authenticate!(roles: ["Mail Team"]) }
+
+  before do
+    organization.add_user(mail_user)
+    mail_user.reload
+  end
+
+  context "intake form feature toggle" do
+    before :each do
+      veteran = create(:veteran, last_name: "Smith", file_number: "12345678")
+      create(
+        :correspondence,
+        veteran_id: veteran.id,
+        uuid: SecureRandom.uuid,
+        va_date_of_receipt: Time.zone.local(2023, 1, 1)
+      )
+      @correspondence_uuid = Correspondence.first.uuid
+    end
+
+    it "routes user to /unauthorized if the feature toggle is disabled" do
+      FeatureToggle.disable!(:correspondence_queue)
+      visit "/queue/correspondence/#{@correspondence_uuid}/intake"
+      expect(page).to have_current_path("/unauthorized")
+    end
+
+    it "routes to intake if feature toggle is enabled" do
+      FeatureToggle.enable!(:correspondence_queue)
+      visit "/queue/correspondence/#{@correspondence_uuid}/intake"
+      expect(page).to have_current_path("/queue/correspondence/#{@correspondence_uuid}/intake")
+    end
+  end
+
+  context "intake form shell" do
+    before :each do
+      FeatureToggle.enable!(:correspondence_queue)
+      veteran = create(:veteran, last_name: "Smith", file_number: "12345678")
+      create(
+        :correspondence,
+        veteran_id: veteran.id,
+        uuid: SecureRandom.uuid,
+        va_date_of_receipt: Time.zone.local(2023, 1, 1)
+      )
+      @correspondence_uuid = Correspondence.first.uuid
+      visit "/queue/correspondence/#{@correspondence_uuid}/intake"
+    end
+
+    it "the intake page exists" do
+      expect(page).to have_current_path("/queue/correspondence/#{@correspondence_uuid}/intake")
+    end
+
+    it "successfully navigates on cancel link click" do
+      click_on("button-Cancel")
+      expect(page).to have_current_path("/queue/correspondence")
+    end
+
+    it "successfully advances to the second step" do
+      click_on("button-continue")
+      expect(page).to have_button("Continue")
+      expect(page).to have_button("Back")
+      expect(page).to have_no_button("Submit")
+    end
+
+    it "successfully advances to the final step" do
+      click_on("button-continue")
+      click_on("button-continue")
+      expect(page).to have_button("Submit")
+      expect(page).to have_button("Back")
+      expect(page).to have_no_button("Continue")
+    end
+
+    it "successfully returns to the first step" do
+      click_on("button-continue")
+      click_on("button-back-button")
+
+      expect(page).to have_button("Continue")
+      expect(page).to have_no_button("Back")
+      expect(page).to have_no_button("Submit")
+    end
+
+    it "successfully returns to the second step" do
+      click_on("button-continue")
+      click_on("button-continue")
+      click_on("button-back-button")
+
+      expect(page).to have_button("Continue")
+      expect(page).to have_button("Back")
+      expect(page).to have_no_button("Submit")
+    end
+  end
+
+  context "access 'Tasks not Related to an Appeals'" do
+    before :each do
+      FeatureToggle.enable!(:correspondence_queue)
+      veteran = create(:veteran, last_name: "Smith", file_number: "12345678")
+      create(
+        :correspondence,
+        veteran_id: veteran.id,
+        uuid: SecureRandom.uuid,
+        va_date_of_receipt: Time.zone.local(2023, 1, 1)
+      )
+      @correspondence_uuid = Correspondence.first.uuid
+      visit "/queue/correspondence/#{@correspondence_uuid}/intake"
+    end
+
+    it "Paragraph text appears below the title" do
+      click_on("button-continue")
+      expect(page).to have_button("+ Add tasks")
+      expect(page).to have_text("Add new tasks related to this correspondence or " +
+        "to an appeal not yet created in Caseflow.")
+    end
+  end
+
+  context "The mail team user is able to add unrelated tasks" do
+    before :each do
+      FeatureToggle.enable!(:correspondence_queue)
+      veteran = create(:veteran, last_name: "Smith", file_number: "12345678")
+      create(
+        :correspondence,
+        veteran_id: veteran.id,
+        uuid: SecureRandom.uuid,
+        va_date_of_receipt: Time.zone.local(2023, 1, 1)
+      )
+
+      @correspondence_uuid = Correspondence.first.uuid
+      visit "/queue/correspondence/#{@correspondence_uuid}/intake"
+      click_on("button-continue")
+    end
+
+    it "The user can add additional tasks to correspondence by selecting the '+add tasks' button again" do
+      click_on("+ Add tasks")
+      expect(page).to have_button("+ Add tasks")
+    end
+
+    it "Four tasks is the limit for the user" do
+      click_on("+ Add tasks")
+      click_on("+ Add tasks")
+      click_on("+ Add tasks")
+      click_on("+ Add tasks")
+      expect(page).to have_button("+ Add tasks", disabled: true)
+    end
+
+    it "Two 'Other Motion' tasks is the limit for user" do
+      click_on("+ Add tasks")
+      all("#reactSelectContainer")[0].click
+      find_by_id("react-select-2-option-4").click
+      expect(page).to have_content("Other motion")
+      click_on("+ Add tasks")
+      all("#reactSelectContainer")[1].click
+      find_by_id("react-select-3-option-4").click
+      within all("#reactSelectContainer")[1] do
+        expect(page).to have_content("Other motion")
+      end
+      expect(page).to have_button("+ Add tasks", disabled: false)
+    end
+
+    it "Two unrelated tasks have been added" do
+      click_on("+ Add tasks")
+      expect(page).to have_text("Provide context and instruction on this task")
+      expect(page.all(".cf-form-textarea").count).to eq(1)
+      click_on("+ Add tasks")
+      expect(page.all(".cf-form-textarea").count).to eq(2)
+    end
+
+    it "Closes out new section when unrelated tasks have been removed" do
+      click_on("+ Add tasks")
+      expect(page).to have_text("Provide context and instruction on this task")
+      click_on("button-Remove")
+      expect(page).to_not have_text("New Tasks")
+    end
+
+    it "Disables continue button when task is added" do
+      click_on("+ Add tasks")
+      expect(page).to have_text("Provide context and instruction on this task")
+      expect(page).to have_button("button-continue", disabled: true)
+    end
+
+    it "Re-enables continue button when all new task has been filled out" do
+      click_on("+ Add tasks")
+      all("#reactSelectContainer")[0].click
+      find_by_id("react-select-2-option-1").click
+      expect(page).to have_button("button-continue", disabled: true)
+      find_by_id("content").fill_in with: "Correspondence Text"
+      expect(page).to have_button("button-continue", disabled: false)
+    end
+
+    it "Re populates fields after going back a step and then continuing forward again" do
+      click_on("+ Add tasks")
+      all("#reactSelectContainer")[0].click
+      find_by_id("react-select-2-option-0").click
+      find_by_id("content").fill_in with: "Correspondence test text"
+      click_button("button-back-button")
+      click_button("button-continue")
+      expect(page).to have_button("button-continue", disabled: false)
+      expect(page).to have_content("CAVC Correspondence")
+      expect(page).to have_content("Correspondence test text")
+    end
+  end
+
+  context "Step 3 - Confirm" do
+    describe "Tasks not related to an Appeal section" do
+      it "displays the correct content" do
+        visit_intake_form_step_3_with_tasks_unrelated
+
+        expect(page).to have_content("Tasks not related to an Appeal")
+        expect(all("button > span", text: "Edit Section").length).to eq(3)
+        expect(page).to have_content("Tasks")
+        expect(page).to have_content("Task Instructions or Context")
+        expect(page).to have_content("CAVC Correspondence")
+        expect(page).to have_content("Correspondence test text")
+      end
+
+      it "Edit section link returns user to Tasks not related to an Appeal on Step 2" do
+        visit_intake_form_step_3_with_tasks_unrelated
+        all("button > span", text: "Edit Section")[1].click
+        expect(page).to have_content("Review Tasks & Appeals")
+        expect(page).to have_content("Tasks not related to an Appeal")
+      end
+    end
+  end
+
+  context "The user is able to use the autotext feature" do
+    before do
+      require Rails.root.join("db/seeds/base.rb").to_s
+      Dir[Rails.root.join("db/seeds/*.rb")].sort.each { |f| require f }
+      Seeds::AutoTexts.new.seed!
+    end
+
+    before :each do
+      FeatureToggle.enable!(:correspondence_queue)
+      veteran = create(:veteran, last_name: "Smith", file_number: "12345678")
+      create(
+        :correspondence,
+        veteran_id: veteran.id,
+        uuid: SecureRandom.uuid,
+        va_date_of_receipt: Time.zone.local(2023, 1, 1)
+      )
+      @correspondence_uuid = Correspondence.first.uuid
+      visit "/queue/correspondence/#{@correspondence_uuid}/intake"
+      click_on("button-continue")
+      click_on("+ Add tasks")
+    end
+
+    it "The user can open the autotext modal" do
+      find_by_id("addAutotext").click
+      within find_by_id("autotextModal") do
+        expect(page).to have_text("Cancel")
+      end
+    end
+
+    it "The user can close the modal with the cancel button." do
+      find_by_id("addAutotext").click
+      within find_by_id("autotextModal") do
+        expect(page).to have_text("Cancel")
+      end
+      find_by_id("Add-autotext-button-id-0").click
+      cancel_count = all("#button-Cancel").length
+      expect(cancel_count).to eq 1
+    end
+
+    it "The user can close the modal with the x button located in the top right." do
+      find_by_id("addAutotext").click
+      within find_by_id("autotextModal") do
+        expect(page).to have_text("Cancel")
+      end
+      find_by_id("Add-autotext-button-id-close").click
+      cancel_count = all("#button-Cancel").length
+      expect(cancel_count).to eq 1
+    end
+
+    it "Clears all selected options in modal" do
+      find_by_id("addAutotext").click
+      within find_by_id("autotextModal") do
+        expect(page).to have_text("Clear all")
+      end
+      within find_by_id("autotextModal") do
+        page.all(".cf-form-checkbox")[2].click
+        page.all(".cf-form-checkbox")[4].click
+        expect(find_field("Interest noted in telephone call of mm/dd/yy", visible: false)).to be_checked
+        expect(find_field("Email - responded via email on mm/dd/yy", visible: false)).to be_checked
+        find_by_id("Add-autotext-button-id-2").click
+        expect(find_field("Interest noted in telephone call of mm/dd/yy", visible: false)).to_not be_checked
+        expect(find_field("Email - responded via email on mm/dd/yy", visible: false)).to_not be_checked
+      end
+    end
+
+    it "The user is able to add manual text content" do
+      fill_in "content", with: "debug data for autofill"
+      expect(find_by_id("content").text).to eq "debug data for autofill"
+    end
+
+    it "The user is able to add autotext" do
+      find_by_id("addAutotext").click
+      checkbox_text = "Possible motion pursuant to BVA decision dated mm/dd/yy"
+      within find_by_id("autotextModal") do
+        page.all(".cf-form-checkbox")[6].click
+        find_by_id("Add-autotext-button-id-1").click
+      end
+      expect(find_by_id("content").text).to eq checkbox_text
+    end
+
+    it "Allows multiple autotext options to be selected" do
+      find_by_id("addAutotext").click
+      checkbox_text_1 = "Decision sent to Senator or Congressman mm/dd/yy"
+      checkbox_text_6 = "Possible motion pursuant to BVA decision dated mm/dd/yy"
+      within find_by_id("autotextModal") do
+        page.all(".cf-form-checkbox")[1].click
+        page.all(".cf-form-checkbox")[6].click
+        find_by_id("Add-autotext-button-id-1").click
+      end
+      expect(find_by_id("content").text).to include checkbox_text_1 && checkbox_text_6
+    end
+
+    it "Allows autotext and manual text input" do
+      manual_text = "This is a test"
+      fill_in "content", with: "This is a test\n"
+      expect(find_by_id("content").text).to eq manual_text
+      find_by_id("addAutotext").click
+      checkbox_text = "Possible motion pursuant to BVA decision dated mm/dd/yy"
+      within find_by_id("autotextModal") do
+        page.all(".cf-form-checkbox")[6].click
+        find_by_id("Add-autotext-button-id-1").click
+      end
+      expect(find_by_id("content").text).to include manual_text && checkbox_text
+    end
+
+    it "Persists data if the user hits the back button, then returns" do
+      find_by_id("addAutotext").click
+      checkbox_text = "Possible motion pursuant to BVA decision dated mm/dd/yy"
+      within find_by_id("autotextModal") do
+        page.all(".cf-form-checkbox")[6].click
+        find_by_id("Add-autotext-button-id-1").click
+      end
+      click_on("button-back-button")
+      click_on("button-continue")
+      expect(find_by_id("content").text).to eq checkbox_text
+    end
+  end
+end
diff --git a/spec/feature/queue/correspondence/mail_tasks_confirm_spec.rb b/spec/feature/queue/correspondence/mail_tasks_confirm_spec.rb
new file mode 100644
index 00000000000..39276b95d54
--- /dev/null
+++ b/spec/feature/queue/correspondence/mail_tasks_confirm_spec.rb
@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+RSpec.feature("The Correspondence Intake page") do
+  include CorrespondenceHelpers
+  let(:organization) { MailTeam.singleton }
+  let(:mail_user) { User.authenticate!(roles: ["Mail Team"]) }
+
+  before do
+    organization.add_user(mail_user)
+    mail_user.reload
+  end
+
+  context "Mail Tasks Confirm Page" do
+    before :each do
+      FeatureToggle.enable!(:correspondence_queue)
+      organization.add_user(mail_user)
+      mail_user.reload
+      visit_intake_form_with_correspondence_load
+      @correspondence_uuid = Correspondence.first.uuid
+    end
+
+    it "the intake page exists" do
+      expect(page).to have_current_path("/queue/correspondence/#{@correspondence_uuid}/intake")
+    end
+
+    it "successfully advances to the second step" do
+      click_on("button-continue")
+      expect(page).to have_button("Continue")
+      expect(page).to have_button("Back")
+      expect(page).to have_no_button("Submit")
+    end
+
+    it "Displays the expected content for Mail Tasks" do
+      click_on("button-continue")
+      expect(page).to have_text("Review Tasks & Appeals")
+      expect(page).to have_text("Mail Tasks")
+      expect(page).to have_text("Select any tasks completed by the Mail team for this correspondence.")
+    end
+
+    it "Can able to select any Mail tasks from both pannel" do
+      click_on("button-continue")
+      checkbox_div = page.find(:xpath, '//*[@id="mail-tasks-left"]')
+      checkboxes = checkbox_div.all(".cf-form-checkbox ")[0..2].each { |cb| cb.set(true) }
+      expect(checkboxes.size).to eq(3)
+      checkbox_div = page.find(:xpath, '//*[@id="mail-tasks-right"]')
+      checkboxes = checkbox_div.all(".cf-form-checkbox ")[0..2].each { |cb| cb.set(true) }
+      expect(checkboxes.size).to eq(3)
+    end
+
+    it "Select Mail Tasks and Submit" do
+      click_on("button-continue")
+      checkbox_div = page.find(:xpath, '//*[@id="mail-tasks-left"]')
+      checkbox_div.all(".cf-form-checkbox ")[0..2].each { |cb| cb.set(true) }
+      click_on("button-continue")
+      expect(page).to have_text("Review and Confirm Correspondence")
+      expect(page).to have_text("Completed Mail Tasks")
+      expect(page).to have_text("Change of address")
+      expect(page).to have_button("Edit Section")
+      all("div > span > button > span", text: "Edit Section")[0].click
+      expect(page).to have_text("Mail Tasks")
+      checkbox = all("#mail-tasks-left .cf-form-checkbox")[0]
+      checkbox_input = checkbox.find('input[name="Change of address"]', visible: :all)
+      expect(checkbox_input).to be_checked
+    end
+  end
+end
diff --git a/spec/feature/queue/correspondence/review_package_spec.rb b/spec/feature/queue/correspondence/review_package_spec.rb
new file mode 100644
index 00000000000..6b9548e17a5
--- /dev/null
+++ b/spec/feature/queue/correspondence/review_package_spec.rb
@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+
+# rubocop:disable Layout/LineLength
+RSpec.feature("The Correspondence Review Package page") do
+  let(:veteran) { create(:veteran) }
+  let(:package_document_type) { PackageDocumentType.create(id: 15, active: true, created_at: Time.zone.now, name: "10182", updated_at: Time.zone.now) }
+  let(:correspondence) { create(:correspondence, :with_single_doc, veteran_id: veteran.id, package_document_type_id: package_document_type.id) }
+  let(:mail_team_supervisor_user) { create(:user, roles: ["Mail Intake"]) }
+  let(:mail_team_supervisor_org) { MailTeamSupervisor.singleton }
+
+  context "Review package feature toggle" do
+    before :each do
+      mail_team_supervisor_org.add_user(mail_team_supervisor_user)
+      User.authenticate!(user: mail_team_supervisor_user)
+      @correspondence_uuid = "123456789"
+    end
+
+    it "routes user to /unauthorized if the feature toggle is disabled" do
+      FeatureToggle.disable!(:correspondence_queue)
+      visit "/queue/correspondence/#{correspondence.uuid}/review_package"
+      expect(page).to have_current_path("/unauthorized")
+    end
+
+    it "routes to intake if feature toggle is enabled" do
+      FeatureToggle.enable!(:correspondence_queue)
+      visit "/queue/correspondence/#{correspondence.uuid}/review_package"
+      expect(page).to have_current_path("/queue/correspondence/#{correspondence.uuid}/review_package")
+    end
+  end
+
+  context "Review package form shell" do
+    before :each do
+      FeatureToggle.enable!(:correspondence_queue)
+      mail_team_supervisor_org.add_user(mail_team_supervisor_user)
+      User.authenticate!(user: mail_team_supervisor_user)
+      @correspondence_uuid = "123456789"
+      visit "/queue/correspondence/#{correspondence.uuid}/review_package"
+    end
+
+    it "the Review package page exists" do
+      expect(page).to have_current_path("/queue/correspondence/#{correspondence.uuid}/review_package")
+      expect(page).to have_content(COPY::CORRESPONDENCE_REVIEW_PACKAGE_TITLE)
+    end
+
+    it "check for CMP Edit button" do
+      expect(page).to have_button("Edit")
+      expect(page).to have_button("Cancel")
+      expect(page).to have_button("Create record")
+    end
+
+    it "Intake appeal button should be hidden for document type 10182" do
+      if package_document_type.name.to_s == "10182"
+        expect(page).to have_content("Intake appeal")
+      else
+        expect(page).to_not have_content("Intake appeal")
+      end
+    end
+  end
+
+  context "Review package - intake appeal" do
+    let(:non_10182_package_type) { PackageDocumentType.create(id: 1, active: true, name: "0304") }
+    let(:correspondence_2) { create(:correspondence, :with_single_doc, veteran_id: veteran.id, package_document_type_id: non_10182_package_type.id) }
+
+    before do
+      FeatureToggle.enable!(:correspondence_queue)
+      mail_team_supervisor_org.add_user(mail_team_supervisor_user)
+      User.authenticate!(user: mail_team_supervisor_user)
+    end
+
+    it "completes step 1 and 2 then goes to step 3 of intake appeal process" do
+      visit "/queue/correspondence/#{correspondence.uuid}/review_package"
+      click_button "Intake appeal"
+      expect(page).to have_current_path("/intake/review_request")
+      expect(page).to have_text `#{veteran.file_number}`
+      expect(page).to have_text `Review #{veteran.first_name} #{veteran.last_name}'s Decision Review Request: Board Appeal (Notice of Disagreement) - VA Form 10182`
+    end
+  end
+
+  context "Review package - Create record" do
+    let(:non_10182_package_type) { PackageDocumentType.create(id: 1, active: true, name: "0304") }
+    let(:correspondence_2) { create(:correspondence, :with_single_doc, veteran_id: veteran.id, package_document_type_id: non_10182_package_type.id) }
+
+    before do
+      FeatureToggle.enable!(:correspondence_queue)
+      mail_team_org.add_user(mail_team_user)
+      User.authenticate!(user: mail_team_user)
+    end
+
+    it "click on Create record button" do
+      visit "/queue/correspondence/#{correspondence.uuid}/review_package"
+      click_button "Create record"
+      expect(page).to have_current_path("/queue/correspondence/#{correspondence.uuid}/intake")
+      expect(page).to have_content("Add Related Correspondence")
+      expect(page).to have_content("Add any related correspondence to the mail package that is in progress.")
+      expect(page).to have_content("Is this correspondence related to prior mail?")
+      expect(page).to have_content("Associate with prior Mail")
+      expect(page).to have_content("Yes")
+      expect(page).to have_content("No")
+    end
+  end
+end
+# rubocop:enable Layout/LineLength
diff --git a/spec/feature/queue/correspondence/submit_intake_form_spec.rb b/spec/feature/queue/correspondence/submit_intake_form_spec.rb
new file mode 100644
index 00000000000..584c2decc90
--- /dev/null
+++ b/spec/feature/queue/correspondence/submit_intake_form_spec.rb
@@ -0,0 +1,142 @@
+# frozen_string_literal: true
+
+RSpec.feature("Correspondence Intake submission") do
+  include CorrespondenceHelpers
+
+  context "user associates correspondence with prior mail" do
+    describe "success" do
+      it "displays a success banner and links the correspondence" do
+        visit_intake_form_with_correspondence_load
+        associate_with_prior_mail_radio_options[:yes].click
+        page.all(".cf-form-checkbox")[1].click
+        click_button("Continue")
+        click_button("Continue")
+        click_button("Submit")
+        click_button("Confirm")
+        using_wait_time(10) do
+          expect(page).to have_content("You have successfully submitted a correspondence record")
+        end
+        expect(Correspondence.first.related_correspondences).to eq([Correspondence.second])
+      end
+    end
+  end
+
+  context "user selects completed mail tasks" do
+    describe "success" do
+      # pending feature
+    end
+  end
+
+  context "user add tasks not related to an appeal" do
+    describe "success" do
+      # pending feature
+    end
+
+    describe "failure" do
+      # pending feature
+    end
+  end
+
+  context "user adds tasks related to an appeal" do
+    describe "success" do
+      it "displays a success banner, links the appeal, and creates the task" do
+        visit_intake_form_step_2_with_appeals
+        existing_appeal_radio_options[:yes].click
+        using_wait_time(15) do
+          within ".cf-case-list-table" do
+            page.all(".cf-form-checkbox").last.click
+          end
+        end
+        page.find("#button-addTasks").click
+        all("#reactSelectContainer")[0].click
+        find_by_id("react-select-2-option-1").click
+        find_by_id("content").fill_in with: "Correspondence Text"
+        click_button("Continue")
+        click_button("Submit")
+        click_button("Confirm")
+        using_wait_time(10) do
+          expect(page).to have_content("You have successfully submitted a correspondence record")
+        end
+        expect(Correspondence.first.appeals).to eq([Appeal.fifth])
+        expect(Correspondence.first.appeals[0].tasks.pluck(:type)).to include("ClearAndUnmistakeableErrorMailTask")
+      end
+    end
+
+    describe "failure" do
+      it "displays a failure banner, and does not link appeal" do
+        # this fails because the seed appeal has no root task
+        visit_intake_form_step_2_with_appeals_without_initial_tasks
+        existing_appeal_radio_options[:yes].click
+        using_wait_time(15) do
+          within ".cf-case-list-table" do
+            page.all(".cf-form-checkbox").last.click
+          end
+        end
+        page.find("#button-addTasks").click
+        all("#reactSelectContainer")[0].click
+        find_by_id("react-select-2-option-1").click
+        find_by_id("content").fill_in with: "Correspondence Text"
+        click_button("Continue")
+        click_button("Submit")
+        click_button("Confirm")
+        using_wait_time(10) do
+          expect(page).to have_content("The correspondence's documents have failed to upload to the eFolder")
+        end
+        expect(Correspondence.first.appeals).to eq([])
+      end
+    end
+  end
+
+  context "user waives evidence submission window task on an appeal" do
+    describe "success" do
+      it "completes the evidence submission window task" do
+        active_evidence_submissions_tasks
+        existing_appeal_radio_options[:yes].click
+        using_wait_time(10) do
+          page.all(".checkbox-wrapper-1").find(".cf-form-checkbox").first.click
+        end
+        find('label', text: 'Waive Evidence Window').click
+        find_by_id("waiveReason").fill_in with: "test waive note"
+        click_button("Continue")
+        find(".cf-pdf-external-link-icon").click
+        using_wait_time(15) do
+          page.switch_to_window(page.windows.last)
+          expect(page).to have_content("Evidence Submission Window Task")
+        end
+        page.switch_to_window(page.windows.first)
+        click_button("Submit")
+        click_button("Confirm")
+        using_wait_time(15) do
+          expect(page).to have_content("You have successfully submitted a correspondence record")
+        end
+        page.switch_to_window(page.windows.last)
+        refresh
+        using_wait_time(15) do
+          page.switch_to_window(page.windows.last)
+          expect(page).to have_no_content("Evidence Submission Window Task")
+        end
+      end
+    end
+  end
+
+  context "user links appeals but does not add any tasks" do
+    describe "success" do
+      it "displays a success banner, links the appeal" do
+        visit_intake_form_step_2_with_appeals
+        existing_appeal_radio_options[:yes].click
+        using_wait_time(15) do
+          within ".cf-case-list-table" do
+            page.all(".cf-form-checkbox").last.click
+          end
+        end
+        click_button("Continue")
+        click_button("Submit")
+        click_button("Confirm")
+        using_wait_time(10) do
+          expect(page).to have_content("You have successfully submitted a correspondence record")
+        end
+        expect(Correspondence.first.appeals).to eq([Appeal.fifth])
+      end
+    end
+  end
+end
diff --git a/spec/feature/queue/correspondence/tasks_related_to_an_existing_appeal_spec.rb b/spec/feature/queue/correspondence/tasks_related_to_an_existing_appeal_spec.rb
new file mode 100644
index 00000000000..4434581a049
--- /dev/null
+++ b/spec/feature/queue/correspondence/tasks_related_to_an_existing_appeal_spec.rb
@@ -0,0 +1,304 @@
+# frozen_string_literal: true
+
+RSpec.feature("Tasks related to an existing Appeal - Correspondence Intake page step 2.3") do
+  include CorrespondenceHelpers
+  let(:organization) { MailTeam.singleton }
+  let(:mail_user) { User.authenticate!(roles: ["Mail Team"]) }
+
+  before do
+    organization.add_user(mail_user)
+    mail_user.reload
+  end
+
+  context "Correspondence is not related to an existing appeal" do
+    it "Displays the expected content" do
+      visit_intake_form_step_2_with_appeals
+
+      expect(page).to have_content("Tasks related to an existing Appeal")
+      expect(page).to have_content("Is this correspondence related to an existing appeal?")
+      expect(existing_appeal_radio_options[:yes]).to have_text("Yes")
+      expect(existing_appeal_radio_options[:no]).to have_text("No")
+    end
+
+    it "Continue button is active" do
+      visit_intake_form_step_2_with_appeals
+
+      expect(page.has_button?("Continue")).to be(true)
+    end
+  end
+
+  context "Yes - related existing Appeals" do
+    describe "the continue button" do
+      it "continue button is active if a checkbox is checked" do
+        visit_intake_form_step_2_with_appeals
+
+        existing_appeal_radio_options[:yes].click
+        page.all(".cf-form-checkbox").last.click
+
+        expect(page.has_button?("Continue")).to be(true)
+      end
+    end
+
+    describe "table of existing appeals" do
+      it "table displays pagination summary" do
+        visit_intake_form_step_2_with_appeals
+
+        existing_appeal_radio_options[:yes].click
+
+        using_wait_time(20) do
+          expect(page).to have_content("Viewing 1-5 of 13 total")
+        end
+      end
+
+      it "table has column headers" do
+        visit_intake_form_step_2_with_appeals
+
+        existing_appeal_radio_options[:yes].click
+
+        using_wait_time(20) do
+          expect(page).to have_content("Docket")
+          expect(page).to have_content("Appellant Name")
+          expect(page).to have_content("Status")
+          expect(page).to have_content("Types")
+          expect(page).to have_content("Number of Issues")
+          expect(page).to have_content("Decision Date")
+          expect(page).to have_content("Assigned To")
+        end
+      end
+
+      it "displays link to case details page" do
+        visit_intake_form_step_2_with_appeals
+
+        existing_appeal_radio_options[:yes].click
+
+        using_wait_time(20) do
+          page.all(".cf-pdf-external-link-icon")[0].click
+        end
+        using_wait_time(10) do
+          page.switch_to_window(page.windows.last)
+          expect(current_path).to have_content("/queue/appeals")
+        end
+      end
+
+      it "table displays 5 items per page" do
+        visit_intake_form_step_2_with_appeals
+
+        existing_appeal_radio_options[:yes].click
+
+        using_wait_time(20) do
+          within(page.all(".cf-pagination")[0]) do
+            expect(find_all(".cf-form-checkbox").count).to eq(5)
+          end
+        end
+      end
+
+      it "table incorporates pagination navigation" do
+        visit_intake_form_step_2_with_appeals
+
+        existing_appeal_radio_options[:yes].click
+
+        using_wait_time(20) do
+          expect(page.has_button?("Previous")).to be(false)
+          expect(page.has_button?("Next")).to be(true)
+        end
+
+        click_button("Next")
+
+        expect(page.has_button?("Previous")).to be(true)
+        expect(page.has_button?("Next")).to be(true)
+        expect(page).to have_content("Viewing 6-10 of 13 total")
+
+        click_button("3")
+
+        expect(page.has_button?("Next")).to be(false)
+        expect(page.has_button?("Previous")).to be(true)
+        expect(page).to have_content("Viewing 11-13 of 13 total")
+      end
+
+      it "Checkbox values are reset if user clicks No and then Yes" do
+        visit_intake_form_step_2_with_appeals
+
+        existing_appeal_radio_options[:yes].click
+
+        using_wait_time(20) do
+          page.all(".cf-form-checkbox").last.click
+        end
+
+        existing_appeal_radio_options[:no].click
+
+        existing_appeal_radio_options[:yes].click
+
+        expect(page.all(".cf-form-checkbox").last.checked?).to be(false)
+      end
+
+      it "table displays active evidence submission window tasks related to the existing appeal from the checkbox" do
+        active_evidence_submissions_tasks
+
+        existing_appeal_radio_options[:yes].click
+
+        using_wait_time(20) do
+          page.all(".checkbox-wrapper-1").find(".cf-form-checkbox").first.click
+        end
+        expect(page).to have_selector("#react-select-2-input[disabled]")
+        expect(page).to have_text("Evidence Window Submission Task")
+        expect(page).to have_text("Provide context and instruction on this task")
+        field = find_field("content", disabled: true)
+        expect(field.tag_name).to eq("textarea")
+        checkbox_label = "Waive Evidence Window"
+        find("label", text: checkbox_label).click
+        find_by_id("waiveReason").fill_in with: "test waive note"
+        all("#reactSelectContainer").last.click
+        expect(page).to have_button("button-continue", disabled: false)
+      end
+    end
+
+    describe "Linking and unlinking existing appeals" do
+      it "Clicks an appeal from the table" do
+        visit_intake_form_step_2_with_appeals
+        existing_appeal_radio_options[:yes].click
+        page.should has_selector?("Existing Appeals")
+
+        within find(".cf-case-list-table") do
+          page.all(".cf-form-checkbox").first.click
+          unformatted_id = page.all(".cf-form-checkboxes").first[:class]
+          formatted_id = unformatted_id.split("-")[2].split(" ")[0]
+          expect find_by_id(formatted_id, visible: false).checked?
+        end
+      end
+
+      it "Adds and removes a task from the linked appeal" do
+        visit_intake_form_step_2_with_appeals
+        existing_appeal_radio_options[:yes].click
+        using_wait_time(15) do
+          within ".cf-case-list-table" do
+            page.all(".cf-form-checkbox").last.click
+          end
+        end
+
+        find_by_id("button-addTasks").click
+        all("#reactSelectContainer")[0].click
+        find_by_id("react-select-2-option-1").click
+        find_by_id("content").fill_in with: "Correspondence Text"
+
+        expect(page.all("#button-Remove").length).to eq(1)
+        page.all("#button-Remove").first.click
+        expect(page.all("#button-Remove").length).to eq(0)
+      end
+
+      it "Adds and removes multiple tasks from the linked appeal" do
+        visit_intake_form_step_2_with_appeals
+        existing_appeal_radio_options[:yes].click
+        using_wait_time(15) do
+          within ".cf-case-list-table" do
+            page.all(".cf-form-checkbox").last.click
+          end
+        end
+        find_by_id("button-addTasks").click
+        all("#reactSelectContainer")[0].click
+        find_by_id("react-select-2-option-1").click
+        find_by_id("content").fill_in with: "Correspondence Text"
+
+        expect(page.all("#button-Remove").length).to eq(1)
+        page.all("#button-addTasks").first.click
+        expect(page.all("#button-Remove").length).to eq(2)
+
+        page.all("#button-Remove").last.click
+        expect(page.all("#button-Remove").length).to eq(1)
+        page.all("#button-Remove").first.click
+        expect(page.all("#button-Remove").length).to eq(0)
+      end
+
+      it "Prevents user from clicking continue if task name or text isn't filled out" do
+        visit_intake_form_step_2_with_appeals
+        existing_appeal_radio_options[:yes].click
+        using_wait_time(15) do
+          within ".cf-case-list-table" do
+            page.all(".cf-form-checkbox").last.click
+          end
+        end
+        find_by_id("button-addTasks").click
+        all("#reactSelectContainer")[0].click
+        find_by_id("react-select-2-option-15").click
+        expect(page).to have_button("button-continue", disabled: true)
+
+        all("textarea")[0].fill_in with: "Correspondence Text"
+        expect(page).to have_button("button-continue", disabled: false)
+        page.all("#button-addTasks").first.click
+        all("textarea")[1].fill_in with: "Correspondence Text"
+        expect(page).to have_button("button-continue", disabled: true)
+
+        all("#reactSelectContainer")[1].click
+        find_by_id("react-select-3-option-15").click
+        expect(page).to have_button("button-continue", disabled: false)
+      end
+
+      it "Prevents other motion tasks from being added 3 times" do
+        visit_intake_form_step_2_with_appeals
+        existing_appeal_radio_options[:yes].click
+        using_wait_time(15) do
+          within ".cf-case-list-table" do
+            page.all(".cf-form-checkbox").last.click
+          end
+        end
+        find_by_id("button-addTasks").click
+        all("#reactSelectContainer")[0].click
+        find_by_id("react-select-2-option-15").click
+        find_by_id("content").fill_in with: "Correspondence Text"
+        expect((all("#reactSelectContainer")[0]).text).to include("Other motion")
+
+        page.all("#button-addTasks").first.click
+        all("#reactSelectContainer")[1].click
+        find_by_id("react-select-3-option-15").click
+        all("textarea")[1].fill_in with: "Correspondence Text"
+        expect(all("#reactSelectContainer")[1].text).to include("Other motion")
+
+        page.all("#button-addTasks").first.click
+        all("#reactSelectContainer")[2].click
+        find_by_id("react-select-4-option-15").click
+        all("textarea")[2].fill_in with: "Correspondence Text"
+      end
+
+      it "Unlinks the appeal when the unlink appeal button is clicked" do
+        visit_intake_form_step_2_with_appeals
+        existing_appeal_radio_options[:yes].click
+        using_wait_time(15) do
+          within ".cf-case-list-table" do
+            page.all(".cf-form-checkbox").last.click
+          end
+        end
+        find_by_id("button-addTasks").click
+        all("#reactSelectContainer")[0].click
+        find_by_id("react-select-2-option-15").click
+        find_by_id("content").fill_in with: "Correspondence Text"
+        expect((find_all("#reactSelectContainer")).length).to eq(1)
+        find_all(".fa.fa-unlink").last.click
+        expect((find_all("#reactSelectContainer")).length).to eq(0)
+      end
+
+      it "Unlinks only one appeal if multiple are selected when the unlink appeal button is clicked" do
+        visit_intake_form_step_2_with_appeals
+        existing_appeal_radio_options[:yes].click
+        using_wait_time(15) do
+          within ".cf-case-list-table" do
+            page.all(".cf-form-checkbox").first.click
+            page.all(".cf-form-checkbox").last.click
+          end
+        end
+
+        find_all("#button-addTasks").first.click
+        all("#reactSelectContainer")[0].click
+        find_by_id("react-select-2-option-15").click
+        all("textarea")[0].fill_in with: "Correspondence Text"
+
+        find_all("#button-addTasks").last.click
+        all("#reactSelectContainer")[1].click
+        find_by_id("react-select-3-option-15").click
+        all("textarea")[1].fill_in with: "Correspondence Text"
+
+        expect((find_all("#reactSelectContainer")).length).to eq(2)
+        find_all(".fa.fa-unlink").last.click
+        expect((find_all("#reactSelectContainer")).length).to eq(1)
+      end
+    end
+  end
+end
diff --git a/spec/models/correspondence_document_spec.rb b/spec/models/correspondence_document_spec.rb
new file mode 100644
index 00000000000..dccc0e0dd22
--- /dev/null
+++ b/spec/models/correspondence_document_spec.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+describe CorrespondenceDocument, :postgres do
+  let(:vet) { create(:veteran) }
+  let(:cors) { create(:correspondence, veteran_id: vet.id) }
+  let(:document) do
+    create(
+      :correspondence_document,
+      document_file_number: vet.file_number,
+      correspondence: cors,
+      uuid: SecureRandom.uuid
+    )
+  end
+
+  before do
+    FeatureToggle.enable!(:correspondence_queue)
+    S3Service.store_file(
+      "#{CorrespondenceDocument::S3_BUCKET_NAME}/#{document.uuid}",
+      "lib/pdfs/KnockKnockJokes.pdf", :filepath
+    )
+  end
+
+  it "pdf_name returns name of pdf" do
+    expect(document.pdf_name).to eq("#{document.uuid}.pdf")
+  end
+
+  it "s3_location returns path to doc in s3" do
+    expect(document.s3_location).to eq("#{CorrespondenceDocument::S3_BUCKET_NAME}/#{document.uuid}")
+  end
+
+  it "pdf_location stores file fetched from S3" do
+    document.pdf_location
+    expect(document.output_location).to eq(File.join(Rails.root, "tmp", "pdfs", document.pdf_name).to_s)
+  end
+end
diff --git a/spec/models/correspondence_intake_spec.rb b/spec/models/correspondence_intake_spec.rb
new file mode 100644
index 00000000000..45abc32ddaf
--- /dev/null
+++ b/spec/models/correspondence_intake_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+RSpec.describe CorrespondenceIntake, type: :model do
+  describe "relationships" do
+    it { CorrespondenceIntake.reflect_on_association(:correspondence).macro.should eq(:belongs_to) }
+    it { CorrespondenceIntake.reflect_on_association(:user).macro.should eq(:belongs_to) }
+  end
+
+  describe "Record entry" do
+    it "can be created" do
+      correspondence = Correspondence.create!
+      user = User.create!(css_id: "User", station_id: "1")
+      subject = CorrespondenceIntake.create!(correspondence_id: correspondence.id, user_id: user.id)
+
+      expect(subject).to be_a(CorrespondenceIntake)
+    end
+
+    it "validates :correspondence_id and :user_id" do
+      correspondence = Correspondence.create!
+      user = User.create!(css_id: "User", station_id: "1")
+
+      expect { CorrespondenceIntake.create! }.to raise_error(ActiveRecord::RecordInvalid)
+      expect { CorrespondenceIntake.create!(correspondence_id: correspondence.id) }.to raise_error(ActiveRecord::RecordInvalid)
+      expect { CorrespondenceIntake.create!(user_id: user.id) }.to raise_error(ActiveRecord::RecordInvalid)
+    end
+  end
+end
diff --git a/spec/models/correspondence_spec.rb b/spec/models/correspondence_spec.rb
new file mode 100644
index 00000000000..6b039b57307
--- /dev/null
+++ b/spec/models/correspondence_spec.rb
@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+RSpec.describe Correspondence, type: :model do
+  let!(:current_user) do
+    create(:user, roles: ["Mail Intake"])
+  end
+
+  it "exists" do
+    c = Correspondence.create!
+    expect(c).to be_a(Correspondence)
+  end
+
+  it "can be bi-directionally related to other correspondences" do
+    c_1 = Correspondence.create!
+    c_2 = Correspondence.create!
+
+    expect(c_1.related_correspondences).to eq([])
+    expect(c_2.related_correspondences).to eq([])
+
+    cr = CorrespondenceRelation.create!(correspondence_id: c_1.id, related_correspondence_id: c_2.id)
+
+    expect(c_1.reload.related_correspondences).to eq([c_2])
+    expect(c_2.reload.related_correspondences).to eq([c_1])
+
+    cr.destroy
+
+    expect(c_1.reload.related_correspondences).to eq([])
+    expect(c_2.reload.related_correspondences).to eq([])
+  end
+
+  describe "Create Correspondence Root Task and Review Package task as child" do
+    it "Create Root Task and Review Package task for correspondence" do
+      correspondence = Correspondence.create!(
+        uuid: SecureRandom.uuid,
+        portal_entry_date: Time.zone.now,
+        source_type: "Mail",
+        package_document_type_id: 15,
+        correspondence_type_id: 8,
+        cmp_queue_id: 1,
+        cmp_packet_number: 9_999_999_999,
+        va_date_of_receipt: Time.zone.yesterday,
+        notes: "This is a note from CMP.",
+        assigned_by_id: 81,
+        veteran_id: 1
+      )
+
+      ct = CorrespondenceTask.find_by(appeal_id: correspondence.id, type: "CorrespondenceTask")
+      expect(ct.appeal_id).to eq(correspondence.id)
+      expect(ct.status).to eq("on_hold")
+      expect(ct.type).to eq("CorrespondenceTask")
+      expect(ct.assigned_to).to eq(MailTeamSupervisor.singleton)
+
+      crt = CorrespondenceRootTask.find_by(appeal_id: correspondence.id)
+      expect(crt.appeal_id).to eq(correspondence.id)
+      expect(crt.status).to eq("on_hold")
+      expect(crt.type).to eq("CorrespondenceRootTask")
+      expect(crt.parent_id).to eq(ct.id)
+      expect(crt.assigned_to).to eq(MailTeamSupervisor.singleton)
+
+      rpt = ReviewPackageTask.find_by(appeal_id: correspondence.id)
+      expect(rpt.appeal_id).to eq(correspondence.id)
+      expect(rpt.status).to eq("unassigned")
+      expect(rpt.type).to eq("ReviewPackageTask")
+      expect(rpt.parent_id).to eq(crt.id)
+      expect(rpt.assigned_to).to eq(MailTeamSupervisor.singleton)
+    end
+  end
+end
diff --git a/spec/models/correspondences_appeal_spec.rb b/spec/models/correspondences_appeal_spec.rb
new file mode 100644
index 00000000000..9e18d90123f
--- /dev/null
+++ b/spec/models/correspondences_appeal_spec.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+RSpec.describe CorrespondencesAppeal, type: :model do
+  let(:correspondence) { create(:correspondence) }
+  let(:appeal) { create(:appeal, veteran: create(:veteran)) }
+
+  before do
+    @subject = CorrespondencesAppeal.create!(
+      correspondence_id: correspondence.id,
+      appeal_id: appeal.id)
+  end
+
+  it "exists" do
+    expect(@subject).to be_a(CorrespondencesAppeal)
+  end
+
+  it "belongs to a correspondence" do
+    expect(@subject.correspondence).to eq(correspondence)
+  end
+
+  it "belongs to an appeal" do
+    expect(@subject.appeal).to eq(appeal)
+  end
+
+  it "enables a many-to-many relationship between correspondences and appeals" do
+    expect(appeal.correspondences).to eq([correspondence])
+    expect(correspondence.appeals).to eq([appeal])
+  end
+end
diff --git a/spec/models/post_send_initial_notification_letter_holding_task_spec.rb b/spec/models/post_send_initial_notification_letter_holding_task_spec.rb
index 3e404547c0f..041dbb1043c 100644
--- a/spec/models/post_send_initial_notification_letter_holding_task_spec.rb
+++ b/spec/models/post_send_initial_notification_letter_holding_task_spec.rb
@@ -133,8 +133,6 @@
         # confirm the task isn't completed/cancelled and the timer is working
         expect(post_task.reload.status).to_not eq("cancelled")
         expect(post_task.reload.status).to_not eq("completed")
-
-        expect(((Time.zone.now - post_task.created_at).to_f / 1.day).round).to eq(100)
       end
     end
 
diff --git a/spec/requests/correspondence_controller_spec.rb b/spec/requests/correspondence_controller_spec.rb
new file mode 100644
index 00000000000..79876c5a738
--- /dev/null
+++ b/spec/requests/correspondence_controller_spec.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+RSpec.describe "Correspondence Requests", :all_dbs, type: :request do
+  let(:veteran) { create(:veteran, last_name: "Smith", file_number: "12345678") }
+  let(:correspondence) { create(:correspondence, veteran_id: veteran.id, uuid: SecureRandom.uuid) }
+  let(:current_user) { create(:intake_user) }
+
+  let(:redux_store) do
+    {
+      taskRelatedAppealIds: [],
+      newAppealRelatedTasks: [],
+      fetchedAppeals: [],
+      correspondences: [],
+      radioValue: '0',
+      relatedCorrespondences: [],
+      mailTasks: {},
+      unrelatedTasks: [],
+      currentCorrespondence: {
+        id: 181,
+        veteran_id: 3909
+      },
+      veteranInformation: {
+        id: 3909
+      },
+      waivedEvidenceTasks: []
+    }.to_json
+  end
+
+  before do
+    FeatureToggle.enable!(:correspondence_queue)
+    MailTeam.singleton.add_user(current_user)
+    User.authenticate!(user: current_user)
+  end
+
+  describe "#current_step" do
+    it "saves the user's current step in the intake form" do
+      current_step = 1
+
+      post queue_correspondence_intake_current_step_path(correspondence_uuid: correspondence.uuid), params: {
+        correspondence_uuid: correspondence.uuid,
+        current_step: current_step,
+        redux_store: redux_store
+      }
+
+      expect(response).to have_http_status(:success)
+      expect(CorrespondenceIntake.find_by(user: current_user, correspondence: correspondence).current_step).to eq(current_step)
+      expect(CorrespondenceIntake.find_by(user: current_user, correspondence: correspondence).redux_store).to eq(redux_store)
+    end
+  end
+end
diff --git a/spec/seeds/correspondence.rb b/spec/seeds/correspondence.rb
new file mode 100644
index 00000000000..40147989a39
--- /dev/null
+++ b/spec/seeds/correspondence.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+describe Seeds::Correspondence do
+  let(:seed) { Seeds::Correspondence.new }
+
+  describe "initial values" do
+    it "are set properly" do
+      expect(seed.instance_variable_get(:@file_number)).to eq 500_000_000
+      expect(seed.instance_variable_get(:@participant_id)).to eq 850_000_000
+      expect(seed.instance_variable_get(:@cmp_packet_number)).to eq 1_000_000_000
+    end
+
+    it "are set properly when seed has been previously run" do
+      veteran = Veteran.create!(file_number: 500_000_001)
+      Correspondence.create!(cmp_packet_number: 1_000_000_001, veteran_id: veteran.id)
+
+      expect(seed.instance_variable_get(:@file_number)).to eq 500_000_100
+      expect(seed.instance_variable_get(:@participant_id)).to eq 850_000_100
+      expect(seed.instance_variable_get(:@cmp_packet_number)).to eq 1_000_010_000
+    end
+  end
+
+  describe "#seed!" do
+    it "creates a bunch of correspondences with one document each" do
+      seed.seed!
+      expect(Correspondence.count).to eq(128)
+      expect(Correspondence.first.correspondence_documents.count).to eq(1)
+      expect(Correspondence.last.correspondence_documents.count).to eq(1)
+      expect(CorrespondenceDocument.count).to eq(128)
+    end
+  end
+end
diff --git a/spec/seeds/package_document_types.rb b/spec/seeds/package_document_types.rb
new file mode 100644
index 00000000000..c7f1cadbcae
--- /dev/null
+++ b/spec/seeds/package_document_types.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+describe Seeds::PackageDocumentTypes do
+  describe "#seed!" do
+    subject { described_class.new.seed! }
+
+    it "creates all kinds of annotations" do
+      expect { subject }.to_not raise_error
+      expect(subject.count).to be_positive
+    end
+  end
+end
diff --git a/spec/seeds/users_spec.rb b/spec/seeds/users_spec.rb
index b3b99850203..253dd25fcba 100644
--- a/spec/seeds/users_spec.rb
+++ b/spec/seeds/users_spec.rb
@@ -6,8 +6,8 @@
 
     it "creates all kinds of users and organizations" do
       expect { subject }.to_not raise_error
-      expect(User.count).to eq(127)
-      expect(Organization.count).to eq(37)
+      expect(User.count).to eq(129)
+      expect(Organization.count).to eq(38)
     end
   end
 end
diff --git a/spec/seeds/vbms_document_types.rb b/spec/seeds/vbms_document_types.rb
new file mode 100644
index 00000000000..776e5b51d4a
--- /dev/null
+++ b/spec/seeds/vbms_document_types.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+describe Seeds::VbmsDocumentTypes do
+  describe "#seed!" do
+    subject { described_class.new.seed! }
+
+    it "creates all kinds of vbms doc types" do
+      expect { subject }.to_not raise_error
+      expect(subject.count).to be_positive
+    end
+  end
+end
diff --git a/spec/support/correspondence_helpers.rb b/spec/support/correspondence_helpers.rb
new file mode 100644
index 00000000000..8c692aed73c
--- /dev/null
+++ b/spec/support/correspondence_helpers.rb
@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+
+module CorrespondenceHelpers
+  def setup_access
+    FeatureToggle.enable!(:correspondence_queue)
+    user = create(:user, roles: ["Mail Intake"])
+    MailTeam.singleton.add_user(user)
+    User.authenticate!(user: user)
+  end
+
+  def visit_intake_form_with_correspondence_load
+    setup_access
+    veteran = create(:veteran, last_name: "Smith", file_number: "12345678")
+    54.times do
+      create(
+        :correspondence,
+        veteran_id: veteran.id,
+        uuid: SecureRandom.uuid,
+        va_date_of_receipt: Time.zone.local(2023, 1, 1)
+      )
+    end
+    allow_any_instance_of(CorrespondenceController).to receive(:correspondence_load).and_return(Correspondence.all)
+
+    visit "/queue/correspondence/#{Correspondence.first.uuid}/intake"
+  end
+
+  def visit_intake_form
+    setup_access
+    uuid = SecureRandom.uuid
+    visit "/queue/correspondence/#{uuid}/intake"
+  end
+
+  def visit_intake_form_step_2_with_appeals
+    setup_access
+    veteran = create(:veteran, last_name: "Smith", file_number: "12345678")
+    appeals = (1..13).map { create(:appeal, veteran_file_number: veteran.file_number, docket_type: "direct_review") }
+    appeals.each do |appeal|
+      InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
+    end
+    3.times do
+      create(
+        :correspondence,
+        veteran_id: veteran.id,
+        uuid: SecureRandom.uuid,
+        va_date_of_receipt: Time.zone.local(2023, 1, 1)
+      )
+    end
+    allow_any_instance_of(CorrespondenceController).to receive(:correspondence_load).and_return(Correspondence.all)
+
+    visit "/queue/correspondence/#{Correspondence.first.uuid}/intake"
+
+    click_button("Continue")
+  end
+
+  def visit_intake_form_step_2_with_appeals_without_initial_tasks
+    setup_access
+    veteran = create(:veteran, last_name: "Smith", file_number: "12345678")
+    13.times { create(:appeal, veteran_file_number: veteran.file_number, docket_type: "direct_review") }
+    3.times do
+      create(
+        :correspondence,
+        veteran_id: veteran.id,
+        uuid: SecureRandom.uuid,
+        va_date_of_receipt: Time.zone.local(2023, 1, 1)
+      )
+    end
+    allow_any_instance_of(CorrespondenceController).to receive(:correspondence_load).and_return(Correspondence.all)
+
+    visit "/queue/correspondence/#{Correspondence.first.uuid}/intake"
+
+    click_button("Continue")
+  end
+
+  def visit_intake_form_step_3_with_tasks_unrelated
+    setup_access
+    veteran = create(:veteran, last_name: "Smith", file_number: "12345678")
+    create(
+      :correspondence,
+      veteran_id: veteran.id,
+      uuid: SecureRandom.uuid,
+      va_date_of_receipt: Time.zone.local(2023, 1, 1)
+    )
+    visit "/queue/correspondence/#{Correspondence.first.uuid}/intake"
+
+    click_button("Continue")
+    click_button("+ Add tasks")
+    all("#reactSelectContainer")[0].click
+    find_by_id("react-select-2-option-0").click
+    find_by_id("content", visible: :all).fill_in with: "Correspondence test text"
+    click_button("Continue")
+  end
+
+  def associate_with_prior_mail_radio_options
+    radio_options = page.all(".cf-form-radio-option")
+    { yes: radio_options[0], no: radio_options[1] }
+  end
+
+  def existing_appeal_radio_options
+    radio_options = page.all(".cf-form-radio-option")
+    { yes: radio_options[0], no: radio_options[1] }
+  end
+
+  def active_evidence_submissions_tasks
+    setup_access
+    veteran = create(:veteran, last_name: "Smith", file_number: "12345678")
+    create(:correspondence, veteran_id: veteran.id, uuid: SecureRandom.uuid, va_date_of_receipt: Time.local(2023, 1, 1))
+    2.times do
+      appeal = create(:appeal, veteran_file_number: veteran.file_number)
+      InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
+    end
+    visit "/queue/correspondence/#{Correspondence.first.uuid}/intake"
+    click_button("Continue")
+  end
+end
diff --git a/vbms doc types.json b/vbms doc types.json
new file mode 100644
index 00000000000..7d17578fb44
--- /dev/null
+++ b/vbms doc types.json	
@@ -0,0 +1,100 @@
+{
+    "documentTypes": [
+        {
+            "id": 150,
+            "createDateTime": "2011-12-09",
+            "modifiedDateTime": "2023-07-30T21:04:14",
+            "name": "L141",
+            "description": "VA Form 21-8056, Request for Retirement Information from the Railroad Retirement Board and Certification of Information From Department of Veterans Affairs",
+            "isUserUploadable": true,
+            "is526": false,
+            "documentCategory": {
+                "id": 70,
+                "createDateTime": "2011-12-09",
+                "modifiedDateTime": "2014-04-21T11:49:07",
+                "description": "Correspondence",
+                "subDescription": "Miscellaneous "
+            }
+        },
+        {
+            "id": 152,
+            "createDateTime": "2011-12-09",
+            "modifiedDateTime": "2023-07-30T21:04:14",
+            "name": "L143",
+            "description": "VA Form 21-8358, Notice to Department of Veterans Affairs of Admission to Uniformed Services Hospital",
+            "isUserUploadable": true,
+            "is526": false,
+            "documentCategory": {
+                "id": 70,
+                "createDateTime": "2011-12-09",
+                "modifiedDateTime": "2014-04-21T11:49:07",
+                "description": "Correspondence",
+                "subDescription": "Miscellaneous "
+            }
+        },
+        {
+            "id": 153,
+            "createDateTime": "2011-12-09",
+            "modifiedDateTime": "2023-07-30T21:04:14",
+            "name": "L144",
+            "description": "VA Form 21-8359, Information Re Veteran in Uniformed Services Hospital or Dispensary",
+            "isUserUploadable": true,
+            "is526": false,
+            "documentCategory": {
+                "id": 70,
+                "createDateTime": "2011-12-09",
+                "modifiedDateTime": "2014-04-21T11:49:07",
+                "description": "Correspondence",
+                "subDescription": "Miscellaneous "
+            }
+        },
+        {
+            "id": 258,
+            "createDateTime": "2011-12-09",
+            "modifiedDateTime": "2023-07-30T21:04:14",
+            "name": "L189",
+            "description": "VA Form 21-8960, Certification of School Attendance or Termination",
+            "isUserUploadable": true,
+            "is526": false,
+            "documentCategory": {
+                "id": 70,
+                "createDateTime": "2011-12-09",
+                "modifiedDateTime": "2014-04-21T11:49:07",
+                "description": "Correspondence",
+                "subDescription": "Miscellaneous "
+            }
+        },
+        {
+            "id": 495,
+            "createDateTime": "2011-12-09",
+            "modifiedDateTime": "2023-07-30T21:04:14",
+            "name": "L495",
+            "description": "VA Form 5571, Authorization to Disclose a Record in the Presence of a Third Party",
+            "isUserUploadable": true,
+            "is526": false,
+            "documentCategory": {
+                "id": 70,
+                "createDateTime": "2011-12-09",
+                "modifiedDateTime": "2014-04-21T11:49:07",
+                "description": "Correspondence",
+                "subDescription": "Miscellaneous "
+            }
+        },
+        {
+            "id": 173,
+            "createDateTime": "2011-12-09",
+            "modifiedDateTime": "2023-07-30T21:04:14",
+            "name": "L164",
+            "description": "VA Form 572, Request for Change of Address / Cancellation of Direct Deposit",
+            "isUserUploadable": true,
+            "is526": false,
+            "documentCategory": {
+                "id": 70,
+                "createDateTime": "2011-12-09",
+                "modifiedDateTime": "2014-04-21T11:49:07",
+                "description": "Correspondence",
+                "subDescription": "Miscellaneous "
+            }
+        }
+    ]
+}

From 21a6f8d6ea68f02e9a21821c72a17b8b5e3408ca Mon Sep 17 00:00:00 2001
From: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
Date: Wed, 27 Dec 2023 09:42:00 -0500
Subject: [PATCH 003/237] moved serialized appeal info into
 appeal_search_serializer.rb (#20352)

---
 app/models/serializers/work_queue/appeal_search_serializer.rb | 4 ++++
 app/models/serializers/work_queue/appeal_serializer.rb        | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/serializers/work_queue/appeal_search_serializer.rb b/app/models/serializers/work_queue/appeal_search_serializer.rb
index cdce3ff7be9..36ed9c9fb98 100644
--- a/app/models/serializers/work_queue/appeal_search_serializer.rb
+++ b/app/models/serializers/work_queue/appeal_search_serializer.rb
@@ -111,4 +111,8 @@ class WorkQueue::AppealSearchSerializer
       WorkQueue::DocketSwitchSerializer.new(object.docket_switch).serializable_hash[:data][:attributes]
     end
   end
+
+  attribute :evidence_submission_task do |object|
+    object.tasks.find_by(type: "EvidenceSubmissionWindowTask", status: "assigned")
+  end
 end
diff --git a/app/models/serializers/work_queue/appeal_serializer.rb b/app/models/serializers/work_queue/appeal_serializer.rb
index d8b926efc84..62409533333 100644
--- a/app/models/serializers/work_queue/appeal_serializer.rb
+++ b/app/models/serializers/work_queue/appeal_serializer.rb
@@ -320,8 +320,4 @@ class WorkQueue::AppealSerializer
       Constants.CAVC_DECISION_TYPES.settlement
     ]).count
   end
-
-  attribute :evidence_submission_task do |object|
-    object.tasks.find_by(type: "EvidenceSubmissionWindowTask", status: "assigned")
-  end
 end

From 6c5e3b252a72644454c9fdd18ae1701c6626803c Mon Sep 17 00:00:00 2001
From: divyadasari-va <135847343+divyadasari-va@users.noreply.github.com>
Date: Wed, 27 Dec 2023 09:57:42 -0700
Subject: [PATCH 004/237] Test spec fixes (#20355)

* Test spec fixes

* lint issue
---
 spec/models/correspondence_intake_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/models/correspondence_intake_spec.rb b/spec/models/correspondence_intake_spec.rb
index 45abc32ddaf..3c1be036f08 100644
--- a/spec/models/correspondence_intake_spec.rb
+++ b/spec/models/correspondence_intake_spec.rb
@@ -10,7 +10,7 @@
     it "can be created" do
       correspondence = Correspondence.create!
       user = User.create!(css_id: "User", station_id: "1")
-      subject = CorrespondenceIntake.create!(correspondence_id: correspondence.id, user_id: user.id)
+      subject = CorrespondenceIntake.create!(correspondence_id: correspondence.id, user_id: user.id, current_step: 1, redux_store: 1)
 
       expect(subject).to be_a(CorrespondenceIntake)
     end

From f0c998cb5a70c6f7097a5632979a095e3de758e6 Mon Sep 17 00:00:00 2001
From: Alex Smith <alex.smith.99@thunderyard.com>
Date: Thu, 28 Dec 2023 14:51:32 -0700
Subject: [PATCH 005/237] Save Correspondence Tasks & Upload to eFolder
 (#20315)

* Refactor Correspondence Controller

- Move intake processing logic to new service.

- Clean up some class variables in controller to use method.

* Create Tasks Not Related To Appeal

* Fix Issues with Creating Unrelated Appeal Tasks

* Task Routing: Mail Tasks additions

* Fix Create Mail Tasks Bugs

- Fix issues preventing mail tasks from being created.

- Enhance specs for creating mail tasks and tasks not related to
an appeal.

- Fix linting errors.

* Add Exemptions when Creating Correspondence Tasks

* Refactor Task Creating Edge Case Handling

- Update the Correspondence class to responde to Appeal methods vs.
littering the code with conditionals.

* Fix Linting Error

* Update correspondence_controller_spec.rb

Fix spec failure

---------

Co-authored-by: Dev-KRedd <khalin.redding@va.gov>
---
 app/controllers/correspondence_controller.rb  | 116 ++-----------
 app/models/appeal.rb                          |   4 +
 .../concerns/appealable_correspondence.rb     |  26 +++
 app/models/correspondence.rb                  |   1 +
 app/models/task.rb                            |  14 +-
 ...associated_with_claims_folder_mail_task.rb |   7 +
 .../tasks/cavc_correspondence_mail_task.rb    |   2 +-
 app/models/tasks/sent_to_roj_mail_task.rb     |   7 +
 app/models/tasks/vacols_updated_mail_task.rb  |   7 +
 .../correspondence_intake_processor.rb        | 156 ++++++++++++++++++
 client/COPY.json                              |   3 +
 .../correspondenceActions.js                  |   5 +-
 .../correspondenceReducer.js                  |   6 +-
 .../ConfirmCorrespondenceView.jsx             |  10 +-
 .../SubmitCorrespondenceModal.jsx             |  17 +-
 .../components/CorrespondenceIntake.jsx       |   2 +-
 .../TasksAppeals/AddTasksAppealsView.jsx      |  22 ++-
 config/routes.rb                              |   2 +-
 .../correspondence_controller_spec.rb         | 132 ++++++++++++---
 19 files changed, 393 insertions(+), 146 deletions(-)
 create mode 100644 app/models/concerns/appealable_correspondence.rb
 create mode 100644 app/models/tasks/associated_with_claims_folder_mail_task.rb
 create mode 100644 app/models/tasks/sent_to_roj_mail_task.rb
 create mode 100644 app/models/tasks/vacols_updated_mail_task.rb
 create mode 100644 app/services/correspondence_intake_processor.rb

diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index 21b8f85057f..a6b8a693f93 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -52,19 +52,19 @@ def review_package
   end
 
   def intake_update
-    tasks = Task.where("appeal_id = ? and appeal_type = ?", @correspondence.id, "Correspondence")
+    tasks = Task.where("appeal_id = ? and appeal_type = ?", correspondence.id, "Correspondence")
     begin
       tasks.map do |task|
         if task.type == "ReviewPackageTask"
           task.instructions.push("An appeal intake was started because this Correspondence is a 10182")
-          task.assigned_to_id = @correspondence.assigned_by_id
-          task.assigned_to = User.find(@correspondence.assigned_by_id)
+          task.assigned_to_id = correspondence.assigned_by_id
+          task.assigned_to = User.find(correspondence.assigned_by_id)
         end
         task.status = "cancelled"
         task.save
       end
-      if upload_documents_to_claim_evidence
-        render json: { correspondence: @correspondence }
+      if correspondence_intake_processor.upload_documents_to_claim_evidence(correspondence, current_user)
+        render json: { correspondence: correspondence }
       else
         render json: {}, status: bad_request
       end
@@ -156,23 +156,11 @@ def pdf
   end
 
   def process_intake
-    correspondence_id = Correspondence.find_by(uuid: params[:correspondence_uuid])&.id
-    ActiveRecord::Base.transaction do
-      begin
-        create_correspondence_relations(correspondence_id)
-        link_appeals_to_correspondence(correspondence_id)
-        add_tasks_to_related_appeals(correspondence_id)
-        complete_waived_evidence_submission_tasks(correspondence_id)
-      rescue ActiveRecord::RecordInvalid
-        render json: { error: "Failed to update records" }, status: :bad_request
-        raise ActiveRecord::Rollback
-      rescue ActiveRecord::RecordNotUnique
-        render json: { error: "Failed to update records" }, status: :bad_request
-        raise ActiveRecord::Rollback
-      else
-        set_flash_intake_success_message
-        render json: {}, status: :created
-      end
+    if correspondence_intake_processor.process_intake(params, current_user)
+      set_flash_intake_success_message
+      render json: {}, status: :created
+    else
+      render json: { error: "Failed to update records" }, status: :bad_request
     end
   end
 
@@ -202,44 +190,6 @@ def set_flash_intake_success_message
     ]
   end
 
-  def create_correspondence_relations(correspondence_id)
-    params[:related_correspondence_uuids]&.map do |uuid|
-      CorrespondenceRelation.create!(
-        correspondence_id: correspondence_id,
-        related_correspondence_id: Correspondence.find_by(uuid: uuid)&.id
-      )
-    end
-  end
-
-  def link_appeals_to_correspondence(correspondence_id)
-    params[:related_appeal_ids].map do |appeal_id|
-      CorrespondencesAppeal.find_or_create_by(correspondence_id: correspondence_id, appeal_id: appeal_id)
-    end
-  end
-
-  def complete_waived_evidence_submission_tasks(correspondence_id)
-    params[:waived_evidence_submission_window_tasks]&.map do |task|
-      evidence_submission_window_task = EvidenceSubmissionWindowTask.find(task[:task_id])
-      instructions = evidence_submission_window_task.instructions
-      evidence_submission_window_task.when_timer_ends
-      evidence_submission_window_task.update!(instructions: (instructions << task[:waive_reason]))
-    end
-  end
-
-  def add_tasks_to_related_appeals(correspondence_id)
-    params[:tasks_related_to_appeal]&.map do |data|
-      appeal = Appeal.find(data[:appeal_id])
-      data[:klass].constantize.create_from_params(
-        {
-          appeal: appeal,
-          parent_id: appeal.root_task&.id,
-          assigned_to: data[:assigned_to].constantize.singleton,
-          instructions: data[:content]
-        }, current_user
-      )
-    end
-  end
-
   def verify_correspondence_access
     return true if MailTeamSupervisor.singleton.user_has_access?(current_user) ||
                    MailTeam.singleton.user_has_access?(current_user)
@@ -306,6 +256,14 @@ def veterans_with_correspondences
     veterans.map { |veteran| vet_info_serializer(veteran, veteran.correspondences.last) }
   end
 
+  def auto_texts
+    @auto_texts ||= AutoText.all.pluck(:name)
+  end
+
+  def correspondence_intake_processor
+    @correspondence_intake_processor ||= CorrespondenceIntakeProcessor.new
+  end
+
   def vet_info_serializer(veteran, correspondence)
     {
       firstName: veteran.first_name,
@@ -316,42 +274,4 @@ def vet_info_serializer(veteran, correspondence)
       packageDocumentType: correspondence.correspondence_type_id
     }
   end
-
-  def auto_texts
-    @auto_texts ||= AutoText.all.pluck(:name)
-  end
-
-  def upload_documents_to_claim_evidence
-    if Rails.env.development? || Rails.env.demo? || Rails.env.test?
-      true
-    else
-      begin
-        correspondence.correspondence_documents.all.each do |doc|
-          ExternalApi::ClaimEvidenceService.upload_document(
-            doc.pdf_location,
-            veteran_by_correspondence.file_number,
-            doc.claim_evidence_upload_json
-          )
-        end
-        true
-      rescue StandardError => error
-        Rails.logger.error(error.to_s)
-        create_efolder_upload_failed_task
-        false
-      end
-    end
-  end
-
-  def create_efolder_upload_failed_task
-    rpt = ReviewPackageTask.find_by(appeal_id: correspondence.id, type: ReviewPackageTask.name)
-    euft = EfolderUploadFailedTask.find_or_create_by(
-      appeal_id: correspondence.id,
-      appeal_type: "Correspondence",
-      type: EfolderUploadFailedTask.name,
-      assigned_to: current_user,
-      parent_id: rpt.id
-    )
-
-    euft.update!(status: Constants.TASK_STATUSES.in_progress)
-  end
 end
diff --git a/app/models/appeal.rb b/app/models/appeal.rb
index 98057f260d8..7018abc01da 100644
--- a/app/models/appeal.rb
+++ b/app/models/appeal.rb
@@ -918,6 +918,10 @@ def can_redistribute_appeal?
     return true if relevant_tasks.all?(&:closed?)
   end
 
+  def open_cavc_task
+    CavcTask.open.where(appeal_id: self.id).any?
+  end
+
   private
 
   def business_lines_needing_assignment
diff --git a/app/models/concerns/appealable_correspondence.rb b/app/models/concerns/appealable_correspondence.rb
new file mode 100644
index 00000000000..aff419c811e
--- /dev/null
+++ b/app/models/concerns/appealable_correspondence.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+##
+# Allows a Correspondence to respond to Appeal methods
+#
+# Ultimately, probably need to revisit the inheritance hierarchy here and give these models a common ancestor
+# or something
+module AppealableCorrespondence
+  extend ActiveSupport::Concern
+
+  def active?
+    true
+  end
+
+  def cavc?
+    true
+  end
+
+  def open_cavc_task
+    true
+  end
+
+  def root_task
+    Task.find_by(appeal_id: id, appeal_type: type, type: CorrespondenceRootTask.name)
+  end
+end
diff --git a/app/models/correspondence.rb b/app/models/correspondence.rb
index 465a9a5c568..7560510b157 100644
--- a/app/models/correspondence.rb
+++ b/app/models/correspondence.rb
@@ -5,6 +5,7 @@
 class Correspondence < CaseflowRecord
   has_paper_trail
   include PrintsTaskTree
+  include AppealableCorrespondence
 
   has_many :correspondence_documents
   has_many :correspondence_intakes
diff --git a/app/models/task.rb b/app/models/task.rb
index c0ed69b9a6e..c5600da02d6 100644
--- a/app/models/task.rb
+++ b/app/models/task.rb
@@ -180,6 +180,8 @@ def cannot_have_children
     end
 
     def verify_user_can_create!(user, parent)
+      return true if parent.appeal_type == Correspondence.name && MailTeam.singleton.user_has_access?(user)
+
       can_create = parent&.available_actions(user)&.map do |action|
         parent.build_action_hash(action, user)
       end&.any? do |action|
@@ -187,13 +189,17 @@ def verify_user_can_create!(user, parent)
       end
 
       if !parent&.actions_allowable?(user) || !can_create
-        user_description = user ? "User #{user.id}" : "nil User"
-        parent_description = parent ? " from #{parent.class.name} #{parent.id}" : ""
-        message = "#{user_description} cannot assign #{name}#{parent_description}."
-        fail Caseflow::Error::ActionForbiddenError, message: message
+        fail Caseflow::Error::ActionForbiddenError, message: user_can_create_error_message(user, parent)
       end
     end
 
+    def user_can_create_error_message(user, parent)
+      user_description = user.present? ? "User #{user.id}" : "nil User"
+      parent_description = parent.present? ? "from #{parent.class.name} #{parent.id}" : ""
+
+      "#{user_description} cannot assign #{name} #{parent_description}."
+    end
+
     def child_task_assignee(_parent, params)
       Object.const_get(params[:assigned_to_type]).find(params[:assigned_to_id])
     end
diff --git a/app/models/tasks/associated_with_claims_folder_mail_task.rb b/app/models/tasks/associated_with_claims_folder_mail_task.rb
new file mode 100644
index 00000000000..c20d5815b00
--- /dev/null
+++ b/app/models/tasks/associated_with_claims_folder_mail_task.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AssociatedWithClaimsFolderMailTask < MailTask
+  def self.label
+    COPY::ASSOCIATED_WITH_CLAIMS_FOLDER_MAIL_TASK_LABEL
+  end
+end
diff --git a/app/models/tasks/cavc_correspondence_mail_task.rb b/app/models/tasks/cavc_correspondence_mail_task.rb
index eed371eb471..a5aff59b3d4 100644
--- a/app/models/tasks/cavc_correspondence_mail_task.rb
+++ b/app/models/tasks/cavc_correspondence_mail_task.rb
@@ -49,7 +49,7 @@ def appeal_at_cavc_lit_support
   end
 
   def open_cavc_task
-    CavcTask.open.where(appeal_id: appeal.id).any?
+    appeal.open_cavc_task
   end
 
   def organization_task_actions
diff --git a/app/models/tasks/sent_to_roj_mail_task.rb b/app/models/tasks/sent_to_roj_mail_task.rb
new file mode 100644
index 00000000000..60abd0db4a0
--- /dev/null
+++ b/app/models/tasks/sent_to_roj_mail_task.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class SentToRojMailTask < MailTask
+  def self.label
+    COPY::SENT_TO_ROJ_MAIL_TASK_LABEL
+  end
+end
diff --git a/app/models/tasks/vacols_updated_mail_task.rb b/app/models/tasks/vacols_updated_mail_task.rb
new file mode 100644
index 00000000000..59d3946268b
--- /dev/null
+++ b/app/models/tasks/vacols_updated_mail_task.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class VacolsUpdatedMailTask < MailTask
+  def self.label
+    COPY::VACOLS_UPDATED_MAIL_TASK_LABEL
+  end
+end
diff --git a/app/services/correspondence_intake_processor.rb b/app/services/correspondence_intake_processor.rb
new file mode 100644
index 00000000000..c16a61e0ab8
--- /dev/null
+++ b/app/services/correspondence_intake_processor.rb
@@ -0,0 +1,156 @@
+# frozen_string_literal: true
+
+class CorrespondenceIntakeProcessor
+  def process_intake(intake_params, current_user)
+    correspondence = Correspondence.find_by(uuid: intake_params[:correspondence_uuid])
+
+    fail "Correspondence not found" if correspondence.blank?
+
+    success = true
+
+    ActiveRecord::Base.transaction do
+      begin
+        create_correspondence_relations(intake_params, correspondence.id)
+        link_appeals_to_correspondence(intake_params, correspondence.id)
+        add_tasks_to_related_appeals(intake_params, current_user)
+        complete_waived_evidence_submission_tasks(intake_params)
+        create_tasks_not_related_to_appeals(intake_params, correspondence, current_user)
+        create_mail_tasks(intake_params, correspondence, current_user)
+      rescue ActiveRecord::RecordNotUnique, ActiveRecord::RecordInvalid
+        success = false
+        raise ActiveRecord::Rollback
+      end
+    end
+
+    success
+  end
+
+  def upload_documents_to_claim_evidence(correspondence, current_user)
+    if Rails.env.development? || Rails.env.demo? || Rails.env.test?
+      true
+    else
+      begin
+        correspondence.correspondence_documents.all.each do |doc|
+          ExternalApi::ClaimEvidenceService.upload_document(
+            doc.pdf_location,
+            veteran_by_correspondence.file_number,
+            doc.claim_evidence_upload_json
+          )
+        end
+
+        true
+      rescue StandardError => error
+        Rails.logger.error(error.to_s)
+        create_efolder_upload_failed_task(correspondence, current_user)
+
+        false
+      end
+    end
+  end
+
+  private
+
+  def create_correspondence_relations(intake_params, correspondence_id)
+    intake_params[:related_correspondence_uuids]&.map do |uuid|
+      CorrespondenceRelation.create!(
+        correspondence_id: correspondence_id,
+        related_correspondence_id: Correspondence.find_by(uuid: uuid)&.id
+      )
+    end
+  end
+
+  def link_appeals_to_correspondence(intake_params, correspondence_id)
+    intake_params[:related_appeal_ids]&.map do |appeal_id|
+      CorrespondencesAppeal.find_or_create_by(correspondence_id: correspondence_id, appeal_id: appeal_id)
+    end
+  end
+
+  def add_tasks_to_related_appeals(intake_params, current_user)
+    intake_params[:tasks_related_to_appeal]&.map do |data|
+      appeal = Appeal.find(data[:appeal_id])
+
+      class_for_data(data).create_from_params(
+        {
+          appeal: appeal,
+          parent_id: appeal.root_task&.id,
+          assigned_to: data[:assigned_to].constantize.singleton,
+          instructions: data[:content]
+        }, current_user
+      )
+    end
+  end
+
+  def complete_waived_evidence_submission_tasks(intake_params)
+    intake_params[:waived_evidence_submission_window_tasks]&.map do |task|
+      evidence_submission_window_task = EvidenceSubmissionWindowTask.find(task[:task_id])
+      instructions = evidence_submission_window_task.instructions
+      evidence_submission_window_task.when_timer_ends
+      evidence_submission_window_task.update!(instructions: (instructions << task[:waive_reason]))
+    end
+  end
+
+  def create_efolder_upload_failed_task(correspondence, current_user)
+    rpt = ReviewPackageTask.find_by(appeal_id: correspondence.id, type: ReviewPackageTask.name)
+
+    euft = EfolderUploadFailedTask.find_or_create_by(
+      appeal_id: correspondence.id,
+      appeal_type: "Correspondence",
+      type: EfolderUploadFailedTask.name,
+      assigned_to: current_user,
+      parent_id: rpt.id
+    )
+
+    euft.update!(status: Constants.TASK_STATUSES.in_progress)
+  end
+
+  def create_tasks_not_related_to_appeals(intake_params, correspondence, current_user)
+    unrelated_task_data = intake_params[:tasks_not_related_to_appeal]
+
+    return if unrelated_task_data.blank? || !unrelated_task_data.length
+
+    unrelated_task_data.map do |data|
+      class_for_data(data).create_from_params(
+        {
+          parent_id: correspondence.root_task.id,
+          assigned_to: data[:assigned_to].constantize.singleton,
+          instructions: data[:content]
+        }, current_user
+      )
+    end
+  end
+
+  def create_mail_tasks(intake_params, correspondence, current_user)
+    mail_task_data = intake_params[:mail_tasks]
+
+    return if mail_task_data.blank? || !mail_task_data.length
+
+    mail_task_data.map do |mail_task_type|
+      task = mail_task_class_for_type(mail_task_type).create_from_params(
+        {
+          parent_id: correspondence.root_task.id,
+          assigned_to_id: current_user.id,
+          assigned_to_type: User.name
+        }, current_user
+      )
+
+      task.update!(status: Constants.TASK_STATUSES.completed)
+    end
+  end
+
+  def mail_task_class_for_type(task_type)
+    task_types = {
+      "Associated with Claims Folder": AssociatedWithClaimsFolderMailTask.name,
+      "Change of address": AddressChangeMailTask.name,
+      "Evidence or argument": EvidenceOrArgumentMailTask.name,
+      "Returned or undeliverable mail": ReturnedUndeliverableCorrespondenceMailTask.name,
+      "Sent to ROJ": SentToRojMailTask.name,
+      "VACOLS updated": VacolsUpdatedMailTask.name
+    }.with_indifferent_access
+
+    task_types[task_type]&.constantize
+  end
+
+  def class_for_data(data)
+    data[:klass]&.constantize
+  end
+end
diff --git a/client/COPY.json b/client/COPY.json
index 6e563a7ead0..37ba63fee28 100644
--- a/client/COPY.json
+++ b/client/COPY.json
@@ -1422,5 +1422,8 @@
   "PACKAGE_ACTION_SPLIT_TITLE": "Request split package",
   "CORRESPONDENCE_DOC_UPLOAD_FAILED_HEADER": "The correspondence's documents have failed to upload to the eFolder",
   "CORRESPONDENCE_DOC_UPLOAD_FAILED_MESSAGE": "You can upload it from this page to the veteran's eFolder at a later time.",
+  "ASSOCIATED_WITH_CLAIMS_FOLDER_MAIL_TASK_LABEL": "Associated with claims folder",
+  "VACOLS_UPDATED_MAIL_TASK_LABEL": "VACOLS updated",
+  "SENT_TO_ROJ_MAIL_TASK_LABEL": "Sent to ROJ",
   "UNDER_CONSTRUCTION_MESSAGE": "This page is under construction."
 }
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
index d54bfd7d238..4866db8154b 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
@@ -95,13 +95,12 @@ export const setFetchedAppeals = (appeals) =>
     });
   };
 
-export const saveMailTaskState = (name, isChecked) =>
+export const saveMailTaskState = (name) =>
   (dispatch) => {
     dispatch({
       type: ACTIONS.SAVE_MAIL_TASK_STATE,
       payload: {
-        name,
-        isChecked
+        name
       }
     });
   };
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
index ff021b34f25..5ab2391e9d5 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
@@ -8,7 +8,7 @@ export const initialState = {
   correspondences: [],
   radioValue: '0',
   relatedCorrespondences: [],
-  mailTasks: {},
+  mailTasks: [],
   unrelatedTasks: [],
   currentCorrespondence: [],
   veteranInformation: [],
@@ -91,9 +91,7 @@ export const intakeCorrespondenceReducer = (state = initialState, action = {}) =
   case ACTIONS.SAVE_MAIL_TASK_STATE:
     return update(state, {
       mailTasks: {
-        [action.payload.name]: {
-          $set: action.payload.isChecked
-        }
+        $set: [...action.payload.name]
       }
     });
 
diff --git a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmCorrespondenceView.jsx b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmCorrespondenceView.jsx
index fb894d8294f..9305eb95067 100644
--- a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmCorrespondenceView.jsx
+++ b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmCorrespondenceView.jsx
@@ -29,7 +29,7 @@ const bottonStyling = css({
 
 export const ConfirmCorrespondenceView = (props) => {
 
-  const checkedMailTasks = Object.keys(props.mailTasks).filter((name) => props.mailTasks[name]);
+  const checkedMailTasks = props.mailTasks;
   const relatedCorrespondences = useSelector((state) => state.intakeCorrespondence.relatedCorrespondences);
 
   // eslint-disable-next-line max-statements
@@ -185,16 +185,16 @@ export const ConfirmCorrespondenceView = (props) => {
           })}>
             Completed Mail Tasks
           </div>
-          {checkedMailTasks.map((name, index, array) => (
+          {checkedMailTasks.map((name, index) => (
             <div
               key={index}
               {...css({
-                borderBottom: index === array.length - 1 ? 'none' : '1px solid #d6d7d9',
+                borderBottom: index === checkedMailTasks.length - 1 ? 'none' : '1px solid #d6d7d9',
                 padding: '10px 10px',
                 marginBottom: '10px',
               })}
             >
-              {props.mailTasks[name] && <span>{name}</span>}
+              <span>{name}</span>
             </div>
           ))}
         </div>
@@ -236,6 +236,6 @@ export const ConfirmCorrespondenceView = (props) => {
 
 ConfirmCorrespondenceView.propTypes = {
   goToStep: PropTypes.func,
-  mailTasks: PropTypes.objectOf(PropTypes.bool)
+  mailTasks: PropTypes.arrayOf(PropTypes.string)
 };
 export default ConfirmCorrespondenceView;
diff --git a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/SubmitCorrespondenceModal.jsx b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/SubmitCorrespondenceModal.jsx
index e15f671d3ae..2cc5e52d867 100644
--- a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/SubmitCorrespondenceModal.jsx
+++ b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/SubmitCorrespondenceModal.jsx
@@ -15,6 +15,8 @@ export const SubmitCorrespondenceModal = ({ setSubmitCorrespondenceModalVisible,
   const waivedEvidenceTasks = useSelector((state) => state.intakeCorrespondence.waivedEvidenceTasks);
   const relatedAppealIds = useSelector((state) => state.intakeCorrespondence.taskRelatedAppealIds);
   const tasksRelatedToAppeal = useSelector((state) => state.intakeCorrespondence.newAppealRelatedTasks);
+  const tasksNotRelatedToAppeal = useSelector((state) => state.intakeCorrespondence.unrelatedTasks);
+  const mailTasks = useSelector((state) => state.intakeCorrespondence.mailTasks);
   const [loading, setLoading] = useState(false);
 
   const onCancel = () => {
@@ -35,18 +37,27 @@ export const SubmitCorrespondenceModal = ({ setSubmitCorrespondenceModalVisible,
     const serializedWaivedEvidenceTasks = waivedEvidenceTasks.map((task) => (
       { task_id: task.id, waive_reason: task.waiveReason }
     ));
+
     const serializedTasksRelatedToAppeal = tasksRelatedToAppeal.map((task) => ({
       appeal_id: task.appealId,
       klass: task.type.klass,
       assigned_to: task.type.assigned_to,
       content: task.content
-    })
-    );
+    }));
+
+    const serializedTasksNotRelatedToAppeal = tasksNotRelatedToAppeal.map((task) => ({
+      klass: task.type.klass,
+      assigned_to: task.type.assigned_to,
+      content: task.content
+    }));
+
     const submitData = {
       related_correspondence_uuids: relatedUuids,
       tasks_related_to_appeal: serializedTasksRelatedToAppeal,
       waived_evidence_submission_window_tasks: serializedWaivedEvidenceTasks,
-      related_appeal_ids: relatedAppealIds
+      related_appeal_ids: relatedAppealIds,
+      tasks_not_related_to_appeal: serializedTasksNotRelatedToAppeal,
+      mail_tasks: mailTasks
     };
 
     setLoading(true);
diff --git a/client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx b/client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx
index c242b3862db..9741bf946b9 100644
--- a/client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx
+++ b/client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx
@@ -205,7 +205,7 @@ CorrespondenceIntake.propTypes = {
   correspondences: PropTypes.array,
   unrelatedTasks: PropTypes.arrayOf(Object),
   setUnrelatedTasks: PropTypes.func,
-  mailTasks: PropTypes.objectOf(PropTypes.bool),
+  mailTasks: PropTypes.arrayOf(PropTypes.string),
   autoTexts: PropTypes.arrayOf(PropTypes.string)
 };
 
diff --git a/client/app/queue/correspondence/intake/components/TasksAppeals/AddTasksAppealsView.jsx b/client/app/queue/correspondence/intake/components/TasksAppeals/AddTasksAppealsView.jsx
index fdbb9beed04..b1ba1e4bc1c 100644
--- a/client/app/queue/correspondence/intake/components/TasksAppeals/AddTasksAppealsView.jsx
+++ b/client/app/queue/correspondence/intake/components/TasksAppeals/AddTasksAppealsView.jsx
@@ -23,12 +23,28 @@ const relatedTaskTypes = INTAKE_FORM_TASK_TYPES.relatedToAppeal;
 const unrelatedTaskTypes = INTAKE_FORM_TASK_TYPES.unrelatedToAppeal;
 
 export const AddTasksAppealsView = (props) => {
-  const mailTasks = useSelector((state) => state.intakeCorrespondence.mailTasks);
+  const [mailTasks, setMailTasks] = useState(useSelector((state) => state.intakeCorrespondence.mailTasks));
   const [relatedTasksCanContinue, setRelatedTasksCanContinue] = useState(true);
   const [unrelatedTasksCanContinue, setUnrelatedTasksCanContinue] = useState(true);
 
   const dispatch = useDispatch();
 
+  useEffect(() => {
+    dispatch(saveMailTaskState(mailTasks));
+  }, [mailTasks]);
+
+  const mailTaskCheckboxOnChange = (name, isChecked) => {
+    if (isChecked) {
+      if (!mailTasks.includes(name)) {
+        setMailTasks([...mailTasks, name]);
+      }
+    } else {
+      const selectedMailTasks = mailTasks.filter((taskName) => taskName !== name);
+
+      setMailTasks(selectedMailTasks);
+    }
+  };
+
   const filterUnavailableTaskTypeOptions = (tasks, options) => {
     let otherMotionCount = 0;
 
@@ -72,7 +88,7 @@ export const AddTasksAppealsView = (props) => {
                   name={name}
                   label={name}
                   defaultValue={mailTasks[name] || false}
-                  onChange={(isChecked) => dispatch(saveMailTaskState(name, isChecked))}
+                  onChange={(checked) => mailTaskCheckboxOnChange(name, checked)}
                 />
               );
             })}
@@ -85,7 +101,7 @@ export const AddTasksAppealsView = (props) => {
                   name={name}
                   label={name}
                   defaultValue={mailTasks[name] || false}
-                  onChange={(isChecked) => dispatch(saveMailTaskState(name, isChecked))}
+                  onChange={(checked) => mailTaskCheckboxOnChange(name, checked)}
                 />
               );
             })}
diff --git a/config/routes.rb b/config/routes.rb
index 926cb4a5a6f..88d9ef38a49 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -309,7 +309,7 @@
     get '/correspondence/:pdf_id/pdf', to: 'correspondence#pdf'
     patch '/correspondence/:correspondence_uuid', to: 'correspondence#update'
     patch '/correspondence/:id/update_document', to: 'correspondence_document#update_document'
-    post '/correspondence/:correspondence_uuid', to: 'correspondence#process_intake'
+    post '/correspondence/:correspondence_uuid', to: 'correspondence#process_intake', as: :queue_correspondence_intake_process_intake
     post "/correspondence/:correspondence_uuid/task", to: "correspondence_tasks#create_package_action_task"
     get '/appeals/:vacols_id', to: 'queue#index'
     get '/appeals/:appealId/notifications', to: 'queue#index'
diff --git a/spec/requests/correspondence_controller_spec.rb b/spec/requests/correspondence_controller_spec.rb
index 79876c5a738..361877684e4 100644
--- a/spec/requests/correspondence_controller_spec.rb
+++ b/spec/requests/correspondence_controller_spec.rb
@@ -5,27 +5,6 @@
   let(:correspondence) { create(:correspondence, veteran_id: veteran.id, uuid: SecureRandom.uuid) }
   let(:current_user) { create(:intake_user) }
 
-  let(:redux_store) do
-    {
-      taskRelatedAppealIds: [],
-      newAppealRelatedTasks: [],
-      fetchedAppeals: [],
-      correspondences: [],
-      radioValue: '0',
-      relatedCorrespondences: [],
-      mailTasks: {},
-      unrelatedTasks: [],
-      currentCorrespondence: {
-        id: 181,
-        veteran_id: 3909
-      },
-      veteranInformation: {
-        id: 3909
-      },
-      waivedEvidenceTasks: []
-    }.to_json
-  end
-
   before do
     FeatureToggle.enable!(:correspondence_queue)
     MailTeam.singleton.add_user(current_user)
@@ -33,6 +12,27 @@
   end
 
   describe "#current_step" do
+    let(:redux_store) do
+      {
+        taskRelatedAppealIds: [],
+        newAppealRelatedTasks: [],
+        fetchedAppeals: [],
+        correspondences: [],
+        radioValue: "0",
+        relatedCorrespondences: [],
+        mailTasks: {},
+        unrelatedTasks: [],
+        currentCorrespondence: {
+          id: 181,
+          veteran_id: 3909
+        },
+        veteranInformation: {
+          id: 3909
+        },
+        waivedEvidenceTasks: []
+      }.to_json
+    end
+
     it "saves the user's current step in the intake form" do
       current_step = 1
 
@@ -43,8 +43,94 @@
       }
 
       expect(response).to have_http_status(:success)
-      expect(CorrespondenceIntake.find_by(user: current_user, correspondence: correspondence).current_step).to eq(current_step)
-      expect(CorrespondenceIntake.find_by(user: current_user, correspondence: correspondence).redux_store).to eq(redux_store)
+      
+      intake_correspondence = CorrespondenceIntake.find_by(user: current_user, correspondence: correspondence)
+      expect(intake_correspondence.current_step).to eq(current_step)
+      expect(intake_correspondence.redux_store).to eq(redux_store)
+    end
+  end
+
+  describe "#process_intake" do
+    context "tasks_not_related_to_appeal" do
+      shared_examples "successful unrelated task creation" do |klass_name, assignee|
+        context klass_name.to_s do
+          let(:task_content) { "This is a test" }
+          let(:post_data) do
+            {
+              tasks_not_related_to_appeal: [
+                {
+                  klass: klass_name,
+                  assigned_to: assignee,
+                  content: task_content
+                }
+              ]
+            }
+          end
+
+          it "creates tasks not related to an appeal" do
+            expect do
+              post queue_correspondence_intake_process_intake_path(correspondence_uuid: correspondence.uuid),
+                params: post_data
+            end.to change(Task, :count)
+
+            expect(response).to have_http_status(:created)
+
+            created = Task.last
+            expect(created.instructions).to eq([task_content])
+          end
+        end
+      end
+
+      unrelated_task_types = {
+        "CavcCorrespondenceMailTask": "CavcLitigationSupport",
+        "CongressionalInterestMailTask": "LitigationSupport",
+        "DeathCertificateMailTask": "Colocated",
+        "FoiaRequestMailTask": "PrivacyTeam",
+        "OtherMotionMailTask": "LitigationSupport",
+        "PowerOfAttorneyRelatedMailTask": "HearingAdmin",
+        "PrivacyActRequestMailTask": "PrivacyTeam",
+        "PrivacyComplaintMailTask": "PrivacyTeam",
+        "StatusInquiryMailTask": "LitigationSupport"
+      }
+
+      unrelated_task_types.each do |klass_name, assignee|
+        it_should_behave_like "successful unrelated task creation", klass_name, assignee
+      end
+    end
+
+    context "mail_tasks" do
+      shared_examples "successful mail task creation" do |task_name, class_name|
+        context task_name.to_s do
+          it "creates a new mail task of the given type" do
+            expect do
+              post queue_correspondence_intake_process_intake_path(correspondence_uuid: correspondence.uuid), params: {
+                mail_tasks: [task_name]
+              }
+            end.to change(Task, :count)
+
+            expect(response).to have_http_status(:created)
+
+            created = Task.last
+            expect(created.status).to eq("completed")
+            expect(created.type).to eq(class_name)
+            expect(created.assigned_to_id).to eq(current_user.id)
+            expect(created.assigned_to_type).to eq(User.name)
+          end
+        end
+      end
+
+      mail_tasks = {
+        "Associated with Claims Folder": AssociatedWithClaimsFolderMailTask.name,
+        "Change of address": AddressChangeMailTask.name,
+        "Evidence or argument": EvidenceOrArgumentMailTask.name,
+        "Returned or undeliverable mail": ReturnedUndeliverableCorrespondenceMailTask.name,
+        "Sent to ROJ": SentToRojMailTask.name,
+        "VACOLS updated": VacolsUpdatedMailTask.name
+      }
+
+      mail_tasks.each do |task_type, class_name|
+        it_should_behave_like "successful mail task creation", task_type, class_name
+      end
     end
   end
 end

From a0dfdd795be9f99480da4da678f2f78f628c2ce2 Mon Sep 17 00:00:00 2001
From: divyadasari-va <135847343+divyadasari-va@users.noreply.github.com>
Date: Thu, 28 Dec 2023 14:59:44 -0700
Subject: [PATCH 006/237] Placing dark gray background for textarea (#20368)

---
 .../components/TasksAppeals/AddEvidenceSubmissionTaskView.jsx  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/app/queue/correspondence/intake/components/TasksAppeals/AddEvidenceSubmissionTaskView.jsx b/client/app/queue/correspondence/intake/components/TasksAppeals/AddEvidenceSubmissionTaskView.jsx
index 2e073abc424..38904be1324 100644
--- a/client/app/queue/correspondence/intake/components/TasksAppeals/AddEvidenceSubmissionTaskView.jsx
+++ b/client/app/queue/correspondence/intake/components/TasksAppeals/AddEvidenceSubmissionTaskView.jsx
@@ -4,6 +4,7 @@ import ReactSelectDropdown from '../../../../../components/ReactSelectDropdown';
 import Checkbox from '../../../../../components/Checkbox';
 import PropTypes from 'prop-types';
 import { css } from 'glamor';
+import { COLORS } from '../../../../../constants/AppConstants';
 
 const AddEvidenceSubmissionTaskView = (props) => {
   const task = props.task;
@@ -55,7 +56,7 @@ const AddEvidenceSubmissionTaskView = (props) => {
             name="content"
             label="Provide context and instruction on this task"
             disabled
-            textAreaStyling={css({ cursor: 'not-allowed' })}
+            textAreaStyling={css({ cursor: 'not-allowed', backgroundColor: COLORS.GREY_BACKGROUND })}
           />
           <Checkbox
             name={`${task.id}`}

From db4499e23799b089997f0b096cf48d680c25b339 Mon Sep 17 00:00:00 2001
From: Kamala Madamanchi <110078646+kamala-07@users.noreply.github.com>
Date: Fri, 29 Dec 2023 07:38:21 -0600
Subject: [PATCH 007/237] Fixed UAT seed data (#20367)

* Fixed UAT seed data

* fix in uat seed data veteran save

* Added in missing fields

---------

Co-authored-by: Kevin Ma <magavakevin10@gmail.com>
Co-authored-by: youfoundmanesh <129548081+youfoundmanesh@users.noreply.github.com>
---
 lib/tasks/correspondence.rake | 67 +++++++++++++++++++++++------------
 1 file changed, 44 insertions(+), 23 deletions(-)

diff --git a/lib/tasks/correspondence.rake b/lib/tasks/correspondence.rake
index 945e857f875..39f2f98ab3c 100644
--- a/lib/tasks/correspondence.rake
+++ b/lib/tasks/correspondence.rake
@@ -208,11 +208,19 @@ def create_veteran(options = {})
   @participant_id += 1
   params = {
     file_number: format("%<n>09d", n: @file_number),
-    participant_id: format("%<n>09d", n: @participant_id)
+    participant_id: format("%<n>09d", n: @participant_id),
+    ssn: Generators::Random.unique_ssn
   }
-  veteran = FactoryBot.create(:veteran, params.merge(options))
+  veteran = Generators::Veteran.build(params.merge(options))
+  veteran.save!
+  veteran.update!(params)
   5.times do
-    FactoryBot.create(:appeal, veteran_file_number: veteran.file_number)
+    Appeal.create!(
+      veteran_file_number: veteran.file_number,
+      receipt_date: Time.zone.now,
+      established_at: Time.zone.now,
+      docket_type: Constants.AMA_DOCKETS.evidence_submission
+    )
   end
   veteran
 end
@@ -430,25 +438,32 @@ def create_correspondence_veteran(options = {})
   @participant_id += 1
   params = {
     file_number: format("%<n>09d", n: @file_number),
-    participant_id: format("%<n>09d", n: @participant_id)
+    participant_id: format("%<n>09d", n: @participant_id),
+    ssn: Generators::Random.unique_ssn
   }
-  FactoryBot.create(:veteran, params.merge(options))
+  veteran = Generators::Veteran.build(params.merge(options))
+  veteran.save!
+  veteran.update!(params)
+  veteran
 end
 
 def create_multi_correspondences
   veteran = create_correspondence_veteran(first_name: "Adam", last_name: "West")
   5.times do
-    appeal = FactoryBot.create(
-      :appeal,
-      veteran_file_number: veteran.file_number
+    appeal = Appeal.create!(
+      veteran_file_number: veteran.file_number,
+      receipt_date: Time.zone.now,
+      established_at: Time.zone.now,
+      docket_type: Constants.AMA_DOCKETS.evidence_submission
     )
     InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
   end
   5.times do
-    appeal = FactoryBot.create(
-      :appeal,
+    appeal = Appeal.create!(
       veteran_file_number: veteran.file_number,
-      docket_type: Constants.AMA_DOCKETS.direct_review
+      receipt_date: Time.zone.now,
+      established_at: Time.zone.now,
+      docket_type: Constants.AMA_DOCKETS.evidence_submission
     )
     InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
   end
@@ -479,17 +494,20 @@ def create_multi_correspondences
 
   veteran = create_correspondence_veteran(first_name: "Michael", last_name: "Keaton")
   2.times do
-    appeal = FactoryBot.create(
-      :appeal,
-      veteran_file_number: veteran.file_number
+    appeal = Appeal.create!(
+      veteran_file_number: veteran.file_number,
+      receipt_date: Time.zone.now,
+      established_at: Time.zone.now,
+      docket_type: Constants.AMA_DOCKETS.evidence_submission
     )
     InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
   end
   5.times do
-    appeal = FactoryBot.create(
-      :appeal,
+    appeal = Appeal.create!(
       veteran_file_number: veteran.file_number,
-      docket_type: Constants.AMA_DOCKETS.direct_review
+      receipt_date: Time.zone.now,
+      established_at: Time.zone.now,
+      docket_type: Constants.AMA_DOCKETS.evidence_submission
     )
     InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
   end
@@ -520,17 +538,20 @@ def create_multi_correspondences
 
   veteran = create_correspondence_veteran(first_name: "Christian", last_name: "Bale")
   1.times do
-    appeal = FactoryBot.create(
-      :appeal,
-      veteran_file_number: veteran.file_number
+    appeal = Appeal.create!(
+      veteran_file_number: veteran.file_number,
+      receipt_date: Time.zone.now,
+      established_at: Time.zone.now,
+      docket_type: Constants.AMA_DOCKETS.evidence_submission
     )
     InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
   end
   10.times do
-    appeal = FactoryBot.create(
-      :appeal,
+    appeal = Appeal.create!(
       veteran_file_number: veteran.file_number,
-      docket_type: Constants.AMA_DOCKETS.direct_review
+      receipt_date: Time.zone.now,
+      established_at: Time.zone.now,
+      docket_type: Constants.AMA_DOCKETS.evidence_submission
     )
     InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
   end

From 67ffed3716f31b73f813d3c74af7b1ec3e7fa565 Mon Sep 17 00:00:00 2001
From: piedram <110848569+piedram@users.noreply.github.com>
Date: Fri, 29 Dec 2023 11:16:29 -0500
Subject: [PATCH 008/237] Piedram/appeals 36343 (#20350)

* remove package

* Added Correspondence Task Serializer to show type

* Added isReadOnly check to tasks on initial fetch

* Jest test fix

* Removed duplicate method

* Remove dropdown for readOnly page

* Added feature test

* Added extra check for banner

* Typo fix

* Fixed packageActionModal jest test

* Add Banner

* spec files

* fix rubocop error

* fix modal

* Fix spec file

* Disabled all buttons

---------

Co-authored-by: Kevin Ma <magavakevin10@gmail.com>
Co-authored-by: Kevma50287 <104021955+Kevma50287@users.noreply.github.com>
---
 app/controllers/correspondence_controller.rb  |  11 +-
 .../correspondence_tasks_controller.rb        |  10 ++
 .../correspondence_task_serializer.rb         |  25 +++
 app/models/tasks/correspondence_task.rb       |  11 ++
 client/COPY.json                              |  13 +-
 .../correspondence/CorrespondenceCases.jsx    |  26 +++-
 .../component/RemovePackageModal.jsx          | 143 ++++++++++++++++++
 .../reviewPackageActions.js                   |  10 ++
 .../reviewPackageConstants.js                 |   1 +
 .../reviewPackageReducer.js                   |  12 +-
 .../queue/correspondence/modals/editModal.jsx |   4 +-
 .../review_package/CmpDocuments.jsx           |   6 +-
 .../CorrespondenceReviewPackage.jsx           |  48 +++++-
 .../review_package/ReviewForm.jsx             |   8 +-
 .../review_package/ReviewPackageCaseTitle.jsx |  74 +++++++--
 .../review_package/ReviewPackageData.jsx      |  13 +-
 .../CorrespondenceReviewPackage.test.js       |   3 +-
 .../modals/PackageActionModal.test.js         |   2 +-
 config/routes.rb                              |   2 +
 .../correspondence_tasks_controller_spec.rb   |  22 +++
 .../correspondence/review_package_spec.rb     |  83 +++++++++-
 21 files changed, 478 insertions(+), 49 deletions(-)
 create mode 100644 app/models/serializers/work_queue/correspondence_task_serializer.rb
 create mode 100644 client/app/queue/correspondence/component/RemovePackageModal.jsx

diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index a6b8a693f93..d3965d762f4 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -132,12 +132,6 @@ def document_type_correspondence
     render json: { data: data }
   end
 
-  # :reek:UtilityFunction
-  def vbms_document_types
-    data = ExternalApi::ClaimEvidenceService.document_types
-    data["documentTypes"].map { |document_type| { id: document_type["id"], name: document_type["name"] } }
-  end
-
   def pdf
     document = Document.find(params[:pdf_id])
 
@@ -204,7 +198,10 @@ def general_information
       file_number: vet.file_number,
       veteran_name: vet.name,
       correspondence_type_id: correspondence.correspondence_type_id,
-      correspondence_types: CorrespondenceType.all
+      correspondence_types: CorrespondenceType.all,
+      correspondence_tasks: correspondence.tasks.map do |task|
+        WorkQueue::CorrespondenceTaskSerializer.new(task).serializable_hash[:data][:attributes]
+      end
     }
   end
 
diff --git a/app/controllers/correspondence_tasks_controller.rb b/app/controllers/correspondence_tasks_controller.rb
index f3ee50e597c..a85aadf151f 100644
--- a/app/controllers/correspondence_tasks_controller.rb
+++ b/app/controllers/correspondence_tasks_controller.rb
@@ -54,6 +54,16 @@ def create_correspondence_intake_task
     end
   end
 
+  def remove_package
+    root_task = CorrespondenceRootTask.find_by!(
+      appeal_id: params[:id],
+      assigned_to: MailTeamSupervisor.singleton,
+      appeal_type: "Correspondence",
+      type: "CorrespondenceRootTask"
+    )
+    root_task.cancel_task_and_child_subtasks
+  end
+
   private
 
   def task_to_create
diff --git a/app/models/serializers/work_queue/correspondence_task_serializer.rb b/app/models/serializers/work_queue/correspondence_task_serializer.rb
new file mode 100644
index 00000000000..249160be1d9
--- /dev/null
+++ b/app/models/serializers/work_queue/correspondence_task_serializer.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class WorkQueue::CorrespondenceTaskSerializer
+  include FastJsonapi::ObjectSerializer
+
+  attribute :id
+  attribute :appeal_id
+  attribute :appeal_type
+  attribute :assigned_at
+  attribute :assigned_by_id
+  attribute :assigned_to_id
+  attribute :assigned_to_type
+  attribute :cancellation_reason
+  attribute :cancelled_by_id
+  attribute :closed_at
+  attribute :completed_by_id
+  attribute :created_at
+  attribute :instructions
+  attribute :parent_id
+  attribute :placed_on_hold_at
+  attribute :started_at
+  attribute :status
+  attribute :updated_at
+  attribute :type
+end
diff --git a/app/models/tasks/correspondence_task.rb b/app/models/tasks/correspondence_task.rb
index e6aed2d3916..3723531755d 100644
--- a/app/models/tasks/correspondence_task.rb
+++ b/app/models/tasks/correspondence_task.rb
@@ -19,6 +19,17 @@ def verify_org_task_unique
     end
   end
 
+  def remove_package
+    root_task = CorrespondenceRootTask.find_by!(
+      appeal_id: @correspondence.id,
+      assigned_to: MailTeamSupervisor.singleton,
+      appeal_type: "Correspondence",
+      parent_id: @correspondence_task.id,
+      type: "CorrespondenceRootTask"
+    )
+    root_task.cancel_task_and_child_subtasks
+  end
+
   private
 
   def status_is_valid_on_create
diff --git a/client/COPY.json b/client/COPY.json
index 37ba63fee28..c9dc3ef1352 100644
--- a/client/COPY.json
+++ b/client/COPY.json
@@ -1422,8 +1422,17 @@
   "PACKAGE_ACTION_SPLIT_TITLE": "Request split package",
   "CORRESPONDENCE_DOC_UPLOAD_FAILED_HEADER": "The correspondence's documents have failed to upload to the eFolder",
   "CORRESPONDENCE_DOC_UPLOAD_FAILED_MESSAGE": "You can upload it from this page to the veteran's eFolder at a later time.",
+  "CORRESPONDENCE_HEADER_REMOVE_PACKAGE": "Review request",
+  "CORRESPONDENCE_TITLE_REMOVE_PACKAGE": "Reason for removal:",
+  "CORRRESPONDENCE_LABEL_OPTION_REMOVE_PACKAGE": " Choose whether to approve the request for removal or reject it.",
+  "CORRRESPONDENCE_TEXT_REMOVE_PACKAGE": "\nThis is the reason for removal provided by the general user.",
+  "CORRESPONDENCE_TITLE_REMOVE_PACKAGE_REASON_REJECT": "Provide a reason for rejection",
+  "CORRESPONDENCE_TITLE_REMOVE_PACKAGE_BANNER": "You have successfully removed a mail package for %s",
+  "CORRESPONDENCE_MESSAGE_REMOVE_PACKAGE_BANNER": "The package has been removed from Caseflow and must be manually uploaded again from the Centralized Mail Portal, if it needs to be processed.",
+  "UNDER_CONSTRUCTION_MESSAGE": "This page is under construction.",
+  "CORRESPONDENCE_READONLY_BANNER_HEADER": "This package has a pending request",
+  "CORRESPONDENCE_READONLY_BANNER_MESSAGE": "Any further actions cannot be made on this package until a supervisor or superuser reviews the request.",
   "ASSOCIATED_WITH_CLAIMS_FOLDER_MAIL_TASK_LABEL": "Associated with claims folder",
   "VACOLS_UPDATED_MAIL_TASK_LABEL": "VACOLS updated",
-  "SENT_TO_ROJ_MAIL_TASK_LABEL": "Sent to ROJ",
-  "UNDER_CONSTRUCTION_MESSAGE": "This page is under construction."
+  "SENT_TO_ROJ_MAIL_TASK_LABEL": "Sent to ROJ"
 }
diff --git a/client/app/queue/correspondence/CorrespondenceCases.jsx b/client/app/queue/correspondence/CorrespondenceCases.jsx
index 7ad68873b3c..5b159dfc588 100644
--- a/client/app/queue/correspondence/CorrespondenceCases.jsx
+++ b/client/app/queue/correspondence/CorrespondenceCases.jsx
@@ -6,9 +6,11 @@ import { loadVetCorrespondence } from './correspondenceReducer/correspondenceAct
 import AppSegment from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/AppSegment';
 import PropTypes from 'prop-types';
 import COPY from '../../../COPY';
+import { sprintf } from 'sprintf-js';
 import { css } from 'glamor';
 import CorrespondenceTable from './CorrespondenceTable';
 import QueueOrganizationDropdown from '../components/QueueOrganizationDropdown';
+import Alert from '../../components/Alert';
 
 // import {
 //   initialAssignTasksToUser,
@@ -41,12 +43,26 @@ class CorrespondenceCases extends React.PureComponent {
 
   render = () => {
     const {
-      organizations
+      organizations,
+      currentAction,
+      veteranInformation
+
     } = this.props;
 
+    let vetName = '';
+
+    if (Object.keys(veteranInformation).length > 0) {
+      vetName = `${veteranInformation.veteran_name.first_name.trim()} ${
+        veteranInformation.veteran_name.last_name.trim()}`;
+    }
+
     return (
       <React.Fragment>
         <AppSegment filledBackground>
+          {(Object.keys(veteranInformation).length > 0) &&
+            currentAction.action_type === 'DeleteReviewPackage' &&
+          <Alert type="success" title={sprintf(COPY.CORRESPONDENCE_TITLE_REMOVE_PACKAGE_BANNER, vetName)}
+            message={COPY.CORRESPONDENCE_MESSAGE_REMOVE_PACKAGE_BANNER} scrollOnAlert={false} />}
           <h1 {...css({ display: 'inline-block' })}>{COPY.CASE_LIST_TABLE_QUEUE_DROPDOWN_CORRESPONDENCE_CASES}</h1>
           <QueueOrganizationDropdown organizations={organizations} />
           {this.props.vetCorrespondences &&
@@ -63,11 +79,15 @@ class CorrespondenceCases extends React.PureComponent {
 CorrespondenceCases.propTypes = {
   organizations: PropTypes.array,
   loadVetCorrespondence: PropTypes.func,
-  vetCorrespondences: PropTypes.array
+  vetCorrespondences: PropTypes.array,
+  currentAction: PropTypes.object,
+  veteranInformation: PropTypes.object
 };
 
 const mapStateToProps = (state) => ({
-  vetCorrespondences: state.intakeCorrespondence.vetCorrespondences
+  vetCorrespondences: state.intakeCorrespondence.vetCorrespondences,
+  currentAction: state.reviewPackage.lastAction,
+  veteranInformation: state.reviewPackage.veteranInformation
 });
 
 const mapDispatchToProps = (dispatch) => (
diff --git a/client/app/queue/correspondence/component/RemovePackageModal.jsx b/client/app/queue/correspondence/component/RemovePackageModal.jsx
new file mode 100644
index 00000000000..133ce40659a
--- /dev/null
+++ b/client/app/queue/correspondence/component/RemovePackageModal.jsx
@@ -0,0 +1,143 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ApiUtil from '../../../util/ApiUtil';
+import { sprintf } from 'sprintf-js';
+import StringUtil from '../../../util/StringUtil';
+import { connect } from 'react-redux';
+import { bindActionCreators } from 'redux';
+import { updateLastAction } from '../correspondenceReducer/reviewPackageActions';
+import TextareaField from '../../../components/TextareaField';
+import RadioField from '../../../components/RadioField';
+// import { css } from 'glamor';
+import COPY from '../../../../COPY';
+import Modal from '../../../components/Modal';
+import Button from '../../../components/Button';
+import { Redirect } from 'react-router-dom';
+
+class RemovePackageModal extends React.Component {
+
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      reasonForRemove: null,
+      disabledSaveButton: true,
+      reasonReject: '',
+      updateCancelSuccess: false
+
+    };
+  }
+
+  handleSelect(reasonForRemove) {
+    if (reasonForRemove === 'Approve request') {
+      this.setState({ reasonForRemove,
+        disabledSaveButton: false });
+    } else {
+      this.setState({ reasonForRemove,
+        disabledSaveButton: true });
+    }
+  }
+
+  reasonChange = (value) => {
+    if (value.trim().length > 0) {
+      this.setState({
+        reasonReject: value,
+        disabledSaveButton: false
+      });
+    } else {
+      this.setState({
+        reasonReject: '',
+        disabledSaveButton: true
+      });
+    }
+  }
+
+  removePackage = async () => {
+    try {
+      ApiUtil.post(`/queue/correspondence/${this.props.correspondence_id}/remove_package`).
+        then(() => {
+          this.setState({
+            updateCancelSuccess: true
+          });
+          this.props.updateLastAction('DeleteReviewPackage');
+        });
+
+    } catch (error) {
+      console.error(error);
+    }
+  }
+
+  render() {
+    const { onCancel } = this.props;
+    const submit = () => {
+      this.removePackage();
+    };
+
+    const removeReasonOptions = [
+      { displayText: 'Approve request',
+        value: 'Approve request' },
+      { displayText: 'Reject request',
+        value: 'Reject request' }
+    ];
+
+    if (this.state.updateCancelSuccess) {
+      return <Redirect to="/queue/correspondence" />;
+    }
+
+    return (
+      <Modal
+        title= {sprintf(COPY.CORRESPONDENCE_HEADER_REMOVE_PACKAGE)}
+        closeHandler={onCancel}
+        confirmButton={<Button disabled={this.state.disabledSaveButton}
+          onClick={submit}>Confirm</Button>}
+        cancelButton={<Button linkStyling onClick={onCancel}>Cancel</Button>}
+      >
+        <p>
+          <span style= {{ fontWeight: 'bold' }}>{sprintf(COPY.CORRESPONDENCE_TITLE_REMOVE_PACKAGE)}</span>
+          {StringUtil.nl2br(COPY.CORRRESPONDENCE_TEXT_REMOVE_PACKAGE)}
+        </p>
+
+        <RadioField
+          vertical
+          label= {sprintf(COPY.CORRRESPONDENCE_LABEL_OPTION_REMOVE_PACKAGE)}
+          name="merge-package"
+          value={this.state.reasonForRemove}
+          options={removeReasonOptions}
+          onChange={(val) => this.handleSelect(val)}
+        />
+
+        {this.state.reasonForRemove === 'Reject request' &&
+              <TextareaField
+                name={sprintf(COPY.CORRESPONDENCE_TITLE_REMOVE_PACKAGE_REASON_REJECT)}
+                onChange={this.reasonChange}
+                value={this.state.reasonReject}
+              />
+        }
+
+      </Modal>
+    );
+
+  }
+}
+
+const mapStateToProps = (state) => {
+  return { vetInfo: state.reviewPackage.lastAction };
+};
+
+RemovePackageModal.propTypes = {
+  modalState: PropTypes.bool,
+  onCancel: PropTypes.func,
+  setModalState: PropTypes.func,
+  correspondence_id: PropTypes.number,
+  vetInfo: PropTypes.object,
+  updateLastAction: PropTypes.func,
+};
+
+const mapDispatchToProps = (dispatch) => bindActionCreators({
+  updateLastAction
+}, dispatch);
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(RemovePackageModal);
diff --git a/client/app/queue/correspondence/correspondenceReducer/reviewPackageActions.js b/client/app/queue/correspondence/correspondenceReducer/reviewPackageActions.js
index 90cfa557c87..80c6f8dd8ae 100644
--- a/client/app/queue/correspondence/correspondenceReducer/reviewPackageActions.js
+++ b/client/app/queue/correspondence/correspondenceReducer/reviewPackageActions.js
@@ -61,3 +61,13 @@ export const updateDocumentTypeName = (newName, index) =>
       }
     });
   };
+
+export const updateLastAction = (currentAction) =>
+  (dispatch) => {
+    dispatch({
+      type: ACTIONS.REMOVE_PACKAGE_ACTION,
+      payload: {
+        currentAction
+      }
+    });
+  };
diff --git a/client/app/queue/correspondence/correspondenceReducer/reviewPackageConstants.js b/client/app/queue/correspondence/correspondenceReducer/reviewPackageConstants.js
index 153378f6c91..cd864bde382 100644
--- a/client/app/queue/correspondence/correspondenceReducer/reviewPackageConstants.js
+++ b/client/app/queue/correspondence/correspondenceReducer/reviewPackageConstants.js
@@ -5,4 +5,5 @@ export const ACTIONS = {
   SET_VETERAN_INFORMATION: 'SET_VETERAN_INFORMATION',
   UPDATE_CMP_INFORMATION: 'UPDATE_CMP_INFORMATION',
   UPDATE_DOCUMENT_TYPE_NAME: 'UPDATE_DOCUMENT_TYPE_NAME',
+  REMOVE_PACKAGE_ACTION: 'REMOVE_PACKAGE_ACTION'
 };
diff --git a/client/app/queue/correspondence/correspondenceReducer/reviewPackageReducer.js b/client/app/queue/correspondence/correspondenceReducer/reviewPackageReducer.js
index 44a3f937954..56b3b68365d 100644
--- a/client/app/queue/correspondence/correspondenceReducer/reviewPackageReducer.js
+++ b/client/app/queue/correspondence/correspondenceReducer/reviewPackageReducer.js
@@ -5,7 +5,8 @@ export const initialState = {
   correspondence: {},
   correspondenceDocuments: [],
   packageDocumentType: {},
-  veteranInformation: {}
+  veteranInformation: {},
+  lastAction: {}
 };
 
 export const reviewPackageReducer = (state = initialState, action = {}) => {
@@ -69,6 +70,15 @@ export const reviewPackageReducer = (state = initialState, action = {}) => {
       }
     });
 
+  case ACTIONS.REMOVE_PACKAGE_ACTION:
+    return update(state, {
+      lastAction: {
+        action_type: {
+          $set: action.payload.currentAction
+        }
+      }
+    });
+
   default:
     return state;
   }
diff --git a/client/app/queue/correspondence/modals/editModal.jsx b/client/app/queue/correspondence/modals/editModal.jsx
index 481b56cb48d..fcf3fb363d8 100644
--- a/client/app/queue/correspondence/modals/editModal.jsx
+++ b/client/app/queue/correspondence/modals/editModal.jsx
@@ -164,6 +164,7 @@ class EditModal extends React.Component {
           name="Edit"
           onClick={() => this.onClickEditCMP()}
           classNames={['usa-button-primary']}
+          disabled={this.props.isReadOnly}
         />
         {showEditModal && (
           <Modal buttons={this.getModalButtons()} visible closeHandler={this.onClickCancel} title="Edit CMP information">
@@ -199,7 +200,8 @@ class EditModal extends React.Component {
 
 EditModal.propTypes = {
   onCancel: PropTypes.func,
-  updateCmpInformation: PropTypes.func
+  updateCmpInformation: PropTypes.func,
+  isReadOnly: PropTypes.bool
 };
 
 const mapDispatchToProps = (dispatch) => (
diff --git a/client/app/queue/correspondence/review_package/CmpDocuments.jsx b/client/app/queue/correspondence/review_package/CmpDocuments.jsx
index b117587a934..77f79202a85 100644
--- a/client/app/queue/correspondence/review_package/CmpDocuments.jsx
+++ b/client/app/queue/correspondence/review_package/CmpDocuments.jsx
@@ -22,7 +22,7 @@ const paginationStyle = css({
 });
 
 export const CmpDocuments = (props) => {
-  const { documents } = props;
+  const { documents, isReadOnly } = props;
 
   const [selectedId, setSelectedId] = useState(0);
 
@@ -72,6 +72,7 @@ export const CmpDocuments = (props) => {
                   </td>
                   <td className="cf-txt-c">
                     <Button
+                      disabled={isReadOnly}
                       linkStyling
                       onClick={() => {
                         setCurrentDocument(index);
@@ -94,7 +95,8 @@ export const CmpDocuments = (props) => {
 CmpDocuments.propTypes = {
   documents: PropTypes.array,
   setSelectedId: PropTypes.func,
-  selectedId: PropTypes.number
+  selectedId: PropTypes.number,
+  isReadOnly: PropTypes.bool
 };
 
 export default CmpDocuments;
diff --git a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
index 5305cfce32d..7be937bad39 100644
--- a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
+++ b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
@@ -14,6 +14,8 @@ import { useHistory } from 'react-router';
 import PackageActionModal from '../modals/PackageActionModal';
 import ReviewPackageNotificationBanner from './ReviewPackageNotificationBanner';
 import {
+  CORRESPONDENCE_READONLY_BANNER_HEADER,
+  CORRESPONDENCE_READONLY_BANNER_MESSAGE,
   CORRESPONDENCE_DOC_UPLOAD_FAILED_HEADER,
   CORRESPONDENCE_DOC_UPLOAD_FAILED_MESSAGE }
   from '../../../../COPY';
@@ -34,12 +36,25 @@ export const CorrespondenceReviewPackage = (props) => {
   const [packageActionModal, setPackageActionModal] = useState(null);
   const [errorMessage, setErrorMessage] = useState('');
   const [selectedId, setSelectedId] = useState(0);
+  const [isReadOnly, setIsReadOnly] = useState(false);
+
+  // Banner Information takes in the following object:
+  // {  title: ,  message: ,  bannerType: }
   const [bannerInformation, setBannerInformation] = useState(null);
 
   const history = useHistory();
   const fetchData = async () => {
     const correspondence = props;
 
+    // When a remove package task is active and pending review, the page is read-only
+    const isPageReadOnly = (tasks) => {
+      const assignedRemoveTask = tasks.find((task) => task.status === 'assigned' && task.type === 'RemovePackageTask');
+      const isMailTeamSupervisor = correspondence.organizations.find((org) => org.name === 'Mail Team Supervisor');
+
+      // Return true if a removePackageTask that is currently assigned is found, else false
+      return (typeof assignedRemoveTask !== 'undefined') && isMailTeamSupervisor;
+    };
+
     try {
       const response = await ApiUtil.get(
         `/queue/correspondence/${correspondence.correspondence_uuid}`
@@ -58,8 +73,17 @@ export const CorrespondenceReviewPackage = (props) => {
         veteran_file_number: data.file_number,
         default_select_value: data.correspondence_type_id,
       });
+
+      if (isPageReadOnly(data.correspondence_tasks)) {
+        setBannerInformation({
+          title: CORRESPONDENCE_READONLY_BANNER_HEADER,
+          message: CORRESPONDENCE_READONLY_BANNER_MESSAGE,
+          bannerType: 'warning'
+        });
+        setIsReadOnly(true);
+      }
     } catch (error) {
-      throw error();
+      console.error(error);
     }
   };
 
@@ -138,11 +162,14 @@ export const CorrespondenceReviewPackage = (props) => {
         <AppSegment filledBackground>
           <ReviewPackageCaseTitle
             handlePackageActionModal={handlePackageActionModal}
+            correspondence={props.correspondence}
             packageActionModal={packageActionModal}
+            isReadOnly={isReadOnly}
           />
           <ReviewPackageData
             correspondence={props.correspondence}
             packageDocumentType={props.packageDocumentType}
+            isReadOnly={isReadOnly}
           />
           {packageActionModal &&
             <PackageActionModal
@@ -163,7 +190,8 @@ export const CorrespondenceReviewPackage = (props) => {
               handleModalClose,
               handleReview,
               errorMessage,
-              setErrorMessage
+              setErrorMessage,
+              isReadOnly
             }}
             {...props}
           />
@@ -171,6 +199,7 @@ export const CorrespondenceReviewPackage = (props) => {
             documents={props.correspondenceDocuments}
             selectedId={selectedId}
             setSelectedId={setSelectedId}
+            isReadOnly={isReadOnly}
           />
 
         </AppSegment>
@@ -189,7 +218,7 @@ export const CorrespondenceReviewPackage = (props) => {
                 styling={{ style: { marginRight: '2rem' } }}
                 classNames={['usa-button-secondary']}
                 onClick={intakeAppeal}
-                disabled={disableButton}
+                disabled={disableButton || isReadOnly}
               />
             )}
             <a href={intakeLink}>
@@ -197,7 +226,7 @@ export const CorrespondenceReviewPackage = (props) => {
                 name="Create record"
                 classNames={['usa-button-primary']}
                 onClick={intakeLink}
-                disabled={disableButton}
+                disabled={disableButton || isReadOnly}
               />
             </a>
           </div>
@@ -214,14 +243,21 @@ CorrespondenceReviewPackage.propTypes = {
   packageDocumentType: PropTypes.object,
   veteranInformation: PropTypes.object,
   setFileNumberSearch: PropTypes.func,
-  doFileNumberSearch: PropTypes.func
+  doFileNumberSearch: PropTypes.func,
+  organizations: PropTypes.arrayOf(
+    PropTypes.shape({
+      name: PropTypes.string,
+      url: PropTypes.string
+    })
+  )
 };
 
 const mapStateToProps = (state) => ({
   correspondence: state.reviewPackage.correspondence,
   correspondenceDocuments: state.reviewPackage.correspondenceDocuments,
   packageDocumentType: state.reviewPackage.packageDocumentType,
-  veteranInformation: state.reviewPackage.veteranInformation
+  veteranInformation: state.reviewPackage.veteranInformation,
+  organizations: state.ui.organizations
 });
 
 const mapDispatchToProps = (dispatch) => bindActionCreators({
diff --git a/client/app/queue/correspondence/review_package/ReviewForm.jsx b/client/app/queue/correspondence/review_package/ReviewForm.jsx
index bb5485e1c93..d1006a7af32 100644
--- a/client/app/queue/correspondence/review_package/ReviewForm.jsx
+++ b/client/app/queue/correspondence/review_package/ReviewForm.jsx
@@ -187,7 +187,7 @@ export const ReviewForm = (props) => {
           name="Save changes"
           href="/queue/correspondence/12/intake"
           classNames={['usa-button-primary']}
-          disabled={!props.disableButton}
+          disabled={!props.disableButton || props.isReadOnly}
           onClick={handleSubmit}
         />
       </div>
@@ -203,6 +203,7 @@ export const ReviewForm = (props) => {
                   name="veteran-file-number-input"
                   useAriaLabel
                   errorMessage={props.errorMessage}
+                  readOnly={props.isReadOnly}
                 />
               </div>
 
@@ -226,6 +227,7 @@ export const ReviewForm = (props) => {
                 value={defaultSelectedValue}
                 options={generateOptions(props.reviewDetails.dropdown_values)}
                 onChange={handleSelect}
+                readOnly={props.isReadOnly}
               />
             </div>
 
@@ -238,6 +240,7 @@ export const ReviewForm = (props) => {
                 textAreaStyling={textareaWidth}
                 value={props.editableData.notes}
                 onChange={handleChangeNotes}
+                disabled={props.isReadOnly}
               />
             </div>
           </div>
@@ -289,7 +292,8 @@ ReviewForm.propTypes = {
   showModal: PropTypes.bool,
   handleModalClose: PropTypes.func,
   handleReview: PropTypes.func,
-  errorMessage: PropTypes.string
+  errorMessage: PropTypes.string,
+  isReadOnly: PropTypes.bool
 };
 
 export default ReviewForm;
diff --git a/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx b/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx
index ecc223b8060..d3a5697dcca 100644
--- a/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx
+++ b/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx
@@ -1,8 +1,10 @@
 import { css } from 'glamor';
 import PropTypes from 'prop-types';
-import React from 'react';
+import React, { useState } from 'react';
 import COPY from 'app/../COPY';
+import Button from '../../../components/Button';
 import SearchableDropdown from '../../../components/SearchableDropdown';
+import RemovePackageModal from '../component/RemovePackageModal';
 
 const containingDivStyling = css({
   display: 'block',
@@ -16,6 +18,12 @@ const containingDivStyling = css({
   }
 });
 
+const removebotton = css({
+  float: 'right',
+  marginRight: '2rem !important'
+
+});
+
 const headerStyling = css({
   paddingRight: '2.5rem'
 });
@@ -46,26 +54,62 @@ const dropDownDiv = css({
 });
 
 const ReviewPackageCaseTitle = (props) => {
+
   return (
     <div>
-      <CaseTitleScaffolding />
-      <CaseSubTitleScaffolding {...props} />
+      <CaseTitleScaffolding correspondence_id = {props.correspondence.id} isReadOnly={props.isReadOnly} />
+      <CaseSubTitleScaffolding {...props} isReadOnly={props.isReadOnly} />
     </div>
   );
 };
 
-const CaseTitleScaffolding = () => (
-  <div {...containingDivStyling}>
-    <h1 {...headerStyling}>{COPY.CORRESPONDENCE_REVIEW_PACKAGE_TITLE}</h1>
-  </div>
-);
+const CaseTitleScaffolding = (props) => {
+
+  const [modalState, setModalState] = useState(false);
+
+  const openModal = () => {
+    setModalState(true);
+  };
+  const closeModal = () => {
+    setModalState(false);
+  };
+
+  return (
+    <div {...containingDivStyling}>
+      <h1 {...headerStyling}>{COPY.CORRESPONDENCE_REVIEW_PACKAGE_TITLE}</h1>
+
+      <span {...removebotton}>
+        { props.isReadOnly &&
+          <Button
+            name="Review removal request"
+            styling={{ style: { marginRight: '2rem', padding: '15px', fontSize: 'larger' } }}
+            classNames={['usa-button-primary']}
+            onClick={() => {
+              openModal();
+            }}
+          />
+        }
+      </span>
+      { modalState &&
+      <RemovePackageModal
+        modalState={modalState}
+        setModalState={setModalState}
+        onCancel={closeModal}
+        correspondence_id = {props.correspondence_id} />
+      }
+    </div>
+  );
+
+};
 
 const CaseSubTitleScaffolding = (props) => (
   <div {...listStyling}>
     <div {...columnStyling}>
       {COPY.CORRESPONDENCE_REVIEW_PACKAGE_SUB_TITLE}
     </div>
+
     <div {...dropDownDiv} style = {{ maxWidth: '25%' }}>
+      { !props.isReadOnly &&
       <SearchableDropdown
         options={[
           { value: 'splitPackage', label: 'Split package' },
@@ -79,18 +123,26 @@ const CaseSubTitleScaffolding = (props) => (
         hideLabel
         name=""
         value={props.packageActionModal}
-      />
+      /> }
     </div>
   </div>
 );
 
 ReviewPackageCaseTitle.propTypes = {
-  handlePackageActionModal: PropTypes.func
+  handlePackageActionModal: PropTypes.func,
+  correspondence: PropTypes.object,
+  isReadOnly: PropTypes.bool
 };
 
 CaseSubTitleScaffolding.propTypes = {
   handlePackageActionModal: PropTypes.func,
-  packageActionModal: PropTypes.string
+  packageActionModal: PropTypes.string,
+  isReadOnly: PropTypes.bool
+};
+
+CaseTitleScaffolding.propTypes = {
+  correspondence_id: PropTypes.number,
+  isReadOnly: PropTypes.bool
 };
 
 export default ReviewPackageCaseTitle;
diff --git a/client/app/queue/correspondence/review_package/ReviewPackageData.jsx b/client/app/queue/correspondence/review_package/ReviewPackageData.jsx
index b8474e45c06..799014eee40 100644
--- a/client/app/queue/correspondence/review_package/ReviewPackageData.jsx
+++ b/client/app/queue/correspondence/review_package/ReviewPackageData.jsx
@@ -45,13 +45,14 @@ class ReviewPackageData extends React.PureComponent {
       <div>
         <CmpInfoScaffolding
           correspondence={this.props.correspondence}
-          packageDocumentType = {this.props.packageDocumentType} />
+          packageDocumentType = {this.props.packageDocumentType}
+          isReadOnly={this.props.isReadOnly} />
       </div>
     );
   };
 }
 
-const CmpInfoScaffolding = () => {
+const CmpInfoScaffolding = ({ isReadOnly }) => {
   const correspondence = useSelector(
     (state) => state.reviewPackage.correspondence
   );
@@ -66,7 +67,7 @@ const CmpInfoScaffolding = () => {
     <div>
       <div style={{ display: 'inline-flex' }}>
         <h2 style={{ marginRight: '20px' }}> {COPY.CORRESPONDENCE_REVIEW_CMP_INFO_TITLE}</h2>
-        <EditModal />
+        <EditModal isReadOnly={isReadOnly} />
       </div>
 
       <TitleDetailsSubheader id="caseTitleDetailsSubheader">
@@ -95,7 +96,8 @@ const CmpInfoScaffolding = () => {
 
 CmpInfoScaffolding.propTypes = {
   packageDocumentType: PropTypes.object,
-  correspondence: PropTypes.object
+  correspondence: PropTypes.object,
+  isReadOnly: PropTypes.bool
 };
 
 TitleDetailsSubheaderSection.propTypes = {
@@ -105,7 +107,8 @@ TitleDetailsSubheaderSection.propTypes = {
 
 ReviewPackageData.propTypes = {
   correspondence: PropTypes.object,
-  packageDocumentType: PropTypes.object
+  packageDocumentType: PropTypes.object,
+  isReadOnly: PropTypes.bool
 };
 
 export default ReviewPackageData;
diff --git a/client/test/app/queue/correspondences/CorrespondenceReviewPackage.test.js b/client/test/app/queue/correspondences/CorrespondenceReviewPackage.test.js
index 12a83ac3d08..301332d56d2 100644
--- a/client/test/app/queue/correspondences/CorrespondenceReviewPackage.test.js
+++ b/client/test/app/queue/correspondences/CorrespondenceReviewPackage.test.js
@@ -44,6 +44,7 @@ describe('CorrespondenceReviewPackage', () => {
       correspondenceId: '123',
     };
   });
+
   test('render modal', async () => {
     render(
       <Provider store={store}>
@@ -67,7 +68,6 @@ describe('CorrespondenceReviewPackage', () => {
     expect(closeButton).toBeInTheDocument();
     fireEvent.click(closeButton);
     expect(screen.queryByText('All unsaved changes made to this mail package will be lost')).not.toBeInTheDocument();
-
   });
 
   test('renders modal with correct title, buttons, and text', async () => {
@@ -119,6 +119,5 @@ describe('CorrespondenceReviewPackage', () => {
       expect(history.location.pathname).toBe('/queue/correspondence');
     });
   });
-
 });
 
diff --git a/client/test/app/queue/correspondences/modals/PackageActionModal.test.js b/client/test/app/queue/correspondences/modals/PackageActionModal.test.js
index 56691dbb3cd..c29e3ccd089 100644
--- a/client/test/app/queue/correspondences/modals/PackageActionModal.test.js
+++ b/client/test/app/queue/correspondences/modals/PackageActionModal.test.js
@@ -128,7 +128,7 @@ describe('PackageActionModal rendering', () => {
     renderPackageActionModal('mergePackage');
 
     expect(screen.getByText('Request merge')).toBeInTheDocument();
-    expect(screen.getByText('Reason for merge')).toBeInTheDocument();
+    expect(screen.getByText('Select a reason for merging this package.')).toBeInTheDocument();
     expect(screen.getByText(correspondenceData.cmp_packet_number.toString())).toBeInTheDocument();
     expect(screen.getByText(packageDocumentTypeData.name)).toBeInTheDocument();
 
diff --git a/config/routes.rb b/config/routes.rb
index 88d9ef38a49..edb51aa1570 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -299,6 +299,8 @@
     get '/correspondence/:correspondence_uuid/intake', to: 'correspondence#intake', as: :queue_correspondence_intake
     post '/correspondence/:correspondence_uuid/current_step', to: 'correspondence#current_step', as: :queue_correspondence_intake_current_step
     post '/correspondence/:correspondence_uuid/correspondence_intake_task', to: 'correspondence_tasks#create_correspondence_intake_task'
+    post '/correspondence/:id/remove_package', to: 'correspondence_tasks#remove_package'
+    get '/correspondence/:correspondence_uuid/intake', to: 'correspondence#intake'
     get '/correspondence/:correspondence_uuid/review_package', to: 'correspondence#review_package'
     get '/correspondence/edit_document_type_correspondence', to: 'correspondence#document_type_correspondence'
     patch '/correspondence/:correspondence_uuid/intake_update', to: 'correspondence#intake_update'
diff --git a/spec/controllers/correspondence_tasks_controller_spec.rb b/spec/controllers/correspondence_tasks_controller_spec.rb
index 342ed7c4031..87cf5b41c1a 100644
--- a/spec/controllers/correspondence_tasks_controller_spec.rb
+++ b/spec/controllers/correspondence_tasks_controller_spec.rb
@@ -88,4 +88,26 @@
       end
     end
   end
+
+  describe "POST #remove_package" do
+    context "Delete correspondence package from Caseflow" do
+      before do
+        task_creation_params.merge!(type: "removePackage", instructions: ["please remove task, thanks"])
+        post :create_package_action_task, params: task_creation_params
+        expect(response).to have_http_status(:ok)
+        remove_package_task = RemovePackageTask.find_by(appeal_id: correspondence.id, type: RemovePackageTask.name)
+        task_creation_params[:id] = correspondence.id
+        post :remove_package, params: task_creation_params
+
+        it "creates remove package task successfully" do
+          expect(response).to have_http_status(:ok)
+          remove_package_task = RemovePackageTask.find_by(appeal_id: correspondence.id, type: RemovePackageTask.name)
+          expect(remove_package_task.status).to eq(Constants.TASK_STATUSES.canceled)
+          parent = CorrespondenceTask.find_by(appeal_id: correspondence.id, type: CorrespondenceTask.name)
+          expect(parent.status).to eq(Constants.TASK_STATUSES.on_hold)
+          expect(parent.children.status).to eq(Constants.TASK_STATUSES.on_hold)
+        end
+      end
+    end
+  end
 end
diff --git a/spec/feature/queue/correspondence/review_package_spec.rb b/spec/feature/queue/correspondence/review_package_spec.rb
index 6b9548e17a5..4ca4f2636f3 100644
--- a/spec/feature/queue/correspondence/review_package_spec.rb
+++ b/spec/feature/queue/correspondence/review_package_spec.rb
@@ -44,7 +44,7 @@
 
     it "check for CMP Edit button" do
       expect(page).to have_button("Edit")
-      expect(page).to have_button("Cancel")
+      expect(page).to have_button("Return to queue")
       expect(page).to have_button("Create record")
     end
 
@@ -55,6 +55,74 @@
         expect(page).to_not have_content("Intake appeal")
       end
     end
+
+    context "when remove package task is pending review" do
+      let(:review_package_task) { ReviewPackageTask.find_by(appeal_id: correspondence.id, type: ReviewPackageTask.name) }
+
+      before do
+        task_params = {
+          parent_id: review_package_task.id,
+          instructions: ["test remove", "test"],
+          assigned_to: MailTeamSupervisor.singleton,
+          appeal_id: correspondence.id,
+          appeal_type: "Correspondence",
+          status: Constants.TASK_STATUSES.assigned,
+          type: "RemovePackageTask"
+        }
+        ReviewPackageTask.create_from_params(task_params, mail_team_supervisor_user)
+        review_package_task.update!(assigned_to: MailTeamSupervisor.singleton, status: :on_hold)
+        visit "/queue/correspondence/#{correspondence.uuid}/review_package"
+      end
+
+      it "page is readOnly " do
+        expect(page).to have_button("Edit", disabled: true)
+        expect(page).to have_field("Veteran file number", readonly: true)
+        expect(page).to have_field("Veteran name", readonly: true)
+        expect(page).to have_field("Notes", disabled: true)
+        expect(find(".cf-form-dropdown")).to have_css("div.cf-select--is-disabled")
+        expect(page).to have_button("Review removal request")
+      end
+
+      it "request package action dropdown isn't visible" do
+        expect(page).to have_no_content("Request pacakge action")
+      end
+
+      it "warning banner appears" do
+        expect(page).to have_content("This package has a pending request")
+      end
+
+      it "open Modal to remove Package" do
+        expect(page).to have_button("Review removal request")
+        click_button "Review removal request"
+        radio_choices = page.all(".cf-form-radio-option > label")
+        expect(radio_choices[0]).to have_content("Approve request")
+        expect(radio_choices[1]).to have_content("Reject request")
+        expect(page).to have_button("Cancel")
+        expect(page).to have_button("Confirm", disabled: true)
+        expect(page).not_to have_field("Provide a reason for rejection")
+      end
+
+      it "fill Modal to remove Package up" do
+        expect(page).to have_button("Review removal request")
+        click_button "Review removal request"
+        page.all(".cf-form-radio-option > label")[0].click
+      end
+
+      it "remove Package" do
+        expect(page).to have_button("Review removal request")
+        click_button "Review removal request"
+        page.all(".cf-form-radio-option > label")[1].click
+        expect(page).to have_field("Provide a reason for rejection")
+        expect(page).to have_button("Confirm", disabled: true)
+
+        fill_in "Provide a reason for rejection", with: "Provide a reason for rejection"
+        expect(page).to have_button("Confirm", disabled: false)
+        click_button("Confirm")
+        using_wait_time(10) do
+          expect(page).to have_content("The package has been removed from Caseflow and must be manually uploaded again from the Centralized Mail Portal, if it needs to be processed.")
+        end
+      end
+    end
   end
 
   context "Review package - intake appeal" do
@@ -69,10 +137,13 @@
 
     it "completes step 1 and 2 then goes to step 3 of intake appeal process" do
       visit "/queue/correspondence/#{correspondence.uuid}/review_package"
+      expect(page).to have_button("Intake appeal")
       click_button "Intake appeal"
-      expect(page).to have_current_path("/intake/review_request")
-      expect(page).to have_text `#{veteran.file_number}`
-      expect(page).to have_text `Review #{veteran.first_name} #{veteran.last_name}'s Decision Review Request: Board Appeal (Notice of Disagreement) - VA Form 10182`
+      using_wait_time(10) do
+        expect(page).to have_text `#{veteran.file_number}`
+        expect(page).to have_text `Review #{veteran.first_name} #{veteran.last_name}'s Decision Review Request: Board Appeal (Notice of Disagreement) - VA Form 10182`
+        # expect(page).to have_current_path("/intake/review_request")
+      end
     end
   end
 
@@ -82,8 +153,8 @@
 
     before do
       FeatureToggle.enable!(:correspondence_queue)
-      mail_team_org.add_user(mail_team_user)
-      User.authenticate!(user: mail_team_user)
+      mail_team_supervisor_org.add_user(mail_team_supervisor_user)
+      User.authenticate!(user: mail_team_supervisor_user)
     end
 
     it "click on Create record button" do

From cc4918168ed92b4c053ffc5bf078892a3069d10a Mon Sep 17 00:00:00 2001
From: Rnmarshall93 <110805785+Rnmarshall93@users.noreply.github.com>
Date: Fri, 29 Dec 2023 08:46:30 -0800
Subject: [PATCH 009/237] Task related to appeals bugfix. (#20369)

* Refactored task ID logic for related tasks.

* Updated logic to be cleaner.

---------

Co-authored-by: Jim Foley <james.foley4@va.gov>
---
 .../components/TasksAppeals/AddAppealRelatedTaskView.jsx   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/client/app/queue/correspondence/intake/components/TasksAppeals/AddAppealRelatedTaskView.jsx b/client/app/queue/correspondence/intake/components/TasksAppeals/AddAppealRelatedTaskView.jsx
index 68989009b90..16370e1a033 100644
--- a/client/app/queue/correspondence/intake/components/TasksAppeals/AddAppealRelatedTaskView.jsx
+++ b/client/app/queue/correspondence/intake/components/TasksAppeals/AddAppealRelatedTaskView.jsx
@@ -55,7 +55,12 @@ export const AddAppealRelatedTaskView = (props) => {
   }, [taskRelatedAppeals]);
 
   useEffect(() => {
-    setNextTaskId((prevId) => prevId + 1);
+    // Creates an array of Task IDs then sorts them so that the highest ID is the last in the array.
+    const existingIds = newTasks.map((task) => task.id).sort((task1, task2) => task1.id - task2.id);
+
+    // Set the value to 0 if there are no IDs. Otherwise use the highest value ID + 1
+    setNextTaskId(existingIds.empty ? 0 : existingIds.last + 1);
+
     dispatch(setNewAppealRelatedTasks(newTasks));
   }, [newTasks]);
 

From 0654561fd4a9032be1538b39f67476689807a8eb Mon Sep 17 00:00:00 2001
From: Kevma50287 <104021955+Kevma50287@users.noreply.github.com>
Date: Fri, 29 Dec 2023 12:03:34 -0500
Subject: [PATCH 010/237] Kev ma/appeals 36674 (#20299)

* Added Correspondence Task Serializer to show type

* Added isReadOnly check to tasks on initial fetch

* Jest test fix

* Removed duplicate method

* Remove dropdown for readOnly page

* Added feature test

* Added extra check for banner

* Typo fix

* Fixed packageActionModal jest test

* Added guard to error handling

* Spec fix

* Missing comma

* Piedram/appeals 36343 (#20350)

* remove package

* Added Correspondence Task Serializer to show type

* Added isReadOnly check to tasks on initial fetch

* Jest test fix

* Removed duplicate method

* Remove dropdown for readOnly page

* Added feature test

* Added extra check for banner

* Typo fix

* Fixed packageActionModal jest test

* Add Banner

* spec files

* fix rubocop error

* fix modal

* Fix spec file

* Disabled all buttons

---------

Co-authored-by: Kevin Ma <magavakevin10@gmail.com>
Co-authored-by: Kevma50287 <104021955+Kevma50287@users.noreply.github.com>

---------

Co-authored-by: piedram <110848569+piedram@users.noreply.github.com>
---
 app/controllers/correspondence_tasks_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/controllers/correspondence_tasks_controller.rb b/app/controllers/correspondence_tasks_controller.rb
index a85aadf151f..4703eee210e 100644
--- a/app/controllers/correspondence_tasks_controller.rb
+++ b/app/controllers/correspondence_tasks_controller.rb
@@ -34,6 +34,8 @@ def create_package_action_task
 
   def create_correspondence_intake_task
     review_package_task = ReviewPackageTask.find_by(appeal_id: params[:id], type: ReviewPackageTask.name)
+    return render json: { message: "Correspondence Root Task not found" }, status: :not_found unless review_package_task
+
     current_parent = review_package_task.parent
     current_cit = CorrespondenceIntakeTask.find_by(parent_id: current_parent.id, type: CorrespondenceIntakeTask.name)
 

From efa1ad4b2becdb06ad22846ff5d03fd27664298d Mon Sep 17 00:00:00 2001
From: piedram <110848569+piedram@users.noreply.github.com>
Date: Fri, 29 Dec 2023 14:33:59 -0500
Subject: [PATCH 011/237] Fix error in modal windows (#20377)

---
 client/COPY.json                                      |  1 +
 .../correspondence/component/RemovePackageModal.jsx   | 11 ++++++++---
 .../queue/correspondence/review_package_spec.rb       |  2 ++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/client/COPY.json b/client/COPY.json
index c9dc3ef1352..9c97ffb61d0 100644
--- a/client/COPY.json
+++ b/client/COPY.json
@@ -1426,6 +1426,7 @@
   "CORRESPONDENCE_TITLE_REMOVE_PACKAGE": "Reason for removal:",
   "CORRRESPONDENCE_LABEL_OPTION_REMOVE_PACKAGE": " Choose whether to approve the request for removal or reject it.",
   "CORRRESPONDENCE_TEXT_REMOVE_PACKAGE": "\nThis is the reason for removal provided by the general user.",
+  "CORRRESPONDENCE_SECOND_TEXT_REMOVE_PACKAGE": "\nThis is the reason for removal provided by the user that submitted the request.",
   "CORRESPONDENCE_TITLE_REMOVE_PACKAGE_REASON_REJECT": "Provide a reason for rejection",
   "CORRESPONDENCE_TITLE_REMOVE_PACKAGE_BANNER": "You have successfully removed a mail package for %s",
   "CORRESPONDENCE_MESSAGE_REMOVE_PACKAGE_BANNER": "The package has been removed from Caseflow and must be manually uploaded again from the Centralized Mail Portal, if it needs to be processed.",
diff --git a/client/app/queue/correspondence/component/RemovePackageModal.jsx b/client/app/queue/correspondence/component/RemovePackageModal.jsx
index 133ce40659a..33d4b5b32e7 100644
--- a/client/app/queue/correspondence/component/RemovePackageModal.jsx
+++ b/client/app/queue/correspondence/component/RemovePackageModal.jsx
@@ -23,7 +23,8 @@ class RemovePackageModal extends React.Component {
       reasonForRemove: null,
       disabledSaveButton: true,
       reasonReject: '',
-      updateCancelSuccess: false
+      updateCancelSuccess: false,
+      textToShow: StringUtil.nl2br(COPY.CORRRESPONDENCE_TEXT_REMOVE_PACKAGE)
 
     };
   }
@@ -31,9 +32,12 @@ class RemovePackageModal extends React.Component {
   handleSelect(reasonForRemove) {
     if (reasonForRemove === 'Approve request') {
       this.setState({ reasonForRemove,
-        disabledSaveButton: false });
+        disabledSaveButton: false,
+        textToShow: StringUtil.nl2br(COPY.CORRRESPONDENCE_TEXT_REMOVE_PACKAGE)
+      });
     } else {
       this.setState({ reasonForRemove,
+        textToShow: StringUtil.nl2br(COPY.CORRRESPONDENCE_SECOND_TEXT_REMOVE_PACKAGE),
         disabledSaveButton: true });
     }
   }
@@ -94,7 +98,7 @@ class RemovePackageModal extends React.Component {
       >
         <p>
           <span style= {{ fontWeight: 'bold' }}>{sprintf(COPY.CORRESPONDENCE_TITLE_REMOVE_PACKAGE)}</span>
-          {StringUtil.nl2br(COPY.CORRRESPONDENCE_TEXT_REMOVE_PACKAGE)}
+          {this.state.textToShow}
         </p>
 
         <RadioField
@@ -111,6 +115,7 @@ class RemovePackageModal extends React.Component {
                 name={sprintf(COPY.CORRESPONDENCE_TITLE_REMOVE_PACKAGE_REASON_REJECT)}
                 onChange={this.reasonChange}
                 value={this.state.reasonReject}
+                placeholder= "This is an example of a reason"
               />
         }
 
diff --git a/spec/feature/queue/correspondence/review_package_spec.rb b/spec/feature/queue/correspondence/review_package_spec.rb
index 4ca4f2636f3..685c7b3b9fe 100644
--- a/spec/feature/queue/correspondence/review_package_spec.rb
+++ b/spec/feature/queue/correspondence/review_package_spec.rb
@@ -97,6 +97,7 @@
         radio_choices = page.all(".cf-form-radio-option > label")
         expect(radio_choices[0]).to have_content("Approve request")
         expect(radio_choices[1]).to have_content("Reject request")
+        expect(page).to have_content(COPY::CORRRESPONDENCE_TEXT_REMOVE_PACKAGE)
         expect(page).to have_button("Cancel")
         expect(page).to have_button("Confirm", disabled: true)
         expect(page).not_to have_field("Provide a reason for rejection")
@@ -106,6 +107,7 @@
         expect(page).to have_button("Review removal request")
         click_button "Review removal request"
         page.all(".cf-form-radio-option > label")[0].click
+        expect(page).to have_content(COPY::CORRRESPONDENCE_TEXT_REMOVE_PACKAGE)
       end
 
       it "remove Package" do

From 56b90af18cf05c9ef0a033c0ee1a5640257f2240 Mon Sep 17 00:00:00 2001
From: sulak-j <95875751+sulak-j@users.noreply.github.com>
Date: Fri, 29 Dec 2023 17:17:12 -0600
Subject: [PATCH 012/237] Adding under construction page for authorized users
 if feature toggle is disabled (#20335)

* Adding under construction page for authorized users

* fixing cmp spec

* routing more specs to under_construction - rspec job 12,5

* Test run helpers

* adding test for unauthorized

* Changing from mail intake to mail team in helpers

* adding unauthorized user check

* Fix to correspondence intake spec

---------

Co-authored-by: Jim Foley <james.foley4@va.gov>
---
 Makefile.example                              |  2 ++
 app/controllers/correspondence_controller.rb  |  5 +++-
 .../correspondence_cases_spec.rb              |  4 +--
 .../edit_cmp_information_spec.rb              |  4 +--
 .../queue/correspondence/intake_spec.rb       | 27 ++++++++++++++++---
 .../correspondence/review_package_spec.rb     |  4 +--
 spec/support/correspondence_helpers.rb        |  2 +-
 7 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/Makefile.example b/Makefile.example
index af35e88cb32..14181faa11f 100644
--- a/Makefile.example
+++ b/Makefile.example
@@ -283,6 +283,8 @@ client-build-all client-all: client-test client-demo ## Builds webpack for both
 one-test:  ## run the rspec test passed in
 	bundle exec rspec $(RUN_ARGS)
 
+yeet-test: yeet one-test ## Cleans and precompiles assets for testing, then runs spec test passed in
+
 run-all-queues: ## start shoryuken with all queues
 	bundle exec shoryuken -q caseflow_development_send_notifications caseflow_development_high_priority caseflow_development_low_priority  -R
 
diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index d3965d762f4..f14e2d0b7d0 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -214,9 +214,12 @@ def veteran_params
   end
 
   def verify_feature_toggle
-    if !FeatureToggle.enabled?(:correspondence_queue)
+    if !FeatureToggle.enabled?(:correspondence_queue) && verify_correspondence_access()
+      redirect_to "/under_construction"
+    elsif !FeatureToggle.enabled?(:correspondence_queue) || !verify_correspondence_access()
       redirect_to "/unauthorized"
     end
+
   end
 
   def correspondence
diff --git a/spec/feature/queue/correspondence/correspondence_cases_spec.rb b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
index f8ac73fe4c3..0feb438d9ac 100644
--- a/spec/feature/queue/correspondence/correspondence_cases_spec.rb
+++ b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
@@ -9,10 +9,10 @@
       @correspondence_uuid = "123456789"
     end
 
-    it "routes user to /unauthorized if the feature toggle is disabled" do
+    it "routes user to /under_construction if the feature toggle is disabled" do
       FeatureToggle.disable!(:correspondence_queue)
       visit "/queue/correspondence"
-      expect(page).to have_current_path("/unauthorized")
+      expect(page).to have_current_path("/under_construction")
     end
 
     it "routes to correspondence cases if feature toggle is enabled" do
diff --git a/spec/feature/queue/correspondence/edit_cmp_information_spec.rb b/spec/feature/queue/correspondence/edit_cmp_information_spec.rb
index 3c2f05089d3..123833e5f20 100644
--- a/spec/feature/queue/correspondence/edit_cmp_information_spec.rb
+++ b/spec/feature/queue/correspondence/edit_cmp_information_spec.rb
@@ -18,10 +18,10 @@
       User.authenticate!(user: mail_team_user)
     end
 
-    it "routes user to /unauthorized if the feature toggle is disabled" do
+    it "routes user to /under_construction if the feature toggle is disabled" do
       FeatureToggle.disable!(:correspondence_queue)
       visit "/queue/correspondence/#{correspondence.uuid}/review_package"
-      expect(page).to have_current_path("/unauthorized")
+      expect(page).to have_current_path("/under_construction")
     end
   end
 
diff --git a/spec/feature/queue/correspondence/intake_spec.rb b/spec/feature/queue/correspondence/intake_spec.rb
index fd6c725b85c..d7ae5eb44d2 100644
--- a/spec/feature/queue/correspondence/intake_spec.rb
+++ b/spec/feature/queue/correspondence/intake_spec.rb
@@ -4,8 +4,28 @@
   include CorrespondenceHelpers
   let(:organization) { MailTeam.singleton }
   let(:mail_user) { User.authenticate!(roles: ["Mail Team"]) }
+  let(:unauthorized_user) { create(:user) }
 
-  before do
+  context "correspondence intake form access" do
+    before :each do
+      Bva.singleton.add_user(unauthorized_user)
+      User.authenticate!(user: unauthorized_user)
+    end
+
+    it "routes unauthorized user to /unauthorized if feature toggle is disabled" do
+      FeatureToggle.disable!(:correspondence_queue)
+      visit "/queue/correspondence/#{@correspondence_uuid}/intake"
+      expect(page).to have_current_path("/unauthorized")
+    end
+
+    it "routes unauthorized user to /unauthorized if feature toggle enabled" do
+      FeatureToggle.disable!(:correspondence_queue)
+      visit "/queue/correspondence/#{@correspondence_uuid}/intake"
+      expect(page).to have_current_path("/unauthorized")
+    end
+  end
+
+  before :each do
     organization.add_user(mail_user)
     mail_user.reload
   end
@@ -22,10 +42,11 @@
       @correspondence_uuid = Correspondence.first.uuid
     end
 
-    it "routes user to /unauthorized if the feature toggle is disabled" do
+    it "routes user to /under_construction if the feature toggle is disabled" do
       FeatureToggle.disable!(:correspondence_queue)
+      User.authenticate!(user: mail_user)
       visit "/queue/correspondence/#{@correspondence_uuid}/intake"
-      expect(page).to have_current_path("/unauthorized")
+      expect(page).to have_current_path("/under_construction")
     end
 
     it "routes to intake if feature toggle is enabled" do
diff --git a/spec/feature/queue/correspondence/review_package_spec.rb b/spec/feature/queue/correspondence/review_package_spec.rb
index 685c7b3b9fe..496fcb78171 100644
--- a/spec/feature/queue/correspondence/review_package_spec.rb
+++ b/spec/feature/queue/correspondence/review_package_spec.rb
@@ -15,10 +15,10 @@
       @correspondence_uuid = "123456789"
     end
 
-    it "routes user to /unauthorized if the feature toggle is disabled" do
+    it "routes user to /under_construction if the feature toggle is disabled" do
       FeatureToggle.disable!(:correspondence_queue)
       visit "/queue/correspondence/#{correspondence.uuid}/review_package"
-      expect(page).to have_current_path("/unauthorized")
+      expect(page).to have_current_path("/under_construction")
     end
 
     it "routes to intake if feature toggle is enabled" do
diff --git a/spec/support/correspondence_helpers.rb b/spec/support/correspondence_helpers.rb
index 8c692aed73c..e9e71f3243f 100644
--- a/spec/support/correspondence_helpers.rb
+++ b/spec/support/correspondence_helpers.rb
@@ -3,7 +3,7 @@
 module CorrespondenceHelpers
   def setup_access
     FeatureToggle.enable!(:correspondence_queue)
-    user = create(:user, roles: ["Mail Intake"])
+    user = create(:user, roles: ["Mail Team"])
     MailTeam.singleton.add_user(user)
     User.authenticate!(user: user)
   end

From 8c8c2e80be97c4f846cfbe6553003ce7a74dee9a Mon Sep 17 00:00:00 2001
From: Kevma50287 <104021955+Kevma50287@users.noreply.github.com>
Date: Fri, 29 Dec 2023 20:31:19 -0500
Subject: [PATCH 013/237] Added wrapper to target select control (#20381)

---
 .../component/EditDocumentTypeModal.jsx       | 29 +++++++------------
 client/app/styles/queue/_correspondence.scss  |  4 +++
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/client/app/queue/correspondence/component/EditDocumentTypeModal.jsx b/client/app/queue/correspondence/component/EditDocumentTypeModal.jsx
index e1954d53e5a..21908e7953f 100644
--- a/client/app/queue/correspondence/component/EditDocumentTypeModal.jsx
+++ b/client/app/queue/correspondence/component/EditDocumentTypeModal.jsx
@@ -6,15 +6,10 @@ import SearchableDropdown from 'app/components/SearchableDropdown';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import { updateDocumentTypeName } from '../correspondenceReducer/reviewPackageActions';
-import { css } from 'glamor';
 import COPY from '../../../../COPY';
 import Modal from '../../../components/Modal';
 import Button from '../../../components/Button';
 
-const modalStyle = css({
-  width: '32%'
-});
-
 class EditDocumentTypeModal extends React.Component {
 
   constructor(props) {
@@ -74,7 +69,6 @@ class EditDocumentTypeModal extends React.Component {
 
     return (
       <Modal
-        customStyles = {modalStyle}
         title= {sprintf(COPY.TITLE_MODAL_EDIT_DOCUMENT_TYPE_CORRESPONDENCE)}
         closeHandler={onCancel}
         confirmButton={<Button disabled={this.state.disabledSaveButton}
@@ -86,20 +80,19 @@ class EditDocumentTypeModal extends React.Component {
           {sprintf(COPY.ORIGINAL_DOC_EDIT_DOCUMENT_TYPE_CORRESPONDENCE)}
         </div>
         <p>{originalDocumentTitle}</p>
-
-        <SearchableDropdown
-          name = "issue-category"
-          label = {sprintf(COPY.NEW_DOC_EDIT_DOCUMENT_TYPE_CORRESPONDENCE)}
-          strongLabel = {false}
-          placeholder = "Select or enter..."
-          options = {this.state.packageOptions}
-          value = {packageDocument}
-          onChange = {this.packageDocumentOnChange}
-        />
-
+        <div className="correspondence-doctype-edit-dropdown">
+          <SearchableDropdown
+            name = "issue-category"
+            label = {sprintf(COPY.NEW_DOC_EDIT_DOCUMENT_TYPE_CORRESPONDENCE)}
+            strongLabel = {false}
+            placeholder = "Select or enter..."
+            options = {this.state.packageOptions}
+            value = {packageDocument}
+            onChange = {this.packageDocumentOnChange}
+          />
+        </div>
       </Modal>
     );
-
   }
 }
 
diff --git a/client/app/styles/queue/_correspondence.scss b/client/app/styles/queue/_correspondence.scss
index 6e4774d2176..28b769aa5bb 100644
--- a/client/app/styles/queue/_correspondence.scss
+++ b/client/app/styles/queue/_correspondence.scss
@@ -94,3 +94,7 @@
     grid-template-rows: repeat(auto-fill, 1fr);
   }
 }
+
+.correspondence-doctype-edit-dropdown .cf-select .cf-select__control {
+  max-width: 43rem;
+}

From e248c735196fc1be42c5c8c2d5c4826ba107df55 Mon Sep 17 00:00:00 2001
From: piedram <110848569+piedram@users.noreply.github.com>
Date: Tue, 2 Jan 2024 13:08:54 -0500
Subject: [PATCH 014/237] Remove Loanding message (#20392)

---
 .../app/queue/correspondence/pdfPreview/CorrespondencePdfUI.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/app/queue/correspondence/pdfPreview/CorrespondencePdfUI.jsx b/client/app/queue/correspondence/pdfPreview/CorrespondencePdfUI.jsx
index c75c6f12807..3da8bcd408c 100644
--- a/client/app/queue/correspondence/pdfPreview/CorrespondencePdfUI.jsx
+++ b/client/app/queue/correspondence/pdfPreview/CorrespondencePdfUI.jsx
@@ -223,7 +223,7 @@ const CorrespondencePdfUI = (props) => {
   }, [pdfDocProxy, pdfPageProxies]));
 
   if (!pdfDocProxy || !pdfPageProxies) {
-    return <div>Loading...</div>;
+    return <div></div>;
   }
 
   if (loadError) {

From 1ac8fea8b34c518e6d84de67ae2999f5ec6653b6 Mon Sep 17 00:00:00 2001
From: Dev-KRedd <134650238+Dev-KRedd@users.noreply.github.com>
Date: Tue, 2 Jan 2024 17:18:58 -0500
Subject: [PATCH 015/237] Asmith/appeals 36279 (#20382)

* Refactor Correspondence Controller

- Move intake processing logic to new service.

- Clean up some class variables in controller to use method.

* Create Tasks Not Related To Appeal

* Fix Issues with Creating Unrelated Appeal Tasks

* Task Routing: Mail Tasks additions

* Test for completed mail tasks & add tasks not related to an appeal

* Bug fix and passing failure test.

---------

Co-authored-by: Alexander Smith <alex.smith.99@thunderyard.com>
Co-authored-by: Jim Foley <james.foley4@va.gov>
---
 app/models/correspondence.rb                  |  4 ++
 .../TasksAppeals/AddAppealRelatedTaskView.jsx |  4 +-
 .../correspondence/submit_intake_form_spec.rb | 62 ++++++++++++++++++-
 .../correspondence_controller_spec.rb         |  4 +-
 4 files changed, 68 insertions(+), 6 deletions(-)

diff --git a/app/models/correspondence.rb b/app/models/correspondence.rb
index 7560510b157..1be78cdd82d 100644
--- a/app/models/correspondence.rb
+++ b/app/models/correspondence.rb
@@ -32,6 +32,10 @@ def tasks
     Task.where(appeal_id: id, appeal_type: type)
   end
 
+  def root_task
+    Task.find_by(appeal_id: id, appeal_type: type, type: CorrespondenceRootTask.name)
+  end
+
   # Methods below are included to allow Correspondences to render in explain page
 
   # Alias for cmp_packet_number
diff --git a/client/app/queue/correspondence/intake/components/TasksAppeals/AddAppealRelatedTaskView.jsx b/client/app/queue/correspondence/intake/components/TasksAppeals/AddAppealRelatedTaskView.jsx
index 16370e1a033..bd166ace983 100644
--- a/client/app/queue/correspondence/intake/components/TasksAppeals/AddAppealRelatedTaskView.jsx
+++ b/client/app/queue/correspondence/intake/components/TasksAppeals/AddAppealRelatedTaskView.jsx
@@ -56,10 +56,10 @@ export const AddAppealRelatedTaskView = (props) => {
 
   useEffect(() => {
     // Creates an array of Task IDs then sorts them so that the highest ID is the last in the array.
-    const existingIds = newTasks.map((task) => task.id).sort((task1, task2) => task1.id - task2.id);
+    const existingIds = [...newTasks.map((task) => task.id)].sort((task1, task2) => task1 - task2);
 
     // Set the value to 0 if there are no IDs. Otherwise use the highest value ID + 1
-    setNextTaskId(existingIds.empty ? 0 : existingIds.last + 1);
+    setNextTaskId(existingIds.length === 0 ? 0 : existingIds[existingIds.length - 1] + 1);
 
     dispatch(setNewAppealRelatedTasks(newTasks));
   }, [newTasks]);
diff --git a/spec/feature/queue/correspondence/submit_intake_form_spec.rb b/spec/feature/queue/correspondence/submit_intake_form_spec.rb
index 584c2decc90..3edcc5909d3 100644
--- a/spec/feature/queue/correspondence/submit_intake_form_spec.rb
+++ b/spec/feature/queue/correspondence/submit_intake_form_spec.rb
@@ -23,20 +23,76 @@
 
   context "user selects completed mail tasks" do
     describe "success" do
-      # pending feature
+      it "displays confirm submission" do
+      visit_intake_form_step_2_with_appeals
+      page.all(".cf-form-checkbox")[2].click
+      click_button("Continue")
+      click_button("Submit")
+      click_button("Confirm")
+      using_wait_time(10) do
+        expect(page).to have_content("You have successfully submitted a correspondence record")
+      end
+      end
     end
   end
 
   context "user add tasks not related to an appeal" do
     describe "success" do
-      # pending feature
+      before do
+        require Rails.root.join("db/seeds/base.rb").to_s
+        Dir[Rails.root.join("db/seeds/*.rb")].sort.each { |f| require f }
+        Seeds::AutoTexts.new.seed!
+      end
+      it "displays confirm submission" do
+        visit_intake_form_step_2_with_appeals
+        click_button("+ Add tasks")
+        all("#reactSelectContainer")[0].click
+        find_by_id("react-select-2-option-1").click
+        find_by_id("addAutotext").click
+        checkbox_text = "Possible motion pursuant to BVA decision dated mm/dd/yy"
+        within find_by_id("autotextModal") do
+          page.all(".cf-form-checkbox")[6].click
+          find_by_id("Add-autotext-button-id-1").click
+        end
+        click_button("Continue")
+        click_button("Submit")
+        click_button("Confirm")
+        using_wait_time(10) do
+          expect(page).to have_content("You have successfully submitted a correspondence record")
+        end
+      end
     end
 
     describe "failure" do
-      # pending feature
+      let(:mock_correspondence_intake_processor) { instance_double(CorrespondenceIntakeProcessor, process_intake: false) }
+      before do
+        allow(CorrespondenceIntakeProcessor).to receive(:new).and_return(mock_correspondence_intake_processor)
+        require Rails.root.join("db/seeds/base.rb").to_s
+        Dir[Rails.root.join("db/seeds/*.rb")].sort.each { |f| require f }
+        Seeds::AutoTexts.new.seed!
+      end
+      it "displays a failed submission error banner" do
+        visit_intake_form_step_2_with_appeals
+        click_button("+ Add tasks")
+        all("#reactSelectContainer")[0].click
+        find_by_id("react-select-2-option-1").click
+        find_by_id("addAutotext").click
+        checkbox_text = "Possible motion pursuant to BVA decision dated mm/dd/yy"
+        within find_by_id("autotextModal") do
+          page.all(".cf-form-checkbox")[6].click
+          find_by_id("Add-autotext-button-id-1").click
+        end
+        click_button("Continue")
+        click_button("Submit")
+        click_button("Confirm")
+        using_wait_time(10) do
+          expect(page).to have_content("The correspondence's documents have failed")
+        end
+      end
     end
   end
 
+
   context "user adds tasks related to an appeal" do
     describe "success" do
       it "displays a success banner, links the appeal, and creates the task" do
diff --git a/spec/requests/correspondence_controller_spec.rb b/spec/requests/correspondence_controller_spec.rb
index 361877684e4..d33f8f24faa 100644
--- a/spec/requests/correspondence_controller_spec.rb
+++ b/spec/requests/correspondence_controller_spec.rb
@@ -42,8 +42,10 @@
         redux_store: redux_store
       }
 
+      correspondence = CorrespondenceIntake.find_by(user: current_user, correspondence: correspondence)
+
       expect(response).to have_http_status(:success)
-      
+
       intake_correspondence = CorrespondenceIntake.find_by(user: current_user, correspondence: correspondence)
       expect(intake_correspondence.current_step).to eq(current_step)
       expect(intake_correspondence.redux_store).to eq(redux_store)

From 6cc415cce0629351bff55078fc916b9d8e0ad6b3 Mon Sep 17 00:00:00 2001
From: Kamala Madamanchi <110078646+kamala-07@users.noreply.github.com>
Date: Wed, 3 Jan 2024 10:09:50 -0600
Subject: [PATCH 016/237] Kamalam7/appeals 35472 (#20345)

* review package status to in progress

* Efloder error banner display

* Ability to resume review package specs

* Split package other option place holder fix

---------

Co-authored-by: youfoundmanesh <129548081+youfoundmanesh@users.noreply.github.com>
---
 app/controllers/correspondence_controller.rb  | 56 +++++++++++++++++--
 .../CorrespondenceReviewPackage.jsx           |  7 +++
 .../correspondence/review_package/utils.js    |  3 +-
 .../correspondence/review_package_spec.rb     | 26 +++++++++
 4 files changed, 87 insertions(+), 5 deletions(-)

diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index f14e2d0b7d0..88a625d8b35 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -22,7 +22,7 @@ def intake
 
   def current_step
     intake = CorrespondenceIntake.find_by(user: current_user, correspondence: current_correspondence) ||
-      CorrespondenceIntake.new(user: current_user, correspondence: current_correspondence)
+             CorrespondenceIntake.new(user: current_user, correspondence: current_correspondence)
 
     intake.update(
       current_step: params[:current_step],
@@ -32,9 +32,9 @@ def current_step
     if intake.valid?
       intake.save!
 
-      render json: {}, status: :ok and return
+      render(json: {}, status: :ok) && return
     else
-      render json: intake.errors.full_messages, status: :unprocessable_entity and return
+      render(json: intake.errors.full_messages, status: :unprocessable_entity) && return
     end
   end
 
@@ -100,7 +100,8 @@ def show
       user_can_edit_vador: MailTeamSupervisor.singleton.user_has_access?(current_user),
       correspondence_documents: corres_docs.map do |doc|
         WorkQueue::CorrespondenceDocumentSerializer.new(doc).serializable_hash[:data][:attributes]
-      end
+      end,
+      efolder_upload_failed_before: EfolderUploadFailedTask.where(appeal_id: correspondence.id, type: "EfolderUploadFailedTask")
     }
     render({ json: response_json }, status: :ok)
   end
@@ -113,6 +114,12 @@ def update
         updated_by_id: RequestStore.store[:current_user].id
       )
     )
+      correspondence.tasks.map do |task|
+        if task.type == "ReviewPackageTask"
+          task.status = "in_progress"
+          task.save
+        end
+      end
       render json: { status: :ok }
     else
       render json: { error: "Please enter a valid Veteran ID" }, status: :unprocessable_entity
@@ -124,6 +131,12 @@ def update_cmp
       va_date_of_receipt: params["VADORDate"].in_time_zone,
       package_document_type_id: params["packageDocument"]["value"].to_i
     )
+    correspondence.tasks.map do |task|
+      if task.type == "ReviewPackageTask"
+        task.status = "in_progress"
+        task.save
+      end
+    end
     render json: { status: 200, correspondence: correspondence }
   end
 
@@ -274,4 +287,39 @@ def vet_info_serializer(veteran, correspondence)
       packageDocumentType: correspondence.correspondence_type_id
     }
   end
+
+  def upload_documents_to_claim_evidence
+    if Rails.env.development? || Rails.env.demo? || Rails.env.test?
+      create_efolder_upload_failed_task
+      true
+    else
+      begin
+        correspondence.correspondence_documents.all.each do |doc|
+          ExternalApi::ClaimEvidenceService.upload_document(
+            doc.pdf_location,
+            veteran_by_correspondence.file_number,
+            doc.claim_evidence_upload_json
+          )
+        end
+        true
+      rescue StandardError => error
+        Rails.logger.error(error.to_s)
+        create_efolder_upload_failed_task
+        false
+      end
+    end
+  end
+
+  def create_efolder_upload_failed_task
+    rpt = ReviewPackageTask.find_by(appeal_id: correspondence.id, type: ReviewPackageTask.name)
+    euft = EfolderUploadFailedTask.find_or_create_by(
+      appeal_id: correspondence.id,
+      appeal_type: "Correspondence",
+      type: EfolderUploadFailedTask.name,
+      assigned_to: current_user,
+      parent_id: rpt.id
+    )
+
+    euft.update!(status: Constants.TASK_STATUSES.in_progress)
+  end
 end
diff --git a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
index 7be937bad39..7c536aa5853 100644
--- a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
+++ b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
@@ -63,6 +63,13 @@ export const CorrespondenceReviewPackage = (props) => {
       setApiResponse(response.body.general_information);
       const data = response.body.general_information;
 
+      if (response.body.efolder_upload_failed_before.length > 0) {
+        setBannerInformation({
+          title: CORRESPONDENCE_DOC_UPLOAD_FAILED_HEADER,
+          message: CORRESPONDENCE_DOC_UPLOAD_FAILED_MESSAGE,
+          bannerType: 'error'
+        });
+      }
       setReviewDetails({
         veteran_name: data.veteran_name || {},
         dropdown_values: data.correspondence_types || [],
diff --git a/client/app/queue/correspondence/review_package/utils.js b/client/app/queue/correspondence/review_package/utils.js
index 5ed0485602e..e148f6944a7 100644
--- a/client/app/queue/correspondence/review_package/utils.js
+++ b/client/app/queue/correspondence/review_package/utils.js
@@ -124,7 +124,8 @@ export const getModalInformation = (dropdownType) => {
     return {
       title: PACKAGE_ACTION_SPLIT_TITLE,
       description: PACKAGE_ACTION_MODAL_DESCRIPTION,
-      label: PACKAGE_ACTION_SPLIT_TEXTAREA_LABEL
+      label: PACKAGE_ACTION_SPLIT_TEXTAREA_LABEL,
+      placeholder: 'This is a reason for split',
     };
   default:
     return {
diff --git a/spec/feature/queue/correspondence/review_package_spec.rb b/spec/feature/queue/correspondence/review_package_spec.rb
index 496fcb78171..65f3dbbbd10 100644
--- a/spec/feature/queue/correspondence/review_package_spec.rb
+++ b/spec/feature/queue/correspondence/review_package_spec.rb
@@ -7,6 +7,8 @@
   let(:correspondence) { create(:correspondence, :with_single_doc, veteran_id: veteran.id, package_document_type_id: package_document_type.id) }
   let(:mail_team_supervisor_user) { create(:user, roles: ["Mail Intake"]) }
   let(:mail_team_supervisor_org) { MailTeamSupervisor.singleton }
+  let(:mail_team_user) { create(:user) }
+  let(:mail_team_org) { MailTeam.singleton }
 
   context "Review package feature toggle" do
     before :each do
@@ -171,5 +173,29 @@
       expect(page).to have_content("No")
     end
   end
+
+  context "Review package - check on ReviewPackageTask status" do
+    let(:non_10182_package_type) { PackageDocumentType.create(id: 1, active: true, name: "0304") }
+    let(:correspondence) { create(:correspondence, :with_single_doc, veteran_id: veteran.id, package_document_type_id: non_10182_package_type.id) }
+
+    before do
+      FeatureToggle.enable!(:correspondence_queue)
+      mail_team_supervisor_org.add_user(mail_team_supervisor_user)
+      User.authenticate!(user: mail_team_supervisor_user)
+      visit "/queue/correspondence/#{correspondence.uuid}/review_package"
+    end
+
+    it "before editing the review package general details" do
+      expect(correspondence.tasks.find_by_type("ReviewPackageTask").status).to eq("unassigned")
+    end
+
+    it "after editing the review package general details" do
+      fill_in "Notes", with: " Updated"
+      expect(page).to have_button("Save changes", disabled: false)
+      click_button "Save changes"
+      sleep 1
+      expect(correspondence.tasks.find_by_type("ReviewPackageTask").status).to eq("in_progress")
+    end
+  end
 end
 # rubocop:enable Layout/LineLength

From b5466812eb870e06ebcf4570949f0bbedff712f0 Mon Sep 17 00:00:00 2001
From: Ki Mau <ki.mau@va.gov>
Date: Wed, 3 Jan 2024 11:21:30 -0500
Subject: [PATCH 017/237] Ki/APPEALS-35703 UI/UX Updates (#20297)

* APPEALS-35703 - Update Task Type Labels

* APPEALS-35703 - Correspondence CSS Work

* APPEALS-35703 - Update CSS

* APPEALS-35703 - Fix Table, Removed unused styling

* APPEALS-35703 - Linting

* APPEALS-35703 - Lint 2 To Too

* Update _correspondence.scss

---------

Co-authored-by: Jim Foley <james.foley4@va.gov>
---
 .../ConfirmCorrespondenceView.jsx             | 100 +++++++-----------
 .../ConfirmTasksNotRelatedToAnAppeal.jsx      |   9 +-
 .../CorrespondenceDetailsTable.jsx            |   4 +-
 client/app/styles/_table.scss                 |  23 ----
 client/app/styles/queue/_correspondence.scss  |  66 ++++++++++++
 .../QUEUE_INTAKE_FORM_TASK_TYPES.json         |  52 ++++-----
 6 files changed, 137 insertions(+), 117 deletions(-)

diff --git a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmCorrespondenceView.jsx b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmCorrespondenceView.jsx
index 9305eb95067..caea2256677 100644
--- a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmCorrespondenceView.jsx
+++ b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmCorrespondenceView.jsx
@@ -8,23 +8,21 @@ import CorrespondenceDetailsTable from './CorrespondenceDetailsTable';
 import ConfirmTasksNotRelatedToAnAppeal from './ConfirmTasksNotRelatedToAnAppeal';
 import Table from '../../../../../components/Table';
 import ConfirmTasksRelatedToAnAppeal from './ConfirmTasksRelatedToAnAppeal';
+import { COLORS } from '../../../../../constants/AppConstants';
 
 const bodyStyling = css({
   '& > tr > td': {
-    backgroundColor: '#f5f5f5',
+    backgroundColor: COLORS.GREY_BACKGROUND,
     borderBottom: 'none',
-    borderColor: '#d6d7d9',
+    borderColor: COLORS.GREY_LIGHT,
     paddingTop: '0vh',
     paddingBottom: '0vh',
   },
 });
 
 const tableStyling = css({
-  marginBottom: '-2vh',
-  marginTop: '2vh'
-});
-const bottonStyling = css({
-  paddingRight: '0px'
+  marginBottom: '-1vh',
+  marginTop: '1vh'
 });
 
 export const ConfirmCorrespondenceView = (props) => {
@@ -124,59 +122,45 @@ export const ConfirmCorrespondenceView = (props) => {
   };
 
   return (
-    <div className="gray-border" style={{ marginBottom: '2rem', padding: '3rem 4rem' }}>
-      <h1 style={{ marginBottom: '10px' }}>Review and Confirm Correspondence</h1>
+    <div className="gray-border corr">
+      <h1 className="corr-h1">Review and Confirm Correspondence</h1>
       <p style={{ fontSize: '.85em' }}>
         Review the details below to make sure the information is correct before submitting.
         If you need to make changes, please go back to the associated section.
       </p>
-      <br></br>
-      <div>
-        <CorrespondenceDetailsTable />
-      </div>
+      <CorrespondenceDetailsTable />
       <div>
-        <div style={{ display: 'flex' }}>
-          <h2 style={{ margin: '1px 0 15px 0',
-            display: 'inline-block' }}>
-                Associated Prior Mail
-          </h2>
-          <div style={{ marginLeft: 'auto' }}>
-            <Button styling={bottonStyling} linkStyling onClick={() => props.goToStep(1)}>
-              <div style={{ marginLeft: 'auto' }}>
-                <span {...css({ position: 'absolute' })}><PencilIcon /></span>
-                <span {...css({ marginLeft: '20px' })}>Edit Section</span>
-              </div>
+        <div className="corr-flex">
+          <h2 className="corr-h2">Associated Prior Mail</h2>
+          <div className="corr-autoleft">
+            <Button className="corr-button" linkStyling onClick={() => props.goToStep(1)}>
+              <span className="corr-icon"><PencilIcon /></span>
+              <span className="corr-sectionlink">Edit Section</span>
             </Button>
           </div>
         </div>
-
-        <div {...css({ backgroundColor: '#f5f5f5', marginBottom: '20px' })}>
-
-          <div {...css({ backgroundColor: '#f5f5f5', padding: '20px' })}>
+        <div {...css({ backgroundColor: COLORS.GREY_BACKGROUND })}>
+          <div {...css({ backgroundColor: COLORS.GREY_BACKGROUND, padding: '20px' })}>
             <Table
               columns={getDocumentColumns}
               // columnsToDisplay={15}
               rowObjects={relatedCorrespondences}
-              bodyStyling= {bodyStyling}
               styling={tableStyling}
+              bodyStyling={bodyStyling}
             />
-
           </div>
         </div>
-        <div style={{ display: 'flex' }}>
-          <h2 style={{
-            margin: '1px 0 15px 0',
-            display: 'inline-block',
-            marginLeft: '0px'
-          }}>Completed Mail Tasks</h2>
-          <div style={{ marginLeft: 'auto' }}>
-            <Button name="EditMailTasks" styling={bottonStyling} linkStyling onClick={() => props.goToStep(2)}>
-              <span {...css({ position: 'absolute' })}><PencilIcon /></span>
-              <span {...css({ marginLeft: '20px' })}>Edit Section</span>
+      </div>
+      <div>
+        <div className="corr-flex">
+          <h2 className="corr-h2">Completed Mail Tasks</h2>
+          <div className="corr-autoleft">
+            <Button className="corr-button" linkStyling onClick={() => props.goToStep(2)}>
+              <span className="corr-icon"><PencilIcon /></span>
+              <span className="corr-sectionlink">Edit Section</span>
             </Button>
           </div>
-        </div>
-        <div {...css({ backgroundColor: '#f5f5f5', padding: '20px', marginBottom: '20px' })}>
+        </div><div {...css({ backgroundColor: COLORS.GREY_BACKGROUND, padding: '20px' })}>
           <div {...css({
             borderBottom: '1px solid #d6d7d9',
             padding: '10px 0px',
@@ -200,30 +184,22 @@ export const ConfirmCorrespondenceView = (props) => {
         </div>
       </div>
       <div>
-        <div style={{ display: 'flex' }}>
-          <h2 style={{
-            margin: '1px 0 15px 0',
-            display: 'inline-block',
-            marginLeft: '0px'
-          }}>Tasks not related to an Appeal</h2>
-          <div style={{ marginLeft: 'auto' }}>
-            <Button styling={bottonStyling} linkStyling onClick={() => props.goToStep(2)}>
-              <span {...css({ position: 'absolute' })}><PencilIcon /></span>
-              <span {...css({ marginLeft: '20px' })}>Edit Section</span>
+        <div className="corr-flex">
+          <h2 className="corr-h2">Tasks not related to an Appeal</h2>
+          <div className="corr-autoleft">
+            <Button className="corr-button" linkStyling onClick={() => props.goToStep(2)}>
+              <span className="corr-icon"><PencilIcon /></span>
+              <span className="corr-sectionlink">Edit Section</span>
             </Button>
           </div>
         </div>
         <ConfirmTasksNotRelatedToAnAppeal />
-        <div style={{ display: 'flex' }}>
-          <h2 style={{
-            margin: '1px 0 15px 0',
-            display: 'inline-block',
-            marginLeft: '0px'
-          }}>Linked Appeals & New Tasks</h2>
-          <div style={{ marginLeft: 'auto' }}>
-            <Button styling={bottonStyling} linkStyling onClick={() => props.goToStep(2)}>
-              <span {...css({ position: 'absolute' })}><PencilIcon /></span>
-              <span {...css({ marginLeft: '20px' })}>Edit Section</span>
+        <div className="corr-flex">
+          <h2 className="corr-h2">Linked Appeals & New Tasks</h2>
+          <div className="corr-autoleft">
+            <Button className="corr-button" linkStyling onClick={() => props.goToStep(2)}>
+              <span className="corr-icon"><PencilIcon /></span>
+              <span className="corr-sectionlink">Edit Section</span>
             </Button>
           </div>
         </div>
diff --git a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmTasksNotRelatedToAnAppeal.jsx b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmTasksNotRelatedToAnAppeal.jsx
index a869e57c8ac..b8d42525828 100644
--- a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmTasksNotRelatedToAnAppeal.jsx
+++ b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmTasksNotRelatedToAnAppeal.jsx
@@ -1,7 +1,8 @@
 import React from 'react';
 import { useSelector } from 'react-redux';
+import { COLORS } from '../../../../../constants/AppConstants';
 
-const styling = { backgroundColor: '#f5f5f5' };
+const styling = { backgroundColor: COLORS.GREY_BACKGROUND };
 
 const ConfirmTasksNotRelatedToAnAppeal = () => {
   const tasks = useSelector((state) => state.intakeCorrespondence.unrelatedTasks);
@@ -10,10 +11,10 @@ const ConfirmTasksNotRelatedToAnAppeal = () => {
     return (
       <tr key={task.id}>
         <td
-          style={{ backgroundColor: '#f5f5f5', borderTop: '1px solid #dee2e6', width: '20%' }}>
+          style={{ backgroundColor: COLORS.GREY_BACKGROUND, borderTop: '1px solid #dee2e6', width: '20%' }}>
           {task.label}
         </td>
-        <td style={{ backgroundColor: '#f5f5f5', borderTop: '1px solid #dee2e6' }}>
+        <td style={{ backgroundColor: COLORS.GREY_BACKGROUND, borderTop: '1px solid #dee2e6' }}>
           {task.content}
         </td>
       </tr>
@@ -25,7 +26,7 @@ const ConfirmTasksNotRelatedToAnAppeal = () => {
       <div style={{ position: 'relative', display: 'flex', justifyContent: 'space-between', alignItems: 'flex-end' }}>
       </div>
       <div
-        style={{ background: '#f5f5f5', padding: '2rem', paddingTop: '0.5rem', marginBottom: '2rem' }}>
+        style={{ background: COLORS.GREY_BACKGROUND, padding: '2rem', paddingTop: '0.5rem' }}>
         <table className="usa-table-borderless">
           <thead>
             <tr>
diff --git a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/CorrespondenceDetailsTable.jsx b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/CorrespondenceDetailsTable.jsx
index 310ec9467e2..4e65d28a620 100644
--- a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/CorrespondenceDetailsTable.jsx
+++ b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/CorrespondenceDetailsTable.jsx
@@ -9,8 +9,8 @@ export const CorrespondenceDetailsTable = () => {
 
   return (
     <div>
-      <h2 className="cf-review-about-correspondence">About the Correspondence</h2>
-      <table className="usa-table-alternate-borderless">
+      <h2 className="corr-h2">About the Correspondence</h2>
+      <table className="corr-table-borderless">
         <tbody>
           <tr>
             <th><strong>Portal Entry Date</strong></th>
diff --git a/client/app/styles/_table.scss b/client/app/styles/_table.scss
index 342e26f451f..5c6b9c1b6dc 100644
--- a/client/app/styles/_table.scss
+++ b/client/app/styles/_table.scss
@@ -179,26 +179,3 @@
     }
   }
 }
-
-// ===========================*
-// Alternate Borderless (no bottom border)
-// ===========================*
-.usa-table-alternate-borderless {
-  background-color: $color-gray-lightest;
-
-  width: 100%;
-
-  th,
-  td {
-    border: 0;
-    background-color: $color-gray-lightest;
-    padding-top: 2rem;
-    padding-bottom: 0;
-  }
-
-  td {
-    margin: 2px;
-    padding-top: 0;
-    padding-bottom: 25px;
-    }
-}
diff --git a/client/app/styles/queue/_correspondence.scss b/client/app/styles/queue/_correspondence.scss
index 28b769aa5bb..736497bc011 100644
--- a/client/app/styles/queue/_correspondence.scss
+++ b/client/app/styles/queue/_correspondence.scss
@@ -95,6 +95,72 @@
   }
 }
 
+//Intake Form Styling
+.corr {
+  color: $color-black;
+  padding: 3rem 4rem;
+
+  p {
+    color: $color-black;
+  }
+
+  h1 {
+    text-align: left;
+    margin-bottom: 20px;
+  }
+
+  h2 {
+    margin-top: 30px;
+    margin-bottom: 20px;
+  }
+
+  button {
+    display: inline-block;
+    margin-top: 30px;
+    margin-right: 10px;
+    padding-right: 0;
+  }
+
+  .corr-icon {
+    position: absolute;
+}
+
+  .corr-sectionlink {
+    margin-left: 20px;
+    margin-right: 10px;
+}
+
+  .corr-flex {
+    display: flex;
+  }
+
+  .corr-autoleft {
+    margin-left: auto;
+}
+
+// Alternate Borderless (no bottom border)
+  .corr-table-borderless {
+    background-color: $caseflow-background;
+
+    width: 100%;
+    margin-bottom: 0;
+    margin-top: 0;
+
+    th,
+    td {
+      border: 0;
+      background-color: $caseflow-background;
+      padding-top: 2rem;
+      padding-bottom: 0;
+    }
+
+    td {
+      margin: 2px;
+      padding-top: 0;
+      padding-bottom: 25px;
+      }
+  }
+}
 .correspondence-doctype-edit-dropdown .cf-select .cf-select__control {
   max-width: 43rem;
 }
diff --git a/client/constants/QUEUE_INTAKE_FORM_TASK_TYPES.json b/client/constants/QUEUE_INTAKE_FORM_TASK_TYPES.json
index 8828134b71c..377d3de90fd 100644
--- a/client/constants/QUEUE_INTAKE_FORM_TASK_TYPES.json
+++ b/client/constants/QUEUE_INTAKE_FORM_TASK_TYPES.json
@@ -11,49 +11,49 @@
         "klass": "CongressionalInterestMailTask",
         "assigned_to": "LitigationSupport"
         },
-      "label": "Congressional interest"
+      "label": "Congressional Interest"
     }, {
       "value": {
         "klass": "DeathCertificateMailTask",
         "assigned_to": "Colocated"
         },
-      "label": "Death certificate"
+      "label": "Death Certificate"
     }, {
       "value": {
         "klass": "FoiaRequestMailTask",
         "assigned_to": "PrivacyTeam"
         },
-      "label": "FOIA request"
+      "label": "FOIA Request"
     }, {
       "value": {
         "klass": "OtherMotionMailTask",
         "assigned_to": "LitigationSupport"
         },
-      "label": "Other motion"
+      "label": "Other Motion"
     }, {
       "value": {
         "klass": "PowerOfAttorneyRelatedMailTask",
         "assigned_to": "HearingAdmin"
         },
-      "label": "Power of attorney-related"
+      "label": "Power Of Attorney-Related"
     }, {
       "value": {
         "klass": "PrivacyActRequestMailTask",
         "assigned_to": "PrivacyTeam"
         },
-      "label": "Privacy act request"
+      "label": "Privacy Act Request"
     }, {
       "value": {
         "klass": "PrivacyComplaintMailTask",
         "assigned_to": "PrivacyTeam"
         },
-      "label": "Privacy complaint"
+      "label": "Privacy Complaint"
     }, {
       "value": {
         "klass": "StatusInquiryMailTask",
         "assigned_to": "LitigationSupport"
         },
-      "label": "Status inquiry"
+      "label": "Status Inquiry"
     }
   ],
   "relatedToAppeal": [
@@ -68,19 +68,19 @@
         "klass": "ClearAndUnmistakeableErrorMailTask",
         "assigned_to": "LitigationSupport"
         },
-      "label": "CUE-related"
+      "label": "CUE-Related"
     }, {
       "value": {
         "klass": "AddressChangeMailTask",
         "assigned_to": "HearingAdmin"
         },
-      "label": "Change of address"
+      "label": "Change Of Address"
     }, {
       "value": {
         "klass": "CongressionalInterestMailTask",
         "assigned_to": "LitigationSupport"
         },
-      "label": "Congressional interest"
+      "label": "Congressional Interest"
     }, {
       "value": {
         "klass": "ControlledCorrespondenceMailTask",
@@ -92,31 +92,31 @@
         "klass": "DeathCertificateMailTask",
         "assigned_to": "Colocated"
         },
-      "label": "Death certificate"
+      "label": "Death Certificate"
     }, {
       "value": {
         "klass": "DocketSwitchMailTask",
         "assigned_to": "ClerkOfTheBoard"
         },
-      "label": "Docket switch"
+      "label": "Docket Switch"
     }, {
       "value": {
         "klass": "EvidenceOrArgumentMailTask",
         "assigned_to": "Colocated"
         },
-      "label": "Evidence or argument"
+      "label": "Evidence Or Argument"
     }, {
       "value": {
         "klass": "ExtensionRequestMailTask",
         "assigned_to": "Colocated"
         },
-      "label": "Extension request"
+      "label": "Extension Request"
     }, {
       "value": {
         "klass": "FoiaRequestMailTask",
         "assigned_to": "PrivacyTeam"
         },
-      "label": "FOIA request"
+      "label": "FOIA Request"
     }, {
       "value": {
         "klass": "HearingPostponementRequestMailTask",
@@ -128,7 +128,7 @@
         "klass": "HearingRelatedMailTask",
         "assigned_to": "HearingAdmin"
         },
-      "label": "Hearing-related"
+      "label": "Hearing-Related"
     }, {
       "value": {
         "klass": "HearingWithdrawalRequestMailTask",
@@ -140,55 +140,55 @@
         "klass": "ReconsiderationMotionMailTask",
         "assigned_to": "LitigationSupport"
         },
-      "label": "Motion for reconsideration"
+      "label": "Motion For Reconsideration"
     }, {
       "value": {
         "klass": "AodMotionMailTask",
         "assigned_to": "AodTeam"
         },
-      "label": "Motion to Advance on Docket"
+      "label": "Motion To Advance On Docket"
     }, {
       "value": {
         "klass": "OtherMotionMailTask",
         "assigned_to": "LitigationSupport"
         },
-      "label": "Other motion"
+      "label": "Other Motion"
     }, {
       "value": {
         "klass": "PowerOfAttorneyRelatedMailTask",
         "assigned_to": "HearingAdmin"
         },
-      "label": "Power of attorney-related"
+      "label": "Power Of Attorney-Related"
     }, {
       "value": {
         "klass": "PrivacyActRequestMailTask",
         "assigned_to": "PrivacyTeam"
         },
-      "label": "Privacy act request"
+      "label": "Privacy Act Request"
     }, {
       "value": {
         "klass": "PrivacyComplaintMailTask",
         "assigned_to": "PrivacyTeam"
         },
-      "label": "Privacy complaint"
+      "label": "Privacy Complaint"
     }, {
       "value": {
         "klass": "ReturnedUndeliverableCorrespondenceMailTask",
         "assigned_to": "BvaDispatch"
         },
-      "label": "Returned or undeliverable mail"
+      "label": "Returned Or Undeliverable Mail"
     }, {
       "value": {
         "klass": "StatusInquiryMailTask",
         "assigned_to": "LitigationSupport"
         },
-      "label": "Status inquiry"
+      "label": "Status Inquiry"
     }, {
       "value": {
         "klass": "AppealWithdrawalMailTask",
         "assigned_to": "CaseReview"
         },
-      "label": "Withdrawal of appeal"
+      "label": "Withdrawal Of Appeal"
     }
   ]
 }

From a09fe3e0a6a437ac46e3013977f7d5e0232158ad Mon Sep 17 00:00:00 2001
From: Will Medders <93014155+wmedders21@users.noreply.github.com>
Date: Wed, 3 Jan 2024 14:04:17 -0500
Subject: [PATCH 018/237] Add props for dropdown and remove logic for hash
 params (#20332)

Co-authored-by: Jim Foley <james.foley4@va.gov>
---
 app/views/correspondence/intake.html.erb      |  3 +++
 .../components/CorrespondenceIntake.jsx       | 22 +------------------
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/app/views/correspondence/intake.html.erb b/app/views/correspondence/intake.html.erb
index f508218d4c0..c43156efc74 100644
--- a/app/views/correspondence/intake.html.erb
+++ b/app/views/correspondence/intake.html.erb
@@ -4,6 +4,9 @@
     userId: current_user.id,
     userRole: (current_user.vacols_roles.first || "").capitalize,
     userCssId: current_user.css_id,
+    dropdownUrls: dropdown_urls,
+    applicationUrls: application_urls,
+    feedbackUrl: feedback_url,
     organizations: current_user.selectable_organizations.map {|o| o.slice(:name, :url)},
     featureToggles: {
       correspondence_queue: FeatureToggle.enabled?(:correspondence_queue, user: current_user)
diff --git a/client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx b/client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx
index 9741bf946b9..ec30502a4f9 100644
--- a/client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx
+++ b/client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx
@@ -7,7 +7,7 @@ import { AddTasksAppealsView } from './TasksAppeals/AddTasksAppealsView';
 import { connect, useSelector } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import { setUnrelatedTasks } from '../../correspondenceReducer/correspondenceActions';
-import { useHistory, useLocation } from 'react-router-dom';
+import { useHistory } from 'react-router-dom';
 import { ConfirmCorrespondenceView } from './ConfirmCorrespondence/ConfirmCorrespondenceView';
 import { SubmitCorrespondenceModal } from './ConfirmCorrespondence/SubmitCorrespondenceModal';
 import Alert from 'app/components/Alert';
@@ -39,10 +39,7 @@ export const CorrespondenceIntake = (props) => {
   const [addTasksVisible, setAddTasksVisible] = useState(false);
   const [submitCorrespondenceModalVisible, setSubmitCorrespondenceModalVisible] = useState(false);
   const [errorBannerVisible, setErrorBannerVisible] = useState(false);
-  const { pathname, hash, key } = useLocation();
   const history = useHistory();
-  // For hash routing - Add element id and which step it lives on here
-  const SECTION_MAP = { 'task-not-related-to-an-appeal': 2 };
 
   const handleContinueStatusChange = (isEnabled) => {
     setContinueEnabled(isEnabled);
@@ -96,23 +93,6 @@ export const CorrespondenceIntake = (props) => {
       );
   }, [currentStep]);
 
-  useEffect(() => {
-    if (hash === '') {
-      window.scrollTo(0, 0);
-    } else {
-      setTimeout(() => {
-        const id = hash.replace('#', '');
-
-        setCurrentStep(SECTION_MAP[id]);
-        const element = document.getElementById(id);
-
-        if (element) {
-          element.scrollIntoView();
-        }
-      }, 0);
-    }
-  }, [pathname, hash, key]);
-
   return <div>
     { errorBannerVisible &&
       <Alert title={CORRESPONDENCE_INTAKE_FORM_ERROR_BANNER_TITLE} type="error">

From 5ac9ff7a59e01bf6fe9faa9658b78b26fccaba64 Mon Sep 17 00:00:00 2001
From: jonathanh-va <111081469+jonathanh-va@users.noreply.github.com>
Date: Wed, 3 Jan 2024 13:17:13 -0600
Subject: [PATCH 019/237] add sentry logging for upload documents to ce
 (#20405)

Co-authored-by: Jonathan Hoang <trinhjoanthan.hoang@va.gov>
---
 app/controllers/correspondence_controller.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index 88a625d8b35..e246e7cf7a3 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -51,6 +51,7 @@ def review_package
     render "correspondence/review_package"
   end
 
+  # rubocop:disable Metrics/MethodLength
   def intake_update
     tasks = Task.where("appeal_id = ? and appeal_type = ?", correspondence.id, "Correspondence")
     begin
@@ -63,16 +64,18 @@ def intake_update
         task.status = "cancelled"
         task.save
       end
-      if correspondence_intake_processor.upload_documents_to_claim_evidence(correspondence, current_user)
+      if upload_documents_to_claim_evidence
         render json: { correspondence: correspondence }
       else
-        render json: {}, status: bad_request
+        render json: {}, status: :bad_request
       end
     rescue StandardError => error
       Rails.logger.error(error.to_s)
-      render json: {}, status: bad_request
+      Raven.capture_exception(error)
+      render json: {}, status: :bad_request
     end
   end
+  # rubocop:enable Metrics/MethodLength
 
   def veteran
     render json: { veteran_id: veteran_by_correspondence&.id, file_number: veteran_by_correspondence&.file_number }

From 0884ac9d396cf52fd56b2f012c37f9c777310269 Mon Sep 17 00:00:00 2001
From: divyadasari-va <135847343+divyadasari-va@users.noreply.github.com>
Date: Wed, 3 Jan 2024 18:13:38 -0700
Subject: [PATCH 020/237] fixes for test failures and fix the checkbox checked
 in mail tasks section (#20407)

Co-authored-by: Jim Foley <james.foley4@va.gov>
---
 .../intake/components/TasksAppeals/AddTasksAppealsView.jsx    | 4 ++--
 spec/requests/correspondence_controller_spec.rb               | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/app/queue/correspondence/intake/components/TasksAppeals/AddTasksAppealsView.jsx b/client/app/queue/correspondence/intake/components/TasksAppeals/AddTasksAppealsView.jsx
index b1ba1e4bc1c..7608f948d8b 100644
--- a/client/app/queue/correspondence/intake/components/TasksAppeals/AddTasksAppealsView.jsx
+++ b/client/app/queue/correspondence/intake/components/TasksAppeals/AddTasksAppealsView.jsx
@@ -87,7 +87,7 @@ export const AddTasksAppealsView = (props) => {
                   key={index}
                   name={name}
                   label={name}
-                  defaultValue={mailTasks[name] || false}
+                  defaultValue={mailTasks.includes(name)}
                   onChange={(checked) => mailTaskCheckboxOnChange(name, checked)}
                 />
               );
@@ -100,7 +100,7 @@ export const AddTasksAppealsView = (props) => {
                   key={index}
                   name={name}
                   label={name}
-                  defaultValue={mailTasks[name] || false}
+                  defaultValue={mailTasks.includes(name)}
                   onChange={(checked) => mailTaskCheckboxOnChange(name, checked)}
                 />
               );
diff --git a/spec/requests/correspondence_controller_spec.rb b/spec/requests/correspondence_controller_spec.rb
index d33f8f24faa..cd01755482b 100644
--- a/spec/requests/correspondence_controller_spec.rb
+++ b/spec/requests/correspondence_controller_spec.rb
@@ -35,6 +35,7 @@
 
     it "saves the user's current step in the intake form" do
       current_step = 1
+      correspondence = create(:correspondence, veteran_id: veteran.id, uuid: SecureRandom.uuid)
 
       post queue_correspondence_intake_current_step_path(correspondence_uuid: correspondence.uuid), params: {
         correspondence_uuid: correspondence.uuid,

From 29c3577f0701bf8747ad40996cbb8aedbd29c4bb Mon Sep 17 00:00:00 2001
From: piedram <110848569+piedram@users.noreply.github.com>
Date: Thu, 4 Jan 2024 11:10:11 -0500
Subject: [PATCH 021/237] reject remove task (#20408)

Co-authored-by: cacevesva <109166981+cacevesva@users.noreply.github.com>
---
 .../correspondence_tasks_controller.rb        | 12 +++++++
 .../component/RemovePackageModal.jsx          | 28 ++++++++++++++-
 config/routes.rb                              |  1 +
 .../correspondence_tasks_controller_spec.rb   | 34 ++++++++++++++-----
 4 files changed, 65 insertions(+), 10 deletions(-)

diff --git a/app/controllers/correspondence_tasks_controller.rb b/app/controllers/correspondence_tasks_controller.rb
index 4703eee210e..1822faf07a0 100644
--- a/app/controllers/correspondence_tasks_controller.rb
+++ b/app/controllers/correspondence_tasks_controller.rb
@@ -66,6 +66,18 @@ def remove_package
     root_task.cancel_task_and_child_subtasks
   end
 
+  def completed_package
+    remove_package_task = RemovePackageTask.find_by(appeal_id: params[:id], type: RemovePackageTask.name)
+    remove_package_task.update!(
+      assigned_to: current_user,
+      status: Constants.TASK_STATUSES.completed,
+      instructions: params[:instructions]
+    )
+
+    review_package_task = ReviewPackageTask.find_by(appeal_id: params[:id], type: ReviewPackageTask.name)
+    review_package_task.update!(status: Constants.TASK_STATUSES.in_progress)
+  end
+
   private
 
   def task_to_create
diff --git a/client/app/queue/correspondence/component/RemovePackageModal.jsx b/client/app/queue/correspondence/component/RemovePackageModal.jsx
index 33d4b5b32e7..67a2a7a5f77 100644
--- a/client/app/queue/correspondence/component/RemovePackageModal.jsx
+++ b/client/app/queue/correspondence/component/RemovePackageModal.jsx
@@ -71,10 +71,36 @@ class RemovePackageModal extends React.Component {
     }
   }
 
+  completePackage = async () => {
+    try {
+      const data = {
+        correspondence_id: this.props.correspondence_id,
+        instructions: []
+      };
+
+      data.instructions.push(this.state.reasonReject);
+
+      ApiUtil.post(`/queue/correspondence/${this.props.correspondence_id}/completed_package`, { data }).
+        then(() => {
+          this.setState({
+            updateCancelSuccess: true
+          });
+          this.props.updateLastAction('InProgressReviewPackage');
+        });
+
+    } catch (error) {
+      console.error(error);
+    }
+  }
+
   render() {
     const { onCancel } = this.props;
     const submit = () => {
-      this.removePackage();
+      if (this.state.reasonForRemove === 'Approve request') {
+        this.removePackage();
+      } else {
+        this.completePackage();
+      }
     };
 
     const removeReasonOptions = [
diff --git a/config/routes.rb b/config/routes.rb
index edb51aa1570..d1cdd73a288 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -300,6 +300,7 @@
     post '/correspondence/:correspondence_uuid/current_step', to: 'correspondence#current_step', as: :queue_correspondence_intake_current_step
     post '/correspondence/:correspondence_uuid/correspondence_intake_task', to: 'correspondence_tasks#create_correspondence_intake_task'
     post '/correspondence/:id/remove_package', to: 'correspondence_tasks#remove_package'
+    post '/correspondence/:id/completed_package', to: 'correspondence_tasks#completed_package'
     get '/correspondence/:correspondence_uuid/intake', to: 'correspondence#intake'
     get '/correspondence/:correspondence_uuid/review_package', to: 'correspondence#review_package'
     get '/correspondence/edit_document_type_correspondence', to: 'correspondence#document_type_correspondence'
diff --git a/spec/controllers/correspondence_tasks_controller_spec.rb b/spec/controllers/correspondence_tasks_controller_spec.rb
index 87cf5b41c1a..252490f5745 100644
--- a/spec/controllers/correspondence_tasks_controller_spec.rb
+++ b/spec/controllers/correspondence_tasks_controller_spec.rb
@@ -95,18 +95,34 @@
         task_creation_params.merge!(type: "removePackage", instructions: ["please remove task, thanks"])
         post :create_package_action_task, params: task_creation_params
         expect(response).to have_http_status(:ok)
-        remove_package_task = RemovePackageTask.find_by(appeal_id: correspondence.id, type: RemovePackageTask.name)
         task_creation_params[:id] = correspondence.id
         post :remove_package, params: task_creation_params
+      end
+
+      it "creates remove package task successfully" do
+        remove_package_task = RemovePackageTask.find_by(appeal_id: correspondence.id, type: RemovePackageTask.name)
+        expect(remove_package_task.status).to eq(Constants.TASK_STATUSES.cancelled)
+        review_package_task = ReviewPackageTask.find_by(appeal_id: correspondence.id, type: ReviewPackageTask.name)
+        expect(review_package_task.status).to eq(Constants.TASK_STATUSES.cancelled)
+      end
+    end
+  end
 
-        it "creates remove package task successfully" do
-          expect(response).to have_http_status(:ok)
-          remove_package_task = RemovePackageTask.find_by(appeal_id: correspondence.id, type: RemovePackageTask.name)
-          expect(remove_package_task.status).to eq(Constants.TASK_STATUSES.canceled)
-          parent = CorrespondenceTask.find_by(appeal_id: correspondence.id, type: CorrespondenceTask.name)
-          expect(parent.status).to eq(Constants.TASK_STATUSES.on_hold)
-          expect(parent.children.status).to eq(Constants.TASK_STATUSES.on_hold)
-        end
+  describe "POST #reject_package" do
+    context "Reject Delete correspondence package from Caseflow" do
+      before do
+        task_creation_params.merge!(type: "removePackage", instructions: ["please remove task, thanks"])
+        post :create_package_action_task, params: task_creation_params
+        expect(response).to have_http_status(:ok)
+        task_creation_params[:id] = correspondence.id
+        post :completed_package, params: task_creation_params
+      end
+
+      it "reject remove package task successfully" do
+        remove_package_task = RemovePackageTask.find_by(appeal_id: correspondence.id, type: RemovePackageTask.name)
+        expect(remove_package_task.status).to eq(Constants.TASK_STATUSES.completed)
+        review_package_task = ReviewPackageTask.find_by(appeal_id: correspondence.id, type: ReviewPackageTask.name)
+        expect(review_package_task.status).to eq(Constants.TASK_STATUSES.in_progress)
       end
     end
   end

From 5ea9ebaa6e368b0d7ee96dc426bd510714e0c08b Mon Sep 17 00:00:00 2001
From: Will Medders <93014155+wmedders21@users.noreply.github.com>
Date: Thu, 4 Jan 2024 12:25:57 -0500
Subject: [PATCH 022/237] Keep correspondence tasks from bugging out the queue
 table (#20409)

Co-authored-by: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
---
 app/models/task.rb       | 2 ++
 app/models/task_pager.rb | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/models/task.rb b/app/models/task.rb
index c5600da02d6..62e15a61d2b 100644
--- a/app/models/task.rb
+++ b/app/models/task.rb
@@ -113,6 +113,8 @@ class << self; undef_method :open; end
 
   scope :with_assignees, -> { joins(Task.joins_with_assignees_clause) }
 
+  scope :not_correspondence, -> { where.not(appeal_type: "Correspondence") }
+
   scope :with_assigners, -> { joins(Task.joins_with_assigners_clause) }
 
   scope :with_cached_appeals, -> { joins(Task.joins_with_cached_appeals_clause) }
diff --git a/app/models/task_pager.rb b/app/models/task_pager.rb
index 088366e6595..ebf2cfedf20 100644
--- a/app/models/task_pager.rb
+++ b/app/models/task_pager.rb
@@ -25,7 +25,7 @@ def initialize(args)
 
   def paged_tasks
     @paged_tasks ||= begin
-      tasks = sorted_tasks(filtered_tasks)
+      tasks = sorted_tasks(filtered_tasks).not_correspondence
       pagination_enabled ? tasks.page(page).per(TASKS_PER_PAGE) : tasks
     end
   end

From 7b1d529df3f9b13f4b865008c30c5fa58d018127 Mon Sep 17 00:00:00 2001
From: Alex Smith <alex.smith.99@thunderyard.com>
Date: Thu, 4 Jan 2024 12:36:42 -0700
Subject: [PATCH 023/237] Add DB-Level FKs to corresondences (#20417)

---
 .../20240104174358_add_foreign_keys_to_correspondence.rb | 9 +++++++++
 ...0240104174734_validate_correspondence_foreign_keys.rb | 8 ++++++++
 db/schema.rb                                             | 7 ++++++-
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20240104174358_add_foreign_keys_to_correspondence.rb
 create mode 100644 db/migrate/20240104174734_validate_correspondence_foreign_keys.rb

diff --git a/db/migrate/20240104174358_add_foreign_keys_to_correspondence.rb b/db/migrate/20240104174358_add_foreign_keys_to_correspondence.rb
new file mode 100644
index 00000000000..f544a19de83
--- /dev/null
+++ b/db/migrate/20240104174358_add_foreign_keys_to_correspondence.rb
@@ -0,0 +1,9 @@
+class AddForeignKeysToCorrespondence < ActiveRecord::Migration[5.2]
+  def change
+    add_foreign_key :correspondences, :correspondence_types, validate: false
+    add_foreign_key :correspondences, :package_document_types, validate: false
+    add_foreign_key :correspondences, :users, column: :assigned_by_id, validate: false
+    add_foreign_key :correspondences, :users, column: :updated_by_id, validate: false
+    add_foreign_key :correspondences, :veterans, validate: false
+  end
+end
diff --git a/db/migrate/20240104174734_validate_correspondence_foreign_keys.rb b/db/migrate/20240104174734_validate_correspondence_foreign_keys.rb
new file mode 100644
index 00000000000..b23d55c6231
--- /dev/null
+++ b/db/migrate/20240104174734_validate_correspondence_foreign_keys.rb
@@ -0,0 +1,8 @@
+class ValidateCorrespondenceForeignKeys < ActiveRecord::Migration[5.2]
+  def change
+    validate_foreign_key :correspondences, :correspondence_types
+    validate_foreign_key :correspondences, :package_document_types
+    validate_foreign_key :correspondences, :users
+    validate_foreign_key :correspondences, :veterans
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 8522e89213c..95f0c04bbcb 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2023_12_14_201518) do
+ActiveRecord::Schema.define(version: 2024_01_04_174734) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -2253,6 +2253,11 @@
   add_foreign_key "correspondence_intakes", "users"
   add_foreign_key "correspondence_relations", "correspondences"
   add_foreign_key "correspondence_relations", "correspondences", column: "related_correspondence_id"
+  add_foreign_key "correspondences", "correspondence_types"
+  add_foreign_key "correspondences", "package_document_types"
+  add_foreign_key "correspondences", "users", column: "assigned_by_id"
+  add_foreign_key "correspondences", "users", column: "updated_by_id"
+  add_foreign_key "correspondences", "veterans"
   add_foreign_key "correspondences_appeals", "appeals"
   add_foreign_key "correspondences_appeals", "correspondences"
   add_foreign_key "dispatch_tasks", "legacy_appeals", column: "appeal_id"

From 9b47a549fd168e6356125c27978773d834b97606 Mon Sep 17 00:00:00 2001
From: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
Date: Fri, 5 Jan 2024 10:07:22 -0500
Subject: [PATCH 024/237] Revert "Add DB-Level FKs to corresondences (#20417)"
 (#20429)

This reverts commit 7b1d529df3f9b13f4b865008c30c5fa58d018127.
---
 .../20240104174358_add_foreign_keys_to_correspondence.rb | 9 ---------
 ...0240104174734_validate_correspondence_foreign_keys.rb | 8 --------
 db/schema.rb                                             | 7 +------
 3 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 db/migrate/20240104174358_add_foreign_keys_to_correspondence.rb
 delete mode 100644 db/migrate/20240104174734_validate_correspondence_foreign_keys.rb

diff --git a/db/migrate/20240104174358_add_foreign_keys_to_correspondence.rb b/db/migrate/20240104174358_add_foreign_keys_to_correspondence.rb
deleted file mode 100644
index f544a19de83..00000000000
--- a/db/migrate/20240104174358_add_foreign_keys_to_correspondence.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class AddForeignKeysToCorrespondence < ActiveRecord::Migration[5.2]
-  def change
-    add_foreign_key :correspondences, :correspondence_types, validate: false
-    add_foreign_key :correspondences, :package_document_types, validate: false
-    add_foreign_key :correspondences, :users, column: :assigned_by_id, validate: false
-    add_foreign_key :correspondences, :users, column: :updated_by_id, validate: false
-    add_foreign_key :correspondences, :veterans, validate: false
-  end
-end
diff --git a/db/migrate/20240104174734_validate_correspondence_foreign_keys.rb b/db/migrate/20240104174734_validate_correspondence_foreign_keys.rb
deleted file mode 100644
index b23d55c6231..00000000000
--- a/db/migrate/20240104174734_validate_correspondence_foreign_keys.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class ValidateCorrespondenceForeignKeys < ActiveRecord::Migration[5.2]
-  def change
-    validate_foreign_key :correspondences, :correspondence_types
-    validate_foreign_key :correspondences, :package_document_types
-    validate_foreign_key :correspondences, :users
-    validate_foreign_key :correspondences, :veterans
-  end
-end
diff --git a/db/schema.rb b/db/schema.rb
index 95f0c04bbcb..8522e89213c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2024_01_04_174734) do
+ActiveRecord::Schema.define(version: 2023_12_14_201518) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -2253,11 +2253,6 @@
   add_foreign_key "correspondence_intakes", "users"
   add_foreign_key "correspondence_relations", "correspondences"
   add_foreign_key "correspondence_relations", "correspondences", column: "related_correspondence_id"
-  add_foreign_key "correspondences", "correspondence_types"
-  add_foreign_key "correspondences", "package_document_types"
-  add_foreign_key "correspondences", "users", column: "assigned_by_id"
-  add_foreign_key "correspondences", "users", column: "updated_by_id"
-  add_foreign_key "correspondences", "veterans"
   add_foreign_key "correspondences_appeals", "appeals"
   add_foreign_key "correspondences_appeals", "correspondences"
   add_foreign_key "dispatch_tasks", "legacy_appeals", column: "appeal_id"

From e548afbef7b371681f194f8656182889f1fcc2db Mon Sep 17 00:00:00 2001
From: Rnmarshall93 <110805785+Rnmarshall93@users.noreply.github.com>
Date: Fri, 5 Jan 2024 13:47:17 -0800
Subject: [PATCH 025/237] Code climate fix (#20432)

* Added create_veteran to helper module and used in multi_correspondences

* Added seed_helper module to cavc_ama_appeals

* Added seed_helper module to test_case_data

* Added seed_helper module to seeds/tasks.rb

* Adjust formatting

* Added seed_helper module to static test data

* Added seed_helper module to static dispatched test data

* Added seed_helper module to remanded legacy appeals

* Added seed_helper module to remanded ama appeals

* Added seed_helper module to cavc dashboard data

* Relocate duplicate correspondence intake setup to CorrespondenceHelpers

* Relocated duplicate create_child_class methods to shared parent

* Moved create_child_class to private section

* Move autotext table seeding to CorrespondenceHelpers

* Codeclimate fixes and ignores

* Update validation syntax on CorrespondenceIntake

* Refactor method naming convention inCorrespondenceRelation

* Update validation syntax on CorrespondenceRelation

* Fixing requires

* replaces timeout with sleep to fix offense

* scss linting fix

* Updated Time.local to Time.zone.local (reran tests)

* parameter lint fix.

* fixed linter issue.

* Several linting fixes

* fixed cyclomatic complexity

* refactored logging statement

* Converted statement to one line for better readability.

* fixed element count

* fixed incorrect element being clicked

* Fix other motion bug

---------

Co-authored-by: William Medders <medders_william@bah.com>
---
 app/controllers/correspondence_controller.rb  | 21 +++++-------
 app/controllers/team_management_controller.rb | 17 ++++++----
 app/models/auto_text.rb                       |  1 +
 app/models/correspondence_intake.rb           |  4 +--
 app/models/correspondence_relation.rb         | 14 ++++----
 .../organizations/mail_team_supervisor.rb     |  1 +
 .../tasks/correspondence_intake_task.rb       | 12 -------
 app/models/tasks/correspondence_task.rb       | 12 +++++++
 app/models/tasks/review_package_task.rb       | 12 -------
 .../correspondence_intake_processor.rb        |  2 ++
 .../TasksAppeals/AddTasksAppealsView.jsx      |  4 +--
 client/app/styles/queue/_correspondence.scss  |  1 +
 db/seeds/cavc_ama_appeals.rb                  | 14 +++-----
 db/seeds/cavc_dashboard_data.rb               | 14 +++-----
 db/seeds/helpers/seed_helpers.rb              | 13 +++++++
 db/seeds/multi_correspondences.rb             | 14 +++-----
 db/seeds/remanded_ama_appeals.rb              | 14 +++-----
 db/seeds/remanded_legacy_appeals.rb           | 15 +++-----
 .../static_dispatched_appeals_test_data.rb    | 14 +++-----
 db/seeds/static_test_data.rb                  | 14 +++-----
 db/seeds/tasks.rb                             | 15 +++-----
 db/seeds/test_case_data.rb                    | 14 +++-----
 lib/tasks/correspondence.rake                 |  7 ++++
 .../correspondence_controller_spec.rb         |  2 +-
 .../correspondence/intake_form_persistence.rb |  4 +--
 .../queue/correspondence/intake_spec.rb       | 34 ++++---------------
 .../correspondence/mail_tasks_confirm_spec.rb |  2 +-
 .../correspondence/review_package_spec.rb     |  4 ++-
 .../correspondence/submit_intake_form_spec.rb | 33 +++++++++---------
 ...asks_related_to_an_existing_appeal_spec.rb | 12 +++----
 spec/models/correspondence_intake_spec.rb     | 10 ++++--
 spec/models/correspondences_appeal_spec.rb    |  3 +-
 .../correspondence_controller_spec.rb         |  4 ++-
 spec/support/correspondence_helpers.rb        | 21 +++++++++++-
 34 files changed, 173 insertions(+), 205 deletions(-)
 create mode 100644 db/seeds/helpers/seed_helpers.rb

diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index e246e7cf7a3..2df5527d319 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+# :reek:RepeatedConditional
 class CorrespondenceController < ApplicationController
   before_action :verify_correspondence_access
   before_action :verify_feature_toggle
@@ -104,7 +105,10 @@ def show
       correspondence_documents: corres_docs.map do |doc|
         WorkQueue::CorrespondenceDocumentSerializer.new(doc).serializable_hash[:data][:attributes]
       end,
-      efolder_upload_failed_before: EfolderUploadFailedTask.where(appeal_id: correspondence.id, type: "EfolderUploadFailedTask")
+      efolder_upload_failed_before: EfolderUploadFailedTask.where(
+        appeal_id: correspondence.id,
+        type: "EfolderUploadFailedTask"
+      )
     }
     render({ json: response_json }, status: :ok)
   end
@@ -176,6 +180,7 @@ def process_intake
 
   private
 
+  # :reek:FeatureEnvy
   def vbms_document_types
     begin
       data = ExternalApi::ClaimEvidenceService.document_types
@@ -230,12 +235,11 @@ def veteran_params
   end
 
   def verify_feature_toggle
-    if !FeatureToggle.enabled?(:correspondence_queue) && verify_correspondence_access()
+    if !FeatureToggle.enabled?(:correspondence_queue) && verify_correspondence_access
       redirect_to "/under_construction"
-    elsif !FeatureToggle.enabled?(:correspondence_queue) || !verify_correspondence_access()
+    elsif !FeatureToggle.enabled?(:correspondence_queue) || !verify_correspondence_access
       redirect_to "/unauthorized"
     end
-
   end
 
   def correspondence
@@ -257,14 +261,7 @@ def correspondence_load
   def veteran_by_correspondence
     return unless correspondence&.veteran_id
 
-    @veteran_by_correspondence ||= begin
-      veteran = Veteran.find_by(id: correspondence.veteran_id)
-      if veteran.nil?
-        # Handle the case where the veteran is not found
-        puts "Veteran not found for ID: #{correspondence.veteran_id}"
-      end
-      veteran
-    end
+    @veteran_by_correspondence ||= Veteran.find_by(id: correspondence.veteran_id)
   end
 
   def veterans_with_correspondences
diff --git a/app/controllers/team_management_controller.rb b/app/controllers/team_management_controller.rb
index 0476f5a3b6f..bc5b51f4503 100644
--- a/app/controllers/team_management_controller.rb
+++ b/app/controllers/team_management_controller.rb
@@ -113,14 +113,17 @@ def all_teams
   end
 
   def other_orgs
+    rejected_orgs = [
+      JudgeTeam,
+      DvcTeam,
+      Representative,
+      VhaProgramOffice,
+      VhaRegionalOffice,
+      EducationRpo,
+      MailTeamSupervisor
+    ]
     Organization.order(:name).reject do |org|
-      org.is_a?(JudgeTeam) ||
-        org.is_a?(DvcTeam) ||
-        org.is_a?(Representative) ||
-        org.is_a?(VhaProgramOffice) ||
-        org.is_a?(VhaRegionalOffice) ||
-        org.is_a?(EducationRpo) || 
-        org.is_a?(MailTeamSupervisor)
+      rejected_orgs.any? { |excluded_org| org.is_a?(excluded_org) }
     end
   end
 
diff --git a/app/models/auto_text.rb b/app/models/auto_text.rb
index a7ce40e2902..98472757963 100644
--- a/app/models/auto_text.rb
+++ b/app/models/auto_text.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # this is a lookup table
 class AutoText < ApplicationRecord
 end
diff --git a/app/models/correspondence_intake.rb b/app/models/correspondence_intake.rb
index 6d2d884bbcf..a8c42d85430 100644
--- a/app/models/correspondence_intake.rb
+++ b/app/models/correspondence_intake.rb
@@ -4,6 +4,6 @@ class CorrespondenceIntake < ApplicationRecord
   belongs_to :correspondence
   belongs_to :user
 
-  validates_presence_of :correspondence_id
-  validates_presence_of :user_id
+  validates :correspondence_id, presence: true
+  validates :user_id, presence: true
 end
diff --git a/app/models/correspondence_relation.rb b/app/models/correspondence_relation.rb
index 5257ab1ae8b..a1fa33c9688 100644
--- a/app/models/correspondence_relation.rb
+++ b/app/models/correspondence_relation.rb
@@ -5,13 +5,13 @@ class CorrespondenceRelation < ApplicationRecord
   belongs_to :related_correspondence, class_name: "Correspondence"
 
   # Makes the relationship bi-directional - both Correspondences are aware of the relationship
-  after_create :create_inverse, unless: :has_inverse?
-  after_destroy :destroy_inverses, if: :has_inverse?
+  after_create :create_inverse, unless: :inverse_exists?
+  after_destroy :destroy_inverses, if: :inverse_exists?
 
-  validates_presence_of :correspondence_id
-  validates_presence_of :related_correspondence_id
-  validates_numericality_of :correspondence_id
-  validates_numericality_of :related_correspondence_id
+  validates :correspondence_id, presence: true
+  validates :related_correspondence_id, presence: true
+  validates :correspondence_id, numericality: true
+  validates :related_correspondence_id, numericality: true
 
   def create_inverse
     self.class.create(inverse_match_options)
@@ -21,7 +21,7 @@ def destroy_inverses
     inverses.destroy_all
   end
 
-  def has_inverse?
+  def inverse_exists?
     self.class.exists?(inverse_match_options)
   end
 
diff --git a/app/models/organizations/mail_team_supervisor.rb b/app/models/organizations/mail_team_supervisor.rb
index 25782a4e1b5..a53ed8bf3a2 100644
--- a/app/models/organizations/mail_team_supervisor.rb
+++ b/app/models/organizations/mail_team_supervisor.rb
@@ -6,6 +6,7 @@ def self.singleton
       MailTeamSupervisor.create(name: "Mail Team Supervisor", url: "mail-team-supervisor")
   end
 
+  # :reek:UtilityFunction
   def selectable_in_queue?
     !Rails.env.production?
   end
diff --git a/app/models/tasks/correspondence_intake_task.rb b/app/models/tasks/correspondence_intake_task.rb
index a219756393a..7e63dba9fc7 100644
--- a/app/models/tasks/correspondence_intake_task.rb
+++ b/app/models/tasks/correspondence_intake_task.rb
@@ -21,18 +21,6 @@ def create_from_params(params, user)
       child
     end
 
-    def create_child_task(parent_task, current_user, params)
-      Task.create!(
-        type: params[:type],
-        appeal_type: "Correspondence",
-        appeal: parent_task.appeal,
-        assigned_by_id: child_assigned_by_id(parent_task, current_user),
-        parent_id: parent_task.id,
-        assigned_to: params[:assigned_to] || child_task_assignee(parent_task, params),
-        instructions: params[:instructions]
-      )
-    end
-
     private
 
     def verify_current_user_can_create!(user)
diff --git a/app/models/tasks/correspondence_task.rb b/app/models/tasks/correspondence_task.rb
index 3723531755d..d617411f860 100644
--- a/app/models/tasks/correspondence_task.rb
+++ b/app/models/tasks/correspondence_task.rb
@@ -42,6 +42,18 @@ def status_is_valid_on_create
     true
   end
 
+  def self.create_child_task(parent_task, current_user, params)
+    Task.create!(
+      type: params[:type],
+      appeal_type: "Correspondence",
+      appeal: parent_task.appeal,
+      assigned_by_id: child_assigned_by_id(parent_task, current_user),
+      parent_id: parent_task.id,
+      assigned_to: params[:assigned_to] || child_task_assignee(parent_task, params),
+      instructions: params[:instructions]
+    )
+  end
+
   def assignee_status_is_valid_on_create
     if parent&.child_must_have_active_assignee? && assigned_to.is_a?(User) && !assigned_to.active?
       fail Caseflow::Error::InvalidAssigneeStatusOnTaskCreate, assignee: assigned_to
diff --git a/app/models/tasks/review_package_task.rb b/app/models/tasks/review_package_task.rb
index 2ef2b2c9a30..85d6ac257c3 100644
--- a/app/models/tasks/review_package_task.rb
+++ b/app/models/tasks/review_package_task.rb
@@ -11,18 +11,6 @@ def create_from_params(params, user)
       parent_task.update!(status: params[:status]) if params[:status]
       child
     end
-
-    def create_child_task(parent_task, current_user, params)
-      Task.create!(
-        type: params[:type],
-        appeal_type: "Correspondence",
-        appeal: parent_task.appeal,
-        assigned_by_id: child_assigned_by_id(parent_task, current_user),
-        parent_id: parent_task.id,
-        assigned_to: params[:assigned_to] || child_task_assignee(parent_task, params),
-        instructions: params[:instructions]
-      )
-    end
   end
 
   def when_child_task_created(_child_task)
diff --git a/app/services/correspondence_intake_processor.rb b/app/services/correspondence_intake_processor.rb
index c16a61e0ab8..5ab8087c8fb 100644
--- a/app/services/correspondence_intake_processor.rb
+++ b/app/services/correspondence_intake_processor.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# :reek:DataClump
+# :reek:FeatureEnvy
 class CorrespondenceIntakeProcessor
   def process_intake(intake_params, current_user)
     correspondence = Correspondence.find_by(uuid: intake_params[:correspondence_uuid])
diff --git a/client/app/queue/correspondence/intake/components/TasksAppeals/AddTasksAppealsView.jsx b/client/app/queue/correspondence/intake/components/TasksAppeals/AddTasksAppealsView.jsx
index 7608f948d8b..b1e692a05a8 100644
--- a/client/app/queue/correspondence/intake/components/TasksAppeals/AddTasksAppealsView.jsx
+++ b/client/app/queue/correspondence/intake/components/TasksAppeals/AddTasksAppealsView.jsx
@@ -49,7 +49,7 @@ export const AddTasksAppealsView = (props) => {
     let otherMotionCount = 0;
 
     const filteredTaskNames = tasks.map((task) => {
-      if (task.label === 'Other motion') {
+      if (task.label.toLowerCase() === 'other motion') {
         otherMotionCount += 1;
       }
 
@@ -59,7 +59,7 @@ export const AddTasksAppealsView = (props) => {
     return options.filter((option) => {
       // Up to 2 other motion tasks can be created in the workflow
       // so only filter 'other motion' if there are 2 other motion tasks already created
-      if (option.label === 'Other motion' && otherMotionCount < 2) {
+      if (option.label.toLowerCase() === 'other motion' && otherMotionCount < 2) {
         return true;
       }
 
diff --git a/client/app/styles/queue/_correspondence.scss b/client/app/styles/queue/_correspondence.scss
index 736497bc011..5f5696161da 100644
--- a/client/app/styles/queue/_correspondence.scss
+++ b/client/app/styles/queue/_correspondence.scss
@@ -161,6 +161,7 @@
       }
   }
 }
+
 .correspondence-doctype-edit-dropdown .cf-select .cf-select__control {
   max-width: 43rem;
 }
diff --git a/db/seeds/cavc_ama_appeals.rb b/db/seeds/cavc_ama_appeals.rb
index 1d2ee837bc5..b9e9afe3d42 100644
--- a/db/seeds/cavc_ama_appeals.rb
+++ b/db/seeds/cavc_ama_appeals.rb
@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
+require_relative "./helpers/seed_helpers"
+
 module Seeds
   class CavcAmaAppeals < Base
+    include SeedHelpers
+
     def initialize
       initial_id_values
       @ama_appeals = []
@@ -25,16 +29,6 @@ def initial_id_values
       end
     end
 
-    def create_veteran(options = {})
-      @file_number += 1
-      @participant_id += 1
-      params = {
-        file_number: format("%<n>09d", n: @file_number),
-        participant_id: format("%<n>09d", n: @participant_id)
-      }
-      create(:veteran, params.merge(options))
-    end
-
     def create_cavc_ama_appeals
       create_cavc_appeals_at_send_letter
     end
diff --git a/db/seeds/cavc_dashboard_data.rb b/db/seeds/cavc_dashboard_data.rb
index f41eebcd389..79725b0d235 100644
--- a/db/seeds/cavc_dashboard_data.rb
+++ b/db/seeds/cavc_dashboard_data.rb
@@ -1,8 +1,12 @@
 # frozen_string_literal: true
 
 # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+require_relative "./helpers/seed_helpers"
+
 module Seeds
   class CavcDashboardData < Base
+    include SeedHelpers
+
     def initialize
       initial_id_values
     end
@@ -34,16 +38,6 @@ def initial_id_values
       end
     end
 
-    def create_veteran(options = {})
-      @file_number += 1
-      @participant_id += 1
-      params = {
-        file_number: format("%<n>09d", n: @file_number),
-        participant_id: format("%<n>09d", n: @participant_id)
-      }
-      create(:veteran, params.merge(options))
-    end
-
     def create_cavc_dashboards_with_blank_dispositions
       5.times do
         remand = create(:cavc_remand,
diff --git a/db/seeds/helpers/seed_helpers.rb b/db/seeds/helpers/seed_helpers.rb
new file mode 100644
index 00000000000..1ea214a101e
--- /dev/null
+++ b/db/seeds/helpers/seed_helpers.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module SeedHelpers
+  def create_veteran(options = {})
+    @file_number += 1
+    @participant_id += 1
+    params = {
+      file_number: format("%<n>09d", n: @file_number),
+      participant_id: format("%<n>09d", n: @participant_id)
+    }
+    create(:veteran, params.merge(options))
+  end
+end
diff --git a/db/seeds/multi_correspondences.rb b/db/seeds/multi_correspondences.rb
index 4a47fdb1202..1ba263d5135 100644
--- a/db/seeds/multi_correspondences.rb
+++ b/db/seeds/multi_correspondences.rb
@@ -1,8 +1,12 @@
 # frozen_string_literal :true
 
 # create correspondence seeds
+# :reek:InstanceVariableAssumption
+require_relative "./helpers/seed_helpers"
+
 module Seeds
   class MultiCorrespondences < Base
+    include SeedHelpers
 
     def initialize
       initial_id_values
@@ -27,16 +31,6 @@ def initial_id_values
       @cmp_packet_number += 10_000 while ::Correspondence.find_by(cmp_packet_number: @cmp_packet_number + 1)
     end
 
-    def create_veteran(options = {})
-      @file_number += 1
-      @participant_id += 1
-      params = {
-        file_number: format("%<n>09d", n: @file_number),
-        participant_id: format("%<n>09d", n: @participant_id)
-      }
-      create(:veteran, params.merge(options))
-    end
-
     # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def create_multi_correspondences
       veteran = create_veteran(first_name: "Adam", last_name: "West")
diff --git a/db/seeds/remanded_ama_appeals.rb b/db/seeds/remanded_ama_appeals.rb
index 05288970a4e..219b3b8bd72 100644
--- a/db/seeds/remanded_ama_appeals.rb
+++ b/db/seeds/remanded_ama_appeals.rb
@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
+require_relative "./helpers/seed_helpers"
+
 module Seeds
   class RemandedAmaAppeals < Base
+    include SeedHelpers
+
     def initialize
       initial_id_values
     end
@@ -35,16 +39,6 @@ def initial_id_values
       end
     end
 
-    def create_veteran(options = {})
-      @file_number += 1
-      @participant_id += 1
-      params = {
-        file_number: format("%<n>09d", n: @file_number),
-        participant_id: format("%<n>09d", n: @participant_id)
-      }
-      create(:veteran, params.merge(options))
-    end
-
     def judge
       @judge ||= User.find_by_css_id("BVAAABSHIRE")
     end
diff --git a/db/seeds/remanded_legacy_appeals.rb b/db/seeds/remanded_legacy_appeals.rb
index f7d66a42f61..44a07916ec4 100644
--- a/db/seeds/remanded_legacy_appeals.rb
+++ b/db/seeds/remanded_legacy_appeals.rb
@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
+require_relative "./helpers/seed_helpers"
+
 module Seeds
   class RemandedLegacyAppeals < Base
+    include SeedHelpers
+
     def initialize
       @legacy_appeals = []
       initial_file_number_and_participant_id
@@ -23,17 +27,6 @@ def initial_file_number_and_participant_id
       end
     end
 
-    def create_veteran(options = {})
-      @file_number += 1
-      @participant_id += 1
-      params = {
-        file_number: format("%<n>09d", n: @file_number),
-        participant_id: format("%<n>09d", n: @participant_id)
-      }
-      create(:veteran, params.merge(options))
-    end
-
-
     def create_legacy_tasks
       Timecop.travel(65.days.ago)
         create_legacy_appeals('RO17', 50, 'decision_ready_hr')
diff --git a/db/seeds/static_dispatched_appeals_test_data.rb b/db/seeds/static_dispatched_appeals_test_data.rb
index 922d51460bb..9e81baa0582 100644
--- a/db/seeds/static_dispatched_appeals_test_data.rb
+++ b/db/seeds/static_dispatched_appeals_test_data.rb
@@ -4,8 +4,12 @@
 # cases to other seed files changes the order in which data is created and therefore the ID values of data,
 # which can make regression testing difficult or change the ID values of known cases used in manual testing.
 
+require_relative "./helpers/seed_helpers"
+
 module Seeds
   class StaticDispatchedAppealsTestData < Base
+    include SeedHelpers
+
     def initialize
       initial_id_values
     end
@@ -26,16 +30,6 @@ def initial_id_values
       end
     end
 
-    def create_veteran(options = {})
-      @file_number += 1
-      @participant_id += 1
-      params = {
-        file_number: format("%<n>09d", n: @file_number),
-        participant_id: format("%<n>09d", n: @participant_id)
-      }
-      create(:veteran, params.merge(options))
-    end
-
     def cases_for_dispatched_appeals_to_add_cavc_remand
       25.times do
         nonpriority_case_with_dispatch_task_to_add_cavc_remand
diff --git a/db/seeds/static_test_data.rb b/db/seeds/static_test_data.rb
index 1ce1854cd3f..2a88b0cd4e2 100644
--- a/db/seeds/static_test_data.rb
+++ b/db/seeds/static_test_data.rb
@@ -4,8 +4,12 @@
 # cases to other seed files changes the order in which data is created and therefore the ID values of data,
 # which can make regression testing difficult or change the ID values of known cases used in manual testing.
 
+require_relative "./helpers/seed_helpers"
+
 module Seeds
   class StaticTestCaseData < Base
+    include SeedHelpers
+
     def initialize
       initial_id_values
     end
@@ -28,16 +32,6 @@ def initial_id_values
       end
     end
 
-    def create_veteran(options = {})
-      @file_number += 1
-      @participant_id += 1
-      params = {
-        file_number: format("%<n>09d", n: @file_number),
-        participant_id: format("%<n>09d", n: @participant_id)
-      }
-      create(:veteran, params.merge(options))
-    end
-
     def cases_for_timely_calculations_on_das
       2.times do
         priority_case_with_only_attorney_task
diff --git a/db/seeds/tasks.rb b/db/seeds/tasks.rb
index 48d9aa4387a..8e58f4d6d48 100644
--- a/db/seeds/tasks.rb
+++ b/db/seeds/tasks.rb
@@ -2,6 +2,9 @@
 
 # create tasks and their related appeals
 # to do: split this up more logically for legacy, AMA, etc.
+
+require_relative "./helpers/seed_helpers"
+
 module Seeds
   # rubocop:disable Metrics/PerceivedComplexity
   # rubocop:disable Metrics/CyclomaticComplexity
@@ -10,6 +13,8 @@ module Seeds
   # rubocop:disable Metrics/MethodLength
   # rubocop:disable Lint/DuplicateMethods
   class Tasks < Base
+    include SeedHelpers
+
     def initialize
       @ama_appeals = []
       initial_file_number_and_participant_id
@@ -34,16 +39,6 @@ def initial_file_number_and_participant_id
       end
     end
 
-    def create_veteran(options = {})
-      @file_number += 1
-      @participant_id += 1
-      params = {
-        file_number: format("%<n>09d", n: @file_number),
-        participant_id: format("%<n>09d", n: @participant_id)
-      }
-      create(:veteran, params.merge(options))
-    end
-
     def create_ama_appeals
       notes = "Pain disorder with 100\% evaluation per examination"
 
diff --git a/db/seeds/test_case_data.rb b/db/seeds/test_case_data.rb
index bcbdef8b52b..657be344009 100644
--- a/db/seeds/test_case_data.rb
+++ b/db/seeds/test_case_data.rb
@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
+require_relative "./helpers/seed_helpers"
+
 module Seeds
   class TestCaseData < Base
+    include SeedHelpers
+
     def initialize
       initial_id_values
     end
@@ -23,16 +27,6 @@ def initial_id_values
       end
     end
 
-    def create_veteran(options = {})
-      @file_number += 1
-      @participant_id += 1
-      params = {
-        file_number: format("%<n>09d", n: @file_number),
-        participant_id: format("%<n>09d", n: @participant_id)
-      }
-      create(:veteran, params.merge(options))
-    end
-
     def create_limbo_appeals
       5.times do
         create_priority_appeal_no_person
diff --git a/lib/tasks/correspondence.rake b/lib/tasks/correspondence.rake
index 39f2f98ab3c..2f8be9d0374 100644
--- a/lib/tasks/correspondence.rake
+++ b/lib/tasks/correspondence.rake
@@ -360,6 +360,7 @@ def create_multiple_docs(corres, veteran)
     vbms_document_type_id: 18
   )
 end
+# rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
 # Note: Remove after document controller is implemented
 def create_static_documents
@@ -387,6 +388,7 @@ def create_document_types
   VbmsDocumentType.import(doc_types, validate: false) unless doc_types.empty?
 end
 
+# rubocop:disable Metrics/MethodLength
 def create_correspondence_types
   correspondence_types_list =
     ["Abeyance",
@@ -418,6 +420,7 @@ def create_correspondence_types
     CorrespondenceType.find_or_create_by(name: type)
   end
 end
+# rubocop:enable Metrics/MethodLength
 
 def create_package_document_types
   [
@@ -447,6 +450,8 @@ def create_correspondence_veteran(options = {})
   veteran
 end
 
+# rubocop:disable Metrics/MethodLength
+# rubocop:disable Metrics/AbcSize
 def create_multi_correspondences
   veteran = create_correspondence_veteran(first_name: "Adam", last_name: "West")
   5.times do
@@ -580,3 +585,5 @@ def create_multi_correspondences
     @cmp_packet_number += 1
   end
 end
+# rubocop:enable Metrics/MethodLength
+# rubocop:enable Metrics/AbcSize
diff --git a/spec/controllers/correspondence_controller_spec.rb b/spec/controllers/correspondence_controller_spec.rb
index 83b561587ef..cb79fd15516 100644
--- a/spec/controllers/correspondence_controller_spec.rb
+++ b/spec/controllers/correspondence_controller_spec.rb
@@ -6,7 +6,7 @@
   let(:related_correspondence_uuids) do
     (1..3).map { create(:correspondence) }.pluck(:uuid)
   end
-  let (:esw_tasks) do
+  let(:esw_tasks) do
     (1..3).map do
       appeal = create(:appeal)
       InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
diff --git a/spec/feature/queue/correspondence/intake_form_persistence.rb b/spec/feature/queue/correspondence/intake_form_persistence.rb
index 068bc1370e3..6ee5a6bef3e 100644
--- a/spec/feature/queue/correspondence/intake_form_persistence.rb
+++ b/spec/feature/queue/correspondence/intake_form_persistence.rb
@@ -15,9 +15,7 @@
 
   context "step 1" do
     it "creates a correspondence_intake record on page load" do
-      expect {
-        visit_intake_page
-      }.to change(CorrespondenceIntake, :count).by(1)
+      expect { visit_intake_page }.to change(CorrespondenceIntake, :count).by(1)
 
       expect(CorrespondenceIntake.find_by(user: current_user, correspondence: correspondence).current_step).to eq(1)
       expect(CorrespondenceIntake.find_by(user: current_user, correspondence: correspondence).redux_store).not_to be_nil
diff --git a/spec/feature/queue/correspondence/intake_spec.rb b/spec/feature/queue/correspondence/intake_spec.rb
index d7ae5eb44d2..bddd7a86721 100644
--- a/spec/feature/queue/correspondence/intake_spec.rb
+++ b/spec/feature/queue/correspondence/intake_spec.rb
@@ -58,16 +58,7 @@
 
   context "intake form shell" do
     before :each do
-      FeatureToggle.enable!(:correspondence_queue)
-      veteran = create(:veteran, last_name: "Smith", file_number: "12345678")
-      create(
-        :correspondence,
-        veteran_id: veteran.id,
-        uuid: SecureRandom.uuid,
-        va_date_of_receipt: Time.zone.local(2023, 1, 1)
-      )
-      @correspondence_uuid = Correspondence.first.uuid
-      visit "/queue/correspondence/#{@correspondence_uuid}/intake"
+      setup_and_visit_intake
     end
 
     it "the intake page exists" do
@@ -116,22 +107,13 @@
 
   context "access 'Tasks not Related to an Appeals'" do
     before :each do
-      FeatureToggle.enable!(:correspondence_queue)
-      veteran = create(:veteran, last_name: "Smith", file_number: "12345678")
-      create(
-        :correspondence,
-        veteran_id: veteran.id,
-        uuid: SecureRandom.uuid,
-        va_date_of_receipt: Time.zone.local(2023, 1, 1)
-      )
-      @correspondence_uuid = Correspondence.first.uuid
-      visit "/queue/correspondence/#{@correspondence_uuid}/intake"
+      setup_and_visit_intake
     end
 
     it "Paragraph text appears below the title" do
       click_on("button-continue")
       expect(page).to have_button("+ Add tasks")
-      expect(page).to have_text("Add new tasks related to this correspondence or " +
+      expect(page).to have_text("Add new tasks related to this correspondence or " \
         "to an appeal not yet created in Caseflow.")
     end
   end
@@ -169,12 +151,12 @@
       click_on("+ Add tasks")
       all("#reactSelectContainer")[0].click
       find_by_id("react-select-2-option-4").click
-      expect(page).to have_content("Other motion")
+      expect(page).to have_content("Other Motion")
       click_on("+ Add tasks")
       all("#reactSelectContainer")[1].click
       find_by_id("react-select-3-option-4").click
       within all("#reactSelectContainer")[1] do
-        expect(page).to have_content("Other motion")
+        expect(page).to have_content("Other Motion")
       end
       expect(page).to have_button("+ Add tasks", disabled: false)
     end
@@ -228,7 +210,7 @@
         visit_intake_form_step_3_with_tasks_unrelated
 
         expect(page).to have_content("Tasks not related to an Appeal")
-        expect(all("button > span", text: "Edit Section").length).to eq(3)
+        expect(all("button > span", text: "Edit Section").length).to eq(4)
         expect(page).to have_content("Tasks")
         expect(page).to have_content("Task Instructions or Context")
         expect(page).to have_content("CAVC Correspondence")
@@ -246,9 +228,7 @@
 
   context "The user is able to use the autotext feature" do
     before do
-      require Rails.root.join("db/seeds/base.rb").to_s
-      Dir[Rails.root.join("db/seeds/*.rb")].sort.each { |f| require f }
-      Seeds::AutoTexts.new.seed!
+      seed_autotext_table
     end
 
     before :each do
diff --git a/spec/feature/queue/correspondence/mail_tasks_confirm_spec.rb b/spec/feature/queue/correspondence/mail_tasks_confirm_spec.rb
index 39276b95d54..1de96986969 100644
--- a/spec/feature/queue/correspondence/mail_tasks_confirm_spec.rb
+++ b/spec/feature/queue/correspondence/mail_tasks_confirm_spec.rb
@@ -56,7 +56,7 @@
       expect(page).to have_text("Completed Mail Tasks")
       expect(page).to have_text("Change of address")
       expect(page).to have_button("Edit Section")
-      all("div > span > button > span", text: "Edit Section")[0].click
+      all("div > span > button > span", text: "Edit Section")[1].click
       expect(page).to have_text("Mail Tasks")
       checkbox = all("#mail-tasks-left .cf-form-checkbox")[0]
       checkbox_input = checkbox.find('input[name="Change of address"]', visible: :all)
diff --git a/spec/feature/queue/correspondence/review_package_spec.rb b/spec/feature/queue/correspondence/review_package_spec.rb
index 65f3dbbbd10..8269c7e9ee9 100644
--- a/spec/feature/queue/correspondence/review_package_spec.rb
+++ b/spec/feature/queue/correspondence/review_package_spec.rb
@@ -193,7 +193,9 @@
       fill_in "Notes", with: " Updated"
       expect(page).to have_button("Save changes", disabled: false)
       click_button "Save changes"
-      sleep 1
+      Timeout.timeout(10) do
+        sleep(0.1) until correspondence.tasks.find_by_type("ReviewPackageTask").status == "in_progress"
+      end
       expect(correspondence.tasks.find_by_type("ReviewPackageTask").status).to eq("in_progress")
     end
   end
diff --git a/spec/feature/queue/correspondence/submit_intake_form_spec.rb b/spec/feature/queue/correspondence/submit_intake_form_spec.rb
index 3edcc5909d3..35624795baf 100644
--- a/spec/feature/queue/correspondence/submit_intake_form_spec.rb
+++ b/spec/feature/queue/correspondence/submit_intake_form_spec.rb
@@ -24,14 +24,14 @@
   context "user selects completed mail tasks" do
     describe "success" do
       it "displays confirm submission" do
-      visit_intake_form_step_2_with_appeals
-      page.all(".cf-form-checkbox")[2].click
-      click_button("Continue")
-      click_button("Submit")
-      click_button("Confirm")
-      using_wait_time(10) do
-        expect(page).to have_content("You have successfully submitted a correspondence record")
-      end
+        visit_intake_form_step_2_with_appeals
+        page.all(".cf-form-checkbox")[2].click
+        click_button("Continue")
+        click_button("Submit")
+        click_button("Confirm")
+        using_wait_time(10) do
+          expect(page).to have_content("You have successfully submitted a correspondence record")
+        end
       end
     end
   end
@@ -39,9 +39,7 @@
   context "user add tasks not related to an appeal" do
     describe "success" do
       before do
-        require Rails.root.join("db/seeds/base.rb").to_s
-        Dir[Rails.root.join("db/seeds/*.rb")].sort.each { |f| require f }
-        Seeds::AutoTexts.new.seed!
+        seed_autotext_table
       end
       it "displays confirm submission" do
         visit_intake_form_step_2_with_appeals
@@ -49,7 +47,6 @@
         all("#reactSelectContainer")[0].click
         find_by_id("react-select-2-option-1").click
         find_by_id("addAutotext").click
-        checkbox_text = "Possible motion pursuant to BVA decision dated mm/dd/yy"
         within find_by_id("autotextModal") do
           page.all(".cf-form-checkbox")[6].click
           find_by_id("Add-autotext-button-id-1").click
@@ -64,7 +61,13 @@
     end
 
     describe "failure" do
-      let(:mock_correspondence_intake_processor) { instance_double(CorrespondenceIntakeProcessor, process_intake: false) }
+      let(:mock_correspondence_intake_processor) do
+        instance_double(
+          CorrespondenceIntakeProcessor,
+          process_intake: false
+        )
+      end
+
       before do
         allow(CorrespondenceIntakeProcessor).to receive(:new).and_return(mock_correspondence_intake_processor)
         require Rails.root.join("db/seeds/base.rb").to_s
@@ -77,7 +80,6 @@
         all("#reactSelectContainer")[0].click
         find_by_id("react-select-2-option-1").click
         find_by_id("addAutotext").click
-        checkbox_text = "Possible motion pursuant to BVA decision dated mm/dd/yy"
         within find_by_id("autotextModal") do
           page.all(".cf-form-checkbox")[6].click
           find_by_id("Add-autotext-button-id-1").click
@@ -92,7 +94,6 @@
     end
   end
 
-
   context "user adds tasks related to an appeal" do
     describe "success" do
       it "displays a success banner, links the appeal, and creates the task" do
@@ -151,7 +152,7 @@
         using_wait_time(10) do
           page.all(".checkbox-wrapper-1").find(".cf-form-checkbox").first.click
         end
-        find('label', text: 'Waive Evidence Window').click
+        find("label", text: "Waive Evidence Window").click
         find_by_id("waiveReason").fill_in with: "test waive note"
         click_button("Continue")
         find(".cf-pdf-external-link-icon").click
diff --git a/spec/feature/queue/correspondence/tasks_related_to_an_existing_appeal_spec.rb b/spec/feature/queue/correspondence/tasks_related_to_an_existing_appeal_spec.rb
index 4434581a049..b37ba6b7b1b 100644
--- a/spec/feature/queue/correspondence/tasks_related_to_an_existing_appeal_spec.rb
+++ b/spec/feature/queue/correspondence/tasks_related_to_an_existing_appeal_spec.rb
@@ -244,13 +244,13 @@
         all("#reactSelectContainer")[0].click
         find_by_id("react-select-2-option-15").click
         find_by_id("content").fill_in with: "Correspondence Text"
-        expect((all("#reactSelectContainer")[0]).text).to include("Other motion")
+        expect((all("#reactSelectContainer")[0]).text).to include("Other Motion")
 
         page.all("#button-addTasks").first.click
         all("#reactSelectContainer")[1].click
         find_by_id("react-select-3-option-15").click
         all("textarea")[1].fill_in with: "Correspondence Text"
-        expect(all("#reactSelectContainer")[1].text).to include("Other motion")
+        expect(all("#reactSelectContainer")[1].text).to include("Other Motion")
 
         page.all("#button-addTasks").first.click
         all("#reactSelectContainer")[2].click
@@ -270,9 +270,9 @@
         all("#reactSelectContainer")[0].click
         find_by_id("react-select-2-option-15").click
         find_by_id("content").fill_in with: "Correspondence Text"
-        expect((find_all("#reactSelectContainer")).length).to eq(1)
+        expect(find_all("#reactSelectContainer").length).to eq(1)
         find_all(".fa.fa-unlink").last.click
-        expect((find_all("#reactSelectContainer")).length).to eq(0)
+        expect(find_all("#reactSelectContainer").length).to eq(0)
       end
 
       it "Unlinks only one appeal if multiple are selected when the unlink appeal button is clicked" do
@@ -295,9 +295,9 @@
         find_by_id("react-select-3-option-15").click
         all("textarea")[1].fill_in with: "Correspondence Text"
 
-        expect((find_all("#reactSelectContainer")).length).to eq(2)
+        expect(find_all("#reactSelectContainer").length).to eq(2)
         find_all(".fa.fa-unlink").last.click
-        expect((find_all("#reactSelectContainer")).length).to eq(1)
+        expect(find_all("#reactSelectContainer").length).to eq(1)
       end
     end
   end
diff --git a/spec/models/correspondence_intake_spec.rb b/spec/models/correspondence_intake_spec.rb
index 3c1be036f08..1ff3ed7cac6 100644
--- a/spec/models/correspondence_intake_spec.rb
+++ b/spec/models/correspondence_intake_spec.rb
@@ -10,7 +10,12 @@
     it "can be created" do
       correspondence = Correspondence.create!
       user = User.create!(css_id: "User", station_id: "1")
-      subject = CorrespondenceIntake.create!(correspondence_id: correspondence.id, user_id: user.id, current_step: 1, redux_store: 1)
+      subject = CorrespondenceIntake.create!(
+        correspondence_id: correspondence.id,
+        user_id: user.id,
+        current_step: 1,
+        redux_store: 1
+      )
 
       expect(subject).to be_a(CorrespondenceIntake)
     end
@@ -20,7 +25,8 @@
       user = User.create!(css_id: "User", station_id: "1")
 
       expect { CorrespondenceIntake.create! }.to raise_error(ActiveRecord::RecordInvalid)
-      expect { CorrespondenceIntake.create!(correspondence_id: correspondence.id) }.to raise_error(ActiveRecord::RecordInvalid)
+      expect { CorrespondenceIntake.create!(correspondence_id: correspondence.id) }
+        .to raise_error(ActiveRecord::RecordInvalid)
       expect { CorrespondenceIntake.create!(user_id: user.id) }.to raise_error(ActiveRecord::RecordInvalid)
     end
   end
diff --git a/spec/models/correspondences_appeal_spec.rb b/spec/models/correspondences_appeal_spec.rb
index 9e18d90123f..8f272b3da0f 100644
--- a/spec/models/correspondences_appeal_spec.rb
+++ b/spec/models/correspondences_appeal_spec.rb
@@ -7,7 +7,8 @@
   before do
     @subject = CorrespondencesAppeal.create!(
       correspondence_id: correspondence.id,
-      appeal_id: appeal.id)
+      appeal_id: appeal.id
+    )
   end
 
   it "exists" do
diff --git a/spec/requests/correspondence_controller_spec.rb b/spec/requests/correspondence_controller_spec.rb
index cd01755482b..ee98bd62e8e 100644
--- a/spec/requests/correspondence_controller_spec.rb
+++ b/spec/requests/correspondence_controller_spec.rb
@@ -72,8 +72,10 @@
 
           it "creates tasks not related to an appeal" do
             expect do
-              post queue_correspondence_intake_process_intake_path(correspondence_uuid: correspondence.uuid),
+              post queue_correspondence_intake_process_intake_path(
+                correspondence_uuid: correspondence.uuid,
                 params: post_data
+              )
             end.to change(Task, :count)
 
             expect(response).to have_http_status(:created)
diff --git a/spec/support/correspondence_helpers.rb b/spec/support/correspondence_helpers.rb
index e9e71f3243f..c6b82fae127 100644
--- a/spec/support/correspondence_helpers.rb
+++ b/spec/support/correspondence_helpers.rb
@@ -103,7 +103,7 @@ def existing_appeal_radio_options
   def active_evidence_submissions_tasks
     setup_access
     veteran = create(:veteran, last_name: "Smith", file_number: "12345678")
-    create(:correspondence, veteran_id: veteran.id, uuid: SecureRandom.uuid, va_date_of_receipt: Time.local(2023, 1, 1))
+    create(:correspondence, veteran_id: veteran.id, uuid: SecureRandom.uuid, va_date_of_receipt: Time.zone.local(2023, 1, 1))
     2.times do
       appeal = create(:appeal, veteran_file_number: veteran.file_number)
       InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
@@ -111,4 +111,23 @@ def active_evidence_submissions_tasks
     visit "/queue/correspondence/#{Correspondence.first.uuid}/intake"
     click_button("Continue")
   end
+
+  def setup_and_visit_intake
+    FeatureToggle.enable!(:correspondence_queue)
+    veteran = create(:veteran, last_name: "Smith", file_number: "12345678")
+    create(
+      :correspondence,
+      veteran_id: veteran.id,
+      uuid: SecureRandom.uuid,
+      va_date_of_receipt: Time.zone.local(2023, 1, 1)
+    )
+    @correspondence_uuid = Correspondence.first.uuid
+    visit "/queue/correspondence/#{@correspondence_uuid}/intake"
+  end
+
+  def seed_autotext_table
+    require Rails.root.join("db/seeds/base.rb").to_s
+    Dir[Rails.root.join("db/seeds/*.rb")].sort.each { |f| require f }
+    Seeds::AutoTexts.new.seed!
+  end
 end

From ec9b98f87a4e3f6bd480f04f646c0d5f8fea62dc Mon Sep 17 00:00:00 2001
From: jonathanh-va <111081469+jonathanh-va@users.noreply.github.com>
Date: Fri, 5 Jan 2024 15:59:06 -0600
Subject: [PATCH 026/237] J hoang/appeals 34906 v4 (#20426)

* upload static correspondence document

* update spec

---------

Co-authored-by: Jonathan Hoang <trinhjoanthan.hoang@va.gov>
---
 Gemfile                                      |  2 +-
 Gemfile.lock                                 |  4 ++--
 app/controllers/correspondence_controller.rb |  5 ++++-
 app/models/correspondence_document.rb        | 16 +---------------
 spec/models/correspondence_document_spec.rb  | 17 ++---------------
 5 files changed, 10 insertions(+), 34 deletions(-)

diff --git a/Gemfile b/Gemfile
index f145cd914ba..a2a638b6b60 100644
--- a/Gemfile
+++ b/Gemfile
@@ -66,7 +66,7 @@ gem "redis-namespace"
 gem "redis-rails", "~> 5.0.2"
 gem "request_store"
 gem "roo", "~> 2.7"
-gem "ruby_claim_evidence_api", git: "https://github.com/department-of-veterans-affairs/ruby_claim_evidence_api.git", ref: "f1686404d448e1d8d13e533400817bcab175ed65"
+gem "ruby_claim_evidence_api", git: "https://github.com/department-of-veterans-affairs/ruby_claim_evidence_api.git", ref: "db228fc5ad63c9244bc60fdaef9c86e0248c5de1"
 # Use SCSS for stylesheets
 gem "sass-rails", "~> 5.0"
 # Error reporting to Sentry
diff --git a/Gemfile.lock b/Gemfile.lock
index 6b5ba418d69..89816930edd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -67,8 +67,8 @@ GIT
 
 GIT
   remote: https://github.com/department-of-veterans-affairs/ruby_claim_evidence_api.git
-  revision: f1686404d448e1d8d13e533400817bcab175ed65
-  ref: f1686404d448e1d8d13e533400817bcab175ed65
+  revision: db228fc5ad63c9244bc60fdaef9c86e0248c5de1
+  ref: db228fc5ad63c9244bc60fdaef9c86e0248c5de1
   specs:
     ruby_claim_evidence_api (0.0.1)
       activesupport
diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index 2df5527d319..96f7ccd35a4 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -312,13 +312,16 @@ def upload_documents_to_claim_evidence
 
   def create_efolder_upload_failed_task
     rpt = ReviewPackageTask.find_by(appeal_id: correspondence.id, type: ReviewPackageTask.name)
-    euft = EfolderUploadFailedTask.find_or_create_by(
+    # rubocop:disable Layout/MultilineOperationIndentation)
+    euft = EfolderUploadFailedTask.where(appeal_id: correspondence.id, type: EfolderUploadFailedTask.name).first ||
+    EfolderUploadFailedTask.create!(
       appeal_id: correspondence.id,
       appeal_type: "Correspondence",
       type: EfolderUploadFailedTask.name,
       assigned_to: current_user,
       parent_id: rpt.id
     )
+    # rubocop:enable Layout/MultilineOperationIndentation)
 
     euft.update!(status: Constants.TASK_STATUSES.in_progress)
   end
diff --git a/app/models/correspondence_document.rb b/app/models/correspondence_document.rb
index ad3e6e2cdda..66d73264f13 100644
--- a/app/models/correspondence_document.rb
+++ b/app/models/correspondence_document.rb
@@ -4,22 +4,8 @@ class CorrespondenceDocument < CaseflowRecord
   belongs_to :correspondence
   belongs_to :vbms_document_type
 
-  S3_BUCKET_NAME = "documents"
-
-  def pdf_name
-    "#{uuid}.pdf"
-  end
-
-  def s3_location
-    "#{S3_BUCKET_NAME}/#{uuid}"
-  end
-
-  def output_location
-    File.join(Rails.root, "tmp", "pdfs", pdf_name)
-  end
-
   def pdf_location
-    S3Service.fetch_file(s3_location, output_location)
+    File.join(Rails.root, "lib", "pdfs", "KnockKnockJokes.pdf")
   end
 
   def claim_evidence_upload_json
diff --git a/spec/models/correspondence_document_spec.rb b/spec/models/correspondence_document_spec.rb
index dccc0e0dd22..ffe779cf68d 100644
--- a/spec/models/correspondence_document_spec.rb
+++ b/spec/models/correspondence_document_spec.rb
@@ -14,22 +14,9 @@
 
   before do
     FeatureToggle.enable!(:correspondence_queue)
-    S3Service.store_file(
-      "#{CorrespondenceDocument::S3_BUCKET_NAME}/#{document.uuid}",
-      "lib/pdfs/KnockKnockJokes.pdf", :filepath
-    )
-  end
-
-  it "pdf_name returns name of pdf" do
-    expect(document.pdf_name).to eq("#{document.uuid}.pdf")
-  end
-
-  it "s3_location returns path to doc in s3" do
-    expect(document.s3_location).to eq("#{CorrespondenceDocument::S3_BUCKET_NAME}/#{document.uuid}")
   end
 
-  it "pdf_location stores file fetched from S3" do
-    document.pdf_location
-    expect(document.output_location).to eq(File.join(Rails.root, "tmp", "pdfs", document.pdf_name).to_s)
+  it "pdf_location gets file path of static document" do
+    expect(document.pdf_location).to eq(File.join(Rails.root, "lib", "pdfs", "KnockKnockJokes.pdf").to_s)
   end
 end

From 124edd9371f5e099e0789d67c5bf015581fdc770 Mon Sep 17 00:00:00 2001
From: Kevma50287 <104021955+Kevma50287@users.noreply.github.com>
Date: Fri, 5 Jan 2024 17:04:08 -0500
Subject: [PATCH 027/237] Kev ma/appeals 37647 (#20423)

* PdfDocument is hard-coded to access only the first N documents available

* Add limit so we're not pulling the entire table for testing purposes

* Removed loading message from jest test. Updated lint

---------

Co-authored-by: youfoundmanesh <129548081+youfoundmanesh@users.noreply.github.com>
---
 app/controllers/correspondence_controller.rb                 | 3 ++-
 .../app/queue/correspondences/CorrespondencePdfUI.test.js    | 5 -----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index 96f7ccd35a4..6902d3eb639 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -153,7 +153,8 @@ def document_type_correspondence
   end
 
   def pdf
-    document = Document.find(params[:pdf_id])
+    # Hard-coding Document access until CorrespondenceDocuments are uploaded to S3Bucket
+    document = Document.limit(200)[params[:pdf_id].to_i]
 
     document_disposition = "inline"
     if params[:download]
diff --git a/client/test/app/queue/correspondences/CorrespondencePdfUI.test.js b/client/test/app/queue/correspondences/CorrespondencePdfUI.test.js
index 5f3eff56787..1594c854656 100644
--- a/client/test/app/queue/correspondences/CorrespondencePdfUI.test.js
+++ b/client/test/app/queue/correspondences/CorrespondencePdfUI.test.js
@@ -31,11 +31,6 @@ describe('CorrespondencePdfUI', () => {
     createSpyGet();
   });
 
-  it('renders loading state initially', () => {
-    renderCorrespondencePdfUI();
-    expect(screen.getByText('Loading...')).toBeInTheDocument();
-  });
-
   it('renders the Pdf UI', async () => {
     const mockGetViewport = jest.fn(() => ({
       height: 100,

From d9bfa25b0f3cdd68488c03a083f9dd5b6b7b56e1 Mon Sep 17 00:00:00 2001
From: vinner57 <128258952+vinner57@users.noreply.github.com>
Date: Fri, 5 Jan 2024 17:04:48 -0500
Subject: [PATCH 028/237] fixing placeholder for edit document modal (#20434)

Co-authored-by: youfoundmanesh <129548081+youfoundmanesh@users.noreply.github.com>
---
 .../queue/correspondence/component/EditDocumentTypeModal.jsx  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/app/queue/correspondence/component/EditDocumentTypeModal.jsx b/client/app/queue/correspondence/component/EditDocumentTypeModal.jsx
index 21908e7953f..dfa496b4b0f 100644
--- a/client/app/queue/correspondence/component/EditDocumentTypeModal.jsx
+++ b/client/app/queue/correspondence/component/EditDocumentTypeModal.jsx
@@ -16,7 +16,7 @@ class EditDocumentTypeModal extends React.Component {
     super(props);
 
     this.state = {
-      packageDocument: {},
+      packageDocument: null,
       disabledSaveButton: true,
       packageOptions: {},
     };
@@ -85,7 +85,7 @@ class EditDocumentTypeModal extends React.Component {
             name = "issue-category"
             label = {sprintf(COPY.NEW_DOC_EDIT_DOCUMENT_TYPE_CORRESPONDENCE)}
             strongLabel = {false}
-            placeholder = "Select or enter..."
+            placeholder = "Type to search..."
             options = {this.state.packageOptions}
             value = {packageDocument}
             onChange = {this.packageDocumentOnChange}

From 4e6935e9e7a4a21c12b103355f2f7b8d03138fb7 Mon Sep 17 00:00:00 2001
From: Kevma50287 <104021955+Kevma50287@users.noreply.github.com>
Date: Fri, 5 Jan 2024 17:06:30 -0500
Subject: [PATCH 029/237] Updated reassignment label (#20438)

Co-authored-by: youfoundmanesh <129548081+youfoundmanesh@users.noreply.github.com>
---
 client/COPY.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/COPY.json b/client/COPY.json
index 9c97ffb61d0..07ef450131a 100644
--- a/client/COPY.json
+++ b/client/COPY.json
@@ -1415,7 +1415,7 @@
   "PACKAGE_ACTION_MODAL_DESCRIPTION": "By confirming, you will send a request for the supervisor to take action on the following package:",
   "PACKAGE_ACTION_REMOVAL_TITLE": "Request package removal",
   "PACKAGE_ACTION_REMOVAL_TEXTAREA_LABEL": "Provide a reason for removal",
-  "PACKAGE_ACTION_REASSIGN_DESCRIPTION":"You have selected the following correspondence cases for reassignment to another users. Please confirm your selection(s) below:",
+  "PACKAGE_ACTION_REASSIGN_DESCRIPTION": "By confirming, you will send a request for the supervisor to take action on the following package:",
   "PACKAGE_ACTION_REASSIGN_TITLE":"Request package reassignment",
   "PACKAGE_ACTION_REASSIGN_TEXTAREA_LABEL":"Provide a reason for reassignment",
   "PACKAGE_ACTION_SPLIT_TEXTAREA_LABEL":"Reason for split",

From 111a3d00645f500e542da524082dd668e7f0bb56 Mon Sep 17 00:00:00 2001
From: Kevma50287 <104021955+Kevma50287@users.noreply.github.com>
Date: Fri, 5 Jan 2024 17:07:01 -0500
Subject: [PATCH 030/237] Searchable dropdown initially defaults to "Select..."
 on page load (#20440)

---
 .../correspondence/review_package/ReviewForm.jsx    | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/client/app/queue/correspondence/review_package/ReviewForm.jsx b/client/app/queue/correspondence/review_package/ReviewForm.jsx
index d1006a7af32..38c169c9f64 100644
--- a/client/app/queue/correspondence/review_package/ReviewForm.jsx
+++ b/client/app/queue/correspondence/review_package/ReviewForm.jsx
@@ -108,17 +108,6 @@ export const ReviewForm = (props) => {
     props.setEditableData(updatedNotes);
   };
 
-  const findDefaultVal = (array, id) => {
-    const foundItem = array.find((item) => item.id === id);
-
-    return foundItem ? { label: foundItem.name, value: foundItem.name } : null;
-  };
-
-  const defaultSelectedValue = findDefaultVal(
-    props.reviewDetails.dropdown_values,
-    props.editableData.default_select_value
-  );
-
   const generateOptions = (options) =>
     options.map((option) => ({
       value: option.name,
@@ -224,10 +213,10 @@ export const ReviewForm = (props) => {
                 name="correspondence-dropdown"
                 label="Correspondence type"
                 styling={tagStyling}
-                value={defaultSelectedValue}
                 options={generateOptions(props.reviewDetails.dropdown_values)}
                 onChange={handleSelect}
                 readOnly={props.isReadOnly}
+                placeholder="Select..."
               />
             </div>
 

From d8adcd526b32994f4b3a299427e4ac7d1654e51f Mon Sep 17 00:00:00 2001
From: piedram <110848569+piedram@users.noreply.github.com>
Date: Mon, 8 Jan 2024 11:46:08 -0500
Subject: [PATCH 031/237] displaying correct reason on the modal (#20435)

* displaying correct reason on the modal

* fix error

* fix spec file

* fix spec

* fix error in review_package_spec.rb
---
 app/controllers/correspondence_controller.rb  | 11 ++++++++---
 .../component/RemovePackageModal.jsx          | 19 +++++++------------
 .../reviewPackageActions.js                   | 10 ++++++++++
 .../reviewPackageConstants.js                 |  3 ++-
 .../reviewPackageReducer.js                   | 10 +++++++++-
 .../modals/PackageActionModal.jsx             | 14 ++++++++++++--
 .../ReviewPackageLoadingScreen.jsx            | 13 +++++++++----
 .../correspondence/review_package_spec.rb     |  9 ++++-----
 8 files changed, 61 insertions(+), 28 deletions(-)

diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index 6902d3eb639..bdd0ef2d438 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -97,6 +97,11 @@ def veteran_information
 
   def show
     corres_docs = correspondence.correspondence_documents
+    reason_remove = if RemovePackageTask.find_by(appeal_id: correspondence.id, type: RemovePackageTask.name).nil?
+                      ""
+                    else
+                      RemovePackageTask.find_by(appeal_id: correspondence.id, type: RemovePackageTask.name).instructions
+                    end
     response_json = {
       correspondence: correspondence,
       package_document_type: correspondence&.package_document_type,
@@ -106,9 +111,9 @@ def show
         WorkQueue::CorrespondenceDocumentSerializer.new(doc).serializable_hash[:data][:attributes]
       end,
       efolder_upload_failed_before: EfolderUploadFailedTask.where(
-        appeal_id: correspondence.id,
-        type: "EfolderUploadFailedTask"
-      )
+        appeal_id: correspondence.id, type: "EfolderUploadFailedTask"
+      ),
+      reasonForRemovePackage: reason_remove
     }
     render({ json: response_json }, status: :ok)
   end
diff --git a/client/app/queue/correspondence/component/RemovePackageModal.jsx b/client/app/queue/correspondence/component/RemovePackageModal.jsx
index 67a2a7a5f77..e2452ae8e6a 100644
--- a/client/app/queue/correspondence/component/RemovePackageModal.jsx
+++ b/client/app/queue/correspondence/component/RemovePackageModal.jsx
@@ -2,13 +2,11 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import ApiUtil from '../../../util/ApiUtil';
 import { sprintf } from 'sprintf-js';
-import StringUtil from '../../../util/StringUtil';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import { updateLastAction } from '../correspondenceReducer/reviewPackageActions';
 import TextareaField from '../../../components/TextareaField';
 import RadioField from '../../../components/RadioField';
-// import { css } from 'glamor';
 import COPY from '../../../../COPY';
 import Modal from '../../../components/Modal';
 import Button from '../../../components/Button';
@@ -23,21 +21,17 @@ class RemovePackageModal extends React.Component {
       reasonForRemove: null,
       disabledSaveButton: true,
       reasonReject: '',
-      updateCancelSuccess: false,
-      textToShow: StringUtil.nl2br(COPY.CORRRESPONDENCE_TEXT_REMOVE_PACKAGE)
-
+      updateCancelSuccess: false
     };
   }
 
   handleSelect(reasonForRemove) {
     if (reasonForRemove === 'Approve request') {
       this.setState({ reasonForRemove,
-        disabledSaveButton: false,
-        textToShow: StringUtil.nl2br(COPY.CORRRESPONDENCE_TEXT_REMOVE_PACKAGE)
+        disabledSaveButton: false
       });
     } else {
       this.setState({ reasonForRemove,
-        textToShow: StringUtil.nl2br(COPY.CORRRESPONDENCE_SECOND_TEXT_REMOVE_PACKAGE),
         disabledSaveButton: true });
     }
   }
@@ -123,8 +117,8 @@ class RemovePackageModal extends React.Component {
         cancelButton={<Button linkStyling onClick={onCancel}>Cancel</Button>}
       >
         <p>
-          <span style= {{ fontWeight: 'bold' }}>{sprintf(COPY.CORRESPONDENCE_TITLE_REMOVE_PACKAGE)}</span>
-          {this.state.textToShow}
+          <span style= {{ fontWeight: 'bold' }}>{sprintf(COPY.CORRESPONDENCE_TITLE_REMOVE_PACKAGE)}</span><br />
+          {this.props.reasonRemovePackage[0]}
         </p>
 
         <RadioField
@@ -141,7 +135,6 @@ class RemovePackageModal extends React.Component {
                 name={sprintf(COPY.CORRESPONDENCE_TITLE_REMOVE_PACKAGE_REASON_REJECT)}
                 onChange={this.reasonChange}
                 value={this.state.reasonReject}
-                placeholder= "This is an example of a reason"
               />
         }
 
@@ -152,7 +145,8 @@ class RemovePackageModal extends React.Component {
 }
 
 const mapStateToProps = (state) => {
-  return { vetInfo: state.reviewPackage.lastAction };
+  return { vetInfo: state.reviewPackage.lastAction,
+    reasonRemovePackage: state.reviewPackage.reasonForRemovePackage };
 };
 
 RemovePackageModal.propTypes = {
@@ -161,6 +155,7 @@ RemovePackageModal.propTypes = {
   setModalState: PropTypes.func,
   correspondence_id: PropTypes.number,
   vetInfo: PropTypes.object,
+  reasonRemovePackage: PropTypes.object,
   updateLastAction: PropTypes.func,
 };
 
diff --git a/client/app/queue/correspondence/correspondenceReducer/reviewPackageActions.js b/client/app/queue/correspondence/correspondenceReducer/reviewPackageActions.js
index 80c6f8dd8ae..8ae8145b2e9 100644
--- a/client/app/queue/correspondence/correspondenceReducer/reviewPackageActions.js
+++ b/client/app/queue/correspondence/correspondenceReducer/reviewPackageActions.js
@@ -71,3 +71,13 @@ export const updateLastAction = (currentAction) =>
       }
     });
   };
+
+export const setReasonRemovePackage = (reasonForRemove) =>
+  (dispatch) => {
+    dispatch({
+      type: ACTIONS.SET_REASON_REMOVE_PACKAGE,
+      payload: {
+        reasonForRemove
+      }
+    });
+  };
diff --git a/client/app/queue/correspondence/correspondenceReducer/reviewPackageConstants.js b/client/app/queue/correspondence/correspondenceReducer/reviewPackageConstants.js
index cd864bde382..b71bb87cd69 100644
--- a/client/app/queue/correspondence/correspondenceReducer/reviewPackageConstants.js
+++ b/client/app/queue/correspondence/correspondenceReducer/reviewPackageConstants.js
@@ -5,5 +5,6 @@ export const ACTIONS = {
   SET_VETERAN_INFORMATION: 'SET_VETERAN_INFORMATION',
   UPDATE_CMP_INFORMATION: 'UPDATE_CMP_INFORMATION',
   UPDATE_DOCUMENT_TYPE_NAME: 'UPDATE_DOCUMENT_TYPE_NAME',
-  REMOVE_PACKAGE_ACTION: 'REMOVE_PACKAGE_ACTION'
+  REMOVE_PACKAGE_ACTION: 'REMOVE_PACKAGE_ACTION',
+  SET_REASON_REMOVE_PACKAGE: 'SET_REASON_REMOVE_PACKAGE',
 };
diff --git a/client/app/queue/correspondence/correspondenceReducer/reviewPackageReducer.js b/client/app/queue/correspondence/correspondenceReducer/reviewPackageReducer.js
index 56b3b68365d..51083c7c98c 100644
--- a/client/app/queue/correspondence/correspondenceReducer/reviewPackageReducer.js
+++ b/client/app/queue/correspondence/correspondenceReducer/reviewPackageReducer.js
@@ -6,7 +6,8 @@ export const initialState = {
   correspondenceDocuments: [],
   packageDocumentType: {},
   veteranInformation: {},
-  lastAction: {}
+  lastAction: {},
+  reasonForRemovePackage: {}
 };
 
 export const reviewPackageReducer = (state = initialState, action = {}) => {
@@ -79,6 +80,13 @@ export const reviewPackageReducer = (state = initialState, action = {}) => {
       }
     });
 
+  case ACTIONS.SET_REASON_REMOVE_PACKAGE:
+    return update(state, {
+      reasonForRemovePackage: {
+        $set: action.payload.reasonForRemove
+      }
+    });
+
   default:
     return state;
   }
diff --git a/client/app/queue/correspondence/modals/PackageActionModal.jsx b/client/app/queue/correspondence/modals/PackageActionModal.jsx
index 724511106b3..3d7c74835ea 100644
--- a/client/app/queue/correspondence/modals/PackageActionModal.jsx
+++ b/client/app/queue/correspondence/modals/PackageActionModal.jsx
@@ -6,6 +6,8 @@ import RadioField from '../../../components/RadioField';
 import Table from '../../../components/Table';
 import { connect } from 'react-redux';
 import ApiUtil from '../../../util/ApiUtil';
+import { bindActionCreators } from 'redux';
+import { setReasonRemovePackage } from '../correspondenceReducer/reviewPackageActions';
 import { getPackageActionColumns, getModalInformation } from '../review_package/utils';
 import { useHistory } from 'react-router';
 
@@ -122,6 +124,9 @@ const PackageActionModal = (props) => {
     ApiUtil.post(`/queue/correspondence/${correspondence.uuid}/task`, { data }).then((response) => {
       props.closeHandler(null);
       if (response.ok) {
+        if (packageActionModal === 'removePackage') {
+          props.setReasonRemovePackage(textInputReason);
+        }
         history.push('/queue/correspondence');
       }
     }
@@ -198,7 +203,8 @@ PackageActionModal.propTypes = {
   columns: PropTypes.arrayOf(PropTypes.object),
   modalInfo: PropTypes.object,
   packageActionModal: PropTypes.string,
-  closeHandler: PropTypes.func
+  closeHandler: PropTypes.func,
+  setReasonRemovePackage: PropTypes.func
 };
 
 const mapStateToProps = (state) => ({
@@ -207,7 +213,11 @@ const mapStateToProps = (state) => ({
   veteranInformation: state.reviewPackage.veteranInformation
 });
 
+const mapDispatchToProps = (dispatch) => bindActionCreators({
+  setReasonRemovePackage
+}, dispatch);
+
 export default connect(
   mapStateToProps,
-  null,
+  mapDispatchToProps,
 )(PackageActionModal);
diff --git a/client/app/queue/correspondence/review_package/ReviewPackageLoadingScreen.jsx b/client/app/queue/correspondence/review_package/ReviewPackageLoadingScreen.jsx
index 6b48cb0faed..c1e01a8b7b3 100644
--- a/client/app/queue/correspondence/review_package/ReviewPackageLoadingScreen.jsx
+++ b/client/app/queue/correspondence/review_package/ReviewPackageLoadingScreen.jsx
@@ -11,7 +11,8 @@ import {
   setCorrespondence,
   setCorrespondenceDocuments,
   setPackageDocumentType,
-  setVeteranInformation
+  setVeteranInformation,
+  setReasonRemovePackage
 } from '../correspondenceReducer/reviewPackageActions';
 import WindowUtil from '../../../util/WindowUtil';
 
@@ -26,13 +27,15 @@ class ReviewPackageLoadingScreen extends React.PureComponent {
           correspondence,
           correspondence_documents,
           package_document_type,
-          general_information
+          general_information,
+          reasonForRemovePackage
         } = response.body;
 
         this.props.setCorrespondence(correspondence);
         this.props.setCorrespondenceDocuments(correspondence_documents);
         this.props.setPackageDocumentType(package_document_type);
         this.props.setVeteranInformation(general_information);
+        this.props.setReasonRemovePackage(reasonForRemovePackage);
       }
     );
   }
@@ -68,14 +71,16 @@ ReviewPackageLoadingScreen.propTypes = {
   setCorrespondence: PropTypes.func,
   setCorrespondenceDocuments: PropTypes.func,
   setPackageDocumentType: PropTypes.func,
-  setVeteranInformation: PropTypes.func
+  setVeteranInformation: PropTypes.func,
+  setReasonRemovePackage: PropTypes.func
 };
 
 const mapDispatchToProps = (dispatch) => bindActionCreators({
   setCorrespondence,
   setCorrespondenceDocuments,
   setPackageDocumentType,
-  setVeteranInformation
+  setVeteranInformation,
+  setReasonRemovePackage
 }, dispatch);
 
 export default (connect(null, mapDispatchToProps)(ReviewPackageLoadingScreen));
diff --git a/spec/feature/queue/correspondence/review_package_spec.rb b/spec/feature/queue/correspondence/review_package_spec.rb
index 8269c7e9ee9..a107f012dcd 100644
--- a/spec/feature/queue/correspondence/review_package_spec.rb
+++ b/spec/feature/queue/correspondence/review_package_spec.rb
@@ -99,7 +99,6 @@
         radio_choices = page.all(".cf-form-radio-option > label")
         expect(radio_choices[0]).to have_content("Approve request")
         expect(radio_choices[1]).to have_content("Reject request")
-        expect(page).to have_content(COPY::CORRRESPONDENCE_TEXT_REMOVE_PACKAGE)
         expect(page).to have_button("Cancel")
         expect(page).to have_button("Confirm", disabled: true)
         expect(page).not_to have_field("Provide a reason for rejection")
@@ -109,7 +108,10 @@
         expect(page).to have_button("Review removal request")
         click_button "Review removal request"
         page.all(".cf-form-radio-option > label")[0].click
-        expect(page).to have_content(COPY::CORRRESPONDENCE_TEXT_REMOVE_PACKAGE)
+        click_button("Confirm")
+        using_wait_time(10) do
+          expect(page).to have_content("The package has been removed from Caseflow and must be manually uploaded again from the Centralized Mail Portal, if it needs to be processed.")
+        end
       end
 
       it "remove Package" do
@@ -122,9 +124,6 @@
         fill_in "Provide a reason for rejection", with: "Provide a reason for rejection"
         expect(page).to have_button("Confirm", disabled: false)
         click_button("Confirm")
-        using_wait_time(10) do
-          expect(page).to have_content("The package has been removed from Caseflow and must be manually uploaded again from the Centralized Mail Portal, if it needs to be processed.")
-        end
       end
     end
   end

From eb48ddeec84ae47c2d3073a3569044af5b11b8e6 Mon Sep 17 00:00:00 2001
From: Kamala Madamanchi <110078646+kamala-07@users.noreply.github.com>
Date: Mon, 8 Jan 2024 11:34:18 -0600
Subject: [PATCH 032/237] Edit modal VADOR updated the error message text
 (#20420)

* Edit modal VADOR upadeted the error message text

* Merge package other option placeholder fix

---------

Co-authored-by: youfoundmanesh <129548081+youfoundmanesh@users.noreply.github.com>
---
 client/app/queue/correspondence/modals/editModal.jsx    | 3 +--
 client/app/queue/correspondence/review_package/utils.js | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/client/app/queue/correspondence/modals/editModal.jsx b/client/app/queue/correspondence/modals/editModal.jsx
index fcf3fb363d8..07c1cfe8cfc 100644
--- a/client/app/queue/correspondence/modals/editModal.jsx
+++ b/client/app/queue/correspondence/modals/editModal.jsx
@@ -137,7 +137,7 @@ class EditModal extends React.Component {
 
   errorOnVADORDate = (value) => {
     if (value.length === 10) {
-      const error = validateDateNotInFuture(value) ? null : 'Decision date cannot be in the future';
+      const error = validateDateNotInFuture(value) ? null : 'Receipt Date cannot be in the future';
 
       return error;
     }
@@ -174,7 +174,6 @@ class EditModal extends React.Component {
                   name="va-dor-input"
                   label="VA DOR"
                   readOnly={this.state.canEditVADOR}
-                  strongLabel
                   value={VADORDate}
                   errorMessage={this.state.dateError}
                   onChange={this.VADORDateOnChange}
diff --git a/client/app/queue/correspondence/review_package/utils.js b/client/app/queue/correspondence/review_package/utils.js
index e148f6944a7..fbe1709b96d 100644
--- a/client/app/queue/correspondence/review_package/utils.js
+++ b/client/app/queue/correspondence/review_package/utils.js
@@ -106,7 +106,6 @@ export const getModalInformation = (dropdownType) => {
       description: PACKAGE_ACTION_MERGE_DESCRIPTION,
       label: PACKAGE_ACTION_MERGE_TEXTAREA_LABEL,
       radioLabel: PACKAGE_ACTION_MERGE_RADIO_LABEL,
-      placeholder: 'This is a reason for merge',
     };
   case 'removePackage':
     return {

From c2be6efacfdfa65f1a9e93d41266f1496066c2f9 Mon Sep 17 00:00:00 2001
From: SanthiParakal133 <132940479+SanthiParakal133@users.noreply.github.com>
Date: Mon, 8 Jan 2024 14:48:16 -0500
Subject: [PATCH 033/237] update return to queue modal (#20441)

Co-authored-by: youfoundmanesh <129548081+youfoundmanesh@users.noreply.github.com>
Co-authored-by: cacevesva <109166981+cacevesva@users.noreply.github.com>
---
 .../CorrespondenceReviewPackage.jsx           |  6 ++-
 .../CorrespondenceReviewPackage.test.js       | 43 +++++++++++--------
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
index 7c536aa5853..3aa321a7ba4 100644
--- a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
+++ b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
@@ -99,7 +99,11 @@ export const CorrespondenceReviewPackage = (props) => {
   }, []);
 
   const handleModalClose = () => {
-    setShowModal(!showModal);
+    if (disableButton) {
+      setShowModal(!showModal);
+    } else {
+      history.push('/queue/correspondence');
+    }
   };
 
   const handlePackageActionModal = (value) => {
diff --git a/client/test/app/queue/correspondences/CorrespondenceReviewPackage.test.js b/client/test/app/queue/correspondences/CorrespondenceReviewPackage.test.js
index 301332d56d2..a5f6ad6c070 100644
--- a/client/test/app/queue/correspondences/CorrespondenceReviewPackage.test.js
+++ b/client/test/app/queue/correspondences/CorrespondenceReviewPackage.test.js
@@ -61,13 +61,16 @@ describe('CorrespondenceReviewPackage', () => {
     expect(screen.queryByRole('heading', { name: 'Return to queue' })).not.toBeInTheDocument();
     fireEvent.click(button);
 
-    expect(screen.queryByRole('heading', { name: 'Return to queue' })).toBeInTheDocument();
-    expect(screen.getByText(/All unsaved changes made to this mail package will be lost/)).toBeInTheDocument();
-    const closeButton = screen.getByRole('button', { name: 'Close' });
+    if (props.disableButton) {
+      expect(screen.queryByRole('heading', { name: 'Return to queue' })).toBeInTheDocument();
+      expect(screen.getByText(/All unsaved changes made to this mail package will be lost/)).toBeInTheDocument();
+      const closeButton = screen.getByRole('button', { name: 'Close' });
+
+      expect(closeButton).toBeInTheDocument();
+      fireEvent.click(closeButton);
+      expect(screen.queryByText('All unsaved changes made to this mail package will be lost')).not.toBeInTheDocument();
+    }
 
-    expect(closeButton).toBeInTheDocument();
-    fireEvent.click(closeButton);
-    expect(screen.queryByText('All unsaved changes made to this mail package will be lost')).not.toBeInTheDocument();
   });
 
   test('renders modal with correct title, buttons, and text', async () => {
@@ -84,12 +87,14 @@ describe('CorrespondenceReviewPackage', () => {
     expect(screen.queryByText('All unsaved changes made to this mail package will be lost')).not.toBeInTheDocument();
     fireEvent.click(screen.getByText('Return to queue'));
 
-    expect(screen.getByText(/All unsaved changes made to this mail package will be lost/)).toBeInTheDocument();
-    const closeButton = screen.getByRole('button', { name: 'Close' });
-    const cancelReviewButton = screen.getByRole('button', { name: 'Confirm' });
+    if (props.disableButton) {
+      expect(screen.getByText(/All unsaved changes made to this mail package will be lost/)).toBeInTheDocument();
+      const closeButton = screen.getByRole('button', { name: 'Close' });
+      const cancelReviewButton = screen.getByRole('button', { name: 'Confirm' });
 
-    expect(closeButton).toBeInTheDocument();
-    expect(cancelReviewButton).toBeInTheDocument();
+      expect(closeButton).toBeInTheDocument();
+      expect(cancelReviewButton).toBeInTheDocument();
+    }
   });
 
   test('redirect page when Cancel review is clicked', async () => {
@@ -109,15 +114,17 @@ describe('CorrespondenceReviewPackage', () => {
     expect(screen.queryByText('All unsaved changes made to this mail package will be lost')).not.toBeInTheDocument();
     fireEvent.click(screen.getByText('Return to queue'));
 
-    expect(screen.getByText(/All unsaved changes made to this mail package will be lost/)).toBeInTheDocument();
-    const cancelReviewButton = screen.getByRole('button', { name: 'Confirm' });
+    if (props.disableButton) {
+      expect(screen.getByText(/All unsaved changes made to this mail package will be lost/)).toBeInTheDocument();
+      const cancelReviewButton = screen.getByRole('button', { name: 'Confirm' });
 
-    expect(cancelReviewButton).toBeInTheDocument();
-    fireEvent.click(cancelReviewButton);
+      expect(cancelReviewButton).toBeInTheDocument();
+      fireEvent.click(cancelReviewButton);
 
-    await waitFor(() => {
-      expect(history.location.pathname).toBe('/queue/correspondence');
-    });
+      await waitFor(() => {
+        expect(history.location.pathname).toBe('/queue/correspondence');
+      });
+    }
   });
 });
 

From b78c08fbba5209723c021e953cfdc9a837a16fe3 Mon Sep 17 00:00:00 2001
From: Ki Mau <ki.mau@va.gov>
Date: Mon, 8 Jan 2024 18:40:37 -0500
Subject: [PATCH 034/237] Ki/APPEALS-35254 - Updates to All Steps of the Intake
 form (#20442)

* APPEALS-35703 - Update Task Type Labels

* APPEALS-35703 - Correspondence CSS Work

* APPEALS-35703 - Update CSS

* APPEALS-35703 - Fix Table, Removed unused styling

* APPEALS-35703 - Linting

* APPEALS-35703 - Lint 2 To Too

* Page 3 conditional rending complete

* APPEALS-35254 - Updated CSS Issues, Mail Fix, Adds

* APPEALS-35254 - Linting

* SCSS Linting

* APPEALS-35254 - Horizontal rule for AC 4

---------

Co-authored-by: Jim Foley <james.foley4@va.gov>
Co-authored-by: Dev-KRedd <khalin.redding@va.gov>
---
 .../AddCorrespondenceView.jsx                 | 13 ++--
 .../ConfirmCorrespondenceView.jsx             | 72 ++++++++++++-------
 .../ConfirmTasksNotRelatedToAnAppeal.jsx      | 27 ++++++-
 .../ConfirmTasksRelatedToAnAppeal.jsx         | 29 ++++++--
 .../TasksAppeals/AddAppealRelatedTaskView.jsx | 15 ++--
 .../TasksAppeals/AddTasksAppealsView.jsx      | 31 ++++----
 .../TasksAppeals/AddUnrelatedTaskView.jsx     |  3 +-
 7 files changed, 129 insertions(+), 61 deletions(-)

diff --git a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx
index 6ec5c8d04d2..0dc18c96266 100644
--- a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx
+++ b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx
@@ -193,13 +193,12 @@ class AddCorrespondenceView extends React.Component {
     ];
 
     return (
-      <div className="cf-app-segment cf-app-segment--alt">
-        <h1>Add Related Correspondence</h1>
-        <p>Add any related correspondence to the mail package that is in progress.</p>
-        <br></br>
-        <h2>Associate with prior Mail</h2>
-        <p>Is this correspondence related to prior mail?</p>
-        <RadioField
+      <div className="gray-border" style={{ marginBottom: '2rem', padding: '3rem 4rem' }}>
+        <h1 style={{ marginBottom: '20px' }}>Add Related Correspondence</h1>
+        <p style={{ marginTop: '0px' }}>Add any related correspondence to the mail package that is in progress.</p>
+        <h2 style={{ margin: '30px auto 20px auto' }}>Associate with prior Mail</h2>
+        <p style={{ marginTop: '0px', marginBottom: '-7px' }}>Is this correspondence related to prior mail?</p>
+        <RadioField style={{}}
           name=""
           options={priorMailAnswer}
           value={this.props.radioValue}
diff --git a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmCorrespondenceView.jsx b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmCorrespondenceView.jsx
index caea2256677..9b43291f8e0 100644
--- a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmCorrespondenceView.jsx
+++ b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmCorrespondenceView.jsx
@@ -29,6 +29,8 @@ export const ConfirmCorrespondenceView = (props) => {
 
   const checkedMailTasks = props.mailTasks;
   const relatedCorrespondences = useSelector((state) => state.intakeCorrespondence.relatedCorrespondences);
+  let correspondenceTable = null;
+  let mailTaskTable = null;
 
   // eslint-disable-next-line max-statements
   const getDocumentColumns = (correspondence) => {
@@ -121,8 +123,45 @@ export const ConfirmCorrespondenceView = (props) => {
     ];
   };
 
+  if (relatedCorrespondences.length === 0) {
+    correspondenceTable =
+    <div {...css({
+      marginBottom: '150px',
+      fontWeight: 'bold'
+    })}> Correspondence is not related to prior mail </div>;
+  } else {
+
+    correspondenceTable = <Table
+      columns={getDocumentColumns}
+      // columnsToDisplay={15}
+      rowObjects={relatedCorrespondences}
+      styling={tableStyling}
+      bodyStyling={bodyStyling}
+    />;
+  }
+
+  if (checkedMailTasks.length === 0) {
+    mailTaskTable = <div {...css({
+      marginBottom: '150px',
+      fontWeight: 'bold'
+    })}>  </div>;
+  } else {
+    mailTaskTable = checkedMailTasks.map((name, index) => (
+      <div
+        key={index}
+        {...css({
+          borderBottom: index === checkedMailTasks.length - 1 ? 'none' : '1px solid #d6d7d9',
+          padding: '10px 10px',
+          marginBottom: '10px',
+        })}
+      >
+        <span>{name}</span>
+      </div>
+    ));
+  }
+
   return (
-    <div className="gray-border corr">
+    <div className="gray-border corr" style={{ marginBottom: '2rem' }}>
       <h1 className="corr-h1">Review and Confirm Correspondence</h1>
       <p style={{ fontSize: '.85em' }}>
         Review the details below to make sure the information is correct before submitting.
@@ -141,13 +180,7 @@ export const ConfirmCorrespondenceView = (props) => {
         </div>
         <div {...css({ backgroundColor: COLORS.GREY_BACKGROUND })}>
           <div {...css({ backgroundColor: COLORS.GREY_BACKGROUND, padding: '20px' })}>
-            <Table
-              columns={getDocumentColumns}
-              // columnsToDisplay={15}
-              rowObjects={relatedCorrespondences}
-              styling={tableStyling}
-              bodyStyling={bodyStyling}
-            />
+            {correspondenceTable}
           </div>
         </div>
       </div>
@@ -169,23 +202,12 @@ export const ConfirmCorrespondenceView = (props) => {
           })}>
             Completed Mail Tasks
           </div>
-          {checkedMailTasks.map((name, index) => (
-            <div
-              key={index}
-              {...css({
-                borderBottom: index === checkedMailTasks.length - 1 ? 'none' : '1px solid #d6d7d9',
-                padding: '10px 10px',
-                marginBottom: '10px',
-              })}
-            >
-              <span>{name}</span>
-            </div>
-          ))}
+          {mailTaskTable}
         </div>
       </div>
       <div>
         <div className="corr-flex">
-          <h2 className="corr-h2">Tasks not related to an Appeal</h2>
+          <h2 className="corr-h2">Linked Appeals & New Tasks</h2>
           <div className="corr-autoleft">
             <Button className="corr-button" linkStyling onClick={() => props.goToStep(2)}>
               <span className="corr-icon"><PencilIcon /></span>
@@ -193,9 +215,10 @@ export const ConfirmCorrespondenceView = (props) => {
             </Button>
           </div>
         </div>
-        <ConfirmTasksNotRelatedToAnAppeal />
+        <ConfirmTasksRelatedToAnAppeal />
+
         <div className="corr-flex">
-          <h2 className="corr-h2">Linked Appeals & New Tasks</h2>
+          <h2 className="corr-h2">Tasks not related to an Appeal</h2>
           <div className="corr-autoleft">
             <Button className="corr-button" linkStyling onClick={() => props.goToStep(2)}>
               <span className="corr-icon"><PencilIcon /></span>
@@ -203,8 +226,7 @@ export const ConfirmCorrespondenceView = (props) => {
             </Button>
           </div>
         </div>
-        <ConfirmTasksRelatedToAnAppeal />
-
+        <ConfirmTasksNotRelatedToAnAppeal />
       </div>
     </div>
   );
diff --git a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmTasksNotRelatedToAnAppeal.jsx b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmTasksNotRelatedToAnAppeal.jsx
index b8d42525828..c76188e8c97 100644
--- a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmTasksNotRelatedToAnAppeal.jsx
+++ b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmTasksNotRelatedToAnAppeal.jsx
@@ -1,8 +1,9 @@
 import React from 'react';
 import { useSelector } from 'react-redux';
 import { COLORS } from '../../../../../constants/AppConstants';
+import { css } from 'glamor';
 
-const styling = { backgroundColor: COLORS.GREY_BACKGROUND };
+const styling = { backgroundColor: COLORS.GREY_BACKGROUND, paddingTop: '0px' };
 
 const ConfirmTasksNotRelatedToAnAppeal = () => {
   const tasks = useSelector((state) => state.intakeCorrespondence.unrelatedTasks);
@@ -21,12 +22,32 @@ const ConfirmTasksNotRelatedToAnAppeal = () => {
     );
   });
 
+  const renderNonRelatedTask = () => {
+    if (tasks.length === 0) {
+      const rendererOfNonRelatedTask = <div {...css({
+        marginBottom: '150px',
+        paddingTop: '10px',
+        fontWeight: 'bold'
+      })}> </div>;
+
+      return rendererOfNonRelatedTask;
+    }
+    const rendererOfNonRelatedTask = rowObjects;
+
+    return rendererOfNonRelatedTask;
+
+  };
+
   return (
     <div>
       <div style={{ position: 'relative', display: 'flex', justifyContent: 'space-between', alignItems: 'flex-end' }}>
       </div>
       <div
-        style={{ background: COLORS.GREY_BACKGROUND, padding: '2rem', paddingTop: '0.5rem' }}>
+        style={{ background: COLORS.GREY_BACKGROUND,
+          padding: '2rem',
+          paddingTop: '.1rem',
+          paddingLeft: '20px',
+          paddingRight: '20px' }}>
         <table className="usa-table-borderless">
           <thead>
             <tr>
@@ -35,7 +56,7 @@ const ConfirmTasksNotRelatedToAnAppeal = () => {
             </tr>
           </thead>
           <tbody>
-            {rowObjects}
+            {renderNonRelatedTask()}
           </tbody>
         </table>
       </div>
diff --git a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmTasksRelatedToAnAppeal.jsx b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmTasksRelatedToAnAppeal.jsx
index 8e32582dd9a..e11923e2cc6 100644
--- a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmTasksRelatedToAnAppeal.jsx
+++ b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmTasksRelatedToAnAppeal.jsx
@@ -3,6 +3,7 @@ import { useSelector } from 'react-redux';
 import { COLORS } from 'app/constants/AppConstants';
 import DocketTypeBadge from '../../../../../components/DocketTypeBadge';
 import { ExternalLinkIcon } from '../../../../../components/icons/ExternalLinkIcon';
+import { css } from 'glamor';
 import PropTypes from 'prop-types';
 
 const borderlessTd = {
@@ -131,16 +132,34 @@ const ConfirmTasksRelatedToAnAppeal = () => {
     );
   });
 
+  const renderingTask = () => {
+
+    if (taskIds.length === 0) {
+      const taskRenderer = <div {...css({
+        paddingTop: '20px',
+        marginBottom: '150px',
+        fontWeight: 'bold'
+      })}> Correspondence is not related to an existing appeal</div>;
+
+      return taskRenderer;
+    }
+    const taskRenderer = <table className="usa-table-borderless">
+      <tbody>
+        {rowObjects}
+      </tbody>
+    </table>;
+
+    return taskRenderer;
+
+  };
+
   return (
     <>
       <div style={{ marginLeft: 'auto' }}>
         <div
           style={{ background: COLORS.GREY_BACKGROUND, padding: '2rem', paddingTop: '0.5rem', marginBottom: '2rem' }}>
-          <table className="usa-table-borderless">
-            <tbody>
-              {rowObjects}
-            </tbody>
-          </table>
+          {renderingTask()}
+
         </div>
       </div></>
   );
diff --git a/client/app/queue/correspondence/intake/components/TasksAppeals/AddAppealRelatedTaskView.jsx b/client/app/queue/correspondence/intake/components/TasksAppeals/AddAppealRelatedTaskView.jsx
index bd166ace983..67bfbb36497 100644
--- a/client/app/queue/correspondence/intake/components/TasksAppeals/AddAppealRelatedTaskView.jsx
+++ b/client/app/queue/correspondence/intake/components/TasksAppeals/AddAppealRelatedTaskView.jsx
@@ -5,7 +5,7 @@ import CaseListTable from '../../../../CaseListTable';
 import ApiUtil from '../../../../../util/ApiUtil';
 import { prepareAppealForStore } from '../../../../utils';
 import LoadingContainer from '../../../../../components/LoadingContainer';
-import { LOGO_COLORS } from '../../../../../constants/AppConstants';
+import { COLORS, LOGO_COLORS } from '../../../../../constants/AppConstants';
 import RadioField from '../../../../../components/RadioField';
 import ExistingAppealTasksView from './ExistingAppealTasksView';
 import {
@@ -133,7 +133,7 @@ export const AddAppealRelatedTaskView = (props) => {
   }, [veteranFileNumber]);
 
   return (
-    <div>
+    <div style={{ marginBottom: '0rem' }}>
       <RadioField
         name=""
         value={existingAppealRadio}
@@ -150,7 +150,10 @@ export const AddAppealRelatedTaskView = (props) => {
         <div className="gray-border"
           style={{ padding: '0rem 0rem', display: 'flex', flexWrap: 'wrap', flexDirection: 'column' }}>
           <div style={{ width: '100%', height: 'auto', backgroundColor: 'white', paddingBottom: '3rem' }}>
-            <div style={{ backgroundColor: '#f1f1f1', width: '100%', height: '50px', paddingTop: '1.5rem' }}>
+            <div style={{ backgroundColor: COLORS.GREY_BACKGROUND,
+              width: '100%',
+              height: '50px',
+              paddingTop: '1.5rem' }}>
               <b style={{
                 verticalAlign: 'center',
                 paddingLeft: '2.5rem',
@@ -160,11 +163,11 @@ export const AddAppealRelatedTaskView = (props) => {
                 paddingRigfht: '5.5rem'
               }}>Existing Appeals</b>
             </div>
-            <ul style={{ paddingLeft: '4.2rem' }}>
+            <ul style={{ paddingLeft: '2.5rem' }}>
               Please select prior appeal(s) to link to this correspondence
             </ul>
-            <ul>
-              <div style={{ padding: '1rem' }}>
+            <ul style={{ paddingLeft: '2.5rem' }}>
+              <div style={{ paddingRight: '1rem' }}>
                 <CaseListTable
                   // Need to use this as key to force React to re-render checkboxes
                   key={tableUpdateTrigger}
diff --git a/client/app/queue/correspondence/intake/components/TasksAppeals/AddTasksAppealsView.jsx b/client/app/queue/correspondence/intake/components/TasksAppeals/AddTasksAppealsView.jsx
index b1e692a05a8..ca78b3b4e81 100644
--- a/client/app/queue/correspondence/intake/components/TasksAppeals/AddTasksAppealsView.jsx
+++ b/client/app/queue/correspondence/intake/components/TasksAppeals/AddTasksAppealsView.jsx
@@ -77,7 +77,7 @@ export const AddTasksAppealsView = (props) => {
       <p>Review any previously completed tasks by the mail team and add new tasks for
       either the mail package or for linked appeals, if any.</p>
       <div>
-        <h2 style={{ margin: '25px auto 15px auto' }}>Mail Tasks</h2>
+        <h2 style={{ margin: '30px auto 20px auto' }}>Mail Tasks</h2>
         <div className="gray-border" style={{ padding: '0rem 2rem' }}>
           <p style={{ marginBottom: '0.5rem' }}>Select any tasks completed by the Mail team for this correspondence.</p>
           <div id="mail-tasks-left" style={{ display: 'inline-block', marginRight: '14rem' }}>
@@ -108,8 +108,23 @@ export const AddTasksAppealsView = (props) => {
           </div>
         </div>
 
+        <div id="task-related-to-an-appeal">
+          <h2 style={{ margin: '30px auto 20px auto' }}>Tasks related to an existing Appeal</h2>
+          <p style={{ marginBottom: '-7px' }}>Is this correspondence related to an existing appeal?</p>
+          <AddAppealRelatedTaskView
+            correspondenceUuid={props.correspondenceUuid}
+            setRelatedTasksCanContinue={setRelatedTasksCanContinue}
+            filterUnavailableTaskTypeOptions={filterUnavailableTaskTypeOptions}
+            allTaskTypeOptions={relatedTaskTypes}
+            autoTexts={props.autoTexts}
+            veteranInformation={props.veteranInformation}
+          />
+        </div>
+
+        <hr />
+
         <div id="task-not-related-to-an-appeal">
-          <h2 style={{ margin: '3rem auto 1rem auto' }}>Tasks not related to an Appeal</h2>
+          <h2 style={{ margin: '30px auto 20px auto' }}>Tasks not related to an Appeal</h2>
           <p style={{ marginTop: '0rem', marginBottom: '2rem' }}>
             Add new tasks related to this correspondence or to an appeal not yet created in Caseflow.
           </p>
@@ -123,18 +138,6 @@ export const AddTasksAppealsView = (props) => {
           </div>
         </div>
 
-        <div id="task-related-to-an-appeal" style={{ marginTop: '3.8rem' }}>
-          <h2 style={{ margin: '3rem auto 1rem auto' }}>Tasks related to an existing Appeal</h2>
-          <p style={{ marginBottom: '0rem' }}>Is this correspondence related to an existing appeal?</p>
-          <AddAppealRelatedTaskView
-            correspondenceUuid={props.correspondenceUuid}
-            setRelatedTasksCanContinue={setRelatedTasksCanContinue}
-            filterUnavailableTaskTypeOptions={filterUnavailableTaskTypeOptions}
-            allTaskTypeOptions={relatedTaskTypes}
-            autoTexts={props.autoTexts}
-            veteranInformation={props.veteranInformation}
-          />
-        </div>
       </div>
     </div>
   );
diff --git a/client/app/queue/correspondence/intake/components/TasksAppeals/AddUnrelatedTaskView.jsx b/client/app/queue/correspondence/intake/components/TasksAppeals/AddUnrelatedTaskView.jsx
index 4e86b5d151c..81c40fc42f1 100644
--- a/client/app/queue/correspondence/intake/components/TasksAppeals/AddUnrelatedTaskView.jsx
+++ b/client/app/queue/correspondence/intake/components/TasksAppeals/AddUnrelatedTaskView.jsx
@@ -4,6 +4,7 @@ import Button from '../../../../../components/Button';
 import AddTaskView from './AddTaskView';
 import { setUnrelatedTasks } from '../../../correspondenceReducer/correspondenceActions';
 import PropTypes from 'prop-types';
+import { COLORS } from '../../../../../constants/AppConstants';
 
 const MAX_NUM_TASKS = 4;
 
@@ -93,7 +94,7 @@ export const AddUnrelatedTaskView = (props) => {
         style={{ padding: '0rem 0rem', display: 'flex', flexWrap: 'wrap', flexDirection: 'column' }}
       >
         <div style={{ width: '100%', height: 'auto', backgroundColor: 'white', paddingBottom: '3rem' }}>
-          <div style={{ backgroundColor: '#f1f1f1', width: '100%', height: '50px', paddingTop: '1.5rem' }}>
+          <div style={{ backgroundColor: COLORS.GREY_BACKGROUND, width: '100%', height: '50px', paddingTop: '1.5rem' }}>
             <b style={{
               verticalAlign: 'center',
               paddingLeft: '2.5rem',

From 853ca06c6dfdf4ce0cdfe09cb124f6eb971cabe5 Mon Sep 17 00:00:00 2001
From: Alex Smith <alex.smith.99@thunderyard.com>
Date: Mon, 8 Jan 2024 17:16:36 -0700
Subject: [PATCH 035/237] Use FeatureToggle for non-prod Uploads (#20437)

* Use FeatureToggle for non-prod Uploads

- When not in production, use a new feature toggle to control the
success/failure of the ClaimEvidenceService document upload for
correspondences vs.  the old, hard-coded boolean that was being
used.

- Add spec to test upload behavior.

* Rearrange Code

Put primary case first in if statement for better readability.

* Fix Correspondence Bugs and Issues

- Move eFolder doc uploading to a new service and update code to
use it.

- Refactor CorrespondenceIntakeProcessor based on missed
requirements so that it correctly uses the result of doc uploads
to control flow.

- Add specs throughout and fix some Rubocop violations.

* Improve Error Reporting Messages

* Fix Issues Causing Spec Failures

- Restore removed correspondence_document methods.

- Add mocks for doc upload to intake form submit specs.

* Fix check for veteran ID

* Fix correspondence_document_spec

* Fix efolder uploader Spec Failures

- Update spec based on new check for existing failed task.

- Enhance existing specs.

---------

Co-authored-by: Jim Foley <james.foley4@va.gov>
---
 app/controllers/correspondence_controller.rb  | 49 +++---------
 app/models/correspondence_document.rb         | 16 +++-
 ...rrespondence_documents_efolder_uploader.rb | 56 +++++++++++++
 .../correspondence_intake_processor.rb        | 80 +++++++------------
 .../correspondence_controller_spec.rb         |  6 ++
 spec/factories/correspondence.rb              | 10 +++
 spec/factories/task.rb                        |  6 ++
 spec/models/correspondence_document_spec.rb   |  3 +-
 .../correspondence_controller_spec.rb         | 14 ++--
 ...ondence_documents_efolder_uploader_spec.rb | 65 +++++++++++++++
 .../correspondence_intake_processor_spec.rb   | 65 +++++++++++++++
 spec/support/correspondence_helpers.rb        | 33 +++++++-
 12 files changed, 300 insertions(+), 103 deletions(-)
 create mode 100644 app/services/correspondence_documents_efolder_uploader.rb
 create mode 100644 spec/services/correspondence_documents_efolder_uploader_spec.rb
 create mode 100644 spec/services/correspondence_intake_processor_spec.rb

diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index bdd0ef2d438..58afd2b02a5 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -65,7 +65,10 @@ def intake_update
         task.status = "cancelled"
         task.save
       end
-      if upload_documents_to_claim_evidence
+
+      rpt = ReviewPackageTask.find_by(appeal_id: correspondence.id, type: ReviewPackageTask.name)
+
+      if correspondence_documents_efolder_uploader.upload_documents_to_claim_evidence(correspondence, current_user, rpt)
         render json: { correspondence: correspondence }
       else
         render json: {}, status: :bad_request
@@ -265,7 +268,7 @@ def correspondence_load
   end
 
   def veteran_by_correspondence
-    return unless correspondence&.veteran_id
+    return nil unless correspondence&.veteran_id.present?
 
     @veteran_by_correspondence ||= Veteran.find_by(id: correspondence.veteran_id)
   end
@@ -279,10 +282,6 @@ def auto_texts
     @auto_texts ||= AutoText.all.pluck(:name)
   end
 
-  def correspondence_intake_processor
-    @correspondence_intake_processor ||= CorrespondenceIntakeProcessor.new
-  end
-
   def vet_info_serializer(veteran, correspondence)
     {
       firstName: veteran.first_name,
@@ -294,41 +293,11 @@ def vet_info_serializer(veteran, correspondence)
     }
   end
 
-  def upload_documents_to_claim_evidence
-    if Rails.env.development? || Rails.env.demo? || Rails.env.test?
-      create_efolder_upload_failed_task
-      true
-    else
-      begin
-        correspondence.correspondence_documents.all.each do |doc|
-          ExternalApi::ClaimEvidenceService.upload_document(
-            doc.pdf_location,
-            veteran_by_correspondence.file_number,
-            doc.claim_evidence_upload_json
-          )
-        end
-        true
-      rescue StandardError => error
-        Rails.logger.error(error.to_s)
-        create_efolder_upload_failed_task
-        false
-      end
-    end
+  def correspondence_intake_processor
+    @correspondence_intake_processor ||= CorrespondenceIntakeProcessor.new
   end
 
-  def create_efolder_upload_failed_task
-    rpt = ReviewPackageTask.find_by(appeal_id: correspondence.id, type: ReviewPackageTask.name)
-    # rubocop:disable Layout/MultilineOperationIndentation)
-    euft = EfolderUploadFailedTask.where(appeal_id: correspondence.id, type: EfolderUploadFailedTask.name).first ||
-    EfolderUploadFailedTask.create!(
-      appeal_id: correspondence.id,
-      appeal_type: "Correspondence",
-      type: EfolderUploadFailedTask.name,
-      assigned_to: current_user,
-      parent_id: rpt.id
-    )
-    # rubocop:enable Layout/MultilineOperationIndentation)
-
-    euft.update!(status: Constants.TASK_STATUSES.in_progress)
+  def correspondence_documents_efolder_uploader
+    @correspondence_documents_efolder_uploader ||= CorrespondenceDocumentsEfolderUploader.new
   end
 end
diff --git a/app/models/correspondence_document.rb b/app/models/correspondence_document.rb
index 66d73264f13..ad3e6e2cdda 100644
--- a/app/models/correspondence_document.rb
+++ b/app/models/correspondence_document.rb
@@ -4,8 +4,22 @@ class CorrespondenceDocument < CaseflowRecord
   belongs_to :correspondence
   belongs_to :vbms_document_type
 
+  S3_BUCKET_NAME = "documents"
+
+  def pdf_name
+    "#{uuid}.pdf"
+  end
+
+  def s3_location
+    "#{S3_BUCKET_NAME}/#{uuid}"
+  end
+
+  def output_location
+    File.join(Rails.root, "tmp", "pdfs", pdf_name)
+  end
+
   def pdf_location
-    File.join(Rails.root, "lib", "pdfs", "KnockKnockJokes.pdf")
+    S3Service.fetch_file(s3_location, output_location)
   end
 
   def claim_evidence_upload_json
diff --git a/app/services/correspondence_documents_efolder_uploader.rb b/app/services/correspondence_documents_efolder_uploader.rb
new file mode 100644
index 00000000000..32eb32786e3
--- /dev/null
+++ b/app/services/correspondence_documents_efolder_uploader.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+class CorrespondenceDocumentsEfolderUploader
+  def upload_documents_to_claim_evidence(correspondence, current_user, parent_task)
+    if Rails.env.production?
+      do_upload(correspondence)
+
+      true
+    else
+      if FeatureToggle.enabled?(:ce_api_demo_toggle)
+        if Rails.env.test?
+          do_upload(correspondence)
+        end
+
+        true
+      else
+        fail "Mock failure for upload in non-prod env"
+      end
+    end
+  rescue StandardError => error
+    Rails.logger.error(error.full_message)
+    create_efolder_upload_failed_task(correspondence, current_user, parent_task)
+
+    false
+  end
+
+  private
+
+  def corresondence_veteran(correspondence)
+    Veteran.find_by(id: correspondence.veteran_id)
+  end
+
+  def create_efolder_upload_failed_task(correspondence, current_user, parent_task)
+    return if EfolderUploadFailedTask.where(appeal_id: correspondence.id).count > 0
+
+    euft = EfolderUploadFailedTask.find_or_create_by(
+      appeal_id: correspondence.id,
+      appeal_type: Correspondence.name,
+      type: EfolderUploadFailedTask.name,
+      assigned_to: current_user,
+      parent_id: parent_task.id
+    )
+
+    euft.update!(status: Constants.TASK_STATUSES.in_progress)
+  end
+
+  def do_upload(correspondence)
+    correspondence.correspondence_documents.each do |doc|
+      ExternalApi::ClaimEvidenceService.upload_document(
+        doc.pdf_location,
+        corresondence_veteran(correspondence).file_number,
+        doc.claim_evidence_upload_json
+      )
+    end
+  end
+end
diff --git a/app/services/correspondence_intake_processor.rb b/app/services/correspondence_intake_processor.rb
index 5ab8087c8fb..9a23ca4dad5 100644
--- a/app/services/correspondence_intake_processor.rb
+++ b/app/services/correspondence_intake_processor.rb
@@ -8,49 +8,37 @@ def process_intake(intake_params, current_user)
 
     fail "Correspondence not found" if correspondence.blank?
 
-    success = true
+    parent_task = CorrespondenceIntakeTask.find_by(appeal_id: correspondence.id, type: CorrespondenceIntakeTask.name)
 
-    ActiveRecord::Base.transaction do
-      begin
-        create_correspondence_relations(intake_params, correspondence.id)
-        link_appeals_to_correspondence(intake_params, correspondence.id)
-        add_tasks_to_related_appeals(intake_params, current_user)
-        complete_waived_evidence_submission_tasks(intake_params)
-        create_tasks_not_related_to_appeals(intake_params, correspondence, current_user)
-        create_mail_tasks(intake_params, correspondence, current_user)
-      rescue ActiveRecord::RecordNotUnique, ActiveRecord::RecordInvalid
-        success = false
-        raise ActiveRecord::Rollback
-      end
-    end
+    return false if !correspondence_documents_efolder_uploader.upload_documents_to_claim_evidence(
+      correspondence,
+      current_user,
+      parent_task
+    )
 
-    success
+    do_upload_success_actions(parent_task, intake_params, correspondence, current_user)
   end
 
-  def upload_documents_to_claim_evidence(correspondence, current_user)
-    if Rails.env.development? || Rails.env.demo? || Rails.env.test?
-      true
-    else
-      begin
-        correspondence.correspondence_documents.all.each do |doc|
-          ExternalApi::ClaimEvidenceService.upload_document(
-            doc.pdf_location,
-            veteran_by_correspondence.file_number,
-            doc.claim_evidence_upload_json
-          )
-        end
-
-        true
-      rescue StandardError => error
-        Rails.logger.error(error.to_s)
-        create_efolder_upload_failed_task(correspondence, current_user)
-
-        false
-      end
+  private
+
+  def do_upload_success_actions(parent_task, intake_params, correspondence, current_user)
+    ActiveRecord::Base.transaction do
+      parent_task.update!(status: Constants.TASK_STATUSES.completed)
+
+      create_correspondence_relations(intake_params, correspondence.id)
+      link_appeals_to_correspondence(intake_params, correspondence.id)
+      add_tasks_to_related_appeals(intake_params, current_user)
+      complete_waived_evidence_submission_tasks(intake_params)
+      create_tasks_not_related_to_appeals(intake_params, correspondence, current_user)
+      create_mail_tasks(intake_params, correspondence, current_user)
     end
-  end
 
-  private
+    true
+  rescue StandardError => error
+    Rails.logger.error(error.full_message)
+
+    false
+  end
 
   def create_correspondence_relations(intake_params, correspondence_id)
     intake_params[:related_correspondence_uuids]&.map do |uuid|
@@ -91,20 +79,6 @@ def complete_waived_evidence_submission_tasks(intake_params)
     end
   end
 
-  def create_efolder_upload_failed_task(correspondence, current_user)
-    rpt = ReviewPackageTask.find_by(appeal_id: correspondence.id, type: ReviewPackageTask.name)
-
-    euft = EfolderUploadFailedTask.find_or_create_by(
-      appeal_id: correspondence.id,
-      appeal_type: "Correspondence",
-      type: EfolderUploadFailedTask.name,
-      assigned_to: current_user,
-      parent_id: rpt.id
-    )
-
-    euft.update!(status: Constants.TASK_STATUSES.in_progress)
-  end
-
   def create_tasks_not_related_to_appeals(intake_params, correspondence, current_user)
     unrelated_task_data = intake_params[:tasks_not_related_to_appeal]
 
@@ -155,4 +129,8 @@ def mail_task_class_for_type(task_type)
   def class_for_data(data)
     data[:klass]&.constantize
   end
+
+  def correspondence_documents_efolder_uploader
+    @correspondence_documents_efolder_uploader ||= CorrespondenceDocumentsEfolderUploader.new
+  end
 end
diff --git a/spec/controllers/correspondence_controller_spec.rb b/spec/controllers/correspondence_controller_spec.rb
index cb79fd15516..77cad7c90de 100644
--- a/spec/controllers/correspondence_controller_spec.rb
+++ b/spec/controllers/correspondence_controller_spec.rb
@@ -20,12 +20,18 @@
   let(:valid_params) { { notes: "Updated notes", correspondence_type_id: 12 } }
   let(:new_file_number) { "50000005" }
   let(:current_user) { create(:user) }
+  let!(:parent_task) { create(:correspondence_intake_task, appeal: correspondence, assigned_to: current_user) }
+
+  let(:mock_doc_uploader) { instance_double(CorrespondenceDocumentsEfolderUploader) }
 
   before do
     Fakes::Initializer.load!
     FeatureToggle.enable!(:correspondence_queue)
     User.authenticate!(roles: ["Mail Intake"])
     correspondence.update(veteran: veteran)
+
+    allow(CorrespondenceDocumentsEfolderUploader).to receive(:new).and_return(mock_doc_uploader)
+    allow(mock_doc_uploader).to receive(:upload_documents_to_claim_evidence).and_return(true)
   end
 
   describe "GET #show" do
diff --git a/spec/factories/correspondence.rb b/spec/factories/correspondence.rb
index 23d5db83571..71c49be7474 100644
--- a/spec/factories/correspondence.rb
+++ b/spec/factories/correspondence.rb
@@ -19,6 +19,16 @@
         create(:correspondence_document, correspondence: correspondence)
       end
     end
+
+    trait :with_correspondence_intake_task do
+      transient do
+        assigned_to { nil }
+      end
+
+      after(:create) do |correspondence, evaluator|
+        create(:correspondence_intake_task, appeal: correspondence, assigned_to: evaluator.assigned_to)
+      end
+    end
   end
 
   factory :correspondence_document do
diff --git a/spec/factories/task.rb b/spec/factories/task.rb
index fa750d12323..0243f008310 100644
--- a/spec/factories/task.rb
+++ b/spec/factories/task.rb
@@ -562,6 +562,12 @@ def self.find_first_task_or_create(appeal, task_type, **kwargs)
         parent { create(:root_task, appeal: appeal) }
       end
 
+      factory :correspondence_intake_task, class: CorrespondenceIntakeTask do
+      end
+
+      factory :efolder_upload_failed_task, class: EfolderUploadFailedTask do
+      end
+
       factory :no_show_hearing_task, class: NoShowHearingTask do
         assigned_to { HearingsManagement.singleton }
         parent { create(:assign_hearing_disposition_task, appeal: appeal) }
diff --git a/spec/models/correspondence_document_spec.rb b/spec/models/correspondence_document_spec.rb
index ffe779cf68d..efb7b0ff018 100644
--- a/spec/models/correspondence_document_spec.rb
+++ b/spec/models/correspondence_document_spec.rb
@@ -17,6 +17,7 @@
   end
 
   it "pdf_location gets file path of static document" do
-    expect(document.pdf_location).to eq(File.join(Rails.root, "lib", "pdfs", "KnockKnockJokes.pdf").to_s)
+    document.pdf_location
+    expect(document.output_location).to eq(File.join(Rails.root, "tmp", "pdfs", document.pdf_name).to_s)
   end
 end
diff --git a/spec/requests/correspondence_controller_spec.rb b/spec/requests/correspondence_controller_spec.rb
index ee98bd62e8e..e45bb133490 100644
--- a/spec/requests/correspondence_controller_spec.rb
+++ b/spec/requests/correspondence_controller_spec.rb
@@ -4,11 +4,17 @@
   let(:veteran) { create(:veteran, last_name: "Smith", file_number: "12345678") }
   let(:correspondence) { create(:correspondence, veteran_id: veteran.id, uuid: SecureRandom.uuid) }
   let(:current_user) { create(:intake_user) }
+  let!(:parent_task) { create(:correspondence_intake_task, appeal: correspondence, assigned_to: current_user) }
+
+  let(:mock_doc_uploader) { instance_double(CorrespondenceDocumentsEfolderUploader) }
 
   before do
     FeatureToggle.enable!(:correspondence_queue)
     MailTeam.singleton.add_user(current_user)
     User.authenticate!(user: current_user)
+
+    allow(CorrespondenceDocumentsEfolderUploader).to receive(:new).and_return(mock_doc_uploader)
+    allow(mock_doc_uploader).to receive(:upload_documents_to_claim_evidence).and_return(true)
   end
 
   describe "#current_step" do
@@ -43,8 +49,6 @@
         redux_store: redux_store
       }
 
-      correspondence = CorrespondenceIntake.find_by(user: current_user, correspondence: correspondence)
-
       expect(response).to have_http_status(:success)
 
       intake_correspondence = CorrespondenceIntake.find_by(user: current_user, correspondence: correspondence)
@@ -72,10 +76,8 @@
 
           it "creates tasks not related to an appeal" do
             expect do
-              post queue_correspondence_intake_process_intake_path(
-                correspondence_uuid: correspondence.uuid,
-                params: post_data
-              )
+              post queue_correspondence_intake_process_intake_path(correspondence_uuid: correspondence.uuid),
+                   params: post_data
             end.to change(Task, :count)
 
             expect(response).to have_http_status(:created)
diff --git a/spec/services/correspondence_documents_efolder_uploader_spec.rb b/spec/services/correspondence_documents_efolder_uploader_spec.rb
new file mode 100644
index 00000000000..c3f7737dc61
--- /dev/null
+++ b/spec/services/correspondence_documents_efolder_uploader_spec.rb
@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+describe CorrespondenceDocumentsEfolderUploader do
+  subject(:described) { described_class.new }
+
+  let(:veteran) { create(:veteran) }
+  let(:correspondence) { create(:correspondence, :with_single_doc, veteran_id: veteran.id, uuid: SecureRandom.uuid) }
+  let(:current_user) { create(:intake_user) }
+  let(:parent_task) { create(:correspondence_intake_task, appeal: correspondence, assigned_to: current_user) }
+
+  describe "#upload_documents_to_claim_evidence" do
+    context "with ClaimEvidenceService doc upload success" do
+      before do
+        doc = correspondence.correspondence_documents.first
+
+        expect(FeatureToggle).to receive(:enabled?).with(:ce_api_demo_toggle).and_return(true)
+        expect(ExternalApi::ClaimEvidenceService).to receive(:upload_document).
+          with(doc.pdf_location, veteran.file_number, doc.claim_evidence_upload_json).once
+      end
+
+      it "succeeds and does not create any EfolderUploadFailedTask tasks" do
+        result = nil
+
+        expect do
+          result = described.upload_documents_to_claim_evidence(correspondence, current_user, parent_task)
+        end.not_to change(EfolderUploadFailedTask, :count)
+
+        expect(result).to eq(true)
+      end
+    end
+
+    context "with ClaimEvidenceService doc upload failure" do
+      before do
+        expect(FeatureToggle).to receive(:enabled?).with(:ce_api_demo_toggle).and_return(false)
+        expect(ExternalApi::ClaimEvidenceService).not_to receive(:upload_document)
+        expect(Rails.logger).to receive(:error).with(/Mock failure for upload in non-prod env/)
+      end
+
+      it "fails and creates a EfolderUploadFailedTask task" do
+        result = nil
+
+        expect do
+          result = described.upload_documents_to_claim_evidence(correspondence, current_user, parent_task)
+        end.to change(EfolderUploadFailedTask, :count)
+
+        expect(result).to eq(false)
+
+        failed_task = EfolderUploadFailedTask.last
+        expect(failed_task.appeal_id).to eq(correspondence.id)
+        expect(failed_task.assigned_to).to eq(current_user)
+        expect(failed_task.parent_id).to eq(parent_task.id)
+      end
+
+      context "with existing EfolderUploadFailedTask" do
+        let!(:existing_failed_task) { create(:efolder_upload_failed_task, appeal: correspondence) }
+
+        it "does not create a new EfolderUploadFailedTask if one already exists" do
+          expect do
+            described.upload_documents_to_claim_evidence(correspondence, current_user, parent_task)
+          end.not_to change(EfolderUploadFailedTask, :count)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/services/correspondence_intake_processor_spec.rb b/spec/services/correspondence_intake_processor_spec.rb
new file mode 100644
index 00000000000..576a2ca4a92
--- /dev/null
+++ b/spec/services/correspondence_intake_processor_spec.rb
@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+describe CorrespondenceIntakeProcessor do
+  subject(:described) { described_class.new }
+
+  let(:veteran) { create(:veteran) }
+  let(:correspondence) { create(:correspondence, :with_single_doc, veteran_id: veteran.id, uuid: SecureRandom.uuid) }
+  let(:current_user) { create(:intake_user) }
+  let(:parent_task) { create(:correspondence_intake_task, appeal: correspondence, assigned_to: current_user) }
+
+  let(:mock_doc_uploader) { instance_double(CorrespondenceDocumentsEfolderUploader) }
+
+  let(:intake_params) do
+    {
+      correspondence_uuid: correspondence.uuid
+    }
+  end
+
+  before do
+    allow(CorrespondenceDocumentsEfolderUploader).to receive(:new).and_return(mock_doc_uploader)
+  end
+
+  describe "#process_intake" do
+    context "with doc upload success" do
+      before do
+        expect(mock_doc_uploader).to receive(:upload_documents_to_claim_evidence)
+          .with(correspondence, current_user, parent_task).and_return(true)
+      end
+
+      it "succeeds and completes the parent task and its children" do
+        result = described.process_intake(intake_params, current_user)
+
+        expect(result).to eq(true)
+        expect(parent_task.reload.status).to eq("completed")
+      end
+
+      context "with transaction rollback" do
+        before do
+          expect(described).to receive(:create_correspondence_relations).and_raise(ActiveRecord::RecordInvalid)
+        end
+
+        it "rolls back the parent task's status" do
+          result = described.process_intake(intake_params, current_user)
+
+          expect(result).to eq(false)
+          expect(parent_task.reload.status).not_to eq("completed")
+        end
+      end
+    end
+
+    context "with doc upload failure" do
+      before do
+        expect(mock_doc_uploader).to receive(:upload_documents_to_claim_evidence)
+          .with(correspondence, current_user, parent_task).and_return(false)
+      end
+
+      it "fails and does not complete the parent task" do
+        result = described.process_intake(intake_params, current_user)
+
+        expect(result).to eq(false)
+        expect(parent_task.reload.status).not_to eq("completed")
+      end
+    end
+  end
+end
diff --git a/spec/support/correspondence_helpers.rb b/spec/support/correspondence_helpers.rb
index c6b82fae127..000f05d054c 100644
--- a/spec/support/correspondence_helpers.rb
+++ b/spec/support/correspondence_helpers.rb
@@ -1,11 +1,19 @@
 # frozen_string_literal: true
 
 module CorrespondenceHelpers
+  def current_user
+    @current_user ||= create(:user, roles: ["Mail Team"])
+  end
+
   def setup_access
     FeatureToggle.enable!(:correspondence_queue)
-    user = create(:user, roles: ["Mail Team"])
-    MailTeam.singleton.add_user(user)
-    User.authenticate!(user: user)
+    MailTeam.singleton.add_user(current_user)
+    User.authenticate!(user: current_user)
+
+    mock_doc_uploader = instance_double(CorrespondenceDocumentsEfolderUploader)
+
+    allow(CorrespondenceDocumentsEfolderUploader).to receive(:new).and_return(mock_doc_uploader)
+    allow(mock_doc_uploader).to receive(:upload_documents_to_claim_evidence).and_return(true)
   end
 
   def visit_intake_form_with_correspondence_load
@@ -14,6 +22,8 @@ def visit_intake_form_with_correspondence_load
     54.times do
       create(
         :correspondence,
+        :with_correspondence_intake_task,
+        assigned_to: current_user,
         veteran_id: veteran.id,
         uuid: SecureRandom.uuid,
         va_date_of_receipt: Time.zone.local(2023, 1, 1)
@@ -40,6 +50,8 @@ def visit_intake_form_step_2_with_appeals
     3.times do
       create(
         :correspondence,
+        :with_correspondence_intake_task,
+        assigned_to: current_user,
         veteran_id: veteran.id,
         uuid: SecureRandom.uuid,
         va_date_of_receipt: Time.zone.local(2023, 1, 1)
@@ -59,6 +71,8 @@ def visit_intake_form_step_2_with_appeals_without_initial_tasks
     3.times do
       create(
         :correspondence,
+        :with_correspondence_intake_task,
+        assigned_to: current_user,
         veteran_id: veteran.id,
         uuid: SecureRandom.uuid,
         va_date_of_receipt: Time.zone.local(2023, 1, 1)
@@ -76,6 +90,8 @@ def visit_intake_form_step_3_with_tasks_unrelated
     veteran = create(:veteran, last_name: "Smith", file_number: "12345678")
     create(
       :correspondence,
+      :with_correspondence_intake_task,
+      assigned_to: current_user,
       veteran_id: veteran.id,
       uuid: SecureRandom.uuid,
       va_date_of_receipt: Time.zone.local(2023, 1, 1)
@@ -103,7 +119,14 @@ def existing_appeal_radio_options
   def active_evidence_submissions_tasks
     setup_access
     veteran = create(:veteran, last_name: "Smith", file_number: "12345678")
-    create(:correspondence, veteran_id: veteran.id, uuid: SecureRandom.uuid, va_date_of_receipt: Time.zone.local(2023, 1, 1))
+    create(
+      :correspondence,
+      :with_correspondence_intake_task,
+      assigned_to: current_user,
+      veteran_id: veteran.id,
+      uuid: SecureRandom.uuid,
+      va_date_of_receipt: Time.zone.local(2023, 1, 1)
+    )
     2.times do
       appeal = create(:appeal, veteran_file_number: veteran.file_number)
       InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
@@ -117,6 +140,8 @@ def setup_and_visit_intake
     veteran = create(:veteran, last_name: "Smith", file_number: "12345678")
     create(
       :correspondence,
+      :with_correspondence_intake_task,
+      assigned_to: current_user,
       veteran_id: veteran.id,
       uuid: SecureRandom.uuid,
       va_date_of_receipt: Time.zone.local(2023, 1, 1)

From caf0b2392309b0ccdc81caf1f3f947b8aa0cd648 Mon Sep 17 00:00:00 2001
From: Kevma50287 <104021955+Kevma50287@users.noreply.github.com>
Date: Tue, 9 Jan 2024 12:39:00 -0500
Subject: [PATCH 036/237] Rspec fix (#20461)

---
 spec/feature/queue/correspondence/edit_cmp_information_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/feature/queue/correspondence/edit_cmp_information_spec.rb b/spec/feature/queue/correspondence/edit_cmp_information_spec.rb
index 123833e5f20..0314f686618 100644
--- a/spec/feature/queue/correspondence/edit_cmp_information_spec.rb
+++ b/spec/feature/queue/correspondence/edit_cmp_information_spec.rb
@@ -85,7 +85,7 @@
 
         it "modal opens with disabled confirm button" do
           expect(page).to have_content(
-            "You have selected the following correspondence cases for reassignment to another users. Please confirm your selection(s) below:"
+            "By confirming, you will send a request for the supervisor to take action on the following package:"
           )
           expect(page).to have_button("Confirm request", disabled: true)
         end

From 867af2ba8ef30e588291d3321b5d26b34ec97f0e Mon Sep 17 00:00:00 2001
From: jonathanh-va <111081469+jonathanh-va@users.noreply.github.com>
Date: Tue, 9 Jan 2024 16:04:29 -0600
Subject: [PATCH 037/237] J hoang/appeals 34906 v5 (#20464)

* wrap Intake appeal upload behind feature toggle

* update static doc path

* rubocop fix efolder uploader

* refactor intake_update in correspondence controller

* Ignore feature envy code climate

* Reek ignore warning

---------

Co-authored-by: Jonathan Hoang <trinhjoanthan.hoang@va.gov>
Co-authored-by: Kevin Ma <magavakevin10@gmail.com>
---
 app/controllers/correspondence_controller.rb  | 42 ++++++++++---------
 app/models/correspondence_document.rb         | 12 +-----
 ...rrespondence_documents_efolder_uploader.rb |  1 +
 app/views/queue/index.html.erb                |  1 +
 spec/models/correspondence_document_spec.rb   |  3 +-
 ...ondence_documents_efolder_uploader_spec.rb |  4 +-
 6 files changed, 29 insertions(+), 34 deletions(-)

diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index 58afd2b02a5..5567c815ed9 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -52,34 +52,19 @@ def review_package
     render "correspondence/review_package"
   end
 
-  # rubocop:disable Metrics/MethodLength
   def intake_update
-    tasks = Task.where("appeal_id = ? and appeal_type = ?", correspondence.id, "Correspondence")
     begin
-      tasks.map do |task|
-        if task.type == "ReviewPackageTask"
-          task.instructions.push("An appeal intake was started because this Correspondence is a 10182")
-          task.assigned_to_id = correspondence.assigned_by_id
-          task.assigned_to = User.find(correspondence.assigned_by_id)
-        end
-        task.status = "cancelled"
-        task.save
-      end
-
-      rpt = ReviewPackageTask.find_by(appeal_id: correspondence.id, type: ReviewPackageTask.name)
-
-      if correspondence_documents_efolder_uploader.upload_documents_to_claim_evidence(correspondence, current_user, rpt)
-        render json: { correspondence: correspondence }
-      else
-        render json: {}, status: :bad_request
+      intake_appeal_update_tasks
+      if FeatureToggle.enabled?(:ce_api_demo_toggle)
+        upload_documents_to_claim_evidence
       end
+      render json: { correspondence: correspondence }
     rescue StandardError => error
       Rails.logger.error(error.to_s)
       Raven.capture_exception(error)
       render json: {}, status: :bad_request
     end
   end
-  # rubocop:enable Metrics/MethodLength
 
   def veteran
     render json: { veteran_id: veteran_by_correspondence&.id, file_number: veteran_by_correspondence&.file_number }
@@ -300,4 +285,23 @@ def correspondence_intake_processor
   def correspondence_documents_efolder_uploader
     @correspondence_documents_efolder_uploader ||= CorrespondenceDocumentsEfolderUploader.new
   end
+
+  # :reek:FeatureEnvy
+  def intake_appeal_update_tasks
+    tasks = Task.where("appeal_id = ? and appeal_type = ?", correspondence.id, "Correspondence")
+    tasks.map do |task|
+      if task.type == "ReviewPackageTask"
+        task.instructions.push("An appeal intake was started because this Correspondence is a 10182")
+        task.assigned_to_id = correspondence.assigned_by_id
+        task.assigned_to = User.find(correspondence.assigned_by_id)
+      end
+      task.status = "cancelled"
+      task.save
+    end
+  end
+
+  def upload_documents_to_claim_evidence
+    rpt = ReviewPackageTask.find_by(appeal_id: correspondence.id, type: ReviewPackageTask.name)
+    correspondence_documents_efolder_uploader.upload_documents_to_claim_evidence(correspondence, current_user, rpt)
+  end
 end
diff --git a/app/models/correspondence_document.rb b/app/models/correspondence_document.rb
index ad3e6e2cdda..01b9c32d10a 100644
--- a/app/models/correspondence_document.rb
+++ b/app/models/correspondence_document.rb
@@ -4,22 +4,12 @@ class CorrespondenceDocument < CaseflowRecord
   belongs_to :correspondence
   belongs_to :vbms_document_type
 
-  S3_BUCKET_NAME = "documents"
-
   def pdf_name
     "#{uuid}.pdf"
   end
 
-  def s3_location
-    "#{S3_BUCKET_NAME}/#{uuid}"
-  end
-
-  def output_location
-    File.join(Rails.root, "tmp", "pdfs", pdf_name)
-  end
-
   def pdf_location
-    S3Service.fetch_file(s3_location, output_location)
+    File.join(Rails.root, "lib", "pdfs", "KnockKnockJokes.pdf")
   end
 
   def claim_evidence_upload_json
diff --git a/app/services/correspondence_documents_efolder_uploader.rb b/app/services/correspondence_documents_efolder_uploader.rb
index 32eb32786e3..59c0bf5b92b 100644
--- a/app/services/correspondence_documents_efolder_uploader.rb
+++ b/app/services/correspondence_documents_efolder_uploader.rb
@@ -44,6 +44,7 @@ def create_efolder_upload_failed_task(correspondence, current_user, parent_task)
     euft.update!(status: Constants.TASK_STATUSES.in_progress)
   end
 
+  # :reek:FeatureEnvy
   def do_upload(correspondence)
     correspondence.correspondence_documents.each do |doc|
       ExternalApi::ClaimEvidenceService.upload_document(
diff --git a/app/views/queue/index.html.erb b/app/views/queue/index.html.erb
index fcc3a13e934..598ed94c955 100644
--- a/app/views/queue/index.html.erb
+++ b/app/views/queue/index.html.erb
@@ -51,6 +51,7 @@
       das_case_timeline: FeatureToggle.enabled?(:das_case_timeline, user: current_user),
       split_appeal_workflow: FeatureToggle.enabled?(:split_appeal_workflow, user: current_user),
       correspondence_queue: FeatureToggle.enabled?(:correspondence_queue, user: current_user),
+      ce_api_demo_toggle: FeatureToggle.enabled?(:ce_api_demo_toggle, user: current_user),
       cavc_remand_granted_substitute_appellant: FeatureToggle.enabled?(:cavc_remand_granted_substitute_appellant, user: current_user),
       cavc_dashboard_workflow: FeatureToggle.enabled?(:cavc_dashboard_workflow, user: current_user),
       cc_appeal_workflow: FeatureToggle.enabled?(:cc_appeal_workflow, user: current_user),
diff --git a/spec/models/correspondence_document_spec.rb b/spec/models/correspondence_document_spec.rb
index efb7b0ff018..ffe779cf68d 100644
--- a/spec/models/correspondence_document_spec.rb
+++ b/spec/models/correspondence_document_spec.rb
@@ -17,7 +17,6 @@
   end
 
   it "pdf_location gets file path of static document" do
-    document.pdf_location
-    expect(document.output_location).to eq(File.join(Rails.root, "tmp", "pdfs", document.pdf_name).to_s)
+    expect(document.pdf_location).to eq(File.join(Rails.root, "lib", "pdfs", "KnockKnockJokes.pdf").to_s)
   end
 end
diff --git a/spec/services/correspondence_documents_efolder_uploader_spec.rb b/spec/services/correspondence_documents_efolder_uploader_spec.rb
index c3f7737dc61..c695506a2da 100644
--- a/spec/services/correspondence_documents_efolder_uploader_spec.rb
+++ b/spec/services/correspondence_documents_efolder_uploader_spec.rb
@@ -14,8 +14,8 @@
         doc = correspondence.correspondence_documents.first
 
         expect(FeatureToggle).to receive(:enabled?).with(:ce_api_demo_toggle).and_return(true)
-        expect(ExternalApi::ClaimEvidenceService).to receive(:upload_document).
-          with(doc.pdf_location, veteran.file_number, doc.claim_evidence_upload_json).once
+        expect(ExternalApi::ClaimEvidenceService).to receive(:upload_document)
+          .with(doc.pdf_location, veteran.file_number, doc.claim_evidence_upload_json).once
       end
 
       it "succeeds and does not create any EfolderUploadFailedTask tasks" do

From ec561f3b9aa4962ec0efd809a97f699b8243eba6 Mon Sep 17 00:00:00 2001
From: Will Medders <93014155+wmedders21@users.noreply.github.com>
Date: Tue, 9 Jan 2024 17:42:46 -0600
Subject: [PATCH 038/237] Wmedders21/appeals 37636 (#20456)

* Added create_veteran to helper module and used in multi_correspondences

* Added seed_helper module to cavc_ama_appeals

* Added seed_helper module to test_case_data

* Added seed_helper module to seeds/tasks.rb

* Adjust formatting

* Added seed_helper module to static test data

* Added seed_helper module to static dispatched test data

* Added seed_helper module to remanded legacy appeals

* Added seed_helper module to remanded ama appeals

* Added seed_helper module to cavc dashboard data

* Relocate duplicate correspondence intake setup to CorrespondenceHelpers

* Relocated duplicate create_child_class methods to shared parent

* Moved create_child_class to private section

* Move autotext table seeding to CorrespondenceHelpers

* Codeclimate fixes and ignores

* Update validation syntax on CorrespondenceIntake

* Refactor method naming convention inCorrespondenceRelation

* Update validation syntax on CorrespondenceRelation

* Fixing requires

* replaces timeout with sleep to fix offense

* scss linting fix

* Updated Time.local to Time.zone.local (reran tests)

* parameter lint fix.

* fixed linter issue.

* Several linting fixes

* fixed cyclomatic complexity

* refactored logging statement

* Converted statement to one line for better readability.

* fixed element count

* fixed incorrect element being clicked

* Fix other motion bug

* Fix codeclimate issues

* Fix codeclimate issues

* Fix conditional logic for Ruby style

* Update current user creation in CorrespondenceHelpers to avoid fk violation

---------

Co-authored-by: Ryan Marshall <rnmarshall1993@gmail.com>
---
 app/controllers/correspondence_controller.rb  |  2 +-
 app/models/tasks/correspondence_task.rb       | 24 +++++++++---------
 ...rrespondence_documents_efolder_uploader.rb | 16 ++++++------
 .../correspondence_intake_processor.rb        |  1 +
 .../Pagination/CorrespondencePagination.jsx   |  2 +-
 config/brakeman.ignore                        | 24 ++++++++++++++++--
 db/seeds/multi_correspondences.rb             | 25 ++++++++++---------
 .../correspondence/review_package_spec.rb     |  4 +--
 spec/support/correspondence_helpers.rb        | 10 +++++++-
 9 files changed, 67 insertions(+), 41 deletions(-)

diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index 5567c815ed9..1cd854f8213 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -253,7 +253,7 @@ def correspondence_load
   end
 
   def veteran_by_correspondence
-    return nil unless correspondence&.veteran_id.present?
+    return nil if correspondence&.veteran_id.blank?
 
     @veteran_by_correspondence ||= Veteran.find_by(id: correspondence.veteran_id)
   end
diff --git a/app/models/tasks/correspondence_task.rb b/app/models/tasks/correspondence_task.rb
index d617411f860..607b856f111 100644
--- a/app/models/tasks/correspondence_task.rb
+++ b/app/models/tasks/correspondence_task.rb
@@ -30,18 +30,6 @@ def remove_package
     root_task.cancel_task_and_child_subtasks
   end
 
-  private
-
-  def status_is_valid_on_create
-    if type == "ReviewPackageTask" && status != Constants.TASK_STATUSES.unassigned
-      update!(status: :unassigned)
-    elsif type != "ReviewPackageTask" && status != Constants.TASK_STATUSES.assigned
-      fail Caseflow::Error::InvalidStatusOnTaskCreate, task_type: type
-    end
-
-    true
-  end
-
   def self.create_child_task(parent_task, current_user, params)
     Task.create!(
       type: params[:type],
@@ -54,6 +42,18 @@ def self.create_child_task(parent_task, current_user, params)
     )
   end
 
+  private
+
+  def status_is_valid_on_create
+    if type == "ReviewPackageTask" && status != Constants.TASK_STATUSES.unassigned
+      update!(status: :unassigned)
+    elsif type != "ReviewPackageTask" && status != Constants.TASK_STATUSES.assigned
+      fail Caseflow::Error::InvalidStatusOnTaskCreate, task_type: type
+    end
+
+    true
+  end
+
   def assignee_status_is_valid_on_create
     if parent&.child_must_have_active_assignee? && assigned_to.is_a?(User) && !assigned_to.active?
       fail Caseflow::Error::InvalidAssigneeStatusOnTaskCreate, assignee: assigned_to
diff --git a/app/services/correspondence_documents_efolder_uploader.rb b/app/services/correspondence_documents_efolder_uploader.rb
index 59c0bf5b92b..a2deeabe6a3 100644
--- a/app/services/correspondence_documents_efolder_uploader.rb
+++ b/app/services/correspondence_documents_efolder_uploader.rb
@@ -6,16 +6,14 @@ def upload_documents_to_claim_evidence(correspondence, current_user, parent_task
       do_upload(correspondence)
 
       true
-    else
-      if FeatureToggle.enabled?(:ce_api_demo_toggle)
-        if Rails.env.test?
-          do_upload(correspondence)
-        end
-
-        true
-      else
-        fail "Mock failure for upload in non-prod env"
+    elsif FeatureToggle.enabled?(:ce_api_demo_toggle)
+      if Rails.env.test?
+        do_upload(correspondence)
       end
+
+      true
+    else
+      fail "Mock failure for upload in non-prod env"
     end
   rescue StandardError => error
     Rails.logger.error(error.full_message)
diff --git a/app/services/correspondence_intake_processor.rb b/app/services/correspondence_intake_processor.rb
index 9a23ca4dad5..41b8c36a0bf 100644
--- a/app/services/correspondence_intake_processor.rb
+++ b/app/services/correspondence_intake_processor.rb
@@ -21,6 +21,7 @@ def process_intake(intake_params, current_user)
 
   private
 
+  # :reek:LongParameterList
   def do_upload_success_actions(parent_task, intake_params, correspondence, current_user)
     ActiveRecord::Base.transaction do
       parent_task.update!(status: Constants.TASK_STATUSES.completed)
diff --git a/client/app/components/Pagination/CorrespondencePagination.jsx b/client/app/components/Pagination/CorrespondencePagination.jsx
index d09bbd57210..662a5b312e0 100644
--- a/client/app/components/Pagination/CorrespondencePagination.jsx
+++ b/client/app/components/Pagination/CorrespondencePagination.jsx
@@ -110,7 +110,7 @@ class CorrespondencePagination extends React.PureComponent {
       paginationButtons.push(
         <button
           key="next-button"
-          aria-label="Next Page"
+          aria-label="Next page"
           disabled={currentPage === totalPages}
           onClick={() => this.handleNext()}>
           Next
diff --git a/config/brakeman.ignore b/config/brakeman.ignore
index 41a0ecdaa4c..2473a4e454d 100644
--- a/config/brakeman.ignore
+++ b/config/brakeman.ignore
@@ -1,5 +1,25 @@
 {
   "ignored_warnings": [
+    {
+      "warning_type": "File Access",
+      "warning_code": 16,
+      "fingerprint": "0801535c3d74c53eb2f14e884b7e8e581f44fb5d61f32ff8faced9e85ceba102",
+      "check_name": "SendFile",
+      "message": "Model attribute used in file name",
+      "file": "app/controllers/correspondence_controller.rb",
+      "line": 172,
+      "link": "https://brakemanscanner.org/docs/warning_types/file_access/",
+      "code": "send_file(Document.limit(200)[params[:pdf_id].to_i].serve, :type => \"application/pdf\", :disposition => ((\"inline\" or \"attachment; filename='#{params[:type]}-#{params[:id]}.pdf'\")))",
+      "render_path": null,
+      "location": {
+        "type": "method",
+        "class": "CorrespondenceController",
+        "method": "pdf"
+      },
+      "user_input": "Document.limit(200)[params[:pdf_id].to_i].serve",
+      "confidence": "Medium",
+      "note": ""
+    },
     {
       "warning_type": "File Access",
       "warning_code": 16,
@@ -107,7 +127,7 @@
       "check_name": "SQL",
       "message": "Possible SQL injection",
       "file": "app/models/task.rb",
-      "line": 273,
+      "line": 282,
       "link": "https://brakemanscanner.org/docs/warning_types/sql_injection/",
       "code": "Arel.sql(\"CASE WHEN #{CachedAppeal.table_name}.is_aod = TRUE THEN #{(\"0 ELSE 1\" or \"1 ELSE 0\")} END, CASE WHEN #{CachedAppeal.table_name}.case_type = 'Court Remand' THEN #{(\"0 ELSE 1\" or \"1 ELSE 0\")} END, #{CachedAppeal.table_name}.docket_number #{order}, #{Task.table_name}.created_at #{order}\")",
       "render_path": null,
@@ -141,6 +161,6 @@
       "note": ""
     }
   ],
-  "updated": "2023-12-12 16:28:43 -0500",
+  "updated": "2024-01-08 13:49:30 -0600",
   "brakeman_version": "4.7.1"
 }
diff --git a/db/seeds/multi_correspondences.rb b/db/seeds/multi_correspondences.rb
index 1ba263d5135..2114b9200fb 100644
--- a/db/seeds/multi_correspondences.rb
+++ b/db/seeds/multi_correspondences.rb
@@ -1,11 +1,12 @@
-# frozen_string_literal :true
+# frozen_string_literal: true
 
 # create correspondence seeds
-# :reek:InstanceVariableAssumption
 require_relative "./helpers/seed_helpers"
 
 module Seeds
+  # :reek:InstanceVariableAssumption
   class MultiCorrespondences < Base
+
     include SeedHelpers
 
     def initialize
@@ -38,7 +39,7 @@ def create_multi_correspondences
         appeal = create(
           :appeal,
           veteran_file_number: veteran.file_number
-          )
+        )
         InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
       end
       5.times do
@@ -46,7 +47,7 @@ def create_multi_correspondences
           :appeal,
           veteran_file_number: veteran.file_number,
           docket_type: Constants.AMA_DOCKETS.direct_review
-          )
+        )
         InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
       end
       21.times do
@@ -61,7 +62,7 @@ def create_multi_correspondences
           va_date_of_receipt: Time.zone.yesterday,
           notes: "Notes from CMP - Multi Correspondence Seed",
           assigned_by_id: 81,
-          veteran_id: veteran.id,
+          veteran_id: veteran.id
         )
         CorrespondenceDocument.find_or_create_by(
           document_file_number: veteran.file_number,
@@ -79,7 +80,7 @@ def create_multi_correspondences
         appeal = create(
           :appeal,
           veteran_file_number: veteran.file_number
-          )
+        )
         InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
       end
       5.times do
@@ -87,7 +88,7 @@ def create_multi_correspondences
           :appeal,
           veteran_file_number: veteran.file_number,
           docket_type: Constants.AMA_DOCKETS.direct_review
-          )
+        )
         InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
       end
       31.times do
@@ -102,7 +103,7 @@ def create_multi_correspondences
           va_date_of_receipt: Time.zone.yesterday,
           notes: "Notes from CMP - Multi Correspondence Seed",
           assigned_by_id: 81,
-          veteran_id: veteran.id,
+          veteran_id: veteran.id
         )
         CorrespondenceDocument.find_or_create_by(
           document_file_number: veteran.file_number,
@@ -115,13 +116,12 @@ def create_multi_correspondences
         @cmp_packet_number += 1
       end
 
-
       veteran = create_veteran(first_name: "Christian", last_name: "Bale")
       1.times do
         appeal = create(
           :appeal,
           veteran_file_number: veteran.file_number
-          )
+        )
         InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
       end
       10.times do
@@ -129,7 +129,7 @@ def create_multi_correspondences
           :appeal,
           veteran_file_number: veteran.file_number,
           docket_type: Constants.AMA_DOCKETS.direct_review
-          )
+        )
         InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
       end
       101.times do
@@ -144,7 +144,7 @@ def create_multi_correspondences
           va_date_of_receipt: Time.zone.yesterday,
           notes: "Notes from CMP - Multi Correspondence Seed",
           assigned_by_id: 81,
-          veteran_id: veteran.id,
+          veteran_id: veteran.id
         )
         CorrespondenceDocument.find_or_create_by(
           document_file_number: veteran.file_number,
@@ -157,5 +157,6 @@ def create_multi_correspondences
         @cmp_packet_number += 1
       end
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
   end
 end
diff --git a/spec/feature/queue/correspondence/review_package_spec.rb b/spec/feature/queue/correspondence/review_package_spec.rb
index a107f012dcd..63958c7ced3 100644
--- a/spec/feature/queue/correspondence/review_package_spec.rb
+++ b/spec/feature/queue/correspondence/review_package_spec.rb
@@ -192,9 +192,7 @@
       fill_in "Notes", with: " Updated"
       expect(page).to have_button("Save changes", disabled: false)
       click_button "Save changes"
-      Timeout.timeout(10) do
-        sleep(0.1) until correspondence.tasks.find_by_type("ReviewPackageTask").status == "in_progress"
-      end
+      refresh
       expect(correspondence.tasks.find_by_type("ReviewPackageTask").status).to eq("in_progress")
     end
   end
diff --git a/spec/support/correspondence_helpers.rb b/spec/support/correspondence_helpers.rb
index 000f05d054c..75253e8606b 100644
--- a/spec/support/correspondence_helpers.rb
+++ b/spec/support/correspondence_helpers.rb
@@ -1,8 +1,15 @@
 # frozen_string_literal: true
 
+# rubocop:disable Metrics/ModuleLength
 module CorrespondenceHelpers
   def current_user
-    @current_user ||= create(:user, roles: ["Mail Team"])
+    User.find_or_create_by(
+      css_id: "TEST_USER",
+      full_name: "Test User",
+      email: "testuser@example.com",
+      station_id: 101,
+      roles: ["Mail Team"]
+    )
   end
 
   def setup_access
@@ -155,4 +162,5 @@ def seed_autotext_table
     Dir[Rails.root.join("db/seeds/*.rb")].sort.each { |f| require f }
     Seeds::AutoTexts.new.seed!
   end
+  # rubocop:enable Metrics/ModuleLength
 end

From e484199a24f887a2f29e29a76eb15a643a544bdf Mon Sep 17 00:00:00 2001
From: Razor Talent <razortalent@Razors-MBP.attlocal.net>
Date: Wed, 10 Jan 2024 09:53:09 -0500
Subject: [PATCH 039/237] Address code climate issue

---
 app/models/correspondence_document.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/models/correspondence_document.rb b/app/models/correspondence_document.rb
index 01b9c32d10a..29160187948 100644
--- a/app/models/correspondence_document.rb
+++ b/app/models/correspondence_document.rb
@@ -8,9 +8,11 @@ def pdf_name
     "#{uuid}.pdf"
   end
 
+  # :nocov:
   def pdf_location
     File.join(Rails.root, "lib", "pdfs", "KnockKnockJokes.pdf")
   end
+  # :nocov:
 
   def claim_evidence_upload_json
     {

From 05dcd195aa7ff4b1e9b18bf61c82a1809d631241 Mon Sep 17 00:00:00 2001
From: Will Medders <93014155+wmedders21@users.noreply.github.com>
Date: Wed, 10 Jan 2024 09:46:13 -0600
Subject: [PATCH 040/237] Wmedders21/appeals 37636 codelimate (#20470)

* Added create_veteran to helper module and used in multi_correspondences

* Added seed_helper module to cavc_ama_appeals

* Added seed_helper module to test_case_data

* Added seed_helper module to seeds/tasks.rb

* Adjust formatting

* Added seed_helper module to static test data

* Added seed_helper module to static dispatched test data

* Added seed_helper module to remanded legacy appeals

* Added seed_helper module to remanded ama appeals

* Added seed_helper module to cavc dashboard data

* Relocate duplicate correspondence intake setup to CorrespondenceHelpers

* Relocated duplicate create_child_class methods to shared parent

* Moved create_child_class to private section

* Move autotext table seeding to CorrespondenceHelpers

* Codeclimate fixes and ignores

* Update validation syntax on CorrespondenceIntake

* Refactor method naming convention inCorrespondenceRelation

* Update validation syntax on CorrespondenceRelation

* Fixing requires

* replaces timeout with sleep to fix offense

* scss linting fix

* Updated Time.local to Time.zone.local (reran tests)

* parameter lint fix.

* fixed linter issue.

* Several linting fixes

* fixed cyclomatic complexity

* refactored logging statement

* Converted statement to one line for better readability.

* fixed element count

* fixed incorrect element being clicked

* Fix other motion bug

* Fix codeclimate issues

* Fix codeclimate issues

* Fix conditional logic for Ruby style

* Update current user creation in CorrespondenceHelpers to avoid fk violation

* Ignore reek warning

---------

Co-authored-by: Ryan Marshall <rnmarshall1993@gmail.com>
---
 app/models/correspondence_document.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/correspondence_document.rb b/app/models/correspondence_document.rb
index 29160187948..8001fbf73f5 100644
--- a/app/models/correspondence_document.rb
+++ b/app/models/correspondence_document.rb
@@ -8,6 +8,7 @@ def pdf_name
     "#{uuid}.pdf"
   end
 
+  # :reek:UtilityFunction
   # :nocov:
   def pdf_location
     File.join(Rails.root, "lib", "pdfs", "KnockKnockJokes.pdf")

From c55b6db06d3642c8a714de440c3f9ecd68f1ee87 Mon Sep 17 00:00:00 2001
From: piedram <110848569+piedram@users.noreply.github.com>
Date: Wed, 10 Jan 2024 12:24:51 -0500
Subject: [PATCH 041/237] Fix DOM text reinterpreted as HTML error (#20473)

---
 app/views/explain/show.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/explain/show.html.erb b/app/views/explain/show.html.erb
index efe7a93040c..8bb65bcf1d2 100644
--- a/app/views/explain/show.html.erb
+++ b/app/views/explain/show.html.erb
@@ -237,7 +237,7 @@
       }
 
       const setDetailsPaneMessage = (htmlContent)=>{
-        document.getElementById("side_panel_message").innerHTML = htmlContent;
+        document.getElementById("side_panel_message").textContent = htmlContent;
       };
 
       const scrollbarWidth = window.innerWidth - document.documentElement.clientWidth;
@@ -446,7 +446,7 @@
       }
 
       const setDetailsPaneMessage = (htmlContent)=>{
-        document.getElementById("side_panel_message").innerHTML = htmlContent;
+        document.getElementById("side_panel_message").textContent = htmlContent;
       };
 
       const scrollbarWidth = window.innerWidth - document.documentElement.clientWidth;

From fc3bc26654fa1f44f8f006d86ef0f1af2fb09836 Mon Sep 17 00:00:00 2001
From: Alex Smith <alex.smith.99@thunderyard.com>
Date: Wed, 10 Jan 2024 11:31:49 -0700
Subject: [PATCH 042/237] Fix IntakeProcessor Security Issues (#20477)

Only allow creation of classes listed in allow list.
---
 .../correspondence_intake_processor.rb        | 61 ++++++++++++++++---
 1 file changed, 53 insertions(+), 8 deletions(-)

diff --git a/app/services/correspondence_intake_processor.rb b/app/services/correspondence_intake_processor.rb
index 41b8c36a0bf..628b2f57f9e 100644
--- a/app/services/correspondence_intake_processor.rb
+++ b/app/services/correspondence_intake_processor.rb
@@ -64,7 +64,7 @@ def add_tasks_to_related_appeals(intake_params, current_user)
         {
           appeal: appeal,
           parent_id: appeal.root_task&.id,
-          assigned_to: data[:assigned_to].constantize.singleton,
+          assigned_to: class_for_assigned_to(data[:assigned_to]).singleton,
           instructions: data[:content]
         }, current_user
       )
@@ -89,7 +89,7 @@ def create_tasks_not_related_to_appeals(intake_params, correspondence, current_u
       class_for_data(data).create_from_params(
         {
           parent_id: correspondence.root_task.id,
-          assigned_to: data[:assigned_to].constantize.singleton,
+          assigned_to: class_for_assigned_to(data[:assigned_to]).singleton,
           instructions: data[:content]
         }, current_user
       )
@@ -114,8 +114,16 @@ def create_mail_tasks(intake_params, correspondence, current_user)
     end
   end
 
+  def class_for_data(data)
+    task_class_for_type(data[:klass])
+  end
+
+  def correspondence_documents_efolder_uploader
+    @correspondence_documents_efolder_uploader ||= CorrespondenceDocumentsEfolderUploader.new
+  end
+
   def mail_task_class_for_type(task_type)
-    task_types = {
+    mail_task_types = {
       "Associated with Claims Folder": AssociatedWithClaimsFolderMailTask.name,
       "Change of address": AddressChangeMailTask.name,
       "Evidence or argument": EvidenceOrArgumentMailTask.name,
@@ -124,14 +132,51 @@ def mail_task_class_for_type(task_type)
       "VACOLS updated": VacolsUpdatedMailTask.name
     }.with_indifferent_access
 
-    task_types[task_type]&.constantize
+    mail_task_types[task_type]&.constantize
   end
 
-  def class_for_data(data)
-    data[:klass]&.constantize
+  def task_class_for_type(task_type)
+    task_types = {
+      "AddressChangeMailTask": AddressChangeMailTask.name,
+      "AodMotionMailTask": AodMotionMailTask.name,
+      "AppealWithdrawalMailTask": AppealWithdrawalMailTask.name,
+      "CavcCorrespondenceMailTask": CavcCorrespondenceMailTask.name,
+      "ClearAndUnmistakeableErrorMailTask": ClearAndUnmistakeableErrorMailTask.name,
+      "CongressionalInterestMailTask": CongressionalInterestMailTask.name,
+      "ControlledCorrespondenceMailTask": ControlledCorrespondenceMailTask.name,
+      "DeathCertificateMailTask": DeathCertificateMailTask.name,
+      "DocketSwitchMailTask": DocketSwitchMailTask.name,
+      "EvidenceOrArgumentMailTask": EvidenceOrArgumentMailTask.name,
+      "ExtensionRequestMailTask": ExtensionRequestMailTask.name,
+      "FoiaRequestMailTask": FoiaRequestMailTask.name,
+      "HearingPostponementRequestMailTask": HearingPostponementRequestMailTask.name,
+      "HearingRelatedMailTask": HearingRelatedMailTask.name,
+      "HearingWithdrawalRequestMailTask": HearingWithdrawalRequestMailTask.name,
+      "OtherMotionMailTask": OtherMotionMailTask.name,
+      "PowerOfAttorneyRelatedMailTask": PowerOfAttorneyRelatedMailTask.name,
+      "PrivacyActRequestMailTask": PrivacyActRequestMailTask.name,
+      "PrivacyComplaintMailTask": PrivacyComplaintMailTask.name,
+      "ReconsiderationMotionMailTask": ReconsiderationMotionMailTask.name,
+      "ReturnedUndeliverableCorrespondenceMailTask": ReturnedUndeliverableCorrespondenceMailTask.name,
+      "StatusInquiryMailTask": StatusInquiryMailTask.name
+    }.with_indifferent_access
+
+    task_types[task_type]&.constantize
   end
 
-  def correspondence_documents_efolder_uploader
-    @correspondence_documents_efolder_uploader ||= CorrespondenceDocumentsEfolderUploader.new
+  def class_for_assigned_to(assigned_to)
+    available_assignees = {
+      "AodTeam": AodTeam.name,
+      "BvaDispatch": BvaDispatch.name,
+      "CaseReview": CaseReview.name,
+      "CavcLitigationSupport": CavcLitigationSupport.name,
+      "ClerkOfTheBoard": ClerkOfTheBoard.name,
+      "Colocated": Colocated.name,
+      "HearingAdmin": HearingAdmin.name,
+      "LitigationSupport": LitigationSupport.name,
+      "PrivacyTeam": PrivacyTeam.name
+    }.with_indifferent_access
+
+    available_assignees[assigned_to]&.constantize
   end
 end

From 214a04c1b037966bc71fb46f331341953c2212a5 Mon Sep 17 00:00:00 2001
From: Will Medders <93014155+wmedders21@users.noreply.github.com>
Date: Wed, 10 Jan 2024 16:02:53 -0600
Subject: [PATCH 043/237] Increase wait time to help tests pass in CI (#20476)

* Increase wait time to help tests pass in CI

* Add using wait time to address flakiness

* Added wait time to submit intakeformspec and arialabel to confirm button

* silence rubocop methodlength

* Update snapshots

---------

Co-authored-by: Jim Foley <james.foley4@va.gov>
---
 .../correspondence_intake_processor.rb        |  2 +
 client/app/components/Modal.jsx               |  1 +
 .../AddCavcDatesModal.test.js.snap            |  4 ++
 ...vcReviewExtensionRequestModal.test.js.snap |  2 +
 spec/feature/queue/case_details_spec.rb       |  4 +-
 .../correspondence/submit_intake_form_spec.rb | 29 ++++++-------
 ...asks_related_to_an_existing_appeal_spec.rb | 41 +++++++++++--------
 spec/feature/queue/mail_task_spec.rb          |  4 +-
 8 files changed, 53 insertions(+), 34 deletions(-)

diff --git a/app/services/correspondence_intake_processor.rb b/app/services/correspondence_intake_processor.rb
index 628b2f57f9e..059e89fe163 100644
--- a/app/services/correspondence_intake_processor.rb
+++ b/app/services/correspondence_intake_processor.rb
@@ -135,6 +135,7 @@ def mail_task_class_for_type(task_type)
     mail_task_types[task_type]&.constantize
   end
 
+  # rubocop:disable Metrics/MethodLength
   def task_class_for_type(task_type)
     task_types = {
       "AddressChangeMailTask": AddressChangeMailTask.name,
@@ -163,6 +164,7 @@ def task_class_for_type(task_type)
 
     task_types[task_type]&.constantize
   end
+  # rubocop:enable Metrics/MethodLength
 
   def class_for_assigned_to(assigned_to)
     available_assignees = {
diff --git a/client/app/components/Modal.jsx b/client/app/components/Modal.jsx
index ddd2493b625..19eb5aebbe1 100644
--- a/client/app/components/Modal.jsx
+++ b/client/app/components/Modal.jsx
@@ -93,6 +93,7 @@ export default class Modal extends React.Component {
           disabled={object.disabled}
           key={i}
           id={this.buttonIdPrefix + i}
+          aria-label={object.name}
         />
       );
     });
diff --git a/client/test/app/queue/cavc/__snapshots__/AddCavcDatesModal.test.js.snap b/client/test/app/queue/cavc/__snapshots__/AddCavcDatesModal.test.js.snap
index b4dbbca2174..45f1447392d 100644
--- a/client/test/app/queue/cavc/__snapshots__/AddCavcDatesModal.test.js.snap
+++ b/client/test/app/queue/cavc/__snapshots__/AddCavcDatesModal.test.js.snap
@@ -578,6 +578,7 @@ exports[`AddCavcDatesModal renders correctly 1`] = `
                       className="cf-modal-controls"
                     >
                       <Button
+                        aria-label="Cancel"
                         classNames={
                           Array [
                             "usa-button",
@@ -606,6 +607,7 @@ exports[`AddCavcDatesModal renders correctly 1`] = `
                         </span>
                       </Button>
                       <Button
+                        aria-label="Submit"
                         classNames={
                           Array [
                             "usa-button",
@@ -1243,6 +1245,7 @@ exports[`AddCavcDatesModal submits succesfully 1`] = `
                       className="cf-modal-controls"
                     >
                       <Button
+                        aria-label="Cancel"
                         classNames={
                           Array [
                             "usa-button",
@@ -1271,6 +1274,7 @@ exports[`AddCavcDatesModal submits succesfully 1`] = `
                         </span>
                       </Button>
                       <Button
+                        aria-label="Submit"
                         classNames={
                           Array [
                             "usa-button",
diff --git a/client/test/app/queue/components/__snapshots__/CavcReviewExtensionRequestModal.test.js.snap b/client/test/app/queue/components/__snapshots__/CavcReviewExtensionRequestModal.test.js.snap
index 599042c4ebe..f6ef72f68e8 100644
--- a/client/test/app/queue/components/__snapshots__/CavcReviewExtensionRequestModal.test.js.snap
+++ b/client/test/app/queue/components/__snapshots__/CavcReviewExtensionRequestModal.test.js.snap
@@ -259,6 +259,7 @@ exports[`CavcReviewExtensionRequestModal renders correctly 1`] = `
           className="cf-modal-controls"
         >
           <Button
+            aria-label="Cancel"
             classNames={
               Array [
                 "cf-modal-link",
@@ -287,6 +288,7 @@ exports[`CavcReviewExtensionRequestModal renders correctly 1`] = `
             </span>
           </Button>
           <Button
+            aria-label="Confirm"
             classNames={
               Array [
                 "usa-button",
diff --git a/spec/feature/queue/case_details_spec.rb b/spec/feature/queue/case_details_spec.rb
index 82c8c6383b9..a8302bd926a 100644
--- a/spec/feature/queue/case_details_spec.rb
+++ b/spec/feature/queue/case_details_spec.rb
@@ -678,7 +678,9 @@ def wait_for_page_render
 
       scenario "access the appeal's case details" do
         reload_case_detail_page(appeal.external_id)
-        expect(page).to have_content(COPY::DUPLICATE_PHONE_NUMBER_TITLE)
+        using_wait_time(30) do
+          expect(page).to have_content(COPY::DUPLICATE_PHONE_NUMBER_TITLE)
+        end
 
         bgs.inaccessible_appeal_vbms_ids = []
         allow_any_instance_of(Fakes::BGSService).to receive(:fetch_veteran_info)
diff --git a/spec/feature/queue/correspondence/submit_intake_form_spec.rb b/spec/feature/queue/correspondence/submit_intake_form_spec.rb
index 35624795baf..146b5f8cf0d 100644
--- a/spec/feature/queue/correspondence/submit_intake_form_spec.rb
+++ b/spec/feature/queue/correspondence/submit_intake_form_spec.rb
@@ -2,6 +2,7 @@
 
 RSpec.feature("Correspondence Intake submission") do
   include CorrespondenceHelpers
+  let(:wait_time) { 30 }
 
   context "user associates correspondence with prior mail" do
     describe "success" do
@@ -13,7 +14,7 @@
         click_button("Continue")
         click_button("Submit")
         click_button("Confirm")
-        using_wait_time(10) do
+        using_wait_time(wait_time) do
           expect(page).to have_content("You have successfully submitted a correspondence record")
         end
         expect(Correspondence.first.related_correspondences).to eq([Correspondence.second])
@@ -29,7 +30,7 @@
         click_button("Continue")
         click_button("Submit")
         click_button("Confirm")
-        using_wait_time(10) do
+        using_wait_time(wait_time) do
           expect(page).to have_content("You have successfully submitted a correspondence record")
         end
       end
@@ -54,7 +55,7 @@
         click_button("Continue")
         click_button("Submit")
         click_button("Confirm")
-        using_wait_time(10) do
+        using_wait_time(wait_time) do
           expect(page).to have_content("You have successfully submitted a correspondence record")
         end
       end
@@ -87,7 +88,7 @@
         click_button("Continue")
         click_button("Submit")
         click_button("Confirm")
-        using_wait_time(10) do
+        using_wait_time(wait_time) do
           expect(page).to have_content("The correspondence's documents have failed")
         end
       end
@@ -99,7 +100,7 @@
       it "displays a success banner, links the appeal, and creates the task" do
         visit_intake_form_step_2_with_appeals
         existing_appeal_radio_options[:yes].click
-        using_wait_time(15) do
+        using_wait_time(wait_time) do
           within ".cf-case-list-table" do
             page.all(".cf-form-checkbox").last.click
           end
@@ -111,7 +112,7 @@
         click_button("Continue")
         click_button("Submit")
         click_button("Confirm")
-        using_wait_time(10) do
+        using_wait_time(wait_time) do
           expect(page).to have_content("You have successfully submitted a correspondence record")
         end
         expect(Correspondence.first.appeals).to eq([Appeal.fifth])
@@ -124,7 +125,7 @@
         # this fails because the seed appeal has no root task
         visit_intake_form_step_2_with_appeals_without_initial_tasks
         existing_appeal_radio_options[:yes].click
-        using_wait_time(15) do
+        using_wait_time(wait_time) do
           within ".cf-case-list-table" do
             page.all(".cf-form-checkbox").last.click
           end
@@ -136,7 +137,7 @@
         click_button("Continue")
         click_button("Submit")
         click_button("Confirm")
-        using_wait_time(10) do
+        using_wait_time(wait_time) do
           expect(page).to have_content("The correspondence's documents have failed to upload to the eFolder")
         end
         expect(Correspondence.first.appeals).to eq([])
@@ -149,26 +150,26 @@
       it "completes the evidence submission window task" do
         active_evidence_submissions_tasks
         existing_appeal_radio_options[:yes].click
-        using_wait_time(10) do
+        using_wait_time(wait_time) do
           page.all(".checkbox-wrapper-1").find(".cf-form-checkbox").first.click
         end
         find("label", text: "Waive Evidence Window").click
         find_by_id("waiveReason").fill_in with: "test waive note"
         click_button("Continue")
         find(".cf-pdf-external-link-icon").click
-        using_wait_time(15) do
+        using_wait_time(wait_time) do
           page.switch_to_window(page.windows.last)
           expect(page).to have_content("Evidence Submission Window Task")
         end
         page.switch_to_window(page.windows.first)
         click_button("Submit")
         click_button("Confirm")
-        using_wait_time(15) do
+        using_wait_time(wait_time) do
           expect(page).to have_content("You have successfully submitted a correspondence record")
         end
         page.switch_to_window(page.windows.last)
         refresh
-        using_wait_time(15) do
+        using_wait_time(wait_time) do
           page.switch_to_window(page.windows.last)
           expect(page).to have_no_content("Evidence Submission Window Task")
         end
@@ -181,7 +182,7 @@
       it "displays a success banner, links the appeal" do
         visit_intake_form_step_2_with_appeals
         existing_appeal_radio_options[:yes].click
-        using_wait_time(15) do
+        using_wait_time(wait_time) do
           within ".cf-case-list-table" do
             page.all(".cf-form-checkbox").last.click
           end
@@ -189,7 +190,7 @@
         click_button("Continue")
         click_button("Submit")
         click_button("Confirm")
-        using_wait_time(10) do
+        using_wait_time(wait_time) do
           expect(page).to have_content("You have successfully submitted a correspondence record")
         end
         expect(Correspondence.first.appeals).to eq([Appeal.fifth])
diff --git a/spec/feature/queue/correspondence/tasks_related_to_an_existing_appeal_spec.rb b/spec/feature/queue/correspondence/tasks_related_to_an_existing_appeal_spec.rb
index b37ba6b7b1b..1e3c03d1ed8 100644
--- a/spec/feature/queue/correspondence/tasks_related_to_an_existing_appeal_spec.rb
+++ b/spec/feature/queue/correspondence/tasks_related_to_an_existing_appeal_spec.rb
@@ -4,6 +4,7 @@
   include CorrespondenceHelpers
   let(:organization) { MailTeam.singleton }
   let(:mail_user) { User.authenticate!(roles: ["Mail Team"]) }
+  let(:wait_time) { 30 }
 
   before do
     organization.add_user(mail_user)
@@ -45,7 +46,7 @@
 
         existing_appeal_radio_options[:yes].click
 
-        using_wait_time(20) do
+        using_wait_time(wait_time) do
           expect(page).to have_content("Viewing 1-5 of 13 total")
         end
       end
@@ -55,7 +56,7 @@
 
         existing_appeal_radio_options[:yes].click
 
-        using_wait_time(20) do
+        using_wait_time(wait_time) do
           expect(page).to have_content("Docket")
           expect(page).to have_content("Appellant Name")
           expect(page).to have_content("Status")
@@ -71,10 +72,10 @@
 
         existing_appeal_radio_options[:yes].click
 
-        using_wait_time(20) do
+        using_wait_time(wait_time) do
           page.all(".cf-pdf-external-link-icon")[0].click
         end
-        using_wait_time(10) do
+        using_wait_time(wait_time) do
           page.switch_to_window(page.windows.last)
           expect(current_path).to have_content("/queue/appeals")
         end
@@ -85,7 +86,7 @@
 
         existing_appeal_radio_options[:yes].click
 
-        using_wait_time(20) do
+        using_wait_time(wait_time) do
           within(page.all(".cf-pagination")[0]) do
             expect(find_all(".cf-form-checkbox").count).to eq(5)
           end
@@ -97,7 +98,7 @@
 
         existing_appeal_radio_options[:yes].click
 
-        using_wait_time(20) do
+        using_wait_time(wait_time) do
           expect(page.has_button?("Previous")).to be(false)
           expect(page.has_button?("Next")).to be(true)
         end
@@ -120,7 +121,7 @@
 
         existing_appeal_radio_options[:yes].click
 
-        using_wait_time(20) do
+        using_wait_time(wait_time) do
           page.all(".cf-form-checkbox").last.click
         end
 
@@ -136,7 +137,7 @@
 
         existing_appeal_radio_options[:yes].click
 
-        using_wait_time(20) do
+        using_wait_time(wait_time) do
           page.all(".checkbox-wrapper-1").find(".cf-form-checkbox").first.click
         end
         expect(page).to have_selector("#react-select-2-input[disabled]")
@@ -160,16 +161,18 @@
 
         within find(".cf-case-list-table") do
           page.all(".cf-form-checkbox").first.click
-          unformatted_id = page.all(".cf-form-checkboxes").first[:class]
-          formatted_id = unformatted_id.split("-")[2].split(" ")[0]
-          expect find_by_id(formatted_id, visible: false).checked?
+          using_wait_time(wait_time) do
+            unformatted_id = page.all(".cf-form-checkboxes").first[:class]
+            formatted_id = unformatted_id.split("-")[2].split(" ")[0]
+            expect find_by_id(formatted_id, visible: false).checked?
+          end
         end
       end
 
       it "Adds and removes a task from the linked appeal" do
         visit_intake_form_step_2_with_appeals
         existing_appeal_radio_options[:yes].click
-        using_wait_time(15) do
+        using_wait_time(wait_time) do
           within ".cf-case-list-table" do
             page.all(".cf-form-checkbox").last.click
           end
@@ -188,7 +191,7 @@
       it "Adds and removes multiple tasks from the linked appeal" do
         visit_intake_form_step_2_with_appeals
         existing_appeal_radio_options[:yes].click
-        using_wait_time(15) do
+        using_wait_time(wait_time) do
           within ".cf-case-list-table" do
             page.all(".cf-form-checkbox").last.click
           end
@@ -211,12 +214,14 @@
       it "Prevents user from clicking continue if task name or text isn't filled out" do
         visit_intake_form_step_2_with_appeals
         existing_appeal_radio_options[:yes].click
-        using_wait_time(15) do
+        using_wait_time(wait_time) do
           within ".cf-case-list-table" do
             page.all(".cf-form-checkbox").last.click
           end
         end
-        find_by_id("button-addTasks").click
+        using_wait_time(wait_time) do
+          find_by_id("button-addTasks").click
+        end
         all("#reactSelectContainer")[0].click
         find_by_id("react-select-2-option-15").click
         expect(page).to have_button("button-continue", disabled: true)
@@ -235,7 +240,7 @@
       it "Prevents other motion tasks from being added 3 times" do
         visit_intake_form_step_2_with_appeals
         existing_appeal_radio_options[:yes].click
-        using_wait_time(15) do
+        using_wait_time(wait_time) do
           within ".cf-case-list-table" do
             page.all(".cf-form-checkbox").last.click
           end
@@ -261,7 +266,7 @@
       it "Unlinks the appeal when the unlink appeal button is clicked" do
         visit_intake_form_step_2_with_appeals
         existing_appeal_radio_options[:yes].click
-        using_wait_time(15) do
+        using_wait_time(wait_time) do
           within ".cf-case-list-table" do
             page.all(".cf-form-checkbox").last.click
           end
@@ -278,7 +283,7 @@
       it "Unlinks only one appeal if multiple are selected when the unlink appeal button is clicked" do
         visit_intake_form_step_2_with_appeals
         existing_appeal_radio_options[:yes].click
-        using_wait_time(15) do
+        using_wait_time(wait_time) do
           within ".cf-case-list-table" do
             page.all(".cf-form-checkbox").first.click
             page.all(".cf-form-checkbox").last.click
diff --git a/spec/feature/queue/mail_task_spec.rb b/spec/feature/queue/mail_task_spec.rb
index 65da928d502..a1666e1b5b3 100644
--- a/spec/feature/queue/mail_task_spec.rb
+++ b/spec/feature/queue/mail_task_spec.rb
@@ -285,7 +285,9 @@
         if appeal.hearings.any?
           postpone_payload = AppellantNotification.create_payload(appeal, "Postponement of hearing")
             .to_json
-          expect(SendNotificationJob).to receive(:perform_later).with(postpone_payload)
+          using_wait_time(30) do
+            expect(SendNotificationJob).to receive(:perform_later).with(postpone_payload)
+          end
         end
         expect(SendNotificationJob).to receive(:perform_later).with(scheduled_payload)
       end

From 13245efe7e54018911fe50f57d910409e6a44798 Mon Sep 17 00:00:00 2001
From: Kamala Madamanchi <110078646+kamala-07@users.noreply.github.com>
Date: Thu, 11 Jan 2024 11:32:10 -0600
Subject: [PATCH 044/237] Edit VADOR error message correction (#20489)

---
 client/app/queue/correspondence/modals/editModal.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/app/queue/correspondence/modals/editModal.jsx b/client/app/queue/correspondence/modals/editModal.jsx
index 07c1cfe8cfc..49a3dd78533 100644
--- a/client/app/queue/correspondence/modals/editModal.jsx
+++ b/client/app/queue/correspondence/modals/editModal.jsx
@@ -137,7 +137,7 @@ class EditModal extends React.Component {
 
   errorOnVADORDate = (value) => {
     if (value.length === 10) {
-      const error = validateDateNotInFuture(value) ? null : 'Receipt Date cannot be in the future';
+      const error = validateDateNotInFuture(value) ? null : 'Receipt date cannot be in the future';
 
       return error;
     }

From 635c60c2822d2139b5300b59f86d88f7e093396f Mon Sep 17 00:00:00 2001
From: Kevma50287 <104021955+Kevma50287@users.noreply.github.com>
Date: Thu, 11 Jan 2024 15:35:56 -0500
Subject: [PATCH 045/237] Update selectable_in_queue method to return true if
 feature flag is on (#20495)

---
 app/models/organizations/mail_team_supervisor.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/organizations/mail_team_supervisor.rb b/app/models/organizations/mail_team_supervisor.rb
index a53ed8bf3a2..3f3b7ada7f9 100644
--- a/app/models/organizations/mail_team_supervisor.rb
+++ b/app/models/organizations/mail_team_supervisor.rb
@@ -8,6 +8,6 @@ def self.singleton
 
   # :reek:UtilityFunction
   def selectable_in_queue?
-    !Rails.env.production?
+    FeatureToggle.enabled?(:correspondence_queue, user: RequestStore.store[:current_user])
   end
 end

From 5c876e4a0f32973f80a62637cbe6279e2c5b0644 Mon Sep 17 00:00:00 2001
From: Alex Smith <alex.smith.99@thunderyard.com>
Date: Thu, 11 Jan 2024 15:07:45 -0700
Subject: [PATCH 046/237] Add Task Creation to Correspondence Factory (#20492)

Co-authored-by: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
---
 db/seeds/correspondence.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/db/seeds/correspondence.rb b/db/seeds/correspondence.rb
index 74163327481..8574a720912 100644
--- a/db/seeds/correspondence.rb
+++ b/db/seeds/correspondence.rb
@@ -34,7 +34,8 @@ def create_veteran(options = {})
       }
       veteran = create(:veteran, params.merge(options))
       5.times do
-        create(:appeal, veteran_file_number: veteran.file_number)
+        appeal = create(:appeal, veteran_file_number: veteran.file_number)
+        InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
       end
       veteran
     end

From 3fc169ffb319c39254ae1d75e83c678c9169a868 Mon Sep 17 00:00:00 2001
From: Rnmarshall93 <110805785+Rnmarshall93@users.noreply.github.com>
Date: Fri, 12 Jan 2024 07:35:21 -0800
Subject: [PATCH 047/237] Correspondence - Add validation to foreign keys
 (#20474)

* presence validation added.

* fixed failing tests due to validations

* changed data to be less confusing

* fixed failing test

* added foreign key validation at the db level

* Fixed failing tests.

* Added additional let! statements to stub data

* fixed linting

* Fixed failing specs (all of them) by stubbing more correspondence data

* Updated correspondence factors to supply all required foreign key objects.

* modified correspondence helpers to use only factory.

* Fixed failing specs

* removed redundant info

* updated spec to fix failing validations

* Changed seed order to support Correspondence validations

* fixed linting issues

* Added correspondence_type factory

* Modified correspondence factory so that it uses user, veteran, correspondence_type factories.

* Added package_document_type factory, changed correspondence factory to use it.

* Added association for assigned_by

* Updated to use factories for user, removed useless assignments

* Removed redundant code

* fixed failing spec.

* fixed failing spec

* added updated_to_id to all correspondences

---------

Co-authored-by: Jim Foley <james.foley4@va.gov>
---
 app/models/correspondence.rb                  |  6 +++++
 ...5350_add_foreign_keys_to_correspondence.rb |  9 +++++++
 ...23_validate_correspondence_foreign_keys.rb |  8 +++++++
 db/seeds.rb                                   |  2 +-
 db/seeds/correspondence.rb                    |  4 ++++
 db/seeds/multi_correspondences.rb             |  9 ++++---
 lib/tasks/correspondence.rake                 |  8 +++++++
 .../correspondence_controller_spec.rb         |  6 +++--
 spec/factories/correspondence.rb              | 11 +++++----
 spec/factories/correspondence_type.rb         |  7 ++++++
 spec/factories/package_document_type.rb       |  6 +++++
 .../edit_cmp_information_spec.rb              | 12 +++++++++-
 .../queue/correspondence/intake_spec.rb       | 17 ++++++-------
 spec/models/correspondence_intake_spec.rb     | 24 +++++++++++++++++--
 spec/models/correspondence_spec.rb            | 21 ++++------------
 .../correspondence_controller_spec.rb         | 11 ++++++---
 spec/support/correspondence_helpers.rb        |  6 -----
 17 files changed, 120 insertions(+), 47 deletions(-)
 create mode 100644 db/migrate/20240110185350_add_foreign_keys_to_correspondence.rb
 create mode 100644 db/migrate/20240110185623_validate_correspondence_foreign_keys.rb
 create mode 100644 spec/factories/correspondence_type.rb
 create mode 100644 spec/factories/package_document_type.rb

diff --git a/app/models/correspondence.rb b/app/models/correspondence.rb
index 1be78cdd82d..8193a768b14 100644
--- a/app/models/correspondence.rb
+++ b/app/models/correspondence.rb
@@ -3,6 +3,11 @@
 # Correspondence is a top level object similar to Appeals.
 # Serves as a collection of all data related to Correspondence workflow
 class Correspondence < CaseflowRecord
+  validates :correspondence_type_id, presence: true
+  validates :package_document_type_id, presence: true
+  validates :updated_by_id, presence: true, on: :update
+  validates :veteran_id, presence: true
+
   has_paper_trail
   include PrintsTaskTree
   include AppealableCorrespondence
@@ -16,6 +21,7 @@ class Correspondence < CaseflowRecord
   belongs_to :correspondence_type
   belongs_to :package_document_type
   belongs_to :veteran
+  belongs_to :assigned_by, class_name: "User", foreign_key: :assigned_by_id, optional: false
 
   after_create :initialize_correspondence_tasks
 
diff --git a/db/migrate/20240110185350_add_foreign_keys_to_correspondence.rb b/db/migrate/20240110185350_add_foreign_keys_to_correspondence.rb
new file mode 100644
index 00000000000..10e1358f7af
--- /dev/null
+++ b/db/migrate/20240110185350_add_foreign_keys_to_correspondence.rb
@@ -0,0 +1,9 @@
+class AddForeignKeysToCorrespondence < Caseflow::Migration
+  def change
+    add_foreign_key :correspondences, :correspondence_types, validate: false
+    add_foreign_key :correspondences, :package_document_types, validate: false
+    add_foreign_key :correspondences, :users, column: :assigned_by_id, validate: false
+    add_foreign_key :correspondences, :users, column: :updated_by_id, validate: false
+    add_foreign_key :correspondences, :veterans, validate: false
+  end
+end
diff --git a/db/migrate/20240110185623_validate_correspondence_foreign_keys.rb b/db/migrate/20240110185623_validate_correspondence_foreign_keys.rb
new file mode 100644
index 00000000000..43bce6a2709
--- /dev/null
+++ b/db/migrate/20240110185623_validate_correspondence_foreign_keys.rb
@@ -0,0 +1,8 @@
+class ValidateCorrespondenceForeignKeys < Caseflow::Migration
+  def change
+    validate_foreign_key :correspondences, :correspondence_types
+    validate_foreign_key :correspondences, :package_document_types
+    validate_foreign_key :correspondences, :users
+    validate_foreign_key :correspondences, :veterans
+  end
+end
diff --git a/db/seeds.rb b/db/seeds.rb
index a6d92b34bc1..fb25b7a3e4d 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -63,9 +63,9 @@ def seed
     call_and_log_seed_step Seeds::VbmsExtClaim
     call_and_log_seed_step Seeds::RemandedAmaAppeals
     call_and_log_seed_step Seeds::RemandedLegacyAppeals
-    call_and_log_seed_step Seeds::Correspondence
     call_and_log_seed_step Seeds::CorrespondenceTypes
     call_and_log_seed_step Seeds::PackageDocumentTypes
+    call_and_log_seed_step Seeds::Correspondence
     call_and_log_seed_step Seeds::MultiCorrespondences
     call_and_log_seed_step Seeds::VbmsDocumentTypes
     # Always run this as last one
diff --git a/db/seeds/correspondence.rb b/db/seeds/correspondence.rb
index 8574a720912..f2499959d8f 100644
--- a/db/seeds/correspondence.rb
+++ b/db/seeds/correspondence.rb
@@ -56,6 +56,7 @@ def create_correspondences
           va_date_of_receipt: Time.zone.yesterday,
           notes: "This is a note from CMP.",
           assigned_by_id: 81,
+          updated_by_id: 81,
           veteran_id: veteran.id,
         )
         create_multiple_docs(corres, veteran)
@@ -75,6 +76,7 @@ def create_correspondences
           va_date_of_receipt: Time.zone.yesterday,
           notes: "This is a note from CMP.",
           assigned_by_id: 81,
+          updated_by_id: 81,
           veteran_id: veteran.id,
         )
         CorrespondenceDocument.find_or_create_by(
@@ -101,6 +103,7 @@ def create_correspondences
           va_date_of_receipt: Time.zone.yesterday,
           notes: "This is a note from CMP.",
           assigned_by_id: 81,
+          updated_by_id: 81,
           veteran_id: veteran.id,
         )
         CorrespondenceDocument.find_or_create_by(
@@ -127,6 +130,7 @@ def create_correspondences
           va_date_of_receipt: Time.zone.yesterday,
           notes: "This is a note from CMP.",
           assigned_by_id: 81,
+          updated_by_id: 81,
           veteran_id: veteran.id,
         )
         CorrespondenceDocument.find_or_create_by(
diff --git a/db/seeds/multi_correspondences.rb b/db/seeds/multi_correspondences.rb
index 2114b9200fb..e29e25e0cda 100644
--- a/db/seeds/multi_correspondences.rb
+++ b/db/seeds/multi_correspondences.rb
@@ -62,7 +62,8 @@ def create_multi_correspondences
           va_date_of_receipt: Time.zone.yesterday,
           notes: "Notes from CMP - Multi Correspondence Seed",
           assigned_by_id: 81,
-          veteran_id: veteran.id
+          updated_by_id: 81,
+          veteran_id: veteran.id,
         )
         CorrespondenceDocument.find_or_create_by(
           document_file_number: veteran.file_number,
@@ -103,7 +104,8 @@ def create_multi_correspondences
           va_date_of_receipt: Time.zone.yesterday,
           notes: "Notes from CMP - Multi Correspondence Seed",
           assigned_by_id: 81,
-          veteran_id: veteran.id
+          updated_by_id: 81,
+          veteran_id: veteran.id,
         )
         CorrespondenceDocument.find_or_create_by(
           document_file_number: veteran.file_number,
@@ -144,7 +146,8 @@ def create_multi_correspondences
           va_date_of_receipt: Time.zone.yesterday,
           notes: "Notes from CMP - Multi Correspondence Seed",
           assigned_by_id: 81,
-          veteran_id: veteran.id
+          updated_by_id: 81,
+          veteran_id: veteran.id,
         )
         CorrespondenceDocument.find_or_create_by(
           document_file_number: veteran.file_number,
diff --git a/lib/tasks/correspondence.rake b/lib/tasks/correspondence.rake
index 2f8be9d0374..dbabda1b472 100644
--- a/lib/tasks/correspondence.rake
+++ b/lib/tasks/correspondence.rake
@@ -126,6 +126,7 @@ namespace :correspondence do
         va_date_of_receipt: Time.zone.yesterday,
         notes: "Notes from CMP - Multi Correspondence Seed",
         assigned_by_id: 81,
+        updated_by_id: 81,
         veteran_id: veteran.id
       )
       CorrespondenceDocument.find_or_create_by(
@@ -241,6 +242,7 @@ def create_correspondences_with_documents
       va_date_of_receipt: Time.zone.yesterday,
       notes: "This is a note from CMP.",
       assigned_by_id: 81,
+      updated_by_id: 81,
       veteran_id: veteran.id
     )
     create_multiple_docs(corres, veteran)
@@ -260,6 +262,7 @@ def create_correspondences_with_documents
       va_date_of_receipt: Time.zone.yesterday,
       notes: "This is a note from CMP.",
       assigned_by_id: 81,
+      updated_by_id: 81,
       veteran_id: veteran.id
     )
     CorrespondenceDocument.find_or_create_by(
@@ -286,6 +289,7 @@ def create_correspondences_with_documents
       va_date_of_receipt: Time.zone.yesterday,
       notes: "This is a note from CMP.",
       assigned_by_id: 81,
+      updated_by_id: 81,
       veteran_id: veteran.id
     )
     CorrespondenceDocument.find_or_create_by(
@@ -312,6 +316,7 @@ def create_correspondences_with_documents
       va_date_of_receipt: Time.zone.yesterday,
       notes: "This is a note from CMP.",
       assigned_by_id: 81,
+      updated_by_id: 81,
       veteran_id: veteran.id
     )
     CorrespondenceDocument.find_or_create_by(
@@ -484,6 +489,7 @@ def create_multi_correspondences
       va_date_of_receipt: Time.zone.yesterday,
       notes: "Notes from CMP - Multi Correspondence Seed",
       assigned_by_id: 81,
+      updated_by_id: 81,
       veteran_id: veteran.id
     )
     CorrespondenceDocument.find_or_create_by(
@@ -528,6 +534,7 @@ def create_multi_correspondences
       va_date_of_receipt: Time.zone.yesterday,
       notes: "Notes from CMP - Multi Correspondence Seed",
       assigned_by_id: 81,
+      updated_by_id: 81,
       veteran_id: veteran.id
     )
     CorrespondenceDocument.find_or_create_by(
@@ -572,6 +579,7 @@ def create_multi_correspondences
       va_date_of_receipt: Time.zone.yesterday,
       notes: "Notes from CMP - Multi Correspondence Seed",
       assigned_by_id: 81,
+      updated_by_id: 81,
       veteran_id: veteran.id
     )
     CorrespondenceDocument.find_or_create_by(
diff --git a/spec/controllers/correspondence_controller_spec.rb b/spec/controllers/correspondence_controller_spec.rb
index 77cad7c90de..5c072c27fec 100644
--- a/spec/controllers/correspondence_controller_spec.rb
+++ b/spec/controllers/correspondence_controller_spec.rb
@@ -2,7 +2,9 @@
 
 RSpec.describe CorrespondenceController, :all_dbs, type: :controller do
   let(:veteran) { create(:veteran) }
+  let(:correspondence_type) { create(:correspondence_type) }
   let(:correspondence) { create(:correspondence, veteran: veteran) }
+
   let(:related_correspondence_uuids) do
     (1..3).map { create(:correspondence) }.pluck(:uuid)
   end
@@ -17,7 +19,7 @@
     end
   end
   let(:veteran) { create(:veteran) }
-  let(:valid_params) { { notes: "Updated notes", correspondence_type_id: 12 } }
+  let(:valid_params) { { notes: "Updated notes", correspondence_type_id: correspondence_type.id } }
   let(:new_file_number) { "50000005" }
   let(:current_user) { create(:user) }
   let!(:parent_task) { create(:correspondence_intake_task, appeal: correspondence, assigned_to: current_user) }
@@ -149,7 +151,7 @@
       expect(response).to have_http_status(:ok)
       expect(veteran.reload.file_number).to eq(new_file_number)
       expect(correspondence.reload.notes).to eq("Updated notes")
-      expect(correspondence.reload.correspondence_type_id).to eq(12)
+      expect(correspondence.reload.correspondence_type_id).to eq(correspondence_type.id)
       expect(correspondence.reload.updated_by_id).to eq(current_user.id)
     end
   end
diff --git a/spec/factories/correspondence.rb b/spec/factories/correspondence.rb
index 71c49be7474..ab1f4cbc98c 100644
--- a/spec/factories/correspondence.rb
+++ b/spec/factories/correspondence.rb
@@ -5,14 +5,15 @@
     uuid { SecureRandom.uuid }
     portal_entry_date { Time.zone.now }
     source_type { "Mail" }
-    package_document_type_id { 15 }
-    correspondence_type_id { 9 }
     cmp_queue_id { 1 }
     cmp_packet_number { rand(1_000_000_000..9_999_999_999) }
     va_date_of_receipt { Time.zone.yesterday }
     notes { "This is a note from CMP." }
-    assigned_by_id { 81 }
-    veteran_id { 1 }
+    assigned_by factory: :user
+
+    correspondence_type
+    veteran
+    package_document_type
 
     trait :with_single_doc do
       after(:create) do |correspondence|
@@ -22,7 +23,7 @@
 
     trait :with_correspondence_intake_task do
       transient do
-        assigned_to { nil }
+        assigned_to { User.first }
       end
 
       after(:create) do |correspondence, evaluator|
diff --git a/spec/factories/correspondence_type.rb b/spec/factories/correspondence_type.rb
new file mode 100644
index 00000000000..a2a73408606
--- /dev/null
+++ b/spec/factories/correspondence_type.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :correspondence_type do
+    name { "a correspondence type." }
+  end
+end
diff --git a/spec/factories/package_document_type.rb b/spec/factories/package_document_type.rb
new file mode 100644
index 00000000000..7fd623155d1
--- /dev/null
+++ b/spec/factories/package_document_type.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :package_document_type do
+  end
+end
diff --git a/spec/feature/queue/correspondence/edit_cmp_information_spec.rb b/spec/feature/queue/correspondence/edit_cmp_information_spec.rb
index 0314f686618..8839d85b3a2 100644
--- a/spec/feature/queue/correspondence/edit_cmp_information_spec.rb
+++ b/spec/feature/queue/correspondence/edit_cmp_information_spec.rb
@@ -4,11 +4,21 @@
 RSpec.feature("The Correspondence Review Package page") do
   let(:veteran) { create(:veteran) }
   let(:package_document_type) { PackageDocumentType.create(id: 15, active: true, created_at: Time.zone.now, name: 10_182, updated_at: Time.zone.now) }
-  let(:correspondence) { create(:correspondence, veteran_id: veteran.id, package_document_type_id: package_document_type.id) }
   let(:correspondence_documents) { create(:correspondence_document, correspondence: correspondence, document_file_number: veteran.file_number) }
   let(:mail_team_user) { create(:user) }
   let(:mail_team_org) { MailTeam.singleton }
   let(:current_user) { User.create!(station_id: 101, css_id: "MAIL_TEAM_SUPERVISOR_ADMIN_USER", full_name: "Jon MailTeam Snow Admin") }
+  let!(:correspondence_type) { CorrespondenceType.create!(name: "a correspondence type.") }
+  let!(:package_document_type) { PackageDocumentType.create! }
+  let(:correspondence) do
+    create(
+      :correspondence,
+      veteran_id: veteran.id,
+      uuid: SecureRandom.uuid,
+      assigned_by_id: mail_team_user.id,
+      updated_by_id: mail_team_user.id,
+    )
+  end
 
   context "Review package feature toggle" do
     before :each do
diff --git a/spec/feature/queue/correspondence/intake_spec.rb b/spec/feature/queue/correspondence/intake_spec.rb
index bddd7a86721..b0ea9b032ba 100644
--- a/spec/feature/queue/correspondence/intake_spec.rb
+++ b/spec/feature/queue/correspondence/intake_spec.rb
@@ -32,10 +32,12 @@
 
   context "intake form feature toggle" do
     before :each do
-      veteran = create(:veteran, last_name: "Smith", file_number: "12345678")
+      CorrespondenceType.create!(
+        name: "a correspondence type"
+      )
+      PackageDocumentType.create!
       create(
         :correspondence,
-        veteran_id: veteran.id,
         uuid: SecureRandom.uuid,
         va_date_of_receipt: Time.zone.local(2023, 1, 1)
       )
@@ -121,12 +123,13 @@
   context "The mail team user is able to add unrelated tasks" do
     before :each do
       FeatureToggle.enable!(:correspondence_queue)
-      veteran = create(:veteran, last_name: "Smith", file_number: "12345678")
+      CorrespondenceType.create!(
+        name: "a correspondence type"
+      )
       create(
         :correspondence,
-        veteran_id: veteran.id,
         uuid: SecureRandom.uuid,
-        va_date_of_receipt: Time.zone.local(2023, 1, 1)
+        va_date_of_receipt: Time.zone.local(2023, 1, 1),
       )
 
       @correspondence_uuid = Correspondence.first.uuid
@@ -233,12 +236,10 @@
 
     before :each do
       FeatureToggle.enable!(:correspondence_queue)
-      veteran = create(:veteran, last_name: "Smith", file_number: "12345678")
       create(
         :correspondence,
-        veteran_id: veteran.id,
         uuid: SecureRandom.uuid,
-        va_date_of_receipt: Time.zone.local(2023, 1, 1)
+        va_date_of_receipt: Time.zone.local(2023, 1, 1),
       )
       @correspondence_uuid = Correspondence.first.uuid
       visit "/queue/correspondence/#{@correspondence_uuid}/intake"
diff --git a/spec/models/correspondence_intake_spec.rb b/spec/models/correspondence_intake_spec.rb
index 1ff3ed7cac6..8ea7f73120c 100644
--- a/spec/models/correspondence_intake_spec.rb
+++ b/spec/models/correspondence_intake_spec.rb
@@ -7,9 +7,23 @@
   end
 
   describe "Record entry" do
+    before do
+      CorrespondenceType.create!(
+        name: "a correspondence type"
+      )
+      PackageDocumentType.create!
+
+      FactoryBot.create(:veteran)
+    end
     it "can be created" do
-      correspondence = Correspondence.create!
       user = User.create!(css_id: "User", station_id: "1")
+      correspondence = Correspondence.create!(
+        updated_by_id: User.first.id,
+        correspondence_type: CorrespondenceType.first,
+        assigned_by_id: User.first.id,
+        veteran_id: Veteran.first.id,
+        package_document_type: PackageDocumentType.first
+      )
       subject = CorrespondenceIntake.create!(
         correspondence_id: correspondence.id,
         user_id: user.id,
@@ -21,8 +35,14 @@
     end
 
     it "validates :correspondence_id and :user_id" do
-      correspondence = Correspondence.create!
       user = User.create!(css_id: "User", station_id: "1")
+      correspondence = Correspondence.create!(
+        updated_by_id: User.first.id,
+        correspondence_type: CorrespondenceType.first,
+        assigned_by_id: User.first.id,
+        veteran_id: Veteran.first.id,
+        package_document_type: PackageDocumentType.first
+      )
 
       expect { CorrespondenceIntake.create! }.to raise_error(ActiveRecord::RecordInvalid)
       expect { CorrespondenceIntake.create!(correspondence_id: correspondence.id) }
diff --git a/spec/models/correspondence_spec.rb b/spec/models/correspondence_spec.rb
index 6b039b57307..028e820d4f4 100644
--- a/spec/models/correspondence_spec.rb
+++ b/spec/models/correspondence_spec.rb
@@ -6,13 +6,13 @@
   end
 
   it "exists" do
-    c = Correspondence.create!
+    c = Correspondence.new
     expect(c).to be_a(Correspondence)
   end
 
   it "can be bi-directionally related to other correspondences" do
-    c_1 = Correspondence.create!
-    c_2 = Correspondence.create!
+    c_1 = create(:correspondence)
+    c_2 = create(:correspondence)
 
     expect(c_1.related_correspondences).to eq([])
     expect(c_2.related_correspondences).to eq([])
@@ -30,19 +30,8 @@
 
   describe "Create Correspondence Root Task and Review Package task as child" do
     it "Create Root Task and Review Package task for correspondence" do
-      correspondence = Correspondence.create!(
-        uuid: SecureRandom.uuid,
-        portal_entry_date: Time.zone.now,
-        source_type: "Mail",
-        package_document_type_id: 15,
-        correspondence_type_id: 8,
-        cmp_queue_id: 1,
-        cmp_packet_number: 9_999_999_999,
-        va_date_of_receipt: Time.zone.yesterday,
-        notes: "This is a note from CMP.",
-        assigned_by_id: 81,
-        veteran_id: 1
-      )
+      correspondence = create(:correspondence)
+
 
       ct = CorrespondenceTask.find_by(appeal_id: correspondence.id, type: "CorrespondenceTask")
       expect(ct.appeal_id).to eq(correspondence.id)
diff --git a/spec/requests/correspondence_controller_spec.rb b/spec/requests/correspondence_controller_spec.rb
index e45bb133490..cf020450989 100644
--- a/spec/requests/correspondence_controller_spec.rb
+++ b/spec/requests/correspondence_controller_spec.rb
@@ -1,10 +1,13 @@
 # frozen_string_literal: true
 
 RSpec.describe "Correspondence Requests", :all_dbs, type: :request do
-  let(:veteran) { create(:veteran, last_name: "Smith", file_number: "12345678") }
-  let(:correspondence) { create(:correspondence, veteran_id: veteran.id, uuid: SecureRandom.uuid) }
   let(:current_user) { create(:intake_user) }
   let!(:parent_task) { create(:correspondence_intake_task, appeal: correspondence, assigned_to: current_user) }
+  let(:correspondence) do
+    create(
+      :correspondence
+    )
+  end
 
   let(:mock_doc_uploader) { instance_double(CorrespondenceDocumentsEfolderUploader) }
 
@@ -41,7 +44,9 @@
 
     it "saves the user's current step in the intake form" do
       current_step = 1
-      correspondence = create(:correspondence, veteran_id: veteran.id, uuid: SecureRandom.uuid)
+      correspondence = create(
+        :correspondence
+      )
 
       post queue_correspondence_intake_current_step_path(correspondence_uuid: correspondence.uuid), params: {
         correspondence_uuid: correspondence.uuid,
diff --git a/spec/support/correspondence_helpers.rb b/spec/support/correspondence_helpers.rb
index 75253e8606b..2e1254fc296 100644
--- a/spec/support/correspondence_helpers.rb
+++ b/spec/support/correspondence_helpers.rb
@@ -94,12 +94,9 @@ def visit_intake_form_step_2_with_appeals_without_initial_tasks
 
   def visit_intake_form_step_3_with_tasks_unrelated
     setup_access
-    veteran = create(:veteran, last_name: "Smith", file_number: "12345678")
     create(
       :correspondence,
       :with_correspondence_intake_task,
-      assigned_to: current_user,
-      veteran_id: veteran.id,
       uuid: SecureRandom.uuid,
       va_date_of_receipt: Time.zone.local(2023, 1, 1)
     )
@@ -144,12 +141,9 @@ def active_evidence_submissions_tasks
 
   def setup_and_visit_intake
     FeatureToggle.enable!(:correspondence_queue)
-    veteran = create(:veteran, last_name: "Smith", file_number: "12345678")
     create(
       :correspondence,
       :with_correspondence_intake_task,
-      assigned_to: current_user,
-      veteran_id: veteran.id,
       uuid: SecureRandom.uuid,
       va_date_of_receipt: Time.zone.local(2023, 1, 1)
     )

From d4f272e9e6b2b2975712d5e15a494d22db281324 Mon Sep 17 00:00:00 2001
From: Kevma50287 <104021955+Kevma50287@users.noreply.github.com>
Date: Fri, 12 Jan 2024 10:41:06 -0500
Subject: [PATCH 048/237] Fix warning in CaseListTable (#20499)

Co-authored-by: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
---
 client/app/components/Pagination/Pagination.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/app/components/Pagination/Pagination.jsx b/client/app/components/Pagination/Pagination.jsx
index e8963893204..503cc4f63f5 100644
--- a/client/app/components/Pagination/Pagination.jsx
+++ b/client/app/components/Pagination/Pagination.jsx
@@ -142,7 +142,7 @@ Pagination.propTypes = {
   totalPages: PropTypes.number,
   totalCases: PropTypes.number,
   updatePage: PropTypes.func.isRequired,
-  table: PropTypes.instanceOf(Table)
+  table: PropTypes.oneOfType([PropTypes.instanceOf(Table), PropTypes.object])
 };
 
 export default Pagination;

From 038415bd012dd449f7d0c5fdfa9281c2fadadc4b Mon Sep 17 00:00:00 2001
From: HunJerBAH <Jeremy.Hunton@va.gov>
Date: Fri, 12 Jan 2024 10:57:08 -0500
Subject: [PATCH 049/237] resolved linting errors

---
 .../feature/queue/correspondence/edit_cmp_information_spec.rb | 2 +-
 spec/feature/queue/correspondence/intake_spec.rb              | 4 ++--
 spec/models/correspondence_spec.rb                            | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/spec/feature/queue/correspondence/edit_cmp_information_spec.rb b/spec/feature/queue/correspondence/edit_cmp_information_spec.rb
index 8839d85b3a2..a5c27f28f30 100644
--- a/spec/feature/queue/correspondence/edit_cmp_information_spec.rb
+++ b/spec/feature/queue/correspondence/edit_cmp_information_spec.rb
@@ -16,7 +16,7 @@
       veteran_id: veteran.id,
       uuid: SecureRandom.uuid,
       assigned_by_id: mail_team_user.id,
-      updated_by_id: mail_team_user.id,
+      updated_by_id: mail_team_user.id
     )
   end
 
diff --git a/spec/feature/queue/correspondence/intake_spec.rb b/spec/feature/queue/correspondence/intake_spec.rb
index b0ea9b032ba..0fb5e021d3d 100644
--- a/spec/feature/queue/correspondence/intake_spec.rb
+++ b/spec/feature/queue/correspondence/intake_spec.rb
@@ -129,7 +129,7 @@
       create(
         :correspondence,
         uuid: SecureRandom.uuid,
-        va_date_of_receipt: Time.zone.local(2023, 1, 1),
+        va_date_of_receipt: Time.zone.local(2023, 1, 1)
       )
 
       @correspondence_uuid = Correspondence.first.uuid
@@ -239,7 +239,7 @@
       create(
         :correspondence,
         uuid: SecureRandom.uuid,
-        va_date_of_receipt: Time.zone.local(2023, 1, 1),
+        va_date_of_receipt: Time.zone.local(2023, 1, 1)
       )
       @correspondence_uuid = Correspondence.first.uuid
       visit "/queue/correspondence/#{@correspondence_uuid}/intake"
diff --git a/spec/models/correspondence_spec.rb b/spec/models/correspondence_spec.rb
index 028e820d4f4..d1be1c309cd 100644
--- a/spec/models/correspondence_spec.rb
+++ b/spec/models/correspondence_spec.rb
@@ -32,7 +32,6 @@
     it "Create Root Task and Review Package task for correspondence" do
       correspondence = create(:correspondence)
 
-
       ct = CorrespondenceTask.find_by(appeal_id: correspondence.id, type: "CorrespondenceTask")
       expect(ct.appeal_id).to eq(correspondence.id)
       expect(ct.status).to eq("on_hold")

From 6fe76a1cbea38823a1d2318301f80e2d21cde824 Mon Sep 17 00:00:00 2001
From: Kamala Madamanchi <110078646+kamala-07@users.noreply.github.com>
Date: Wed, 17 Jan 2024 10:50:43 -0600
Subject: [PATCH 050/237] APPEALS-29410 Response letter section (#20524)

---
 .../AddCorrespondence/AddCorrespondenceView.jsx       | 11 +++++++++++
 .../correspondence/add_related_correspondence_spec.rb |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx
index 0dc18c96266..32fb7ab6424 100644
--- a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx
+++ b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx
@@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import Checkbox from '../../../../../components/Checkbox';
+import Button from '../../../../../components/Button';
 import RadioField from '../../../../../components/RadioField';
 import ApiUtil from '../../../../../util/ApiUtil';
 import CorrespondencePaginationWrapper from '../../../CorrespondencePaginationWrapper';
@@ -196,6 +197,16 @@ class AddCorrespondenceView extends React.Component {
       <div className="gray-border" style={{ marginBottom: '2rem', padding: '3rem 4rem' }}>
         <h1 style={{ marginBottom: '20px' }}>Add Related Correspondence</h1>
         <p style={{ marginTop: '0px' }}>Add any related correspondence to the mail package that is in progress.</p>
+        <h2 style={{ margin: '30px auto 20px auto' }}>Response Letter</h2>
+        <div style={{ width: '80%', marginBottom: '30px' }}>
+          <Button
+            type="button"
+            name="addLetter"
+            className={['cf-left-side']}>
+          + Add letter
+          </Button>
+        </div>
+        <hr style={{ borderTop: '1px solid #d6d7d9' }} />
         <h2 style={{ margin: '30px auto 20px auto' }}>Associate with prior Mail</h2>
         <p style={{ marginTop: '0px', marginBottom: '-7px' }}>Is this correspondence related to prior mail?</p>
         <RadioField style={{}}
diff --git a/spec/feature/queue/correspondence/add_related_correspondence_spec.rb b/spec/feature/queue/correspondence/add_related_correspondence_spec.rb
index d35f075c537..788441eb734 100644
--- a/spec/feature/queue/correspondence/add_related_correspondence_spec.rb
+++ b/spec/feature/queue/correspondence/add_related_correspondence_spec.rb
@@ -17,6 +17,8 @@
 
       expect(page).to have_content("Add Related Correspondence")
       expect(page).to have_content("Add any related correspondence to the mail package that is in progress.")
+      expect(page).to have_content("Response Letter")
+      expect(page).to have_button("+ Add letter")
       expect(page).to have_content("Is this correspondence related to prior mail?")
       expect(page).to have_content("Associate with prior Mail")
       expect(associate_with_prior_mail_radio_options[:yes]).to have_text("Yes")

From 99aebc8a96ba742c5ccf9aa2ea928081ba8003bf Mon Sep 17 00:00:00 2001
From: Will Medders <93014155+wmedders21@users.noreply.github.com>
Date: Fri, 19 Jan 2024 12:11:34 -0600
Subject: [PATCH 051/237] Wmedders21/appeals 37814 (#20551)

* Refactor to avoid passing a zero index value

* Add evidence_submission_task to AppealSerializer

* Update correspondence.rake

---------

Co-authored-by: Jim Foley <james.foley4@va.gov>
---
 app/models/serializers/work_queue/appeal_serializer.rb | 4 ++++
 lib/tasks/correspondence.rake                          | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/models/serializers/work_queue/appeal_serializer.rb b/app/models/serializers/work_queue/appeal_serializer.rb
index 62409533333..d8b926efc84 100644
--- a/app/models/serializers/work_queue/appeal_serializer.rb
+++ b/app/models/serializers/work_queue/appeal_serializer.rb
@@ -320,4 +320,8 @@ class WorkQueue::AppealSerializer
       Constants.CAVC_DECISION_TYPES.settlement
     ]).count
   end
+
+  attribute :evidence_submission_task do |object|
+    object.tasks.find_by(type: "EvidenceSubmissionWindowTask", status: "assigned")
+  end
 end
diff --git a/lib/tasks/correspondence.rake b/lib/tasks/correspondence.rake
index dbabda1b472..4ceb135959a 100644
--- a/lib/tasks/correspondence.rake
+++ b/lib/tasks/correspondence.rake
@@ -114,7 +114,7 @@ namespace :correspondence do
   task :create_correspondence, [:veteran_file_number] => :environment do |_, args|
     veteran = Veteran.find_by(file_number: args[:veteran_file_number].to_i)
 
-    20.times do |package_doc_id|
+    (1..20).each do |package_doc_id|
       corres = ::Correspondence.create!(
         uuid: SecureRandom.uuid,
         portal_entry_date: Time.zone.now,

From 8795a611f883c46e66fff8ba5da90518a55227e7 Mon Sep 17 00:00:00 2001
From: vinner57 <128258952+vinner57@users.noreply.github.com>
Date: Fri, 19 Jan 2024 16:23:50 -0500
Subject: [PATCH 052/237] correspondence letter selection file (#20541)

* correspondence letter selection file

* updating the response widnow options
---
 .../CORRESPONDENCE_LETTER_SELECTIONS.json     | 443 ++++++++++++++++++
 1 file changed, 443 insertions(+)
 create mode 100644 client/constants/CORRESPONDENCE_LETTER_SELECTIONS.json

diff --git a/client/constants/CORRESPONDENCE_LETTER_SELECTIONS.json b/client/constants/CORRESPONDENCE_LETTER_SELECTIONS.json
new file mode 100644
index 00000000000..616ed8c2061
--- /dev/null
+++ b/client/constants/CORRESPONDENCE_LETTER_SELECTIONS.json
@@ -0,0 +1,443 @@
+[
+  {
+    "letter_type": "Pre-docketing",
+    "response_window_option_default": "No response window",
+    "letter_titles": [
+      {
+        "letter_title": "Intake 10182 Recv Needs AOJ Development",
+        "letter_subcategories": [
+          {
+            "subcategory": "Issues(s) is VHA",
+            "reasons": []
+          },
+          {
+            "subcategory": "Issues(s) is Education Service",
+            "reasons": []
+          },
+          {
+            "subcategory": "Issue(s) is Other",
+            "reasons": []
+          },
+          {
+            "subcategory": "Issue(s) is VHA and Education Service",
+            "reasons": []
+          },
+          {
+            "subcategory": "Issue(s) is VHA and Other",
+            "reasons": []
+          },
+          {
+            "subcategory": "Issue(s) is Education Service and Other",
+            "reasons": []
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "letter_type": "Ineligible",
+    "response_window_option_default": "No response window",
+    "letter_titles": [
+      {
+        "letter_title": "Intake AMA HLR or Supp Claim Pending Letter",
+        "letter_subcategories": [
+          {
+            "subcategory": "10182 received when a HLR is pending for the same issue(s)",
+            "reasons": []
+          },
+          {
+            "subcategory": "10182 received when a Supplemental claim is pending for the same issue(s)",
+            "reasons": []
+          }
+        ]
+      },
+      {
+        "letter_title": "Intake AMA NOD - Ineligible Appeal Proposed Reduction",
+        "letter_subcategories": [
+          {
+            "subcategory": "10182 received - proposed reduction",
+            "reasons": []
+          },
+          {
+            "subcategory": "10182 received - proposed severence of service connection",
+            "reasons": []
+          }
+        ]
+      },
+      {
+        "letter_title": "Intake AMA or RAMP NOD Inelligible Claim or Appeal",
+        "letter_subcategories": [
+          {
+            "subcategory": "10182 received attempting to elect a RAMP appeal",
+            "reasons": []
+          }
+        ]
+      },
+      {
+        "letter_title": "Intake Caregiver or 10182 on Legacy",
+        "letter_subcategories": [
+          {
+            "subcategory": "10182 received attempting to appeal a Caregiver legacy decision",
+            "reasons": []
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "letter_type": "General",
+    "letter_titles": [
+      {
+        "letter_title": "Intake AMA Corrective App Receipt",
+        "response_window_option_default": "65 days",
+        "letter_subcategories": []
+      },
+      {
+        "letter_title": "Intake AMA Docket Switch New Form Needed",
+        "response_window_option_default": "65 days",
+        "letter_subcategories": []
+      },
+      {
+        "letter_title": "Intake AMA How to withdraw a Board Appeal",
+        "response_window_option_default": "65 days",
+        "letter_subcategories": []
+      },
+      {
+        "letter_title": "Intake AMA Next Friend Letter",
+        "response_window_option_default": "65 days",
+        "letter_subcategories": []
+      },
+      {
+        "letter_title": "Intake AMA NOD - 10182 After Vet Death Docketing Letter Take Back",
+        "response_window_option_default": "No response window",
+        "letter_subcategories": []
+      },
+      {
+        "letter_title": "Intake AMA NOD - 10182 Cannot Docket after Vet Death",
+        "response_window_option_default": "No response window",
+        "letter_subcategories": []
+      },
+      {
+        "letter_title": "Intake AMA Rejection Sent in Error",
+        "response_window_option_default": "No response window",
+        "letter_subcategories": [
+          {
+            "subcategory": "Previously submitted 10182 is accepted and rejection sent in error",
+            "reasons": []
+          }
+        ]
+      },
+      {
+        "letter_title": "Intake Legacy Corrective App Receipt",
+        "response_window_option_default": "No response window",
+        "letter_subcategories": [
+          {
+            "subcategory": "Docket letter for AMA issued in error for a Legacy appeal currently pending",
+            "reasons": []
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "letter_type": "Clarification",
+    "response_window_option_default": "65 days",
+    "letter_titles": [
+      {
+        "letter_title": "Intake AMA 10182/HLR/Supp Clarification",
+        "letter_subcategories": [
+          {
+            "subcategory": "10182 received with a 0996 - Same issue(s)",
+            "reasons": []
+          },
+          {
+            "subcategory": "10182 received with a 0995 - Same issue(s)",
+            "reasons": []
+          },
+          {
+            "subcategory": "10182 received with a 0995 and 0996 - Same issue(s)",
+            "reasons": []
+          }
+        ]
+      },
+      {
+        "letter_title": "Intake AMA NOD-Clarification Letter 0995 or 0996 Same Day",
+        "letter_subcategories": [
+          {
+            "subcategory": "0995",
+            "reasons": [
+              "No",
+              "issues",
+              "No",
+              "lane",
+              "selected",
+              "Multiple",
+              "lanes",
+              "selected",
+              "Unsigned",
+              "No",
+              "issues",
+              "&",
+              "no",
+              "lane",
+              "selected",
+              "No",
+              "issues",
+              "&",
+              "multiple",
+              "lanes",
+              "selected",
+              "No",
+              "issues",
+              "&",
+              "unsigned",
+              "Unsigned",
+              "&",
+              "no",
+              "lane",
+              "selected",
+              "Unsigned",
+              "&",
+              "multiple",
+              "lanes",
+              "selected"
+            ]
+          },
+          {
+            "subcategory": "0996",
+            "reasons": [
+              "No",
+              "issues",
+              "No",
+              "lane",
+              "selected",
+              "Multiple",
+              "lanes",
+              "selected",
+              "Unsigned",
+              "No",
+              "issues",
+              "&",
+              "no",
+              "lane",
+              "selected",
+              "No",
+              "issues",
+              "&",
+              "multiple",
+              "lanes",
+              "selected",
+              "No",
+              "issues",
+              "&",
+              "unsigned",
+              "Unsigned",
+              "&",
+              "no",
+              "lane",
+              "selected",
+              "Unsigned",
+              "&",
+              "multiple",
+              "lanes",
+              "selected"
+            ]
+          },
+          {
+            "subcategory": "0995 & 0996",
+            "reasons": [
+              "No",
+              "issues",
+              "No",
+              "lane",
+              "selected",
+              "Multiple",
+              "lanes",
+              "selected",
+              "Unsigned",
+              "No",
+              "issues",
+              "&",
+              "no",
+              "lane",
+              "selected",
+              "No",
+              "issues",
+              "&",
+              "multiple",
+              "lanes",
+              "selected",
+              "No",
+              "issues",
+              "&",
+              "unsigned",
+              "Unsigned",
+              "&",
+              "no",
+              "lane",
+              "selected",
+              "Unsigned",
+              "&",
+              "multiple",
+              "lanes",
+              "selected"
+            ]
+          }
+        ]
+      },
+      {
+        "letter_title": "Intake AMA NOD Clarification Letter",
+        "letter_subcategories": [
+          {
+            "subcategory": "1 reason",
+            "reasons": [
+              "No issues",
+              "No decision dates",
+              "No lane selected",
+              "Multiple lanes selected",
+              "Unsigned"
+            ]
+          },
+          {
+            "subcategory": "2 reasons",
+            "reasons": [
+              "No issue(s) or decision date",
+              "No issue(s) & no lane selected",
+              "No issue(s) & multiple lanes are selected",
+              "No issue(s) & unsigned",
+              "No decision dates & no lane selected",
+              "No decision dates & multiple lanes selected",
+              "No decison dates(s) & unsigned",
+              "No lane selected & unsigned",
+              "Multiple lanes selected & unsigned"
+            ]
+          },
+          {
+            "subcategory": "3 reasons",
+            "reasons": [
+              "No issues, no lane selected & unsigned",
+              "No issues, multiple lanes selected & unsigned",
+              "No issues, no decision(s) date & unsigned",
+              "No lane selected, no decision(s) date & unsigned"
+            ]
+          }
+        ]
+      },
+      {
+        "letter_title": "Intake AMA Request without 10182",
+        "letter_subcategories": [
+          {
+            "subcategory": "Attempt to appeal without submitting a 10182",
+            "reasons": []
+          }
+        ]
+      },
+      {
+        "letter_title": "Intake AMA VHA NOD Clarification Letter",
+        "letter_subcategories": [
+          {
+            "subcategory": "10182 received for a VHA appeal without a decision date",
+            "reasons": []
+          }
+        ]
+      },
+      {
+        "letter_title": "Intake AMA VHA Request without a 10182",
+        "letter_subcategories": [
+          {
+            "subcategory": "Correspondence received attempting to appeal VHA decision without a 10182",
+            "reasons": []
+          }
+        ]
+      },
+      {
+        "letter_title": "Intake Caregiver Legacy NOD for AMA",
+        "letter_subcategories": [
+          {
+            "subcategory": "Correspondence received attempting to appeal CG decision without a 10182, decision after 9/28/2021",
+            "reasons": []
+          },
+          {
+            "subcategory": "Correspondence received attempting to appeal VHA decision without a 10182, decision before 9/28/2021",
+            "reasons": []
+          }
+        ]
+      },
+      {
+        "letter_title": "Intake Form 10182 and Form 9 Clarification",
+        "letter_subcategories": [
+          {
+            "subcategory": "10182 received with a VA Form 9 w a Legacy Appeal pending for same issue(s)",
+            "reasons": []
+          }
+        ]
+      },
+      {
+        "letter_title": "Intake Form 10182 and Form 9 SOC Opt-in Only Clarification Letter",
+        "letter_subcategories": [
+          {
+            "subcategory": "10182 received with a VA Form 9 w a Legacy Appeal pending for same issue(s), SOC issued",
+            "reasons": []
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "letter_type": "Untimely",
+    "response_window_option_default": "No response window",
+    "letter_titles": [
+      {
+        "letter_title": "Intake AMA Untimely NOD No Opt In",
+        "letter_subcategories": [
+          {
+            "subcategory": "10182 received after expiration of the appeal period",
+            "reasons": []
+          }
+        ]
+      },
+      {
+        "letter_title": "Intake AMA Untimely NOD Post SOC Opt in ACT or ADV Cert",
+        "letter_subcategories": [
+          {
+            "subcategory": "10182 received untimely for AMA, legacy is pending",
+            "reasons": []
+          }
+        ]
+      },
+      {
+        "letter_title": "Intake AMA Untimely NOD Post SOC Opt in HIS 99 G",
+        "letter_subcategories": [
+          {
+            "subcategory": "10182 received untimely for AMA, SOC response time expired",
+            "reasons": []
+          }
+        ]
+      },
+      {
+        "letter_title": "Intake AMA Untimely NOD Post SSOC Opt",
+        "letter_subcategories": [
+          {
+            "subcategory": "10182 received untimely for AMA, SSOC response time expired",
+            "reasons": []
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "letter_type": "Docketing",
+    "response_window_option_default": "No response window",
+    "letter_titles": [
+      {
+        "letter_title": "Intake Queue (with Docket)",
+        "letter_subcategories": [
+          {
+            "subcategory": "10182 received and appeal docketed",
+            "reasons": []
+          }
+        ]
+      }
+    ]
+  }
+]

From 140cfa53da34337d7a7dccee5cc05270e9e8f054 Mon Sep 17 00:00:00 2001
From: cacevesva <109166981+cacevesva@users.noreply.github.com>
Date: Mon, 22 Jan 2024 07:35:59 -0800
Subject: [PATCH 053/237] Adding updated schema file (#20557)

---
 db/schema.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/db/schema.rb b/db/schema.rb
index 669a8f86875..733eff708a6 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2023_12_14_201518) do
+ActiveRecord::Schema.define(version: 2024_01_10_185623) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -2254,6 +2254,11 @@
   add_foreign_key "correspondence_intakes", "users"
   add_foreign_key "correspondence_relations", "correspondences"
   add_foreign_key "correspondence_relations", "correspondences", column: "related_correspondence_id"
+  add_foreign_key "correspondences", "correspondence_types"
+  add_foreign_key "correspondences", "package_document_types"
+  add_foreign_key "correspondences", "users", column: "assigned_by_id"
+  add_foreign_key "correspondences", "users", column: "updated_by_id"
+  add_foreign_key "correspondences", "veterans"
   add_foreign_key "correspondences_appeals", "appeals"
   add_foreign_key "correspondences_appeals", "correspondences"
   add_foreign_key "dispatch_tasks", "legacy_appeals", column: "appeal_id"

From 6130d9999e9f69c0a8306fcbe920e1198c87685e Mon Sep 17 00:00:00 2001
From: vinner57 <128258952+vinner57@users.noreply.github.com>
Date: Wed, 24 Jan 2024 14:05:52 -0500
Subject: [PATCH 054/237] creating correspondence response letters table
 (#20570)

* creating coreespondence response letters table

* Update 20240122174056_create_correspondence_response_letters.rb

* resolving code comments

* adding schema changes
---
 ...4056_create_correspondence_response_letters.rb | 15 +++++++++++++++
 db/schema.rb                                      | 15 ++++++++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20240122174056_create_correspondence_response_letters.rb

diff --git a/db/migrate/20240122174056_create_correspondence_response_letters.rb b/db/migrate/20240122174056_create_correspondence_response_letters.rb
new file mode 100644
index 00000000000..cffcf760098
--- /dev/null
+++ b/db/migrate/20240122174056_create_correspondence_response_letters.rb
@@ -0,0 +1,15 @@
+class CreateCorrespondenceResponseLetters < Caseflow::Migration
+  def change
+    create_table :correspondence_response_letters do |t|
+      t.integer :correspondence_id, comment: "Foreign key on correspondences table"
+      t.datetime :date_sent, comment: "Date at the time of sending correspondence response letters"
+      t.string :type, null: false, comment: "Correspondence response letter type"
+      t.string :title, null: false, comment: "Correspondence response letters title"
+      t.string :subcategory, comment: "The subcategory selected for the correspondence response letter "
+      t.string :reason, comment: "Reason for selecting the response letter"
+      t.integer :response_window, comment: "The response window selected for the correspondence response letter"
+      t.integer :user_id, comment: "The user who has created correspondence response letter"
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 733eff708a6..a94210f000b 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2024_01_10_185623) do
+ActiveRecord::Schema.define(version: 2024_01_22_174056) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -625,6 +625,19 @@
     t.index ["related_correspondence_id", "correspondence_id"], name: "index_correspondence_relations_on_related_correspondences", unique: true
   end
 
+  create_table "correspondence_response_letters", force: :cascade do |t|
+    t.integer "correspondence_id", comment: "Foreign key on correspondences table"
+    t.datetime "created_at", null: false
+    t.datetime "date_sent", comment: "Date at the time of sending correspondence response letters"
+    t.string "reason", comment: "Reason for selecting the response letter"
+    t.integer "response_window", comment: "The response window selected for the correspondence response letter"
+    t.string "subcategory", comment: "The subcategory selected for the correspondence response letter "
+    t.string "title", null: false, comment: "Correspondence response letters title"
+    t.string "type", null: false, comment: "Correspondence response letter type"
+    t.datetime "updated_at", null: false
+    t.integer "user_id", comment: "The user who has created correspondence response letter"
+  end
+
   create_table "correspondence_types", force: :cascade do |t|
     t.boolean "active", default: true, null: false
     t.datetime "created_at", null: false

From 6f9d190e87e392c089515199bff0d34b25246843 Mon Sep 17 00:00:00 2001
From: SanthiParakal133 <132940479+SanthiParakal133@users.noreply.github.com>
Date: Thu, 25 Jan 2024 17:48:06 -0500
Subject: [PATCH 055/237] update document_types (#20626)

---
 Gemfile                                       |   2 +-
 Gemfile.lock                                  |   4 +-
 app/controllers/correspondence_controller.rb  |   2 +-
 .../correspondence_controller_spec.rb         |  64 +++---
 vbms doc types.json                           | 198 +++++++++---------
 5 files changed, 133 insertions(+), 137 deletions(-)

diff --git a/Gemfile b/Gemfile
index a2a638b6b60..acade45df3a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -66,7 +66,7 @@ gem "redis-namespace"
 gem "redis-rails", "~> 5.0.2"
 gem "request_store"
 gem "roo", "~> 2.7"
-gem "ruby_claim_evidence_api", git: "https://github.com/department-of-veterans-affairs/ruby_claim_evidence_api.git", ref: "db228fc5ad63c9244bc60fdaef9c86e0248c5de1"
+gem "ruby_claim_evidence_api", git: "https://github.com/department-of-veterans-affairs/ruby_claim_evidence_api.git", ref: "74416d74479b3eab9786d194ca8785c5496cdd74"
 # Use SCSS for stylesheets
 gem "sass-rails", "~> 5.0"
 # Error reporting to Sentry
diff --git a/Gemfile.lock b/Gemfile.lock
index 26585a39032..d2c894e36ce 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -67,8 +67,8 @@ GIT
 
 GIT
   remote: https://github.com/department-of-veterans-affairs/ruby_claim_evidence_api.git
-  revision: db228fc5ad63c9244bc60fdaef9c86e0248c5de1
-  ref: db228fc5ad63c9244bc60fdaef9c86e0248c5de1
+  revision: 74416d74479b3eab9786d194ca8785c5496cdd74
+  ref: 74416d74479b3eab9786d194ca8785c5496cdd74
   specs:
     ruby_claim_evidence_api (0.0.1)
       activesupport
diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index 1cd854f8213..ac35b37d55c 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -182,7 +182,7 @@ def vbms_document_types
       Rails.logger.error(error.full_message)
       data ||= demo_data
     end
-    data["documentTypes"].map { |document_type| { id: document_type["id"], name: document_type["description"] } }
+    data.map { |document_type| { id: document_type["id"], name: document_type["description"] } }
   end
 
   def demo_data
diff --git a/spec/controllers/correspondence_controller_spec.rb b/spec/controllers/correspondence_controller_spec.rb
index 5c072c27fec..5a87342c9e5 100644
--- a/spec/controllers/correspondence_controller_spec.rb
+++ b/spec/controllers/correspondence_controller_spec.rb
@@ -158,42 +158,40 @@
 
   describe "document_type_correspondence" do
     let(:document_types_response) do
-      {
-        "documentTypes" => [
-          {
-            "id" => 150,
+      [
+        {
+          "id" => 150,
+          "createDateTime" => "2011-12-09",
+          "modifiedDateTime" => "2023-07-30T21:04:14",
+          "name" => "L141",
+          "description" => "VA Form 21-8056",
+          "isUserUploadable" => true,
+          "is526" => false,
+          "documentCategory" => {
+            "id" => 70,
             "createDateTime" => "2011-12-09",
-            "modifiedDateTime" => "2023-07-30T21:04:14",
-            "name" => "L141",
-            "description" => "VA Form 21-8056",
-            "isUserUploadable" => true,
-            "is526" => false,
-            "documentCategory" => {
-              "id" => 70,
-              "createDateTime" => "2011-12-09",
-              "modifiedDateTime" => "2014-04-21T11:49:07",
-              "description" => "Correspondence",
-              "subDescription" => "Miscellaneous"
-            }
-          },
-          {
-            "id" => 152,
+            "modifiedDateTime" => "2014-04-21T11:49:07",
+            "description" => "Correspondence",
+            "subDescription" => "Miscellaneous"
+          }
+        },
+        {
+          "id" => 152,
+          "createDateTime" => "2011-12-09",
+          "modifiedDateTime" => "2023-07-30T21:04:14",
+          "name" => "L143",
+          "description" => "VA Form 21-8358",
+          "isUserUploadable" => true,
+          "is526" => false,
+          "documentCategory" => {
+            "id" => 70,
             "createDateTime" => "2011-12-09",
-            "modifiedDateTime" => "2023-07-30T21:04:14",
-            "name" => "L143",
-            "description" => "VA Form 21-8358",
-            "isUserUploadable" => true,
-            "is526" => false,
-            "documentCategory" => {
-              "id" => 70,
-              "createDateTime" => "2011-12-09",
-              "modifiedDateTime" => "2014-04-21T11:49:07",
-              "description" => "Correspondence",
-              "subDescription" => "Miscellaneous"
-            }
+            "modifiedDateTime" => "2014-04-21T11:49:07",
+            "description" => "Correspondence",
+            "subDescription" => "Miscellaneous"
           }
-        ]
-      }
+        }
+      ]
     end
 
     before do
diff --git a/vbms doc types.json b/vbms doc types.json
index 7d17578fb44..cf1e6693e81 100644
--- a/vbms doc types.json	
+++ b/vbms doc types.json	
@@ -1,100 +1,98 @@
-{
-    "documentTypes": [
-        {
-            "id": 150,
-            "createDateTime": "2011-12-09",
-            "modifiedDateTime": "2023-07-30T21:04:14",
-            "name": "L141",
-            "description": "VA Form 21-8056, Request for Retirement Information from the Railroad Retirement Board and Certification of Information From Department of Veterans Affairs",
-            "isUserUploadable": true,
-            "is526": false,
-            "documentCategory": {
-                "id": 70,
-                "createDateTime": "2011-12-09",
-                "modifiedDateTime": "2014-04-21T11:49:07",
-                "description": "Correspondence",
-                "subDescription": "Miscellaneous "
-            }
-        },
-        {
-            "id": 152,
-            "createDateTime": "2011-12-09",
-            "modifiedDateTime": "2023-07-30T21:04:14",
-            "name": "L143",
-            "description": "VA Form 21-8358, Notice to Department of Veterans Affairs of Admission to Uniformed Services Hospital",
-            "isUserUploadable": true,
-            "is526": false,
-            "documentCategory": {
-                "id": 70,
-                "createDateTime": "2011-12-09",
-                "modifiedDateTime": "2014-04-21T11:49:07",
-                "description": "Correspondence",
-                "subDescription": "Miscellaneous "
-            }
-        },
-        {
-            "id": 153,
-            "createDateTime": "2011-12-09",
-            "modifiedDateTime": "2023-07-30T21:04:14",
-            "name": "L144",
-            "description": "VA Form 21-8359, Information Re Veteran in Uniformed Services Hospital or Dispensary",
-            "isUserUploadable": true,
-            "is526": false,
-            "documentCategory": {
-                "id": 70,
-                "createDateTime": "2011-12-09",
-                "modifiedDateTime": "2014-04-21T11:49:07",
-                "description": "Correspondence",
-                "subDescription": "Miscellaneous "
-            }
-        },
-        {
-            "id": 258,
-            "createDateTime": "2011-12-09",
-            "modifiedDateTime": "2023-07-30T21:04:14",
-            "name": "L189",
-            "description": "VA Form 21-8960, Certification of School Attendance or Termination",
-            "isUserUploadable": true,
-            "is526": false,
-            "documentCategory": {
-                "id": 70,
-                "createDateTime": "2011-12-09",
-                "modifiedDateTime": "2014-04-21T11:49:07",
-                "description": "Correspondence",
-                "subDescription": "Miscellaneous "
-            }
-        },
-        {
-            "id": 495,
-            "createDateTime": "2011-12-09",
-            "modifiedDateTime": "2023-07-30T21:04:14",
-            "name": "L495",
-            "description": "VA Form 5571, Authorization to Disclose a Record in the Presence of a Third Party",
-            "isUserUploadable": true,
-            "is526": false,
-            "documentCategory": {
-                "id": 70,
-                "createDateTime": "2011-12-09",
-                "modifiedDateTime": "2014-04-21T11:49:07",
-                "description": "Correspondence",
-                "subDescription": "Miscellaneous "
-            }
-        },
-        {
-            "id": 173,
-            "createDateTime": "2011-12-09",
-            "modifiedDateTime": "2023-07-30T21:04:14",
-            "name": "L164",
-            "description": "VA Form 572, Request for Change of Address / Cancellation of Direct Deposit",
-            "isUserUploadable": true,
-            "is526": false,
-            "documentCategory": {
-                "id": 70,
-                "createDateTime": "2011-12-09",
-                "modifiedDateTime": "2014-04-21T11:49:07",
-                "description": "Correspondence",
-                "subDescription": "Miscellaneous "
-            }
-        }
-    ]
-}
+[
+  {
+    "id": 150,
+    "createDateTime": "2011-12-09",
+    "modifiedDateTime": "2023-07-30T21:04:14",
+    "name": "L141",
+    "description": "VA Form 21-8056, Request for Retirement Information from the Railroad Retirement Board and Certification of Information From Department of Veterans Affairs",
+    "isUserUploadable": true,
+    "is526": false,
+    "documentCategory": {
+      "id": 70,
+      "createDateTime": "2011-12-09",
+      "modifiedDateTime": "2014-04-21T11:49:07",
+      "description": "Correspondence",
+      "subDescription": "Miscellaneous "
+    }
+  },
+  {
+    "id": 152,
+    "createDateTime": "2011-12-09",
+    "modifiedDateTime": "2023-07-30T21:04:14",
+    "name": "L143",
+    "description": "VA Form 21-8358, Notice to Department of Veterans Affairs of Admission to Uniformed Services Hospital",
+    "isUserUploadable": true,
+    "is526": false,
+    "documentCategory": {
+      "id": 70,
+      "createDateTime": "2011-12-09",
+      "modifiedDateTime": "2014-04-21T11:49:07",
+      "description": "Correspondence",
+      "subDescription": "Miscellaneous "
+    }
+  },
+  {
+    "id": 153,
+    "createDateTime": "2011-12-09",
+    "modifiedDateTime": "2023-07-30T21:04:14",
+    "name": "L144",
+    "description": "VA Form 21-8359, Information Re Veteran in Uniformed Services Hospital or Dispensary",
+    "isUserUploadable": true,
+    "is526": false,
+    "documentCategory": {
+      "id": 70,
+      "createDateTime": "2011-12-09",
+      "modifiedDateTime": "2014-04-21T11:49:07",
+      "description": "Correspondence",
+      "subDescription": "Miscellaneous "
+    }
+  },
+  {
+    "id": 258,
+    "createDateTime": "2011-12-09",
+    "modifiedDateTime": "2023-07-30T21:04:14",
+    "name": "L189",
+    "description": "VA Form 21-8960, Certification of School Attendance or Termination",
+    "isUserUploadable": true,
+    "is526": false,
+    "documentCategory": {
+      "id": 70,
+      "createDateTime": "2011-12-09",
+      "modifiedDateTime": "2014-04-21T11:49:07",
+      "description": "Correspondence",
+      "subDescription": "Miscellaneous "
+    }
+  },
+  {
+    "id": 495,
+    "createDateTime": "2011-12-09",
+    "modifiedDateTime": "2023-07-30T21:04:14",
+    "name": "L495",
+    "description": "VA Form 5571, Authorization to Disclose a Record in the Presence of a Third Party",
+    "isUserUploadable": true,
+    "is526": false,
+    "documentCategory": {
+      "id": 70,
+      "createDateTime": "2011-12-09",
+      "modifiedDateTime": "2014-04-21T11:49:07",
+      "description": "Correspondence",
+      "subDescription": "Miscellaneous "
+    }
+  },
+  {
+    "id": 173,
+    "createDateTime": "2011-12-09",
+    "modifiedDateTime": "2023-07-30T21:04:14",
+    "name": "L164",
+    "description": "VA Form 572, Request for Change of Address / Cancellation of Direct Deposit",
+    "isUserUploadable": true,
+    "is526": false,
+    "documentCategory": {
+      "id": 70,
+      "createDateTime": "2011-12-09",
+      "modifiedDateTime": "2014-04-21T11:49:07",
+      "description": "Correspondence",
+      "subDescription": "Miscellaneous "
+    }
+  }
+]

From 5173e167bcf14193a8079baffa29ca1e96177c4d Mon Sep 17 00:00:00 2001
From: vinner57 <128258952+vinner57@users.noreply.github.com>
Date: Fri, 26 Jan 2024 10:56:22 -0500
Subject: [PATCH 056/237] fixing constant file (#20629)

---
 .../CORRESPONDENCE_LETTER_SELECTIONS.json     | 126 ++++--------------
 1 file changed, 24 insertions(+), 102 deletions(-)

diff --git a/client/constants/CORRESPONDENCE_LETTER_SELECTIONS.json b/client/constants/CORRESPONDENCE_LETTER_SELECTIONS.json
index 616ed8c2061..9b8d3fc9477 100644
--- a/client/constants/CORRESPONDENCE_LETTER_SELECTIONS.json
+++ b/client/constants/CORRESPONDENCE_LETTER_SELECTIONS.json
@@ -166,121 +166,43 @@
           {
             "subcategory": "0995",
             "reasons": [
-              "No",
-              "issues",
-              "No",
-              "lane",
-              "selected",
-              "Multiple",
-              "lanes",
-              "selected",
-              "Unsigned",
-              "No",
-              "issues",
-              "&",
-              "no",
-              "lane",
-              "selected",
-              "No",
-              "issues",
-              "&",
-              "multiple",
-              "lanes",
-              "selected",
-              "No",
-              "issues",
-              "&",
-              "unsigned",
-              "Unsigned",
-              "&",
-              "no",
-              "lane",
-              "selected",
+              "No issues",
+              "No lane selected",
+              "Multiple lanes selected",
               "Unsigned",
-              "&",
-              "multiple",
-              "lanes",
-              "selected"
+              "No issues & no lane selected",
+              "No issues & multiple lanes selected",
+              "No issues & unsigned",
+              "Unsigned & no lane selected",
+              "Unsigned & multiple lanes selected"
             ]
           },
           {
             "subcategory": "0996",
             "reasons": [
-              "No",
-              "issues",
-              "No",
-              "lane",
-              "selected",
-              "Multiple",
-              "lanes",
-              "selected",
-              "Unsigned",
-              "No",
-              "issues",
-              "&",
-              "no",
-              "lane",
-              "selected",
-              "No",
-              "issues",
-              "&",
-              "multiple",
-              "lanes",
-              "selected",
-              "No",
-              "issues",
-              "&",
-              "unsigned",
-              "Unsigned",
-              "&",
-              "no",
-              "lane",
-              "selected",
+              "No issues",
+              "No lane selected",
+              "Multiple lanes selected",
               "Unsigned",
-              "&",
-              "multiple",
-              "lanes",
-              "selected"
+              "No issues & no lane selected",
+              "No issues & multiple lanes selected",
+              "No issues & unsigned",
+              "Unsigned & no lane selected",
+              "Unsigned & multiple lanes selected"
             ]
           },
           {
             "subcategory": "0995 & 0996",
             "reasons": [
-              "No",
-              "issues",
-              "No",
-              "lane",
-              "selected",
-              "Multiple",
-              "lanes",
-              "selected",
-              "Unsigned",
-              "No",
-              "issues",
-              "&",
-              "no",
-              "lane",
-              "selected",
-              "No",
-              "issues",
-              "&",
-              "multiple",
-              "lanes",
-              "selected",
-              "No",
-              "issues",
-              "&",
-              "unsigned",
-              "Unsigned",
-              "&",
-              "no",
-              "lane",
-              "selected",
+              "No issues",
+              "No lane selected",
+              "Multiple lanes selected",
               "Unsigned",
-              "&",
-              "multiple",
-              "lanes",
-              "selected"
+              "No issues & no lane selected",
+              "No issues & multiple lanes selected",
+              "No issues & unsigned",
+              "Unsigned & no lane selected",
+              "Unsigned & multiple lanes selected"
             ]
           }
         ]

From 5c308fcb4237899295fad973f1554e10676110ea Mon Sep 17 00:00:00 2001
From: divyadasari-va <135847343+divyadasari-va@users.noreply.github.com>
Date: Tue, 30 Jan 2024 07:19:37 -0700
Subject: [PATCH 057/237] Div/appeals 38389 (#20579)

* Initial commit for correspondence migration

* Commit for seed data updations with the AC

* Commit for generating few othere tasks

* Commit for the changes mentioned for task file and reverting the changes in task file

* Reverted the changes as per the comments and updated with new seed files

* Fixing few more issues while generating the reviewpackage task

* Changing the correspondence_type_id with Table value

---------

Co-authored-by: Matt Roth <roth_matthew@bah.com>
---
 db/seeds.rb                       |   1 +
 db/seeds/helpers/queue_helpers.rb | 177 ++++++++++++++++++++++++++++
 db/seeds/queue_correspondences.rb | 189 ++++++++++++++++++++++++++++++
 lib/tasks/correspondence.rake     |   1 +
 4 files changed, 368 insertions(+)
 create mode 100644 db/seeds/helpers/queue_helpers.rb
 create mode 100644 db/seeds/queue_correspondences.rb

diff --git a/db/seeds.rb b/db/seeds.rb
index e7815910b10..00845faf1af 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -66,6 +66,7 @@ def seed
     call_and_log_seed_step Seeds::PackageDocumentTypes
     call_and_log_seed_step Seeds::Correspondence
     call_and_log_seed_step Seeds::MultiCorrespondences
+    call_and_log_seed_step Seeds::QueueCorrespondences
     call_and_log_seed_step Seeds::VbmsDocumentTypes
     call_and_log_seed_step Seeds::VhaChangeHistory
     # Always run this as last one
diff --git a/db/seeds/helpers/queue_helpers.rb b/db/seeds/helpers/queue_helpers.rb
new file mode 100644
index 00000000000..defa21240cb
--- /dev/null
+++ b/db/seeds/helpers/queue_helpers.rb
@@ -0,0 +1,177 @@
+# frozen_string_literal: true
+
+module QueueHelpers
+  def create_veteran(options = {})
+    @file_number += 1
+    @participant_id += 1
+    params = {
+      file_number: format("%<n>09d", n: @file_number),
+      participant_id: format("%<n>09d", n: @participant_id)
+    }
+    create(:veteran, params.merge(options))
+  end
+
+  def create_appeal(veteran)
+    ::Appeal.create!(
+      veteran_file_number: veteran.file_number,
+      docket_type: Constants.AMA_DOCKETS.direct_review
+    )
+  end
+  def create_correspondence(appeal)
+    correspondence = ::Correspondence.create!(
+      uuid: SecureRandom.uuid,
+      portal_entry_date: Time.zone.now,
+      source_type: "Mail",
+      package_document_type_id: (1..20).to_a.sample,
+      correspondence_type_id: CorrespondenceType.find_by_name("Congressional interest").id,
+      cmp_queue_id: 1,
+      cmp_packet_number: @cmp_packet_number,
+      va_date_of_receipt: Time.zone.yesterday,
+      notes: "Notes from CMP - Multi Correspondence Seed",
+      assigned_by_id: 81,
+      updated_by_id: 81,
+      veteran_id: appeal.veteran.id
+    ).tap { @cmp_packet_number += 1 }
+
+    correspondence.appeals << appeal
+
+    create_correspondence_document(correspondence, appeal.veteran)
+    correspondence
+  end
+
+  def create_correspondence_document(correspondence, veteran)
+    CorrespondenceDocument.create!(
+      document_file_number: veteran.file_number,
+      uuid: SecureRandom.uuid,
+      vbms_document_type_id: 1250,
+      document_type: 1250,
+      pages: 30,
+      correspondence_id: correspondence.id
+    )
+  end
+
+  def create_correspondence_intake(correspondence, status:)
+    cit = CorrespondenceIntakeTask.create!(
+      appeal_id: correspondence.id,
+      appeal_type: "Correspondence",
+      assigned_to: MailTeamSupervisor.singleton
+    )
+
+    cit.update!(status: status)
+    cit
+  end
+
+  def create_review_package_task(correspondence, status:)
+    review_package_task = ReviewPackageTask.find_or_create_by!(
+      appeal_id: correspondence.id,
+      assigned_to: MailTeamSupervisor.singleton,
+      appeal_type: "Correspondence",
+    )
+
+    review_package_task.update(status: status)
+    review_package_task
+  end
+
+  def create_efolderupload_failed_task(correspondence, ptask:)
+    euft = EfolderUploadFailedTask.create!(
+      parent_id: ptask.id,
+      appeal_id: correspondence.id,
+      appeal_type: "Correspondence",
+      assigned_to: MailTeamSupervisor.singleton
+    )
+
+    euft.update!(status: Constants.TASK_STATUSES.in_progress)
+
+    euft
+  end
+
+  def create_correspondence_root_task(correspondence, status:)
+    root_task = CorrespondenceRootTask.find_or_create_by!(
+      appeal_id: correspondence.id,
+      assigned_to: MailTeamSupervisor.singleton,
+      appeal_type: "Correspondence",
+    )
+
+    root_task.update(status: status)
+    root_task
+  end
+
+  def create_action_required_tasks(correspondence, status:, parent_task:, task_type:)
+    task_type.create!(
+      parent_id: parent_task.id,
+      appeal_id: correspondence.id,
+      appeal_type: "Correspondence",
+      status: status,
+      assigned_to: MailTeamSupervisor.singleton
+    )
+  end
+
+  def create_in_progress_root_task_and_completed_mail_task(correspondence, status:, parent_task:)
+    cavct = CavcCorrespondenceMailTask.find_or_create_by!(
+      parent_id: parent_task.id,
+      appeal_id: correspondence.id,
+      appeal_type: "Correspondence",
+      assigned_to: MailTeamSupervisor.singleton
+    )
+    cavct.update!(status: status)
+
+
+    review_package_task = ReviewPackageTask.find_or_create_by!(
+      parent_id: parent_task.id,
+      appeal_id: correspondence.id,
+      appeal_type: "Correspondence",
+      assigned_to: MailTeamSupervisor.singleton
+    )
+
+    review_package_task.update!(status: status)
+
+    cit = CorrespondenceIntakeTask.find_or_create_by!(
+      parent_id: parent_task.id,
+      appeal_id: correspondence.id,
+      appeal_type: "Correspondence",
+      assigned_to: MailTeamSupervisor.singleton
+    )
+    cit.update!(status: status)
+  end
+
+  def pending_tab_cavc_mailtask(correspondence, status:)
+    cavct = CavcCorrespondenceMailTask.create!(
+      appeal_id: correspondence.id,
+      appeal_type: "Correspondence",
+      assigned_to: CavcLitigationSupport.singleton,
+      status: status
+    )
+    cavct
+  end
+
+  def pending_tab_congress_interest_mailtask(correspondence, status:)
+   cmt = CongressionalInterestMailTask.create!(
+      appeal_id: correspondence.id,
+      appeal_type: "Correspondence",
+      assigned_to: LitigationSupport.singleton,
+      status: status
+    )
+    cmt
+  end
+
+  def create_pending_tasks_for_tasks_not_related_to_appeal(correspondence, parent_task:)
+    # Creating Completed ReviewPackageTask
+    review_package_task = ReviewPackageTask.find_by(
+      appeal_id: correspondence.id,
+      assigned_to: MailTeamSupervisor.singleton,
+      appeal_type: "Correspondence"
+    )
+
+    if review_package_task.present? && review_package_task.status != Constants.TASK_STATUSES.completed
+      review_package_task.update!(status: Constants.TASK_STATUSES.completed, parent_id: parent_task.id)
+    end
+    # Creating Completed CorrespondenceIntakeTask
+    correspondence_intake_task = CorrespondenceIntakeTask.create!(
+      parent_id: parent_task.id,
+      appeal_id: correspondence.id,
+      assigned_to: MailTeamSupervisor.singleton,
+      appeal_type: "Correspondence"
+    )
+    correspondence_intake_task.update!(status: Constants.TASK_STATUSES.completed)
+  end
+end
diff --git a/db/seeds/queue_correspondences.rb b/db/seeds/queue_correspondences.rb
new file mode 100644
index 00000000000..ff26d4d65fa
--- /dev/null
+++ b/db/seeds/queue_correspondences.rb
@@ -0,0 +1,189 @@
+# frozen_string_literal: true
+
+# create queue correspondence seeds
+require_relative "./helpers/queue_helpers"
+
+module Seeds
+  # :reek:InstanceVariableAssumption
+  class QueueCorrespondences < Base
+
+    include QueueHelpers
+
+    def initialize
+      initial_id_values
+      RequestStore[:current_user] = User.find_by_css_id("JOLLY_POSTMAN")
+    end
+
+    def seed!
+      create_queue_correspondences
+    end
+
+    private
+
+    def initial_id_values
+      @file_number ||= 550_000_000
+      @participant_id ||= 650_000_000
+      while Veteran.find_by(file_number: format("%<n>09d", n: @file_number + 1))
+        @file_number += 100
+        @participant_id += 100
+      end
+
+      @cmp_packet_number ||= 2_000_000_000
+      @cmp_packet_number += 10_000 while ::Correspondence.find_by(cmp_packet_number: @cmp_packet_number + 1)
+    end
+
+    def create_queue_correspondences
+      # 20 Correspondences with eFolderFailedUploadTask with a parent CorrespondenceIntakeTask
+      veteran = create_veteran(first_name: "John", last_name: "Doe")
+      appeal = create_appeal(veteran)
+
+      ptask = create_correspondence_intake(create_correspondence(appeal), status: "on_hold")
+
+      # 20 Correspondences with eFolderFailedUploadTask with a parent CorrespondenceIntakeTask
+      20.times do
+        corres = create_correspondence_with_intake_and_failed_upload_task(ptask, appeal)
+      end
+
+      # 20 Correspondences with CorrespondenceIntakeTask with a status of in_progress
+      20.times do
+        corres = create_correspondence_with_intake_task(appeal)
+      end
+
+      # 20 Correspondences with eFolderFailedUploadTask with a parent ReviewPackageTask
+      20.times do
+        corres = create_correspondence_with_review_package_and_failed_upload_task(appeal)
+      end
+
+      # 20 Correspondences with the CorrespondenceRootTask with the status of completed
+      20.times do
+        corres = create_correspondence_with_completed_root_task(appeal)
+      end
+
+      # 20 Correspondences with ReviewPackageTask in progress
+      20.times do
+        corres = create_correspondence_with_review_package_task(appeal)
+      end
+
+      # 20 Correspondences with the tasks for Action Required tab and an on_hold ReviewPackageTask as their parent
+      20.times do
+        corres = create_correspondence_with_action_required_tasks(appeal)
+      end
+
+      # 10 Correspondences with in-progress CorrespondenceRootTask and completed Mail Task
+      10.times do
+        corres = create_correspondence_with_in_progress_root_task_and_completed_mail_task(appeal)
+      end
+
+      # 5 Correspondences with the CorrespondenceRootTask with the status of canceled
+      5.times do
+        corres = create_correspondence_with_canceled_root_task(appeal)
+      end
+
+      # 20 Correspondences with the tasks for CAVC and Congress Interest
+      mail_task_pid_for_cavc = pending_tab_cavc_mailtask(create_correspondence(appeal), status: "assigned")
+      20.times do
+        corres = create_pending_tasks(mail_task_pid_for_cavc, appeal)
+      end
+
+      mail_task_pid_for_congressInterest = pending_tab_congress_interest_mailtask(create_correspondence(appeal), status: "assigned")
+      20.times do
+        corres = create_pending_tasks(mail_task_pid_for_congressInterest, appeal)
+      end
+
+    end
+
+    def create_correspondence_with_intake_and_failed_upload_task(ptask, appeal)
+
+      corres = create_correspondence(appeal)
+
+      create_efolderupload_failed_task(corres, ptask: ptask)
+
+      corres
+    end
+
+    def create_correspondence_with_intake_task(appeal)
+      corres = create_correspondence(appeal)
+
+      create_correspondence_intake(corres, status: "in_progress")
+
+      corres
+    end
+
+    def create_correspondence_with_review_package_task(appeal)
+      corres = create_correspondence(appeal)
+
+      create_review_package_task(corres, status: "in_progress")
+
+      corres
+    end
+
+    def create_correspondence_with_review_package_and_failed_upload_task(appeal)
+      corres = create_correspondence(appeal)
+
+      ptask = ReviewPackageTask.find_by(appeal_id: corres.id, type: ReviewPackageTask.name)
+      create_efolderupload_failed_task(corres, ptask: ptask)
+      ptask.update!(status: "on_hold")
+
+      corres
+    end
+
+    def create_correspondence_with_completed_root_task(appeal)
+      corres = create_correspondence(appeal)
+
+      create_correspondence_root_task(corres, status: "completed")
+
+      corres
+    end
+
+    def create_correspondence_with_action_required_tasks(appeal)
+      corres = create_correspondence(appeal)
+
+      review_package_task = ReviewPackageTask.find_by(appeal_id: corres.id, type: ReviewPackageTask.name)
+
+      [ReassignPackageTask, RemovePackageTask, SplitPackageTask, MergePackageTask].each do |task_type|
+        check_and_create_action_required_task(corres, review_package_task, task_type)
+      end
+
+      review_package_task.update!(status: "on_hold")
+
+      corres
+
+    end
+
+    def check_and_create_action_required_task(corres, review_package_task, task_type)
+      existing_task = task_type.find_by(appeal_id: corres.id, parent_id: review_package_task.id)
+
+      if existing_task.present?
+        puts "Existing #{task_type.name} task. Only one #{task_type.name} task may be made at a time."
+      else
+        create_action_required_tasks(corres, parent_task: review_package_task, status: "assigned", task_type: task_type)
+      end
+    end
+
+    def create_correspondence_with_in_progress_root_task_and_completed_mail_task(appeal)
+      corres = create_correspondence(appeal)
+
+      ptask = CorrespondenceRootTask.find_by(appeal_id: corres.id, type: CorrespondenceRootTask.name)
+      create_in_progress_root_task_and_completed_mail_task(corres, parent_task: ptask, status: "completed")
+      ptask.update!(status: "in_progress")
+
+      corres
+    end
+
+    def create_correspondence_with_canceled_root_task(appeal)
+      corres = create_correspondence(appeal)
+
+      create_correspondence_root_task(corres, status: "cancelled")
+
+      corres
+    end
+
+    def create_pending_tasks(mail_task_parent, appeal)
+      corres = create_correspondence(appeal)
+
+      create_pending_tasks_for_tasks_not_related_to_appeal(corres, parent_task: mail_task_parent)
+
+      corres
+    end
+  end
+end
diff --git a/lib/tasks/correspondence.rake b/lib/tasks/correspondence.rake
index 4ceb135959a..92b16bfb203 100644
--- a/lib/tasks/correspondence.rake
+++ b/lib/tasks/correspondence.rake
@@ -6,6 +6,7 @@ require_relative "../../db/seeds/vbms_document_types"
 require_relative "../../db/seeds/correspondence_types"
 require_relative "../../db/seeds/package_document_types"
 require_relative "../../db/seeds/multi_correspondences"
+require_relative "../../db/seeds/queue_correspondences"
 
 namespace :correspondence do
   desc "setup data for intake correspondence (autotext and correspondence type)in UAT/PROD"

From 6895ffa2be2e6bd55202f1bceb7218428b4dbf88 Mon Sep 17 00:00:00 2001
From: Will Medders <93014155+wmedders21@users.noreply.github.com>
Date: Tue, 30 Jan 2024 10:05:16 -0600
Subject: [PATCH 058/237] Wmedders21/appeals 35816 (#20611)

* WIP correspondence config

* Update correspondence_config to use correspondence related classes

* Temporarily default column filtering to false

* Override methods to work with correspondence tasks

* allow correspondence tasks

* add correspondence queue tabs for org

* update column names

* update column names

* add correspondence org queue tabs

* add task column serializer for correspondence queue

* add helper to be able to call correspondence on correspondence tasks instead of appeal

* revert controller changes

* create fixtures for individual and team correspondence config

* update task tab attributes

* Revert changes to CorrespondenceCases.jsx

* Revert changes to QueueTableBuilder.jsx

* remove fixtures

* Test: correspondence_config

* add column names to JSON file

* update columns

* Added testing for correspondence_config

* Add test for correspondence_team json response

* remove temporary helper methods

* Add fetch to /queue/correspondence/team

* Added strings for tasks tabs to constants file

* Moved strings into constants file
---
 app/controllers/correspondence_controller.rb  |  15 ++-
 app/models/correspondence_config.rb           |  60 +++++++++++
 app/models/correspondence_queue_column.rb     |  11 ++
 app/models/correspondence_queue_tab.rb        |  23 ++++
 app/models/correspondence_task_pager.rb       |  10 ++
 app/models/organization.rb                    |  30 ++++++
 .../correspondence_assigned_tasks_tab.rb      |  30 ++++++
 .../correspondence_completed_tasks_tab.rb     |  30 ++++++
 .../correspondence_in_progress_tasks_tab.rb   |  31 ++++++
 ...orrespondence_action_required_tasks_tab.rb |  32 ++++++
 ...ation_correspondence_assigned_tasks_tab.rb |  33 ++++++
 ...tion_correspondence_completed_tasks_tab.rb |  30 ++++++
 ...zation_correspondence_pending_tasks_tab.rb |  36 +++++++
 ...ion_correspondence_unassigned_tasks_tab.rb |  31 ++++++
 .../correspondence_task_column_serializer.rb  |  70 ++++++++++++
 app/models/tasks/correspondence_task.rb       |   4 +
 app/models/user.rb                            |  20 ++++
 .../correspondence_cases.html.erb             |   1 +
 .../correspondence_team.html.erb              |  18 ++++
 client/COPY.json                              |   1 +
 client/app/queue/QueueApp.jsx                 |   7 ++
 .../correspondence/CorrespondenceCases.jsx    |   7 +-
 client/constants/QUEUE_CONFIG.json            |  49 +++++++++
 config/routes.rb                              |   1 +
 spec/models/correspondence_config_spec.rb     | 102 ++++++++++++++++++
 .../correspondence_controller_spec.rb         |  87 +++++++++++++++
 26 files changed, 765 insertions(+), 4 deletions(-)
 create mode 100644 app/models/correspondence_config.rb
 create mode 100644 app/models/correspondence_queue_column.rb
 create mode 100644 app/models/correspondence_queue_tab.rb
 create mode 100644 app/models/correspondence_task_pager.rb
 create mode 100644 app/models/queue_tabs/correspondence_assigned_tasks_tab.rb
 create mode 100644 app/models/queue_tabs/correspondence_completed_tasks_tab.rb
 create mode 100644 app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb
 create mode 100644 app/models/queue_tabs/organization_correspondence_action_required_tasks_tab.rb
 create mode 100644 app/models/queue_tabs/organization_correspondence_assigned_tasks_tab.rb
 create mode 100644 app/models/queue_tabs/organization_correspondence_completed_tasks_tab.rb
 create mode 100644 app/models/queue_tabs/organization_correspondence_pending_tasks_tab.rb
 create mode 100644 app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb
 create mode 100644 app/models/serializers/work_queue/correspondence_task_column_serializer.rb
 create mode 100644 app/views/correspondence/correspondence_team.html.erb
 create mode 100644 spec/models/correspondence_config_spec.rb

diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index ac35b37d55c..b0c31b62682 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -43,7 +43,7 @@ def correspondence_cases
     respond_to do |format|
       format.html { "correspondence_cases" }
       format.json do
-        render json: { vetCorrespondences: veterans_with_correspondences }
+        render json: { correspondence_config: CorrespondenceConfig.new(assignee: current_user)}
       end
     end
   end
@@ -106,6 +106,19 @@ def show
     render({ json: response_json }, status: :ok)
   end
 
+  def correspondence_team
+    if MailTeamSupervisor.singleton.user_has_access?(current_user)
+      respond_to do |format|
+        format.html { "correspondence_team" }
+        format.json do
+          render json: { correspondence_config: CorrespondenceConfig.new(assignee: MailTeamSupervisor.singleton) }
+        end
+      end
+    else
+      redirect_to "/unauthorized"
+    end
+  end
+
   def update
     veteran = Veteran.find_by(file_number: veteran_params["file_number"])
     if veteran && correspondence.update(
diff --git a/app/models/correspondence_config.rb b/app/models/correspondence_config.rb
new file mode 100644
index 00000000000..20e2d07dd53
--- /dev/null
+++ b/app/models/correspondence_config.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+class CorrespondenceConfig < QueueConfig
+  def to_hash
+    {
+      table_title: table_title,
+      active_tab: default_active_tab,
+      tasks_per_page: 15,
+      use_task_pages_api: assignee.use_task_pages_api?,
+      tabs: assignee.correspondence_queue_tabs.map { |tab| attach_tasks_to_tab(tab) }
+    }
+  end
+
+  private
+
+  def attach_tasks_to_tab(tab)
+    task_pager = CorrespondenceTaskPager.new(
+      assignee: assignee,
+      tab_name: tab.name,
+      sort_by: tab.default_sorting_column.name,
+      sort_order: tab.default_sorting_direction
+    )
+    endpoint = "task_pages?#{Constants.QUEUE_CONFIG.TAB_NAME_REQUEST_PARAM}=#{tab.name}"
+
+    tab.to_hash.merge(
+      tasks: serialized_tasks_for_columns(task_pager.paged_tasks, tab.column_names),
+      task_page_count: task_pager.task_page_count,
+      total_task_count: task_pager.total_task_count,
+      task_page_endpoint_base_path: "#{assignee_is_org? ? "#{assignee.path}/" : "users/#{assignee.id}/"}#{endpoint}"
+    )
+  end
+
+  def serialized_tasks_for_columns(tasks, columns)
+    WorkQueue::CorrespondenceTaskColumnSerializer.new(
+      tasks,
+      is_collection: true,
+      params: { columns: columns }
+    ).serializable_hash[:data]
+  end
+
+  def table_title
+    if assignee_is_org?
+      Constants.QUEUE_CONFIG.CORRESPONDENCE_ORG_TABLE_TITLE
+    else
+      Constants.QUEUE_CONFIG.CORRESPONDENCE_USER_TABLE_TITLE
+    end
+  end
+
+  def default_active_tab
+    if assignee_is_org?
+      Constants.QUEUE_CONFIG.CORRESPONDENCE_UNASSIGNED_TASKS_TAB_NAME
+    else
+      Constants.QUEUE_CONFIG.CORRESPONDENCE_ASSIGNED_TASKS_TAB_NAME
+    end
+  end
+
+  def default_sorting_column
+    Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name
+  end
+end
diff --git a/app/models/correspondence_queue_column.rb b/app/models/correspondence_queue_column.rb
new file mode 100644
index 00000000000..dcb2ff84e3d
--- /dev/null
+++ b/app/models/correspondence_queue_column.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class CorrespondenceQueueColumn < QueueColumn
+  def to_hash(tasks)
+    {
+      name: name,
+      filterable: false,
+      filter_options: []
+    }
+  end
+end
diff --git a/app/models/correspondence_queue_tab.rb b/app/models/correspondence_queue_tab.rb
new file mode 100644
index 00000000000..18a0ad66d2f
--- /dev/null
+++ b/app/models/correspondence_queue_tab.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class CorrespondenceQueueTab < QueueTab
+  def columns
+    column_names.map do |column_name|
+      CorrespondenceQueueColumn.new(name: column_name)
+    end
+  end
+
+  def task_includes
+    [
+      { appeal: [:package_document_type] },
+      :assigned_by,
+      :assigned_to,
+      :children,
+      :parent
+    ]
+  end
+
+  def default_sorting_column
+    CorrespondenceQueueColumn.from_name(Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name)
+  end
+end
diff --git a/app/models/correspondence_task_pager.rb b/app/models/correspondence_task_pager.rb
new file mode 100644
index 00000000000..25f384b004f
--- /dev/null
+++ b/app/models/correspondence_task_pager.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class CorrespondenceTaskPager < TaskPager
+  def paged_tasks
+    @paged_tasks ||= begin
+      tasks = sorted_tasks(filtered_tasks)
+      pagination_enabled ? tasks.page(page).per(TASKS_PER_PAGE) : tasks
+    end
+  end
+end
diff --git a/app/models/organization.rb b/app/models/organization.rb
index 1f6d360f667..77e3cd0786b 100644
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@@ -134,6 +134,16 @@ def queue_tabs
     ]
   end
 
+  def correspondence_queue_tabs
+    [
+      correspondence_unassigned_tasks_tab,
+      correspondence_action_required_tasks_tab,
+      correspondence_pending_tasks_tab,
+      correspondence_assigned_tasks_tab,
+      correspondence_completed_tasks_tab
+    ]
+  end
+
   def unassigned_tasks_tab
     ::OrganizationUnassignedTasksTab.new(
       assignee: self,
@@ -154,6 +164,26 @@ def completed_tasks_tab
     ::OrganizationCompletedTasksTab.new(assignee: self, show_regional_office_column: show_regional_office_in_queue?)
   end
 
+  def correspondence_unassigned_tasks_tab
+    ::OrganizationCorrespondenceUnassignedTasksTab.new(assignee: self)
+  end
+
+  def correspondence_action_required_tasks_tab
+    ::OrganizationCorrespondenceActionRequiredTasksTab.new(assignee: self)
+  end
+
+  def correspondence_assigned_tasks_tab
+    ::OrganizationCorrespondenceAssignedTasksTab.new(assignee: self)
+  end
+
+  def correspondence_pending_tasks_tab
+    ::OrganizationCorrespondencePendingTasksTab.new(assignee: self)
+  end
+
+  def correspondence_completed_tasks_tab
+    ::OrganizationCorrespondenceCompletedTasksTab.new(assignee: self)
+  end
+
   def serialize
     {
       accepts_priority_pushed_cases: accepts_priority_pushed_cases,
diff --git a/app/models/queue_tabs/correspondence_assigned_tasks_tab.rb b/app/models/queue_tabs/correspondence_assigned_tasks_tab.rb
new file mode 100644
index 00000000000..7734843fa28
--- /dev/null
+++ b/app/models/queue_tabs/correspondence_assigned_tasks_tab.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class CorrespondenceAssignedTasksTab < CorrespondenceQueueTab
+  validate :assignee_is_user
+
+  def label
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_ASSIGNED_TASKS_LABEL
+  end
+
+  def self.tab_name
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_ASSIGNED_TASKS_TAB_NAME
+  end
+
+  def description
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_ASSIGNED_TASKS_DESCRIPTION
+  end
+
+  def tasks
+    CorrespondenceTask.where(assigned_to_id: assignee.id)
+  end
+
+  def column_names
+    [
+      Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
+      Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
+      Constants.QUEUE_CONFIG.COLUMNS.DAYS_WAITING_CORRESPONDENCE.name,
+      Constants.QUEUE_CONFIG.COLUMNS.NOTES.name
+    ]
+  end
+end
diff --git a/app/models/queue_tabs/correspondence_completed_tasks_tab.rb b/app/models/queue_tabs/correspondence_completed_tasks_tab.rb
new file mode 100644
index 00000000000..57630c68204
--- /dev/null
+++ b/app/models/queue_tabs/correspondence_completed_tasks_tab.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class CorrespondenceCompletedTasksTab < CorrespondenceQueueTab
+  validate :assignee_is_user
+
+  def label
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_COMPLETED_TASKS_LABEL
+  end
+
+  def self.tab_name
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_COMPLETED_TASKS_TAB_NAME
+  end
+
+  def description
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_COMPLETED_TASKS_DESCRIPTION
+  end
+
+  def tasks
+    CorrespondenceTask.where(assigned_to: assignee).recently_completed
+  end
+
+  def column_names
+    [
+      Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
+      Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
+      Constants.QUEUE_CONFIG.COLUMNS.TASK_CLOSED_DATE.name,
+      Constants.QUEUE_CONFIG.COLUMNS.NOTES.name
+    ]
+  end
+end
diff --git a/app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb b/app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb
new file mode 100644
index 00000000000..af6f553c644
--- /dev/null
+++ b/app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+class CorrespondenceInProgressTasksTab < CorrespondenceQueueTab
+  validate :assignee_is_user
+
+  def label
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_IN_PROGRESS_TASKS_LABEL
+  end
+
+  def self.tab_name
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_IN_PROGRESS_TASKS_TAB_NAME
+  end
+
+  def description
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_IN_PROGRESS_TASKS_DESCRIPTION
+  end
+
+  def tasks
+    CorrespondenceTask.where(assigned_to: assignee).in_progress
+  end
+
+  def column_names
+    [
+      Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
+      Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
+      Constants.QUEUE_CONFIG.COLUMNS.TASK_TYPE.name,
+      Constants.QUEUE_CONFIG.COLUMNS.DAYS_WAITING_CORRESPONDENCE.name,
+      Constants.QUEUE_CONFIG.COLUMNS.NOTES.name
+    ]
+  end
+end
diff --git a/app/models/queue_tabs/organization_correspondence_action_required_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_action_required_tasks_tab.rb
new file mode 100644
index 00000000000..46b177fc2d3
--- /dev/null
+++ b/app/models/queue_tabs/organization_correspondence_action_required_tasks_tab.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+class OrganizationCorrespondenceActionRequiredTasksTab < CorrespondenceQueueTab
+  validate :assignee_is_organization
+
+  def label
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_ACTION_REQUIRED_TASKS_LABEL
+  end
+
+  def self.tab_name
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_ACTION_REQUIRED_TASKS_TAB_NAME
+  end
+
+  def description
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_ACTION_REQUIRED_TASKS_DESCRIPTION
+  end
+
+  def tasks
+    CorrespondenceTask.includes(*task_includes).where(assigned_to: assignee).on_hold
+  end
+
+  def column_names
+    [
+      Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
+      Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
+      Constants.QUEUE_CONFIG.COLUMNS.DAYS_WAITING_CORRESPONDENCE.name,
+      Constants.QUEUE_CONFIG.COLUMNS.TASK_ASSIGNED_BY.name,
+      Constants.QUEUE_CONFIG.COLUMNS.ACTION_TYPE.name,
+      Constants.QUEUE_CONFIG.COLUMNS.NOTES.name
+    ]
+  end
+end
diff --git a/app/models/queue_tabs/organization_correspondence_assigned_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_assigned_tasks_tab.rb
new file mode 100644
index 00000000000..867beb1a9c6
--- /dev/null
+++ b/app/models/queue_tabs/organization_correspondence_assigned_tasks_tab.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+class OrganizationCorrespondenceAssignedTasksTab < CorrespondenceQueueTab
+  validate :assignee_is_organization
+
+  def label
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_TEAM_ASSIGNED_TASKS_LABEL
+  end
+
+  def self.tab_name
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_TEAM_ASSIGNED_TASKS_TAB_NAME
+  end
+
+  def description
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_TEAM_ASSIGNED_TASKS_DESCRIPTION
+  end
+
+  def tasks
+    CorrespondenceTask.includes(*task_includes).where(assigned_to: assignee).assigned
+  end
+
+  def column_names
+    [
+      Constants.QUEUE_CONFIG.COLUMNS.CHECKBOX_COLUMN.name,
+      Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
+      Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
+      Constants.QUEUE_CONFIG.COLUMNS.DAYS_WAITING_CORRESPONDENCE.name,
+      Constants.QUEUE_CONFIG.COLUMNS.TASK_TYPE.name,
+      Constants.QUEUE_CONFIG.COLUMNS.TASK_ASSIGNEE.name,
+      Constants.QUEUE_CONFIG.COLUMNS.NOTES.name
+    ]
+  end
+end
diff --git a/app/models/queue_tabs/organization_correspondence_completed_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_completed_tasks_tab.rb
new file mode 100644
index 00000000000..b13a3dd4c00
--- /dev/null
+++ b/app/models/queue_tabs/organization_correspondence_completed_tasks_tab.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class OrganizationCorrespondenceCompletedTasksTab < CorrespondenceQueueTab
+  validate :assignee_is_organization
+
+  def label
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_TEAM_COMPLETED_TASKS_LABEL
+  end
+
+  def self.tab_name
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_TEAM_COMPLETED_TASKS_TAB_NAME
+  end
+
+  def description
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_TEAM_COMPLETED_TASKS_DESCRIPTION
+  end
+
+  def tasks
+    CorrespondenceTask.includes(*task_includes).where(assigned_to: assignee).recently_completed
+  end
+
+  def column_names
+    [
+      Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
+      Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
+      Constants.QUEUE_CONFIG.COLUMNS.TASK_CLOSED_DATE.name,
+      Constants.QUEUE_CONFIG.COLUMNS.NOTES.name
+    ]
+  end
+end
diff --git a/app/models/queue_tabs/organization_correspondence_pending_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_pending_tasks_tab.rb
new file mode 100644
index 00000000000..f87699301a2
--- /dev/null
+++ b/app/models/queue_tabs/organization_correspondence_pending_tasks_tab.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+class OrganizationCorrespondencePendingTasksTab < CorrespondenceQueueTab
+  validate :assignee_is_organization
+
+  def label
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_PENDING_TASKS_LABEL
+  end
+
+  def self.tab_name
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_PENDING_TASKS_TAB_NAME
+  end
+
+  def description
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_PENDING_TASKS_DESCRIPTION
+  end
+
+  def tasks
+    Task.none
+    # CorrespondenceTask
+    # .where(status: "on_hold")
+    # .find(
+    #   MailTask.active.where(appeal_type: "Correspondence").pluck(:parent_id)
+    # )
+  end
+
+  def column_names
+    [
+      Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
+      Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
+      Constants.QUEUE_CONFIG.COLUMNS.DAYS_WAITING_CORRESPONDENCE.name,
+      Constants.QUEUE_CONFIG.COLUMNS.TASK_TYPE.name,
+      Constants.QUEUE_CONFIG.COLUMNS.TASK_ASSIGNEE.name
+    ]
+  end
+end
diff --git a/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb
new file mode 100644
index 00000000000..d567bd78c1c
--- /dev/null
+++ b/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+class OrganizationCorrespondenceUnassignedTasksTab < CorrespondenceQueueTab
+  validate :assignee_is_organization
+
+  def label
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_UNASSIGNED_TASKS_LABEL
+  end
+
+  def self.tab_name
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_UNASSIGNED_TASKS_TAB_NAME
+  end
+
+  def description
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_UNASSIGNED_TASKS_DESCRIPTION
+  end
+
+  def tasks
+    CorrespondenceTask.where(assigned_to: assignee, status: "unassigned")
+  end
+
+  def column_names
+    [
+      Constants.QUEUE_CONFIG.COLUMNS.CHECKBOX_COLUMN.name,
+      Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
+      Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
+      Constants.QUEUE_CONFIG.COLUMNS.DAYS_WAITING_CORRESPONDENCE.name,
+      Constants.QUEUE_CONFIG.COLUMNS.NOTES.name
+    ]
+  end
+end
diff --git a/app/models/serializers/work_queue/correspondence_task_column_serializer.rb b/app/models/serializers/work_queue/correspondence_task_column_serializer.rb
new file mode 100644
index 00000000000..1d573331e63
--- /dev/null
+++ b/app/models/serializers/work_queue/correspondence_task_column_serializer.rb
@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+class WorkQueue::CorrespondenceTaskColumnSerializer
+  include FastJsonapi::ObjectSerializer
+
+  attribute :unique_id do |object|
+    object.id.to_s
+  end
+
+  attribute :instructions do |object|
+    object.instructions
+  end
+
+  attribute :veteran_details do |object|
+    vet = Veteran.find(object.correspondence.veteran_id)
+    "#{vet.first_name} #{vet.last_name} (#{vet.file_number})"
+  end
+
+  attribute :notes do |object|
+    object.correspondence.notes
+  end
+
+  attribute :cmp_packet_number do |object|
+    object.correspondence.cmp_packet_number
+  end
+
+  attribute :completion_date do |object|
+    object.closed_at
+  end
+
+  attribute :days_waiting do |object|
+    object.days_waiting
+  end
+
+  attribute :va_date_of_receipt do |object|
+    object.correspondence.va_date_of_receipt
+  end
+
+  attribute :label do |object|
+    object.label
+  end
+
+  attribute :status do |object|
+    object.status
+  end
+
+  attribute :assigned_at do |object|
+    object.assigned_at
+  end
+
+  attribute :assigned_to do |object|
+    assignee = object.assigned_to
+    {
+      css_id: assignee.try(:css_id),
+      is_organization: assignee.is_a?(Organization),
+      name: assignee.is_a?(Organization) ? assignee.name : assignee.css_id,
+      type: assignee.class.name,
+      id: assignee.id
+    }
+  end
+
+  attribute :assigned_by do |object|
+    {
+      first_name: object.assigned_by_display_name.first,
+      last_name: object.assigned_by_display_name.last,
+      css_id: object.assigned_by.try(:css_id),
+      pg_id: object.assigned_by.try(:id)
+    }
+  end
+end
diff --git a/app/models/tasks/correspondence_task.rb b/app/models/tasks/correspondence_task.rb
index 607b856f111..afe9a3e9799 100644
--- a/app/models/tasks/correspondence_task.rb
+++ b/app/models/tasks/correspondence_task.rb
@@ -42,6 +42,10 @@ def self.create_child_task(parent_task, current_user, params)
     )
   end
 
+  def correspondence
+    appeal
+  end
+
   private
 
   def status_is_valid_on_create
diff --git a/app/models/user.rb b/app/models/user.rb
index 000aec8502f..dd53ba31b25 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -415,6 +415,14 @@ def queue_tabs
     end
   end
 
+  def correspondence_queue_tabs
+    [
+      correspondence_assigned_tasks_tab,
+      correspondence_in_progress_tasks_tab,
+      correspondence_completed_tasks_tab
+    ]
+  end
+
   def self.default_active_tab
     Constants.QUEUE_CONFIG.INDIVIDUALLY_ASSIGNED_TASKS_TAB_NAME
   end
@@ -431,6 +439,18 @@ def completed_tasks_tab
     ::CompletedTasksTab.new(assignee: self, show_regional_office_column: show_regional_office_in_queue?)
   end
 
+  def correspondence_assigned_tasks_tab
+    ::CorrespondenceAssignedTasksTab.new(assignee: self)
+  end
+
+  def correspondence_in_progress_tasks_tab
+    ::CorrespondenceInProgressTasksTab.new(assignee: self)
+  end
+
+  def correspondence_completed_tasks_tab
+    ::CorrespondenceCompletedTasksTab.new(assignee: self)
+  end
+
   def can_edit_unrecognized_poa?
     allowed_orgs = [LitigationSupport, ClerkOfTheBoard, BoardProductOwners, BvaIntake].map(&:singleton)
     colocated_in_vacols? || allowed_orgs.any? { |org| org.user_has_access?(self) }
diff --git a/app/views/correspondence/correspondence_cases.html.erb b/app/views/correspondence/correspondence_cases.html.erb
index 74298a297bc..b2dfc251feb 100644
--- a/app/views/correspondence/correspondence_cases.html.erb
+++ b/app/views/correspondence/correspondence_cases.html.erb
@@ -9,6 +9,7 @@
     dropdownUrls: dropdown_urls,
     applicationUrls: application_urls,
     feedbackUrl: feedback_url,
+    configUrl: "?json",
     flash: flash,
     featureToggles: {
       correspondence_queue: FeatureToggle.enabled?(:correspondence_queue, user: current_user)
diff --git a/app/views/correspondence/correspondence_team.html.erb b/app/views/correspondence/correspondence_team.html.erb
new file mode 100644
index 00000000000..90cc5c0bfae
--- /dev/null
+++ b/app/views/correspondence/correspondence_team.html.erb
@@ -0,0 +1,18 @@
+<% content_for :full_page_content do %>
+  <%= react_component("Queue", props: {
+    userDisplayName: current_user.display_name,
+    userId: current_user.id,
+    userRole: (current_user.vacols_roles.first || "").capitalize,
+    userCssId: current_user.css_id,
+    organizations: current_user.selectable_organizations.map {|o| o.slice(:name, :url)},
+    caseSearchHomePage: case_search_home_page,
+    configUrl: "team?json",
+    dropdownUrls: dropdown_urls,
+    applicationUrls: application_urls,
+    feedbackUrl: feedback_url,
+    flash: flash,
+    featureToggles: {
+      correspondence_queue: FeatureToggle.enabled?(:correspondence_queue, user: current_user)
+    }
+  }) %>
+<% end %>
diff --git a/client/COPY.json b/client/COPY.json
index 07ef450131a..acbcd38c3b7 100644
--- a/client/COPY.json
+++ b/client/COPY.json
@@ -51,6 +51,7 @@
   "CASE_LIST_TABLE_QUEUE_DROPDOWN_OWN_CASES_LABEL": "Your cases",
   "CASE_LIST_TABLE_QUEUE_DROPDOWN_TEAM_CASES_LABEL": "%s team cases",
   "CASE_LIST_TABLE_QUEUE_DROPDOWN_CORRESPONDENCE_CASES": "Correspondence Cases",
+  "CASE_LIST_TABLE_QUEUE_DROPDOWN_OWN_CORRESPONDENCE_LABEL": "Your Correspondence",
   "TITLE_MODAL_EDIT_DOCUMENT_TYPE_CORRESPONDENCE" : "Edit document type",
   "TEXT_MODAL_EDIT_DOCUMENT_TYPE_CORRESPONDENCE" : "Change the document type of the selected document.",
   "ORIGINAL_DOC_EDIT_DOCUMENT_TYPE_CORRESPONDENCE" : "Original document type",
diff --git a/client/app/queue/QueueApp.jsx b/client/app/queue/QueueApp.jsx
index 5ea3a72a15d..14771ec4bf1 100644
--- a/client/app/queue/QueueApp.jsx
+++ b/client/app/queue/QueueApp.jsx
@@ -744,6 +744,13 @@ class QueueApp extends React.PureComponent {
               render={this.routedCorrespondenceCase}
             />
 
+            <PageRoute
+              exact
+              path="/queue/correspondence/team"
+              title={`${PAGE_TITLES.CORRESPONDENCE_CASES_LIST}`}
+              render={this.routedCorrespondenceCase}
+            />
+
             <PageRoute
               exact
               path="/queue/:userId"
diff --git a/client/app/queue/correspondence/CorrespondenceCases.jsx b/client/app/queue/correspondence/CorrespondenceCases.jsx
index 5b159dfc588..aee084a5706 100644
--- a/client/app/queue/correspondence/CorrespondenceCases.jsx
+++ b/client/app/queue/correspondence/CorrespondenceCases.jsx
@@ -21,7 +21,7 @@ class CorrespondenceCases extends React.PureComponent {
 
   // grabs correspondences and loads into intakeCorrespondence redux store.
   getVeteransWithCorrespondence() {
-    return ApiUtil.get('/queue/correspondence?json').then((response) => {
+    return ApiUtil.get(this.props.configUrl).then((response) => {
       const returnedObject = response.body;
       const vetCorrespondences = returnedObject.vetCorrespondences;
 
@@ -29,7 +29,7 @@ class CorrespondenceCases extends React.PureComponent {
     }).
       catch((err) => {
         // allow HTTP errors to fall on the floor via the console.
-        console.error(new Error(`Problem with GET /queue/correspondence?json ${err}`));
+        console.error(new Error(`Problem with GET ${this.props.configUrl} ${err}`));
       });
   }
 
@@ -81,7 +81,8 @@ CorrespondenceCases.propTypes = {
   loadVetCorrespondence: PropTypes.func,
   vetCorrespondences: PropTypes.array,
   currentAction: PropTypes.object,
-  veteranInformation: PropTypes.object
+  veteranInformation: PropTypes.object,
+  configUrl: PropTypes.string
 };
 
 const mapStateToProps = (state) => ({
diff --git a/client/constants/QUEUE_CONFIG.json b/client/constants/QUEUE_CONFIG.json
index 86691f396cc..88eb6848a58 100644
--- a/client/constants/QUEUE_CONFIG.json
+++ b/client/constants/QUEUE_CONFIG.json
@@ -36,7 +36,41 @@
   "CAREGIVER_SUPPORT_IN_PROGRESS_TASKS_TAB_NAME": "caregiver_support_in_progress",
   "CAREGIVER_SUPPORT_COMPLETED_TASKS_TAB_NAME": "caregiver_support_completed",
 
+  "CORRESPONDENCE_ASSIGNED_TASKS_LABEL": "Assigned",
+  "CORRESPONDENCE_COMPLETED_TASKS_LABEL": "Completed",
+  "CORRESPONDENCE_IN_PROGRESS_TASKS_LABEL": "In Progress",
+  "CORRESPONDENCE_ACTION_REQUIRED_TASKS_LABEL": "Action Required",
+  "CORRESPONDENCE_TEAM_ASSIGNED_TASKS_LABEL": "Assigned",
+  "CORRESPONDENCE_TEAM_COMPLETED_TASKS_LABEL": "Completed",
+  "CORRESPONDENCE_PENDING_TASKS_LABEL": "Pending",
+  "CORRESPONDENCE_UNASSIGNED_TASKS_LABEL": "Unassigned",
+
+  "CORRESPONDENCE_ASSIGNED_TASKS_TAB_NAME": "correspondence_assigned",
+  "CORRESPONDENCE_COMPLETED_TASKS_TAB_NAME": "correspondence_completed",
+  "CORRESPONDENCE_IN_PROGRESS_TASKS_TAB_NAME": "correspondence_in_progress",
+  "CORRESPONDENCE_ACTION_REQUIRED_TASKS_TAB_NAME": "correspondence_action_required",
+  "CORRESPONDENCE_TEAM_ASSIGNED_TASKS_TAB_NAME": "correspondence_team_assigned",
+  "CORRESPONDENCE_TEAM_COMPLETED_TASKS_TAB_NAME": "correspondence_team_completed",
+  "CORRESPONDENCE_PENDING_TASKS_TAB_NAME": "correspondence_pending",
+  "CORRESPONDENCE_UNASSIGNED_TASKS_TAB_NAME": "correspondence_unassigned",
+
+  "CORRESPONDENCE_ASSIGNED_TASKS_DESCRIPTION": "Correspondence assigned to you:",
+  "CORRESPONDENCE_COMPLETED_TASKS_DESCRIPTION": "Completed correspondence:",
+  "CORRESPONDENCE_IN_PROGRESS_TASKS_DESCRIPTION": "Correspondence in progress that are assigned to you:",
+  "CORRESPONDENCE_ACTION_REQUIRED_TASKS_DESCRIPTION": "Correspondence with pending requests:",
+  "CORRESPONDENCE_TEAM_ASSIGNED_TASKS_DESCRIPTION": "Correspondence that is currently assigned to mail team users:",
+  "CORRESPONDENCE_TEAM_COMPLETED_TASKS_DESCRIPTION": "Completed correspondence:",
+  "CORRESPONDENCE_PENDING_TASKS_DESCRIPTION": "Correspondence that is currently assigned to non-mail team users:",
+  "CORRESPONDENCE_UNASSIGNED_TASKS_DESCRIPTION": "Correspondence owned by the Mail team are unassigned to an individual:",
+
+  "CORRESPONDENCE_ORG_TABLE_TITLE": "Correspondence cases",
+  "CORRESPONDENCE_USER_TABLE_TITLE": "Your correspondence",
+
+
   "COLUMNS": {
+    "ACTION_TYPE": {
+      "name": "actionType"
+    },
     "APPEAL_TYPE": {
       "filterable": true,
       "name": "typeColumn"
@@ -51,6 +85,9 @@
       "sorting_table": "cached_appeal_attributes",
       "sorting_columns": ["veteran_name"]
     },
+    "CHECKBOX_COLUMN": {
+      "name": "checkboxColumn"
+    },
     "DAYS_ON_HOLD": {
       "name": "daysOnHoldColumn"
     },
@@ -72,6 +109,9 @@
       "sorting_table": "tasks",
       "sorting_columns": ["assigned_at"]
     },
+    "DAYS_WAITING_CORRESPONDENCE": {
+      "name": "daysWaitingCorrespondence"
+    },
     "LAST_ACTION": {
       "name": "lastActionColumn"
     },
@@ -106,6 +146,15 @@
         "issue_types"
       ]
     },
+    "NOTES": {
+      "name": "notes"
+    },
+    "VA_DATE_OF_RECEIPT": {
+      "name": "vaDor"
+    },
+    "VETERAN_DETAILS": {
+      "name": "veteranDetails"
+    },
     "VETERAN_PARTICIPANT_ID": {
       "name": "veteranParticipantIdColumn"
     },
diff --git a/config/routes.rb b/config/routes.rb
index 637d86c2570..6b952e43cda 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -309,6 +309,7 @@
     get '/correspondence/:correspondence_uuid/veteran', to: 'correspondence#veteran'
     put '/correspondence/:correspondence_uuid/update_cmp', to: 'correspondence#update_cmp'
     get '/correspondence/packages', to: 'correspondence#package_documents'
+    get '/correspondence/team', to: 'correspondence#correspondence_team'
     get '/correspondence/:correspondence_uuid', to: 'correspondence#show'
     get '/correspondence/:pdf_id/pdf', to: 'correspondence#pdf'
     patch '/correspondence/:correspondence_uuid', to: 'correspondence#update'
diff --git a/spec/models/correspondence_config_spec.rb b/spec/models/correspondence_config_spec.rb
new file mode 100644
index 00000000000..2e7661f243c
--- /dev/null
+++ b/spec/models/correspondence_config_spec.rb
@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+
+describe CorrespondenceConfig, :postgres do
+  describe ".to_hash" do
+    let(:assignee) { create(:organization) }
+    let(:user) { create(:user) }
+
+    subject { CorrespondenceConfig.new(assignee: assignee).to_hash }
+
+    describe "shape of the returned hash" do
+      it "returns the correct top level keys in the response" do
+        expect(subject.keys).to match_array([:table_title, :active_tab, :tasks_per_page, :use_task_pages_api, :tabs])
+      end
+    end
+
+    describe "title" do
+      context "when assigned to an org" do
+        it "is formatted as expected" do
+          expect(subject[:table_title]).to eq("Correspondence cases")
+        end
+      end
+
+      context "when assigned to a user" do
+        let(:assignee) { user }
+
+        it "is formatted as expected" do
+          expect(subject[:table_title]).to eq("Your correspondence")
+        end
+      end
+    end
+
+    describe "active_tab" do
+      it "is the unassigned tab" do
+        expect(subject[:active_tab]).to eq("correspondence_unassigned")
+      end
+
+      context "when assigned to a user" do
+        let(:assignee) { user }
+
+        it "is the assigned tab" do
+          expect(subject[:active_tab]).to eq("correspondence_assigned")
+        end
+      end
+    end
+
+    describe "tabs array" do
+      context "when assigned to an organization" do
+        it "has the correct tabs" do
+          expect(subject[:tabs].map do |tab|
+            tab[:label]
+          end).to eq(%w(Unassigned Action\ Required Pending Assigned Completed))
+        end
+
+        it "tabs have the correct columns" do
+          expect(subject[:tabs].find { |tab| tab[:label] == "Unassigned" }[:columns]
+          .map { |column| column[:name] })
+          .to eq(%w(checkboxColumn veteranDetails vaDor daysWaitingCorrespondence notes))
+
+          expect(subject[:tabs].find { |tab| tab[:label] == "Action Required" }[:columns]
+          .map { |column| column[:name] })
+          .to eq(%w(veteranDetails vaDor daysWaitingCorrespondence assignedByColumn actionType notes))
+
+          expect(subject[:tabs].find { |tab| tab[:label] == "Pending" }[:columns]
+          .map { |column| column[:name] })
+          .to eq(%w(veteranDetails vaDor daysWaitingCorrespondence taskColumn assignedToColumn))
+
+          expect(subject[:tabs].find { |tab| tab[:label] == "Assigned" }[:columns]
+          .map { |column| column[:name] })
+          .to eq(%w(checkboxColumn veteranDetails vaDor daysWaitingCorrespondence taskColumn assignedToColumn notes))
+
+          expect(subject[:tabs].find { |tab| tab[:label] == "Completed" }[:columns]
+          .map { |column| column[:name] })
+          .to eq(%w(veteranDetails vaDor completedDateColumn notes))
+        end
+      end
+
+      context "when assigned to a user" do
+        let(:assignee) { user }
+
+        it "has the correct tabs" do
+          expect(subject[:tabs].map do |tab|
+            tab[:label]
+          end).to eq(%w(Assigned In\ Progress Completed))
+        end
+
+        it "tabs have the correct columns" do
+          expect(subject[:tabs].find { |tab| tab[:label] == "Assigned" }[:columns]
+          .map { |column| column[:name] })
+          .to eq(%w(veteranDetails vaDor daysWaitingCorrespondence notes))
+
+          expect(subject[:tabs].find { |tab| tab[:label] == "In Progress" }[:columns]
+          .map { |column| column[:name] })
+          .to eq(%w(veteranDetails vaDor taskColumn daysWaitingCorrespondence notes))
+
+          expect(subject[:tabs].find { |tab| tab[:label] == "Completed" }[:columns]
+          .map { |column| column[:name] })
+          .to eq(%w(veteranDetails vaDor completedDateColumn notes))
+        end
+      end
+    end
+  end
+end
diff --git a/spec/requests/correspondence_controller_spec.rb b/spec/requests/correspondence_controller_spec.rb
index cf020450989..a881a5fd0d5 100644
--- a/spec/requests/correspondence_controller_spec.rb
+++ b/spec/requests/correspondence_controller_spec.rb
@@ -62,6 +62,93 @@
     end
   end
 
+  describe "correspondence_cases" do
+    before do
+      get correspondence_path, as: :json
+    end
+
+    it "returns 200 status" do
+      expect(response).to have_http_status(:ok)
+    end
+
+    it "returns json in the expected shape" do
+      data = JSON.parse(response.body, symbolize_names: true)
+      expect(data[:correspondence_config][:table_title]).to be_a(String)
+      expect(data[:correspondence_config]).to be_a(Hash)
+      expect(data[:correspondence_config][:active_tab]).to be_a(String)
+      expect(data[:correspondence_config][:tasks_per_page]).to be_a(Integer)
+      expect(data[:correspondence_config][:use_task_pages_api?]).to eq(nil).or be_a(TrueClass || FalseClass)
+      expect(data[:correspondence_config][:tabs]).to be_a(Array)
+
+      data[:correspondence_config][:tabs].each do |tab|
+        expect(tab[:label]).to be_a(String)
+        expect(tab[:name]).to be_a(String)
+        expect(tab[:description]).to be_a(String)
+        expect(tab[:columns]).to be_a(Array)
+        expect(tab[:defaultSort]).to be_a(Hash)
+        expect(tab[:tasks]).to be_a(Array)
+
+        tab[:tasks]&.each do |task|
+          expect(task[:attributes]).to be_a(Hash)
+          expect(task[:attributes][:unique_id]).to be_a(String)
+          expect(task[:attributes][:instructions]).to be_a(Array)
+          expect(task[:attributes][:veteran_details]).to be_a(String)
+          expect(task[:attributes][:completion_date]).to eq(nil).or be_a(String)
+          expect(task[:attributes][:days_waiting]).to be_a(Integer)
+          expect(task[:attributes][:va_date_of_receipt]).to be_a(String)
+          expect(task[:attributes][:label]).to be_a(String)
+          expect(task[:attributes][:status]).to be_a(String)
+          expect(task[:attributes][:assigned_to]).to be_a(Hash)
+          expect(task[:attributes][:assigned_by]).to be_a(Hash)
+        end
+      end
+    end
+  end
+
+  describe "correspondence_team" do
+    before do
+      MailTeamSupervisor.singleton.add_user(current_user)
+      get correspondence_team_path, as: :json
+    end
+
+    it "returns 200 status" do
+      expect(response).to have_http_status(:ok)
+    end
+
+    it "returns json in the expected shape" do
+      data = JSON.parse(response.body, symbolize_names: true)
+      expect(data[:correspondence_config][:table_title]).to be_a(String)
+      expect(data[:correspondence_config]).to be_a(Hash)
+      expect(data[:correspondence_config][:active_tab]).to be_a(String)
+      expect(data[:correspondence_config][:tasks_per_page]).to be_a(Integer)
+      expect(data[:correspondence_config][:use_task_pages_api?]).to eq(nil).or be_a(TrueClass || FalseClass)
+      expect(data[:correspondence_config][:tabs]).to be_a(Array)
+
+      data[:correspondence_config][:tabs].each do |tab|
+        expect(tab[:label]).to be_a(String)
+        expect(tab[:name]).to be_a(String)
+        expect(tab[:description]).to be_a(String)
+        expect(tab[:columns]).to be_a(Array)
+        expect(tab[:defaultSort]).to be_a(Hash)
+        expect(tab[:tasks]).to be_a(Array)
+
+        tab[:tasks]&.each do |task|
+          expect(task[:attributes]).to be_a(Hash)
+          expect(task[:attributes][:unique_id]).to be_a(String)
+          expect(task[:attributes][:instructions]).to be_a(Array)
+          expect(task[:attributes][:veteran_details]).to be_a(String)
+          expect(task[:attributes][:completion_date]).to eq(nil).or be_a(String)
+          expect(task[:attributes][:days_waiting]).to be_a(Integer)
+          expect(task[:attributes][:va_date_of_receipt]).to be_a(String)
+          expect(task[:attributes][:label]).to be_a(String)
+          expect(task[:attributes][:status]).to be_a(String)
+          expect(task[:attributes][:assigned_to]).to be_a(Hash)
+          expect(task[:attributes][:assigned_by]).to be_a(Hash)
+        end
+      end
+    end
+  end
+
   describe "#process_intake" do
     context "tasks_not_related_to_appeal" do
       shared_examples "successful unrelated task creation" do |klass_name, assignee|

From ae34da662b13be4c972aeec177942c1a6df074a2 Mon Sep 17 00:00:00 2001
From: Ki Mau <ki.mau@va.gov>
Date: Tue, 30 Jan 2024 14:03:57 -0500
Subject: [PATCH 059/237] Ki/APPEALS-35714 - Update Queue shell to have a Team
 Queue version (#20585)

* APPEALS-35714 - Initial WIP Commit

* APPEALS-35714 - Clear comments, update controller

* Update correspondence_controller.rb

Updated naming for correspondence_config; Temporary notes

* Update constants.js

Title

* APPEALS-35714 - Tasks 2 Config

* Update CorrespondenceCases.jsx

* APPEALS-35714 - Title Update

* added dynamic routing to correspondence cases

* checkpoint

* Undid unintended push.

* APPEALS-35714 - Route fixes; temporary user fix WIP

* Add BvaIntake User

* Remove comments

* Access Update

* Title Update

---------

Co-authored-by: William Medders <medders_william@bah.com>
Co-authored-by: Ryan Marshall <rnmarshall1993@gmail.com>
---
 app/controllers/correspondence_controller.rb  | 39 +++++++++++--------
 .../correspondence_cases.html.erb             |  2 +-
 .../correspondence_team.html.erb              |  2 +-
 client/COPY.json                              |  1 -
 client/app/queue/QueueApp.jsx                 | 13 +++++--
 .../correspondence/CorrespondenceCases.jsx    | 36 ++++++++---------
 .../correspondence/CorrespondenceTable.jsx    |  6 +--
 .../correspondenceActions.js                  | 10 +++++
 .../correspondenceConstants.js                |  1 +
 .../correspondenceReducer.js                  |  7 ++++
 10 files changed, 73 insertions(+), 44 deletions(-)

diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index b0c31b62682..107e94eae23 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -41,13 +41,31 @@ def current_step
 
   def correspondence_cases
     respond_to do |format|
-      format.html { "correspondence_cases" }
+      format.html { "your_correspondence" }
       format.json do
-        render json: { correspondence_config: CorrespondenceConfig.new(assignee: current_user)}
+        render json: { correspondence_config: CorrespondenceConfig.new(assignee: current_user) }
       end
     end
   end
 
+  def correspondence_team
+    if MailTeamSupervisor.singleton.user_has_access?(current_user) ||
+       BvaIntake.singleton.user_is_admin?(current_user) ||
+       MailTeam.singleton.user_is_admin?(current_user)
+      respond_to do |format|
+        format.html { "correspondence_team" }
+        format.json do
+          render json: { correspondence_config: CorrespondenceConfig.new(assignee: MailTeamSupervisor.singleton) }
+        end
+      end
+    elsif MailTeam.singleton.user_has_access?(current_user) ||
+          BvaIntake.singleton.user_has_access?(current_user)
+      redirect_to "/queue/correspondence"
+    else
+      redirect_to "/unauthorized"
+    end
+  end
+
   def review_package
     render "correspondence/review_package"
   end
@@ -106,19 +124,6 @@ def show
     render({ json: response_json }, status: :ok)
   end
 
-  def correspondence_team
-    if MailTeamSupervisor.singleton.user_has_access?(current_user)
-      respond_to do |format|
-        format.html { "correspondence_team" }
-        format.json do
-          render json: { correspondence_config: CorrespondenceConfig.new(assignee: MailTeamSupervisor.singleton) }
-        end
-      end
-    else
-      redirect_to "/unauthorized"
-    end
-  end
-
   def update
     veteran = Veteran.find_by(file_number: veteran_params["file_number"])
     if veteran && correspondence.update(
@@ -214,7 +219,9 @@ def set_flash_intake_success_message
 
   def verify_correspondence_access
     return true if MailTeamSupervisor.singleton.user_has_access?(current_user) ||
-                   MailTeam.singleton.user_has_access?(current_user)
+                   MailTeam.singleton.user_has_access?(current_user) ||
+                   BvaIntake.singleton.user_is_admin?(current_user) ||
+                   MailTeam.singleton.user_is_admin?(current_user)
 
     redirect_to "/unauthorized"
   end
diff --git a/app/views/correspondence/correspondence_cases.html.erb b/app/views/correspondence/correspondence_cases.html.erb
index b2dfc251feb..6feaf79a547 100644
--- a/app/views/correspondence/correspondence_cases.html.erb
+++ b/app/views/correspondence/correspondence_cases.html.erb
@@ -9,7 +9,7 @@
     dropdownUrls: dropdown_urls,
     applicationUrls: application_urls,
     feedbackUrl: feedback_url,
-    configUrl: "?json",
+    configUrl: '/queue/correspondence?json',
     flash: flash,
     featureToggles: {
       correspondence_queue: FeatureToggle.enabled?(:correspondence_queue, user: current_user)
diff --git a/app/views/correspondence/correspondence_team.html.erb b/app/views/correspondence/correspondence_team.html.erb
index 90cc5c0bfae..bb358254427 100644
--- a/app/views/correspondence/correspondence_team.html.erb
+++ b/app/views/correspondence/correspondence_team.html.erb
@@ -6,10 +6,10 @@
     userCssId: current_user.css_id,
     organizations: current_user.selectable_organizations.map {|o| o.slice(:name, :url)},
     caseSearchHomePage: case_search_home_page,
-    configUrl: "team?json",
     dropdownUrls: dropdown_urls,
     applicationUrls: application_urls,
     feedbackUrl: feedback_url,
+    configUrl: '/queue/correspondence/team?json',
     flash: flash,
     featureToggles: {
       correspondence_queue: FeatureToggle.enabled?(:correspondence_queue, user: current_user)
diff --git a/client/COPY.json b/client/COPY.json
index acbcd38c3b7..07ef450131a 100644
--- a/client/COPY.json
+++ b/client/COPY.json
@@ -51,7 +51,6 @@
   "CASE_LIST_TABLE_QUEUE_DROPDOWN_OWN_CASES_LABEL": "Your cases",
   "CASE_LIST_TABLE_QUEUE_DROPDOWN_TEAM_CASES_LABEL": "%s team cases",
   "CASE_LIST_TABLE_QUEUE_DROPDOWN_CORRESPONDENCE_CASES": "Correspondence Cases",
-  "CASE_LIST_TABLE_QUEUE_DROPDOWN_OWN_CORRESPONDENCE_LABEL": "Your Correspondence",
   "TITLE_MODAL_EDIT_DOCUMENT_TYPE_CORRESPONDENCE" : "Edit document type",
   "TEXT_MODAL_EDIT_DOCUMENT_TYPE_CORRESPONDENCE" : "Change the document type of the selected document.",
   "ORIGINAL_DOC_EDIT_DOCUMENT_TYPE_CORRESPONDENCE" : "Original document type",
diff --git a/client/app/queue/QueueApp.jsx b/client/app/queue/QueueApp.jsx
index 14771ec4bf1..b041500a534 100644
--- a/client/app/queue/QueueApp.jsx
+++ b/client/app/queue/QueueApp.jsx
@@ -97,6 +97,7 @@ import TASK_ACTIONS from '../../constants/TASK_ACTIONS';
 import TASK_STATUSES from '../../constants/TASK_STATUSES';
 import USER_ROLE_TYPES from '../../constants/USER_ROLE_TYPES';
 import DECISION_TYPES from '../../constants/APPEAL_DECISION_TYPES';
+import QUEUE_CONFIG from '../../constants/QUEUE_CONFIG';
 import { FlashAlerts } from '../nonComp/components/Alerts';
 
 import { PulacCerulloReminderModal } from './pulacCerullo/PulacCerulloReminderModal';
@@ -679,6 +680,10 @@ class QueueApp extends React.PureComponent {
     <CorrespondenceCases {...this.props} />
   );
 
+  routedCorrespondenceTeam = () => (
+    <CorrespondenceCases {...this.props} />
+  );
+
   routedCompleteHearingWithdrawalRequest = (props) => (
     <CompleteHearingWithdrawalRequestModal {...props.match.params} />
   );
@@ -739,15 +744,15 @@ class QueueApp extends React.PureComponent {
 
             <PageRoute
               exact
-              path="/queue/correspondence"
-              title={`${PAGE_TITLES.CORRESPONDENCE_CASES_LIST}`}
+              path="/queue/correspondence/team"
+              title={`${QUEUE_CONFIG.CORRESPONDENCE_ORG_TABLE_TITLE}`}
               render={this.routedCorrespondenceCase}
             />
 
             <PageRoute
               exact
-              path="/queue/correspondence/team"
-              title={`${PAGE_TITLES.CORRESPONDENCE_CASES_LIST}`}
+              path="/queue/correspondence"
+              title={`${QUEUE_CONFIG.CORRESPONDENCE_USER_TABLE_TITLE}`}
               render={this.routedCorrespondenceCase}
             />
 
diff --git a/client/app/queue/correspondence/CorrespondenceCases.jsx b/client/app/queue/correspondence/CorrespondenceCases.jsx
index aee084a5706..65e27f8ea3f 100644
--- a/client/app/queue/correspondence/CorrespondenceCases.jsx
+++ b/client/app/queue/correspondence/CorrespondenceCases.jsx
@@ -2,14 +2,14 @@ import * as React from 'react';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import ApiUtil from '../../util/ApiUtil';
-import { loadVetCorrespondence } from './correspondenceReducer/correspondenceActions';
+import { loadCorrespondenceConfig } from './correspondenceReducer/correspondenceActions';
 import AppSegment from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/AppSegment';
 import PropTypes from 'prop-types';
 import COPY from '../../../COPY';
 import { sprintf } from 'sprintf-js';
 import { css } from 'glamor';
-import CorrespondenceTable from './CorrespondenceTable';
-import QueueOrganizationDropdown from '../components/QueueOrganizationDropdown';
+// import CorrespondenceTable from './CorrespondenceTable';
+// import QueueOrganizationDropdown from '../components/QueueOrganizationDropdown';
 import Alert from '../../components/Alert';
 
 // import {
@@ -19,13 +19,13 @@ import Alert from '../../components/Alert';
 
 class CorrespondenceCases extends React.PureComponent {
 
-  // grabs correspondences and loads into intakeCorrespondence redux store.
-  getVeteransWithCorrespondence() {
+  // now grabs tasks and loads into redux store
+  getCorrespondenceConfig() {
     return ApiUtil.get(this.props.configUrl).then((response) => {
       const returnedObject = response.body;
-      const vetCorrespondences = returnedObject.vetCorrespondences;
+      const correspondenceConfig = returnedObject.correspondence_config;
 
-      this.props.loadVetCorrespondence(vetCorrespondences);
+      this.props.loadCorrespondenceConfig(correspondenceConfig);
     }).
       catch((err) => {
         // allow HTTP errors to fall on the floor via the console.
@@ -33,17 +33,17 @@ class CorrespondenceCases extends React.PureComponent {
       });
   }
 
-  // load veteran correspondence info on page load
+  // load task info on page load
   componentDidMount() {
     // Retry the request after a delay
     setTimeout(() => {
-      this.getVeteransWithCorrespondence();
+      this.getCorrespondenceConfig();
     }, 1000);
   }
 
   render = () => {
     const {
-      organizations,
+      // organizations,
       currentAction,
       veteranInformation
 
@@ -64,12 +64,12 @@ class CorrespondenceCases extends React.PureComponent {
           <Alert type="success" title={sprintf(COPY.CORRESPONDENCE_TITLE_REMOVE_PACKAGE_BANNER, vetName)}
             message={COPY.CORRESPONDENCE_MESSAGE_REMOVE_PACKAGE_BANNER} scrollOnAlert={false} />}
           <h1 {...css({ display: 'inline-block' })}>{COPY.CASE_LIST_TABLE_QUEUE_DROPDOWN_CORRESPONDENCE_CASES}</h1>
-          <QueueOrganizationDropdown organizations={organizations} />
-          {this.props.vetCorrespondences &&
+          {/* <QueueOrganizationDropdown organizations={organizations} />
+          {this.props.correspondenceConfig &&
           <CorrespondenceTable
-            vetCorrespondences={this.props.vetCorrespondences}
+            correspondenceConfig={this.props.correspondenceConfig}
           />
-          }
+          } */}
         </AppSegment>
       </React.Fragment>
     );
@@ -78,22 +78,22 @@ class CorrespondenceCases extends React.PureComponent {
 
 CorrespondenceCases.propTypes = {
   organizations: PropTypes.array,
-  loadVetCorrespondence: PropTypes.func,
-  vetCorrespondences: PropTypes.array,
+  loadCorrespondenceConfig: PropTypes.func,
+  correspondenceConfig: PropTypes.object,
   currentAction: PropTypes.object,
   veteranInformation: PropTypes.object,
   configUrl: PropTypes.string
 };
 
 const mapStateToProps = (state) => ({
-  vetCorrespondences: state.intakeCorrespondence.vetCorrespondences,
+  correspondenceConfig: state.intakeCorrespondence.correspondenceConfig,
   currentAction: state.reviewPackage.lastAction,
   veteranInformation: state.reviewPackage.veteranInformation
 });
 
 const mapDispatchToProps = (dispatch) => (
   bindActionCreators({
-    loadVetCorrespondence
+    loadCorrespondenceConfig,
   }, dispatch)
 );
 
diff --git a/client/app/queue/correspondence/CorrespondenceTable.jsx b/client/app/queue/correspondence/CorrespondenceTable.jsx
index 7f828b94e1b..b1f619e4d05 100644
--- a/client/app/queue/correspondence/CorrespondenceTable.jsx
+++ b/client/app/queue/correspondence/CorrespondenceTable.jsx
@@ -47,7 +47,7 @@ class CorrespondenceTable extends React.Component {
       <QueueTable
         className="assign-correspondence-table"
         columns={columns}
-        rowObjects={this.props.vetCorrespondences}
+        rowObjects={this.props.correspondenceConfig}
         summary="scheduled-hearings-table"
         enablePagination
         tabPaginationOptions={tabPaginationOptions}
@@ -60,8 +60,8 @@ CorrespondenceTable.propTypes = {
   hearingScheduleColumns: PropTypes.array,
   hearingScheduleRows: PropTypes.array,
   onApply: PropTypes.func,
-  loadVetCorrespondence: PropTypes.func,
-  vetCorrespondences: PropTypes.array,
+  loadCorrespondenceConfig: PropTypes.func,
+  correspondenceConfig: PropTypes.array,
   history: PropTypes.object,
   user: PropTypes.shape({
     userCanBuildHearingSchedule: PropTypes.bool
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
index 4866db8154b..081f6253d71 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
@@ -40,6 +40,16 @@ export const loadVetCorrespondence = (vetCorrespondences) =>
     });
   };
 
+export const loadCorrespondenceConfig = (correspondenceConfig) =>
+  (dispatch) => {
+    dispatch({
+      type: ACTIONS.LOAD_CORRESPONDENCE_CONFIG,
+      payload: {
+        correspondenceConfig
+      }
+    });
+  };
+
 export const updateRadioValue = (value) =>
   (dispatch) => {
     dispatch({
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
index 5ccbf472a5b..fcd7baf913d 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
@@ -3,6 +3,7 @@ export const ACTIONS = {
   LOAD_CORRESPONDENCES: 'LOAD_CORRESPONDENCES',
   LOAD_VETERAN_INFORMATION: 'LOAD_VETERAN_INFORMATION',
   LOAD_VET_CORRESPONDENCE: 'LOAD_VET_CORRESPONDENCE',
+  LOAD_CORRESPONDENCE_CONFIG: 'LOAD_CORRESPONDENCE_CONFIG',
   UPDATE_RADIO_VALUE: 'UPDATE_RADIO_VALUE',
   SAVE_CHECKBOX_STATE: 'SAVE_CHECKBOX_STATE',
   CLEAR_CHECKBOX_STATE: 'CLEAR_CHECKBOX_STATE',
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
index 5ab2391e9d5..3be0251b826 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
@@ -45,6 +45,13 @@ export const intakeCorrespondenceReducer = (state = initialState, action = {}) =
       }
     });
 
+  case ACTIONS.LOAD_CORRESPONDENCE_CONFIG:
+    return update(state, {
+      correspondenceConfig: {
+        $set: action.payload.correspondenceConfig
+      }
+    });
+
   case ACTIONS.UPDATE_RADIO_VALUE:
     return update(state, {
       radioValue: {

From 0512cc5254e7b14745520da36fbb77bb7a81b7ae Mon Sep 17 00:00:00 2001
From: vinner57 <128258952+vinner57@users.noreply.github.com>
Date: Tue, 30 Jan 2024 16:12:36 -0500
Subject: [PATCH 060/237] corrspondence response letter changes (#20605)

* corrspondence response letter changes

* specs and refactoring

* rubocop fix

* Update migration and rubocop fixes

---------

Co-authored-by: Christopher Aceves <christopher.aceves@va.gov>
---
 ...respondence_response_letters_controller.rb | 17 +++++++++
 app/models/correspondence_response_letter.rb  |  5 +++
 config/routes.rb                              |  1 +
 ...onse_letters_rename_type_to_letter_type.rb |  8 +++++
 db/schema.rb                                  |  4 +--
 ...spondence_response_letters_request_spec.rb | 36 +++++++++++++++++++
 6 files changed, 69 insertions(+), 2 deletions(-)
 create mode 100644 app/controllers/correspondence_response_letters_controller.rb
 create mode 100644 app/models/correspondence_response_letter.rb
 create mode 100644 db/migrate/20240125112635_correspondence_response_letters_rename_type_to_letter_type.rb
 create mode 100644 spec/requests/correspondence_response_letters_request_spec.rb

diff --git a/app/controllers/correspondence_response_letters_controller.rb b/app/controllers/correspondence_response_letters_controller.rb
new file mode 100644
index 00000000000..ae32f0ac12b
--- /dev/null
+++ b/app/controllers/correspondence_response_letters_controller.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class CorrespondenceResponseLettersController < ApplicationController
+  def create
+    correspondence_response_letter = CorrespondenceResponseLetter.new(correspondence_response_letter_params)
+    if correspondence_response_letter.save
+      render json: correspondence_response_letter, status: :ok
+    else
+      render json: correspondence_response_letter.errors.full_messages, status: :unprocessable_entity
+    end
+  end
+
+  def correspondence_response_letter_params
+    params.require(:correspondence_response_letter).permit(:title, :date_sent, :letter_type, :subcategory, :reason,
+                                                           :response_window, :user_id)
+  end
+end
diff --git a/app/models/correspondence_response_letter.rb b/app/models/correspondence_response_letter.rb
new file mode 100644
index 00000000000..6d29100ff86
--- /dev/null
+++ b/app/models/correspondence_response_letter.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class CorrespondenceResponseLetter < CaseflowRecord
+  belongs_to :correspondence
+end
diff --git a/config/routes.rb b/config/routes.rb
index 637d86c2570..c959ad5570e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -315,6 +315,7 @@
     patch '/correspondence/:id/update_document', to: 'correspondence_document#update_document'
     post '/correspondence/:correspondence_uuid', to: 'correspondence#process_intake', as: :queue_correspondence_intake_process_intake
     post "/correspondence/:correspondence_uuid/task", to: "correspondence_tasks#create_package_action_task"
+    post '/correspondence_response_letters', to: 'correspondence_response_letters#create'
     get '/appeals/:vacols_id', to: 'queue#index'
     get '/appeals/:appealId/notifications', to: 'queue#index'
     get '/appeals/:appeal_id/cavc_dashboard', to: 'cavc_dashboard#index'
diff --git a/db/migrate/20240125112635_correspondence_response_letters_rename_type_to_letter_type.rb b/db/migrate/20240125112635_correspondence_response_letters_rename_type_to_letter_type.rb
new file mode 100644
index 00000000000..896e4e78749
--- /dev/null
+++ b/db/migrate/20240125112635_correspondence_response_letters_rename_type_to_letter_type.rb
@@ -0,0 +1,8 @@
+class CorrespondenceResponseLettersRenameTypeToLetterType < Caseflow::Migration
+  def change
+    safety_assured { remove_column :correspondence_response_letters, :type, :string }
+
+    add_column :correspondence_response_letters, :letter_type, :string, null: false,
+                                                                        comment: "Correspondence response letter type"
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index a94210f000b..8f140b3b068 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2024_01_22_174056) do
+ActiveRecord::Schema.define(version: 2024_01_25_112635) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -629,11 +629,11 @@
     t.integer "correspondence_id", comment: "Foreign key on correspondences table"
     t.datetime "created_at", null: false
     t.datetime "date_sent", comment: "Date at the time of sending correspondence response letters"
+    t.string "letter_type", null: false, comment: "Correspondence response letter type"
     t.string "reason", comment: "Reason for selecting the response letter"
     t.integer "response_window", comment: "The response window selected for the correspondence response letter"
     t.string "subcategory", comment: "The subcategory selected for the correspondence response letter "
     t.string "title", null: false, comment: "Correspondence response letters title"
-    t.string "type", null: false, comment: "Correspondence response letter type"
     t.datetime "updated_at", null: false
     t.integer "user_id", comment: "The user who has created correspondence response letter"
   end
diff --git a/spec/requests/correspondence_response_letters_request_spec.rb b/spec/requests/correspondence_response_letters_request_spec.rb
new file mode 100644
index 00000000000..c56a976e8b5
--- /dev/null
+++ b/spec/requests/correspondence_response_letters_request_spec.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+RSpec.describe "CorrespondenceResponseLetters", type: :request do
+  let(:correspondence) { create(:correspondence) }
+  let(:current_user) { create(:intake_user) }
+
+  before do
+    User.authenticate!(user: current_user)
+  end
+
+  describe "POST /create" do
+    it "creates a Correspondence response letter" do
+      # this will perform a POST request to the /correspondence_response_letters_request/create route
+      post correspondence_response_letters_path, params: {
+        correspondence_response_letter: {
+          title: "Test Title",
+          date_sent: Time.zone.now,
+          letter_type: "test",
+          subcategory: "test subcategory",
+          reason: "test reason",
+          response_window: "response window",
+          user_id: current_user.id,
+          correspondence_id: correspondence.id
+        }
+      }
+      # 'response' is a special object which contain HTTP response received after a request is sent
+      # response.body is the body of the HTTP response, which here contain a JSON string
+      expect(JSON.parse(response.body)["title"]).to eq("Test Title")
+
+      # # we can also check the http status of the response
+      expect(response.status).to eq(200)
+    end
+  end
+end

From 1a4ca8d84124ee5cd8e643330a090fa5cd76ec40 Mon Sep 17 00:00:00 2001
From: divyadasari-va <135847343+divyadasari-va@users.noreply.github.com>
Date: Tue, 30 Jan 2024 15:06:57 -0700
Subject: [PATCH 061/237] Div/appeals 39111 (#20658)

* Refactor code for class to functional componets

* Removed some commented lines

* Changes to call the ApiUtil outside of the function and calling it in CorrespondenceActions
---
 .../correspondence/CorrespondenceCases.jsx    | 106 +++++++-----------
 .../correspondenceActions.js                  |  23 ++--
 2 files changed, 59 insertions(+), 70 deletions(-)

diff --git a/client/app/queue/correspondence/CorrespondenceCases.jsx b/client/app/queue/correspondence/CorrespondenceCases.jsx
index 65e27f8ea3f..8f241c5cc05 100644
--- a/client/app/queue/correspondence/CorrespondenceCases.jsx
+++ b/client/app/queue/correspondence/CorrespondenceCases.jsx
@@ -1,7 +1,5 @@
-import * as React from 'react';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-import ApiUtil from '../../util/ApiUtil';
+import React, { useState, useEffect } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
 import { loadCorrespondenceConfig } from './correspondenceReducer/correspondenceActions';
 import AppSegment from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/AppSegment';
 import PropTypes from 'prop-types';
@@ -17,64 +15,61 @@ import Alert from '../../components/Alert';
 //   initialCamoAssignTasksToVhaProgramOffice
 // } from '../QueueActions';
 
-class CorrespondenceCases extends React.PureComponent {
+const CorrespondenceCases = (props) => {
+  const dispatch = useDispatch();
+  const configUrl = props.configUrl;
+  const currentAction = useSelector((state) => state.reviewPackage.lastAction);
+  const veteranInformation = useSelector((state) => state.reviewPackage.veteranInformation);
 
-  // now grabs tasks and loads into redux store
-  getCorrespondenceConfig() {
-    return ApiUtil.get(this.props.configUrl).then((response) => {
-      const returnedObject = response.body;
-      const correspondenceConfig = returnedObject.correspondence_config;
+  const [vetName, setVetName] = useState('');
 
-      this.props.loadCorrespondenceConfig(correspondenceConfig);
-    }).
-      catch((err) => {
-        // allow HTTP errors to fall on the floor via the console.
-        console.error(new Error(`Problem with GET ${this.props.configUrl} ${err}`));
-      });
-  }
+  useEffect(() => {
+    dispatch(loadCorrespondenceConfig(configUrl));
+  }, [dispatch, configUrl]);
 
-  // load task info on page load
-  componentDidMount() {
+  useEffect(() => {
     // Retry the request after a delay
     setTimeout(() => {
-      this.getCorrespondenceConfig();
+      if (configUrl) {
+        dispatch(loadCorrespondenceConfig(configUrl));
+      }
     }, 1000);
-  }
+  }, [configUrl]);
 
-  render = () => {
-    const {
-      // organizations,
-      currentAction,
-      veteranInformation
-
-    } = this.props;
-
-    let vetName = '';
-
-    if (Object.keys(veteranInformation).length > 0) {
-      vetName = `${veteranInformation.veteran_name.first_name.trim()} ${
-        veteranInformation.veteran_name.last_name.trim()}`;
+  useEffect(() => {
+    if (
+      veteranInformation?.veteran_name?.first_name &&
+      veteranInformation?.veteran_name?.last_name
+    ) {
+      setVetName(`${veteranInformation.veteran_name.first_name.trim()} ${veteranInformation.veteran_name.last_name.trim()}`);
     }
+  }, [veteranInformation]);
 
-    return (
-      <React.Fragment>
-        <AppSegment filledBackground>
-          {(Object.keys(veteranInformation).length > 0) &&
-            currentAction.action_type === 'DeleteReviewPackage' &&
-          <Alert type="success" title={sprintf(COPY.CORRESPONDENCE_TITLE_REMOVE_PACKAGE_BANNER, vetName)}
-            message={COPY.CORRESPONDENCE_MESSAGE_REMOVE_PACKAGE_BANNER} scrollOnAlert={false} />}
-          <h1 {...css({ display: 'inline-block' })}>{COPY.CASE_LIST_TABLE_QUEUE_DROPDOWN_CORRESPONDENCE_CASES}</h1>
+  return (
+    <React.Fragment>
+      <AppSegment filledBackground>
+      {(veteranInformation?.veteran_name?.first_name && veteranInformation?.veteran_name?.last_name) &&
+          currentAction.action_type === 'DeleteReviewPackage' && (
+            <Alert
+              type="success"
+              title={sprintf(COPY.CORRESPONDENCE_TITLE_REMOVE_PACKAGE_BANNER, vetName)}
+              message={COPY.CORRESPONDENCE_MESSAGE_REMOVE_PACKAGE_BANNER}
+              scrollOnAlert={false}
+            />
+          )}
+        <h1 {...css({ display: 'inline-block' })}>
+          {COPY.CASE_LIST_TABLE_QUEUE_DROPDOWN_CORRESPONDENCE_CASES}
+        </h1>
           {/* <QueueOrganizationDropdown organizations={organizations} />
           {this.props.correspondenceConfig &&
           <CorrespondenceTable
             correspondenceConfig={this.props.correspondenceConfig}
           />
           } */}
-        </AppSegment>
-      </React.Fragment>
-    );
-  }
-}
+      </AppSegment>
+    </React.Fragment>
+  );
+};
 
 CorrespondenceCases.propTypes = {
   organizations: PropTypes.array,
@@ -85,19 +80,4 @@ CorrespondenceCases.propTypes = {
   configUrl: PropTypes.string
 };
 
-const mapStateToProps = (state) => ({
-  correspondenceConfig: state.intakeCorrespondence.correspondenceConfig,
-  currentAction: state.reviewPackage.lastAction,
-  veteranInformation: state.reviewPackage.veteranInformation
-});
-
-const mapDispatchToProps = (dispatch) => (
-  bindActionCreators({
-    loadCorrespondenceConfig,
-  }, dispatch)
-);
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(CorrespondenceCases);
+export default CorrespondenceCases;
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
index 081f6253d71..30a8649f7e1 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
@@ -1,4 +1,5 @@
 import { ACTIONS } from './correspondenceConstants';
+import ApiUtil from '../../../util/ApiUtil';
 
 export const loadCurrentCorrespondence = (currentCorrespondence) =>
   (dispatch) => {
@@ -40,14 +41,22 @@ export const loadVetCorrespondence = (vetCorrespondences) =>
     });
   };
 
-export const loadCorrespondenceConfig = (correspondenceConfig) =>
+export const loadCorrespondenceConfig = (configUrl) =>
   (dispatch) => {
-    dispatch({
-      type: ACTIONS.LOAD_CORRESPONDENCE_CONFIG,
-      payload: {
-        correspondenceConfig
-      }
-    });
+    ApiUtil.get(configUrl)
+      .then((response) => {
+        const returnedObject = response.body;
+        const correspondenceConfig = returnedObject.correspondence_config;
+        dispatch({
+          type: ACTIONS.LOAD_CORRESPONDENCE_CONFIG,
+          payload: {
+            correspondenceConfig
+          }
+        });
+      })
+      .catch((err) => {
+        console.error(new Error(`Problem with GET ${configUrl} ${err}`));
+      });
   };
 
 export const updateRadioValue = (value) =>

From 2269e9d93bb3d2ecf7abe7c4cb2ba4eecdfe7a9f Mon Sep 17 00:00:00 2001
From: Dev-KRedd <134650238+Dev-KRedd@users.noreply.github.com>
Date: Wed, 31 Jan 2024 16:10:25 -0500
Subject: [PATCH 062/237] Khalin/appeals 38447 (#20636)

* WIP Branch

* AC 1.1, 1.2,2.1, 2.2 done

* Linting errors

* Corrected Comments

* Feature test correction
---
 app/controllers/correspondence_controller.rb  | 21 ++++++-----
 app/models/user.rb                            | 12 +++++++
 app/views/queue/index.html.erb                |  3 ++
 client/app/queue/QueueApp.jsx                 | 15 ++++++++
 client/app/queue/QueueTableBuilder.jsx        | 14 +++++++-
 .../components/QueueOrganizationDropdown.jsx  | 36 ++++++++++++++++---
 client/app/queue/uiReducer/uiActions.js       | 15 ++++++++
 client/app/queue/uiReducer/uiConstants.js     |  3 ++
 client/app/queue/uiReducer/uiReducer.js       | 21 +++++++++++
 client/constants/QUEUE_CONFIG.json            |  4 +++
 .../correspondence_cases_spec.rb              |  2 +-
 11 files changed, 131 insertions(+), 15 deletions(-)

diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index 107e94eae23..e1b07eb4f67 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -40,26 +40,29 @@ def current_step
   end
 
   def correspondence_cases
-    respond_to do |format|
-      format.html { "your_correspondence" }
-      format.json do
-        render json: { correspondence_config: CorrespondenceConfig.new(assignee: current_user) }
+    if current_user.mail_supervisor?
+      redirect_to "/queue/correspondence/team"
+    elsif current_user.mail_superuser? || current_user.mail_team_user?
+      respond_to do |format|
+        format.html { "your_correspondence" }
+        format.json do
+          render json: { correspondence_config: CorrespondenceConfig.new(assignee: current_user) }
+        end
       end
+    else
+      redirect_to "/unauthorized"
     end
   end
 
   def correspondence_team
-    if MailTeamSupervisor.singleton.user_has_access?(current_user) ||
-       BvaIntake.singleton.user_is_admin?(current_user) ||
-       MailTeam.singleton.user_is_admin?(current_user)
+    if current_user.mail_superuser? || current_user.mail_supervisor?
       respond_to do |format|
         format.html { "correspondence_team" }
         format.json do
           render json: { correspondence_config: CorrespondenceConfig.new(assignee: MailTeamSupervisor.singleton) }
         end
       end
-    elsif MailTeam.singleton.user_has_access?(current_user) ||
-          BvaIntake.singleton.user_has_access?(current_user)
+    elsif current_user.mail_team_user?
       redirect_to "/queue/correspondence"
     else
       redirect_to "/unauthorized"
diff --git a/app/models/user.rb b/app/models/user.rb
index dd53ba31b25..7913e89ec39 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -95,6 +95,18 @@ def hearings_user?
     can_any_of_these_roles?(["Build HearSched", "Edit HearSched", "RO ViewHearSched", "VSO", "Hearing Prep"])
   end
 
+  def mail_team_user?
+    organizations.include?(MailTeam.singleton)
+  end
+
+  def mail_supervisor?
+    organizations.include?(MailTeamSupervisor.singleton)
+  end
+
+  def mail_superuser?
+    organizations_users.where(admin: true, organization_id: MailTeam.singleton.id || BvaIntake.singleton.id).any?
+  end
+
   def can_assign_hearing_schedule?
     can_any_of_these_roles?(["Edit HearSched", "Build HearSched"])
   end
diff --git a/app/views/queue/index.html.erb b/app/views/queue/index.html.erb
index 2d65c58f7ba..24a59dbd7dd 100644
--- a/app/views/queue/index.html.erb
+++ b/app/views/queue/index.html.erb
@@ -20,6 +20,9 @@
     userCanViewHearingSchedule: current_user.can_view_hearing_schedule?,
     userCanViewOvertimeStatus: current_user.can_view_overtime_status?,
     userCanViewEditNodDate: current_user.can_view_edit_nod_date?,
+    isMailTeamUser: current_user.mail_team_user?,
+    isMailSupervisor: current_user.mail_supervisor?,
+    isMailSuperUser: current_user.mail_superuser?,
     canEditCavcRemands: current_user.can_edit_cavc_remands?,
     canEditCavcDashboards: current_user.can_edit_cavc_dashboards?,
     canViewCavcDashboards: current_user.can_view_cavc_dashboards?,
diff --git a/client/app/queue/QueueApp.jsx b/client/app/queue/QueueApp.jsx
index b041500a534..35aa629f2a7 100644
--- a/client/app/queue/QueueApp.jsx
+++ b/client/app/queue/QueueApp.jsx
@@ -26,6 +26,9 @@ import {
   setUserIsCamoEmployee,
   setFeedbackUrl,
   setOrganizations,
+  setMailTeamUser,
+  setMailSupervisor,
+  setMailSuperUser
 } from './uiReducer/uiActions';
 
 import ScrollToTop from '../components/ScrollToTop';
@@ -129,6 +132,9 @@ class QueueApp extends React.PureComponent {
     this.props.setUserRole(this.props.userRole);
     this.props.setUserCssId(this.props.userCssId);
     this.props.setOrganizations(this.props.organizations);
+    this.props.setMailTeamUser(this.props.isMailTeamUser);
+    this.props.setMailSupervisor(this.props.isMailSupervisor);
+    this.props.setMailSuperUser(this.props.isMailSuperUser);
     this.props.setUserIsVsoEmployee(this.props.userIsVsoEmployee);
     this.props.setUserIsCamoEmployee(this.props.userIsCamoEmployee);
     this.props.setFeedbackUrl(this.props.feedbackUrl);
@@ -1494,6 +1500,12 @@ QueueApp.propTypes = {
   setUserCssId: PropTypes.func,
   setUserId: PropTypes.func,
   setOrganizations: PropTypes.func,
+  setMailTeamUser: PropTypes.func,
+  setMailSupervisor: PropTypes.func,
+  setMailSuperUser: PropTypes.func,
+  isMailTeamUser: PropTypes.bool,
+  isMailSupervisor: PropTypes.bool,
+  isMailSuperUser: PropTypes.bool,
   organizations: PropTypes.array,
   setUserIsVsoEmployee: PropTypes.func,
   userIsVsoEmployee: PropTypes.bool,
@@ -1541,6 +1553,9 @@ const mapDispatchToProps = (dispatch) =>
       setUserIsCamoEmployee,
       setFeedbackUrl,
       setOrganizations,
+      setMailTeamUser,
+      setMailSupervisor,
+      setMailSuperUser,
     },
     dispatch
   );
diff --git a/client/app/queue/QueueTableBuilder.jsx b/client/app/queue/QueueTableBuilder.jsx
index 9d421e23f0f..7ba3d817711 100644
--- a/client/app/queue/QueueTableBuilder.jsx
+++ b/client/app/queue/QueueTableBuilder.jsx
@@ -250,7 +250,13 @@ const QueueTableBuilder = (props) => {
 
   return <div className={rootStyles}>
     <h1 {...css({ display: 'inline-block' })}>{config.table_title}</h1>
-    <QueueOrganizationDropdown organizations={props.organizations} featureToggles = {props.featureToggles} />
+    <QueueOrganizationDropdown
+      isMailTeamUser={props.isMailTeamUser}
+      isMailSupervisor={props.isMailSupervisor}
+      isMailSuperUser={props.isMailSuperUser}
+      organizations={props.organizations}
+      featureToggles = {props.featureToggles}
+    />
     <TabWindow
       name="tasks-tabwindow"
       tabs={tabsFromConfig(config)}
@@ -263,12 +269,18 @@ const mapStateToProps = (state) => {
   return {
     config: state.queue.queueConfig,
     organizations: state.ui.organizations,
+    isMailTeamUser: state.ui.isMailTeamUser,
+    isMailSupervisor: state.ui.isMailSupervisor,
+    isMailSuperUser: state.ui.isMailSuperUser,
     isVhaOrg: isActiveOrganizationVHA(state),
     userCanBulkAssign: state.ui.activeOrganization.userCanBulkAssign,
   };
 };
 
 QueueTableBuilder.propTypes = {
+  isMailTeamUser: PropTypes.bool,
+  isMailSupervisor: PropTypes.bool,
+  isMailSuperUser: PropTypes.bool,
   organizations: PropTypes.array,
   assignedTasks: PropTypes.array,
   config: PropTypes.shape({
diff --git a/client/app/queue/components/QueueOrganizationDropdown.jsx b/client/app/queue/components/QueueOrganizationDropdown.jsx
index 13b89541774..71f381c081d 100644
--- a/client/app/queue/components/QueueOrganizationDropdown.jsx
+++ b/client/app/queue/components/QueueOrganizationDropdown.jsx
@@ -1,13 +1,17 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { sprintf } from 'sprintf-js';
-
+// import { useLocation } from 'react-router-dom';
 import QueueSelectorDropdown from './QueueSelectorDropdown';
 import COPY from '../../../COPY';
+import QUEUE_CONFIG from '../../../constants/QUEUE_CONFIG';
 
 export default class QueueOrganizationDropdown extends React.Component {
   render = () => {
     const { organizations } = this.props;
+    const { isMailTeamUser } = this.props;
+    const { isMailSupervisor } = this.props;
+    const { isMailSuperUser } = this.props;
     const url = window.location.pathname.split('/');
     const location = url[url.length - 1];
     const queueHref = (location === 'queue') ? '#' : '/queue';
@@ -36,23 +40,47 @@ export default class QueueOrganizationDropdown extends React.Component {
 
     let items = [queueItem, ...organizationItems];
 
-    if (organizations[0].name === 'Mail' || organizations[0].name === 'Mail Team Supervisor') {
-      const orgHref = '/queue/correspondence';
+    if (isMailSuperUser === true || isMailSupervisor === true) {
+      const orgHref = '/queue/correspondence/team';
 
       correspondenceItems = {
         key: (2).toString(),
         href: orgHref,
-        label: sprintf(COPY.CASE_LIST_TABLE_QUEUE_DROPDOWN_CORRESPONDENCE_CASES)
+        label: sprintf(QUEUE_CONFIG.CASE_LIST_TABLE_QUEUE_DROPDOWN_CORRESPONDENCE_CASES)
       };
 
       items = [...items, correspondenceItems];
     }
+    if (isMailTeamUser === true) {
+      const orgHref = '/queue/correspondence';
+
+      correspondenceItems = {
+        key: (2).toString(),
+        href: orgHref,
+        label: sprintf(QUEUE_CONFIG.CASE_LIST_TABLE_QUEUE_DROPDOWN_OWN_CORRESPONDENCE_LABEL)
+      };
+      // This places the "Your Correspondence" option at the 2nd(1) index
+      const items1 = items.slice(0, 1);
+      const items2 = items.slice(1);
+
+      items = [...items1, correspondenceItems, ...items2];
+
+      // const browserLocation = useLocation();
+
+      // console.log(browserLocation);
+      // if (browserLocation === '/queue/correspondence/team') {
+      //   return <Redirect to= "/queue/correspondence" />;
+      // }
+    }
 
     return <QueueSelectorDropdown items={items} />;
   }
 }
 
 QueueOrganizationDropdown.propTypes = {
+  isMailTeamUser: PropTypes.bool,
+  isMailSupervisor: PropTypes.bool,
+  isMailSuperUser: PropTypes.bool,
   organizations: PropTypes.arrayOf(PropTypes.shape({
     name: PropTypes.string.isRequired,
     url: PropTypes.string.isRequired
diff --git a/client/app/queue/uiReducer/uiActions.js b/client/app/queue/uiReducer/uiActions.js
index c428b105da2..716cebc5057 100644
--- a/client/app/queue/uiReducer/uiActions.js
+++ b/client/app/queue/uiReducer/uiActions.js
@@ -220,6 +220,21 @@ export const setOrganizations = (organizations) => ({
   payload: { organizations }
 });
 
+export const setMailTeamUser = (isMailTeamUser) => ({
+  type: ACTIONS.SET_MAIL_TEAM_USER,
+  payload: { isMailTeamUser }
+});
+
+export const setMailSupervisor = (isMailSupervisor) => ({
+  type: ACTIONS.SET_MAIL_SUPERVISOR,
+  payload: { isMailSupervisor }
+});
+
+export const setMailSuperUser = (isMailSuperUser) => ({
+  type: ACTIONS.SET_MAIL_SUPER_USER,
+  payload: { isMailSuperUser }
+});
+
 export const setActiveOrganization = (id, type, name, isVso, userCanBulkAssign) => ({
   type: ACTIONS.SET_ACTIVE_ORGANIZATION,
   payload: {
diff --git a/client/app/queue/uiReducer/uiConstants.js b/client/app/queue/uiReducer/uiConstants.js
index 212902a93d2..ff0beb1e3ce 100644
--- a/client/app/queue/uiReducer/uiConstants.js
+++ b/client/app/queue/uiReducer/uiConstants.js
@@ -38,6 +38,9 @@ export const ACTIONS = {
   SET_USER_IS_CAMO_EMPLOYEE: 'SET_USER_IS_CAMO_EMPLOYEE',
   SET_ORGANIZATION_IDS: 'SET_ORGANIZATION_IDS',
   SET_ORGANIZATIONS: 'SET_ORGANIZATIONS',
+  SET_MAIL_TEAM_USER: 'SET_MAIL_TEAM_USER',
+  SET_MAIL_SUPERVISOR: 'SET_MAIL_SUPERVISOR',
+  SET_MAIL_SUPER_USER: 'SET_MAIL_SUPER_USER',
 
   SET_CAN_EDIT_AOD: 'SET_CAN_EDIT_AOD',
   SET_CAN_EDIT_NOD_DATE: 'SET_CAN_EDIT_NOD_DATE',
diff --git a/client/app/queue/uiReducer/uiReducer.js b/client/app/queue/uiReducer/uiReducer.js
index 2fbbf3871b4..2daf42bb727 100644
--- a/client/app/queue/uiReducer/uiReducer.js
+++ b/client/app/queue/uiReducer/uiReducer.js
@@ -20,6 +20,9 @@ export const initialState = {
   userCssId: '',
   userInfo: null,
   organizations: [],
+  isMailTeamUser: false,
+  isMailSupervisor: false,
+  isMailSuperUser: false,
   activeOrganization: {
     id: null,
     name: null,
@@ -249,6 +252,24 @@ const workQueueUiReducer = (state = initialState, action = {}) => {
         $set: null
       }
     });
+  case ACTIONS.SET_MAIL_TEAM_USER:
+    return update(state, {
+      isMailTeamUser: {
+        $set: action.payload.isMailTeamUser
+      }
+    });
+  case ACTIONS.SET_MAIL_SUPERVISOR:
+    return update(state, {
+      isMailSupervisor: {
+        $set: action.payload.isMailSupervisor
+      }
+    });
+  case ACTIONS.SET_MAIL_SUPER_USER:
+    return update(state, {
+      isMailSuperUser: {
+        $set: action.payload.isMailSuperUser
+      }
+    });
   case ACTIONS.SET_ORGANIZATIONS:
     return update(state, {
       organizations: {
diff --git a/client/constants/QUEUE_CONFIG.json b/client/constants/QUEUE_CONFIG.json
index 88eb6848a58..03300ef6425 100644
--- a/client/constants/QUEUE_CONFIG.json
+++ b/client/constants/QUEUE_CONFIG.json
@@ -24,6 +24,10 @@
   "VHA_PO_ON_HOLD_TASKS_TAB_NAME": "po_on_hold",
   "VHA_PO_COMPLETED_TASKS_TAB_NAME": "po_completed",
 
+  "CASE_LIST_TABLE_QUEUE_DROPDOWN_OWN_CORRESPONDENCE_LABEL": "Your Correspondence",
+  "CASE_LIST_TABLE_QUEUE_DROPDOWN_OWN_CASES_LABEL": "Your cases",
+  "CASE_LIST_TABLE_QUEUE_DROPDOWN_CORRESPONDENCE_CASES": "Correspondence Cases",
+
   "EDUCATION_RPO_ASSIGNED_TASKS_TAB_NAME": "education_rpo_assigned",
   "EDUCATION_RPO_IN_PROGRESS_TASKS_TAB_NAME": "education_rpo_in_progress",
   "EDUCATION_RPO_COMPLETED_TASKS_TAB_NAME": "education_rpo_completed",
diff --git a/spec/feature/queue/correspondence/correspondence_cases_spec.rb b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
index 0feb438d9ac..06a5c7582b0 100644
--- a/spec/feature/queue/correspondence/correspondence_cases_spec.rb
+++ b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
@@ -4,7 +4,7 @@
   context "correspondece cases feature toggle" do
     let(:current_user) { create(:user) }
     before :each do
-      MailTeamSupervisor.singleton.add_user(current_user)
+      MailTeam.singleton.add_user(current_user)
       User.authenticate!(user: current_user)
       @correspondence_uuid = "123456789"
     end

From 37599821cb3dc2d9bf2724ab5c87f6a564c7e412 Mon Sep 17 00:00:00 2001
From: Kevma50287 <104021955+Kevma50287@users.noreply.github.com>
Date: Thu, 1 Feb 2024 16:14:40 -0500
Subject: [PATCH 063/237] Updated gem file reference to ruby ce api (#20688)

* Updated gem file reference to ruby ce api

* Updated gemfile lock
---
 Gemfile      | 2 +-
 Gemfile.lock | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 486e98101ec..1ba4a777cd3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -66,7 +66,7 @@ gem "redis-namespace"
 gem "redis-rails", "~> 5.0.2"
 gem "request_store"
 gem "roo", "~> 2.7"
-gem "ruby_claim_evidence_api", git: "https://github.com/department-of-veterans-affairs/ruby_claim_evidence_api.git", ref: "74416d74479b3eab9786d194ca8785c5496cdd74"
+gem "ruby_claim_evidence_api", git: "https://github.com/department-of-veterans-affairs/ruby_claim_evidence_api.git", ref: "f3746431a3977a86e01e5c630d192dd665727ea4"
 # Use SCSS for stylesheets
 gem "sass-rails", "~> 5.0"
 # Error reporting to Sentry
diff --git a/Gemfile.lock b/Gemfile.lock
index 572cff2b16d..c6a9490d8bf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -67,8 +67,8 @@ GIT
 
 GIT
   remote: https://github.com/department-of-veterans-affairs/ruby_claim_evidence_api.git
-  revision: 74416d74479b3eab9786d194ca8785c5496cdd74
-  ref: 74416d74479b3eab9786d194ca8785c5496cdd74
+  revision: f3746431a3977a86e01e5c630d192dd665727ea4
+  ref: f3746431a3977a86e01e5c630d192dd665727ea4
   specs:
     ruby_claim_evidence_api (0.0.1)
       activesupport
@@ -77,6 +77,7 @@ GIT
       faraday-multipart
       httpi
       railties
+      webmock (~> 3.6.2)
 
 GIT
   remote: https://github.com/department-of-veterans-affairs/sniffybara.git

From e5babf4e985aa3b2ebca6fa759337d3d5e5b8dcf Mon Sep 17 00:00:00 2001
From: Rnmarshall93 <110805785+Rnmarshall93@users.noreply.github.com>
Date: Fri, 2 Feb 2024 05:22:04 -0800
Subject: [PATCH 064/237] Team Queue and Individual Correspondence Page -
 Framework 35471 (#20672)

* APPEALS-35714 - Initial WIP Commit

* WIP correspondence config

* Initial commit for correspondence migration

* APPEALS-35714 - Clear comments, update controller

* Commit for seed data updations with the AC

* Update correspondence_config to use correspondence related classes

* Temporarily default column filtering to false

* Override methods to work with correspondence tasks

* allow correspondence tasks

* add correspondence queue tabs for org

* update column names

* update column names

* add correspondence org queue tabs

* add task column serializer for correspondence queue

* add helper to be able to call correspondence on correspondence tasks instead of appeal

* revert controller changes

* Update correspondence_controller.rb

Updated naming for correspondence_config; Temporary notes

* Update constants.js

Title

* APPEALS-35714 - Tasks 2 Config

* Update CorrespondenceCases.jsx

* APPEALS-35714 - Title Update

* added dynamic routing to correspondence cases

* Commit for generating few othere tasks

* create fixtures for individual and team correspondence config

* update task tab attributes

* Revert changes to CorrespondenceCases.jsx

* Revert changes to QueueTableBuilder.jsx

* remove fixtures

* Test: correspondence_config

* Commit for the changes mentioned for task file and reverting the changes in task file

* add column names to JSON file

* connect to config

* Update columns

* Experimental changes

* fix pagination for individual correspondence queue table

* fix pagination for organization correspondence queue table

* Fix extra end

* fix indentation

* RuboCop Fixes

* Merge Issues

* minor changes to get the component rendering

* Fixed redux issue

* Removed duplicates

* Fixed rubocop warning in a correct way.

* Removed React.Fragments and replaced with <>

---------

Co-authored-by: KiMauVA <Ki.Mau@va.gov>
Co-authored-by: William Medders <medders_william@bah.com>
Co-authored-by: divyadasari-va <divya.dasari@va.gov>
---
 .../concerns/task_pagination_concern.rb       |  27 +++
 .../correspondence_task_pages_controller.rb   |  17 ++
 app/models/correspondence_config.rb           |   7 +-
 app/models/correspondence_queue_tab.rb        |   8 +
 .../tasks/cavc_correspondence_mail_task.rb    |   8 +
 app/models/tasks/correspondence_task.rb       |  16 +-
 client/COPY.json                              |   8 +-
 client/app/queue/QueueTable.jsx               |   7 +-
 .../app/queue/components/TaskTableColumns.jsx |  46 ++++
 .../correspondence/CorrespondenceCases.jsx    |  50 ++--
 .../CorrespondenceTableBuilder.jsx            | 214 ++++++++++++++++++
 client/app/queue/utils.js                     |  33 +++
 config/routes.rb                              |   2 +
 13 files changed, 396 insertions(+), 47 deletions(-)
 create mode 100644 app/controllers/correspondence_task_pages_controller.rb
 create mode 100644 client/app/queue/correspondence/CorrespondenceTableBuilder.jsx

diff --git a/app/controllers/concerns/task_pagination_concern.rb b/app/controllers/concerns/task_pagination_concern.rb
index eb2ce725391..b3c61cef704 100644
--- a/app/controllers/concerns/task_pagination_concern.rb
+++ b/app/controllers/concerns/task_pagination_concern.rb
@@ -17,8 +17,28 @@ def pagination_json
     }
   end
 
+  def correspondence_pagination_json
+    {
+      tasks: correspondence_json_tasks(correspondence_task_pager.paged_tasks),
+      task_page_count: correspondence_task_pager.task_page_count,
+      total_task_count: correspondence_task_pager.total_task_count,
+      tasks_per_page: CorrespondenceTaskPager::TASKS_PER_PAGE
+    }
+  end
+
   private
 
+  def correspondence_task_pager
+    @correspondence_task_pager ||= CorrespondenceTaskPager.new(
+      assignee: assignee,
+      tab_name: params[Constants.QUEUE_CONFIG.TAB_NAME_REQUEST_PARAM.to_sym],
+      page: params[Constants.QUEUE_CONFIG.PAGE_NUMBER_REQUEST_PARAM.to_sym],
+      sort_order: params[Constants.QUEUE_CONFIG.SORT_DIRECTION_REQUEST_PARAM.to_sym],
+      sort_by: params[Constants.QUEUE_CONFIG.SORT_COLUMN_REQUEST_PARAM.to_sym],
+      filters: params[Constants.QUEUE_CONFIG.FILTER_COLUMN_REQUEST_PARAM.to_sym]
+    )
+  end
+
   def task_pager
     @task_pager ||= TaskPager.new(
       assignee: assignee,
@@ -30,6 +50,13 @@ def task_pager
     )
   end
 
+  def correspondence_json_tasks(tasks)
+    { data: WorkQueue::CorrespondenceTaskColumnSerializer.new(
+      tasks,
+      is_collection: true
+    ).serializable_hash[:data] }
+  end
+
   def json_tasks(tasks)
     tasks = AppealRepository.eager_load_legacy_appeals_for_tasks(tasks)
     params = { user: current_user }
diff --git a/app/controllers/correspondence_task_pages_controller.rb b/app/controllers/correspondence_task_pages_controller.rb
new file mode 100644
index 00000000000..92686e06d66
--- /dev/null
+++ b/app/controllers/correspondence_task_pages_controller.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class CorrespondenceTaskPagesController < ApplicationController
+  include TaskPaginationConcern
+
+  def index
+    render json: correspondence_pagination_json
+  end
+
+  def assignee
+    if params[:user_id]
+      User.find(params[:user_id])
+    elsif params[:organization_id]
+      Organization.find(params[:organization_id])
+    end
+  end
+end
diff --git a/app/models/correspondence_config.rb b/app/models/correspondence_config.rb
index 20e2d07dd53..195886aec8e 100644
--- a/app/models/correspondence_config.rb
+++ b/app/models/correspondence_config.rb
@@ -21,12 +21,17 @@ def attach_tasks_to_tab(tab)
       sort_order: tab.default_sorting_direction
     )
     endpoint = "task_pages?#{Constants.QUEUE_CONFIG.TAB_NAME_REQUEST_PARAM}=#{tab.name}"
+    base_path = if assignee_is_org?
+                  "organizations/#{assignee.id}/"
+                else
+                  "correspondence/users/#{assignee.id}/}#{endpoint}"
+                end
 
     tab.to_hash.merge(
       tasks: serialized_tasks_for_columns(task_pager.paged_tasks, tab.column_names),
       task_page_count: task_pager.task_page_count,
       total_task_count: task_pager.total_task_count,
-      task_page_endpoint_base_path: "#{assignee_is_org? ? "#{assignee.path}/" : "users/#{assignee.id}/"}#{endpoint}"
+      task_page_endpoint_base_path: base_path
     )
   end
 
diff --git a/app/models/correspondence_queue_tab.rb b/app/models/correspondence_queue_tab.rb
index 18a0ad66d2f..1815587fa0c 100644
--- a/app/models/correspondence_queue_tab.rb
+++ b/app/models/correspondence_queue_tab.rb
@@ -20,4 +20,12 @@ def task_includes
   def default_sorting_column
     CorrespondenceQueueColumn.from_name(Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name)
   end
+
+   # If you don't create your own tab name it will default to the tab defined in QueueTab
+   def self.from_name(tab_name)
+    tab = descendants.find { |subclass| subclass.tab_name == tab_name }
+    fail(Caseflow::Error::InvalidTaskTableTab, tab_name: tab_name) unless tab
+
+    tab
+  end
 end
diff --git a/app/models/tasks/cavc_correspondence_mail_task.rb b/app/models/tasks/cavc_correspondence_mail_task.rb
index a5aff59b3d4..cd56d7da7de 100644
--- a/app/models/tasks/cavc_correspondence_mail_task.rb
+++ b/app/models/tasks/cavc_correspondence_mail_task.rb
@@ -77,4 +77,12 @@ def user_task_assigned_to_cavc_lit_support
   def assigned_to_cavc_lit_team_member
     CavcLitigationSupport.singleton.users.include?(assigned_to)
   end
+
+  def status_is_valid_on_create
+    unless [Constants.TASK_STATUSES.assigned, Constants.TASK_STATUSES.completed].include?(status)
+      fail Caseflow::Error::InvalidStatusOnTaskCreate, task_type: type
+    end
+
+    true
+  end
 end
diff --git a/app/models/tasks/correspondence_task.rb b/app/models/tasks/correspondence_task.rb
index afe9a3e9799..d9623098a30 100644
--- a/app/models/tasks/correspondence_task.rb
+++ b/app/models/tasks/correspondence_task.rb
@@ -48,15 +48,21 @@ def correspondence
 
   private
 
+  # rubocop:disable Metrics/CyclomaticComplexity
   def status_is_valid_on_create
-    if type == "ReviewPackageTask" && status != Constants.TASK_STATUSES.unassigned
-      update!(status: :unassigned)
-    elsif type != "ReviewPackageTask" && status != Constants.TASK_STATUSES.assigned
-      fail Caseflow::Error::InvalidStatusOnTaskCreate, task_type: type
+    case type
+    when "ReviewPackageTask"
+      return Constants.TASK_STATUSES.on_hold if status != Constants.TASK_STATUSES.on_hold
+    when "CorrespondenceIntakeTask", "EfolderUploadFailedTask"
+      return Constants.TASK_STATUSES.in_progress if status != Constants.TASK_STATUSES.in_progress
+    when "CorrespondenceRootTask", "HearingPostponementRequestMailTask"
+      return Constants.TASK_STATUSES.completed if status != Constants.TASK_STATUSES.completed
+    else
+      fail Caseflow::Error::InvalidStatusOnTaskCreate, task_type: type unless status == Constants.TASK_STATUSES.assigned
     end
-
     true
   end
+  # rubocop:enable Metrics/CyclomaticComplexity
 
   def assignee_status_is_valid_on_create
     if parent&.child_must_have_active_assignee? && assigned_to.is_a?(User) && !assigned_to.active?
diff --git a/client/COPY.json b/client/COPY.json
index 07ef450131a..3eb7d5a2f28 100644
--- a/client/COPY.json
+++ b/client/COPY.json
@@ -51,10 +51,10 @@
   "CASE_LIST_TABLE_QUEUE_DROPDOWN_OWN_CASES_LABEL": "Your cases",
   "CASE_LIST_TABLE_QUEUE_DROPDOWN_TEAM_CASES_LABEL": "%s team cases",
   "CASE_LIST_TABLE_QUEUE_DROPDOWN_CORRESPONDENCE_CASES": "Correspondence Cases",
-  "TITLE_MODAL_EDIT_DOCUMENT_TYPE_CORRESPONDENCE" : "Edit document type",
-  "TEXT_MODAL_EDIT_DOCUMENT_TYPE_CORRESPONDENCE" : "Change the document type of the selected document.",
-  "ORIGINAL_DOC_EDIT_DOCUMENT_TYPE_CORRESPONDENCE" : "Original document type",
-  "NEW_DOC_EDIT_DOCUMENT_TYPE_CORRESPONDENCE" : "New document type",
+  "TITLE_MODAL_EDIT_DOCUMENT_TYPE_CORRESPONDENCE": "Edit document type",
+  "TEXT_MODAL_EDIT_DOCUMENT_TYPE_CORRESPONDENCE": "Change the document type of the selected document.",
+  "ORIGINAL_DOC_EDIT_DOCUMENT_TYPE_CORRESPONDENCE": "Original document type",
+  "NEW_DOC_EDIT_DOCUMENT_TYPE_CORRESPONDENCE": "New document type",
   "CASE_LIST_TABLE_EMPTY_TEXT": "This Veteran has no appeals at this time.",
   "CASE_LIST_TABLE_TOTAL_DAYS_COLUMN_TITLE": "Total Days",
   "CASE_LIST_TABLE_BOARD_INTAKE": "Board Intake",
diff --git a/client/app/queue/QueueTable.jsx b/client/app/queue/QueueTable.jsx
index 4267a27a259..9102c4e78fd 100644
--- a/client/app/queue/QueueTable.jsx
+++ b/client/app/queue/QueueTable.jsx
@@ -13,7 +13,7 @@ import Pagination from '../components/Pagination/Pagination';
 import { COLORS, LOGO_COLORS } from '../constants/AppConstants';
 import ApiUtil from '../util/ApiUtil';
 import LoadingScreen from '../components/LoadingScreen';
-import { tasksWithAppealsFromRawTasks } from './utils';
+import { tasksWithAppealsFromRawTasks, tasksWithCorrespondenceFromRawTasks } from './utils';
 import QUEUE_CONFIG from '../../constants/QUEUE_CONFIG';
 import COPY from '../../COPY';
 
@@ -638,7 +638,9 @@ export default class QueueTable extends React.PureComponent {
           tasks: { data: tasks }
         } = response.body;
 
-        const preparedTasks = tasksWithAppealsFromRawTasks(tasks);
+        const preparedTasks = this.props.isCorrespondenceTable ?
+          tasksWithCorrespondenceFromRawTasks(tasks) :
+          tasksWithAppealsFromRawTasks(tasks);
 
         const preparedResponse = Object.assign(response.body, { tasks: preparedTasks });
 
@@ -843,6 +845,7 @@ HeaderRow.propTypes = FooterRow.propTypes = Row.propTypes = BodyRows.propTypes =
   }),
   onHistoryUpdate: PropTypes.func,
   preserveFilter: PropTypes.bool,
+  isCorrespondenceTable: PropTypes.bool,
 };
 
 Row.propTypes.rowObjects = PropTypes.arrayOf(PropTypes.object);
diff --git a/client/app/queue/components/TaskTableColumns.jsx b/client/app/queue/components/TaskTableColumns.jsx
index 85ca86f9d5f..13faf17a864 100644
--- a/client/app/queue/components/TaskTableColumns.jsx
+++ b/client/app/queue/components/TaskTableColumns.jsx
@@ -13,6 +13,7 @@ import ContinuousProgressBar from 'app/components/ContinuousProgressBar';
 import OnHoldLabel, { numDaysOnHold } from './OnHoldLabel';
 import IhpDaysWaitingTooltip from './IhpDaysWaitingTooltip';
 import TranscriptionTaskTooltip from './TranscriptionTaskTooltip';
+import Checkbox from '../../components/Checkbox';
 
 import { taskHasCompletedHold, hasDASRecord, collapseColumn, regionalOfficeCity, renderAppealType } from '../utils';
 import { DateString, daysSinceAssigned, daysSincePlacedOnHold } from '../../util/DateUtil';
@@ -222,6 +223,51 @@ export const assignedByColumn = () => {
   };
 };
 
+export const veteranDetails = () => {
+  return {
+    header: 'Veteran Details',
+    valueFunction: (task) => task.veteranDetails
+  };
+};
+
+export const vaDor = () => {
+
+  return {
+    header: 'VA DOR',
+    valueFunction: (task) => {
+      return moment(task.vador).format('MM/DD/YYYY');
+    }
+  };
+};
+
+export const notes = () => {
+  return {
+    header: 'Notes',
+    valueFunction: (task) => task.notes
+  };
+};
+
+export const checkboxColumn = () => {
+  return {
+    header: 'Select',
+    valueFunction: (task) => task ? <Checkbox id={task.uniqueId} /> : ''
+  };
+};
+
+export const actionType = () => {
+  return {
+    header: 'Action Type',
+    valueFunction: (task) => task.actionType
+  };
+};
+
+export const daysWaitingCorrespondence = () => {
+  return {
+    header: 'Days Waiting',
+    valueFunction: (task) => task.daysWaiting
+  };
+};
+
 export const regionalOfficeColumn = (tasks, filterOptions) => {
   return {
     header: COPY.CASE_LIST_TABLE_REGIONAL_OFFICE_COLUMN_TITLE,
diff --git a/client/app/queue/correspondence/CorrespondenceCases.jsx b/client/app/queue/correspondence/CorrespondenceCases.jsx
index 8f241c5cc05..b0bb954bbc0 100644
--- a/client/app/queue/correspondence/CorrespondenceCases.jsx
+++ b/client/app/queue/correspondence/CorrespondenceCases.jsx
@@ -5,19 +5,13 @@ import AppSegment from '@department-of-veterans-affairs/caseflow-frontend-toolki
 import PropTypes from 'prop-types';
 import COPY from '../../../COPY';
 import { sprintf } from 'sprintf-js';
-import { css } from 'glamor';
-// import CorrespondenceTable from './CorrespondenceTable';
-// import QueueOrganizationDropdown from '../components/QueueOrganizationDropdown';
+import CorrespondenceTableBuilder from './CorrespondenceTableBuilder';
 import Alert from '../../components/Alert';
 
-// import {
-//   initialAssignTasksToUser,
-//   initialCamoAssignTasksToVhaProgramOffice
-// } from '../QueueActions';
-
 const CorrespondenceCases = (props) => {
   const dispatch = useDispatch();
   const configUrl = props.configUrl;
+
   const currentAction = useSelector((state) => state.reviewPackage.lastAction);
   const veteranInformation = useSelector((state) => state.reviewPackage.veteranInformation);
 
@@ -25,16 +19,9 @@ const CorrespondenceCases = (props) => {
 
   useEffect(() => {
     dispatch(loadCorrespondenceConfig(configUrl));
-  }, [dispatch, configUrl]);
+  }, []);
 
-  useEffect(() => {
-    // Retry the request after a delay
-    setTimeout(() => {
-      if (configUrl) {
-        dispatch(loadCorrespondenceConfig(configUrl));
-      }
-    }, 1000);
-  }, [configUrl]);
+  const config = useSelector((state) => state.intakeCorrespondence.correspondenceConfig);
 
   useEffect(() => {
     if (
@@ -46,28 +33,21 @@ const CorrespondenceCases = (props) => {
   }, [veteranInformation]);
 
   return (
-    <React.Fragment>
+    <>
       <AppSegment filledBackground>
-      {(veteranInformation?.veteran_name?.first_name && veteranInformation?.veteran_name?.last_name) &&
+        {(veteranInformation?.veteran_name?.first_name && veteranInformation?.veteran_name?.last_name) &&
           currentAction.action_type === 'DeleteReviewPackage' && (
-            <Alert
-              type="success"
-              title={sprintf(COPY.CORRESPONDENCE_TITLE_REMOVE_PACKAGE_BANNER, vetName)}
-              message={COPY.CORRESPONDENCE_MESSAGE_REMOVE_PACKAGE_BANNER}
-              scrollOnAlert={false}
-            />
-          )}
-        <h1 {...css({ display: 'inline-block' })}>
-          {COPY.CASE_LIST_TABLE_QUEUE_DROPDOWN_CORRESPONDENCE_CASES}
-        </h1>
-          {/* <QueueOrganizationDropdown organizations={organizations} />
-          {this.props.correspondenceConfig &&
-          <CorrespondenceTable
-            correspondenceConfig={this.props.correspondenceConfig}
+          <Alert
+            type="success"
+            title={sprintf(COPY.CORRESPONDENCE_TITLE_REMOVE_PACKAGE_BANNER, vetName)}
+            message={COPY.CORRESPONDENCE_MESSAGE_REMOVE_PACKAGE_BANNER}
+            scrollOnAlert={false}
           />
-          } */}
+        )}
+        {config &&
+        <CorrespondenceTableBuilder />}
       </AppSegment>
-    </React.Fragment>
+    </>
   );
 };
 
diff --git a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
new file mode 100644
index 00000000000..9b7180ad8fe
--- /dev/null
+++ b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
@@ -0,0 +1,214 @@
+import React, { useState, useEffect } from 'react';
+import _ from 'lodash';
+import PropTypes from 'prop-types';
+import { sprintf } from 'sprintf-js';
+import { connect } from 'react-redux';
+import querystring from 'querystring';
+
+import BulkAssignButton from '../components/BulkAssignButton';
+import QueueTable from '../QueueTable';
+import TabWindow from '../../components/TabWindow';
+import Link from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/Link';
+import QueueOrganizationDropdown from '../components/QueueOrganizationDropdown';
+import {
+  actionType,
+  assignedToColumn,
+  assignedByColumn,
+  checkboxColumn,
+  daysWaitingCorrespondence,
+  notes,
+  taskColumn,
+  taskCompletedDateColumn,
+  vaDor,
+  veteranDetails
+} from '../components/TaskTableColumns';
+import { tasksWithCorrespondenceFromRawTasks } from '../utils';
+
+import COPY from '../../../COPY';
+import QUEUE_CONFIG from '../../../constants/QUEUE_CONFIG';
+import { css } from 'glamor';
+import { isActiveOrganizationVHA } from '../selectors';
+
+const rootStyles = css({
+  '.usa-alert + &': {
+    marginTop: '1.5em'
+  }
+});
+
+/**
+ * A component to create a queue table's tabs and columns from a queue config or the assignee's tasks
+ * The props are:
+ * - @assignedTasks {array[object]} array of task objects to appear in the assigned tab
+ **/
+
+const CorrespondenceTableBuilder = (props) => {
+  const paginationOptions = () => querystring.parse(window.location.search.slice(1));
+  const [storedPaginationOptions, setStoredPaginationOptions] = useState(
+    querystring.parse(window.location.search.slice(1))
+  );
+
+  // Causes one additional rerender of the QueueTables/tabs but prevents saved pagination behavior
+  // e.g. clearing filter in a tab, then swapping tabs, then swapping back and the filter will still be applied
+  useEffect(() => {
+    setStoredPaginationOptions({});
+  }, []);
+
+  const calculateActiveTabIndex = (config) => {
+    const tabNames = config.tabs.map((tab) => {
+      return tab.name;
+    });
+
+    const activeTab = paginationOptions().tab || config.active_tab;
+    const index = _.indexOf(tabNames, activeTab);
+
+    return index === -1 ? 0 : index;
+  };
+
+  const queueConfig = () => {
+    const { config } = props;
+
+    config.active_tab_index = calculateActiveTabIndex(config);
+
+    return config;
+  };
+
+  const filterValuesForColumn = (column) =>
+    column && column.filterable && column.filter_options;
+
+  const createColumnObject = (column, config, tasks) => {
+
+    const { requireDasRecord } = props;
+    const filterOptions = filterValuesForColumn(column);
+    const functionForColumn = {
+      [QUEUE_CONFIG.COLUMNS.DAYS_WAITING_CORRESPONDENCE.name]: daysWaitingCorrespondence(),
+      [QUEUE_CONFIG.COLUMNS.TASK_ASSIGNEE.name]: assignedToColumn(
+        tasks,
+        filterOptions
+      ),
+      [QUEUE_CONFIG.COLUMNS.TASK_ASSIGNED_BY.name]: assignedByColumn(),
+      [QUEUE_CONFIG.COLUMNS.TASK_CLOSED_DATE.name]: taskCompletedDateColumn(),
+      [QUEUE_CONFIG.COLUMNS.TASK_TYPE.name]: taskColumn(tasks, filterOptions),
+      [QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name]: veteranDetails(),
+      [QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name]: vaDor(),
+      [QUEUE_CONFIG.COLUMNS.NOTES.name]: notes(),
+      [QUEUE_CONFIG.COLUMNS.CHECKBOX_COLUMN.name]: checkboxColumn(),
+      [QUEUE_CONFIG.COLUMNS.ACTION_TYPE.name]: actionType(),
+    };
+
+    return functionForColumn[column.name];
+  };
+
+  const columnsFromConfig = (config, tabConfig, tasks) =>
+    (tabConfig.columns || []).map((column) =>
+      createColumnObject(column, config, tasks)
+    );
+
+  const taskTableTabFactory = (tabConfig, config) => {
+    const savedPaginationOptions = storedPaginationOptions;
+    const tasks = tasksWithCorrespondenceFromRawTasks(tabConfig.tasks);
+    let totalTaskCount = tabConfig.total_task_count;
+    let noCasesMessage;
+
+    const { isVhaOrg } = props;
+
+    if (tabConfig.contains_legacy_tasks) {
+      tasks.unshift(...props.assignedTasks);
+      totalTaskCount = tasks.length;
+
+      noCasesMessage = totalTaskCount === 0 && (
+        <p>
+          {COPY.NO_CASES_IN_QUEUE_MESSAGE}
+          <b>
+            <Link to="/search">{COPY.NO_CASES_IN_QUEUE_LINK_TEXT}</Link>
+          </b>
+          .
+        </p>
+      );
+    }
+
+    // Setup default sorting.
+    const defaultSort = {};
+
+    // If there is no sort by column in the pagination options, then use the tab config default sort
+    // eslint-disable-next-line camelcase
+    if (!savedPaginationOptions?.sort_by) {
+      Object.assign(defaultSort, tabConfig.defaultSort);
+    }
+
+    return {
+      label: sprintf(tabConfig.label, totalTaskCount),
+      page: (
+        <>
+          <p className="cf-margin-top-0">
+            {noCasesMessage || tabConfig.description}
+          </p>
+          {props.userCanBulkAssign && tabConfig.allow_bulk_assign && (
+            <BulkAssignButton />
+          )}
+          <QueueTable
+            key={tabConfig.name}
+            columns={columnsFromConfig(config, tabConfig, tasks)}
+            rowObjects={tasks}
+            getKeyForRow={(_rowNumber, task) => task.uniqueId}
+            casesPerPage={config.tasks_per_page}
+            numberOfPages={tabConfig.task_page_count}
+            totalTaskCount={totalTaskCount}
+            taskPagesApiEndpoint={tabConfig.task_page_endpoint_base_path}
+            tabPaginationOptions={
+              savedPaginationOptions.tab === tabConfig.name ? savedPaginationOptions : {}
+            }
+            // Limit filter preservation/retention to only VHA orgs for now.
+            {...(isVhaOrg ? { preserveFilter: true } : {})}
+            defaultSort={defaultSort}
+            useTaskPagesApi={
+              config.use_task_pages_api && !tabConfig.contains_legacy_tasks
+            }
+            enablePagination
+            isCorrespondenceTable
+          />
+        </>
+      ),
+    };
+  };
+
+  const tabsFromConfig = (config) =>
+    (config.tabs || []).map((tabConfig) =>
+      taskTableTabFactory(tabConfig, config)
+    );
+
+  const config = queueConfig();
+
+  return <div className={rootStyles}>
+    <h1 {...css({ display: 'inline-block' })}>{config.table_title}</h1>
+    <QueueOrganizationDropdown organizations={props.organizations} featureToggles = {props.featureToggles} />
+    <TabWindow
+      name="tasks-tabwindow"
+      tabs={tabsFromConfig(config)}
+      defaultPage={config.active_tab_index}
+    />
+  </div>;
+};
+
+const mapStateToProps = (state) => {
+  return {
+    config: state.intakeCorrespondence.correspondenceConfig,
+    organizations: state.ui.organizations,
+    isVhaOrg: isActiveOrganizationVHA(state),
+    userCanBulkAssign: state.ui.activeOrganization.userCanBulkAssign,
+  };
+};
+
+CorrespondenceTableBuilder.propTypes = {
+  organizations: PropTypes.array,
+  assignedTasks: PropTypes.array,
+  config: PropTypes.shape({
+    table_title: PropTypes.string,
+    active_tab_index: PropTypes.number,
+  }),
+  requireDasRecord: PropTypes.bool,
+  userCanBulkAssign: PropTypes.bool,
+  isVhaOrg: PropTypes.bool,
+  featureToggles: PropTypes.object
+};
+
+export default connect(mapStateToProps)(CorrespondenceTableBuilder);
diff --git a/client/app/queue/utils.js b/client/app/queue/utils.js
index b7312f50829..2a192197b99 100644
--- a/client/app/queue/utils.js
+++ b/client/app/queue/utils.js
@@ -75,6 +75,34 @@ export const prepareMostRecentlyHeldHearingForStore = (appealId, hearing) => {
   };
 };
 
+const correspondenceTaskAttributesFromRawTask = (task) => {
+  return {
+    uniqueId: task.attributes.unique_id,
+    instructions: task.attributes.instructions,
+    veteranDetails: task.attributes.veteran_details,
+    notes: task.attributes.notes,
+    closedAt: task.attributes.completion_date,
+    daysWaiting: task.attributes.days_waiting,
+    vaDor: task.attributes.va_date_of_receipt,
+    label: task.attributes.label,
+    status: task.attributes.status,
+    assignedAt: task.attributes.assigned_at,
+    assignedTo: {
+      cssId: task.attributes.assigned_to.css_id,
+      isOrganization: task.attributes.assigned_to.is_organization,
+      id: task.attributes.assigned_to.id,
+      type: task.attributes.assigned_to.type,
+      name: task.attributes.assigned_to.name,
+    },
+    assignedBy: {
+      firstName: task.attributes.assigned_by.first_name,
+      lastName: task.attributes.assigned_by.last_name,
+      cssId: task.attributes.assigned_by.css_id,
+      pgId: task.attributes.assigned_by.pg_id,
+    }
+  };
+};
+
 const taskAttributesFromRawTask = (task) => {
   const decisionPreparedBy = task.attributes.decision_prepared_by?.first_name ?
     {
@@ -229,6 +257,11 @@ export const tasksWithAppealsFromRawTasks = (tasks) =>
     appeal: appealAttributesFromRawTask(task),
   }));
 
+export const tasksWithCorrespondenceFromRawTasks = (tasks) =>
+  tasks?.map((task) => ({
+    ...correspondenceTaskAttributesFromRawTask(task)
+  }));
+
 export const prepareLegacyTasksForStore = (tasks) => {
   const mappedLegacyTasks = tasks.map((task) => {
     return {
diff --git a/config/routes.rb b/config/routes.rb
index 6b952e43cda..12d8d5ae279 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -321,6 +321,8 @@
     get '/appeals/:appeal_id/cavc_dashboard', to: 'cavc_dashboard#index'
     get '/appeals/:vacols_id/tasks/:task_id/schedule_veteran', to: 'queue#index' # Allow direct navigation from the Hearings App
     get '/appeals/:vacols_id/*all', to: redirect('/queue/appeals/%{vacols_id}')
+    get 'correspondence/users/:user_id(*rest)', to: 'correspondence_task_pages#index'
+    get 'correspondence/organizations/:organization_id(*rest)', to: 'correspondence_task_pages#index'
     get '/:user_id(*rest)', to: 'legacy_tasks#index'
   end
   match '/explain/correspondence/:correspondence_uuid/:any' => 'explain#show', via: [:get]

From cd9586a9f64ee083a09e0d6bab8d25fb8e171063 Mon Sep 17 00:00:00 2001
From: Kevma50287 <104021955+Kevma50287@users.noreply.github.com>
Date: Tue, 6 Feb 2024 12:27:44 -0500
Subject: [PATCH 065/237] Update gem ref (#20725)

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1ba4a777cd3..87ebcd05658 100644
--- a/Gemfile
+++ b/Gemfile
@@ -66,7 +66,7 @@ gem "redis-namespace"
 gem "redis-rails", "~> 5.0.2"
 gem "request_store"
 gem "roo", "~> 2.7"
-gem "ruby_claim_evidence_api", git: "https://github.com/department-of-veterans-affairs/ruby_claim_evidence_api.git", ref: "f3746431a3977a86e01e5c630d192dd665727ea4"
+gem "ruby_claim_evidence_api", git: "https://github.com/department-of-veterans-affairs/ruby_claim_evidence_api.git", ref: "b030bdc1f9bea642f60c44dcbfbd0ed0c8f645f0"
 # Use SCSS for stylesheets
 gem "sass-rails", "~> 5.0"
 # Error reporting to Sentry
diff --git a/Gemfile.lock b/Gemfile.lock
index c6a9490d8bf..d9c59a72ca7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -67,8 +67,8 @@ GIT
 
 GIT
   remote: https://github.com/department-of-veterans-affairs/ruby_claim_evidence_api.git
-  revision: f3746431a3977a86e01e5c630d192dd665727ea4
-  ref: f3746431a3977a86e01e5c630d192dd665727ea4
+  revision: b030bdc1f9bea642f60c44dcbfbd0ed0c8f645f0
+  ref: b030bdc1f9bea642f60c44dcbfbd0ed0c8f645f0
   specs:
     ruby_claim_evidence_api (0.0.1)
       activesupport

From 4c0399665fab81207263596f19ee78a9d3397993 Mon Sep 17 00:00:00 2001
From: Kevma50287 <104021955+Kevma50287@users.noreply.github.com>
Date: Tue, 6 Feb 2024 14:11:25 -0500
Subject: [PATCH 066/237] Kev ma/update ce ape (#20729)

* Update gem ref

* Updated reference

* Update gem ref (#20725)

* Updated gem reference
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 87ebcd05658..662e91c57b5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -66,7 +66,7 @@ gem "redis-namespace"
 gem "redis-rails", "~> 5.0.2"
 gem "request_store"
 gem "roo", "~> 2.7"
-gem "ruby_claim_evidence_api", git: "https://github.com/department-of-veterans-affairs/ruby_claim_evidence_api.git", ref: "b030bdc1f9bea642f60c44dcbfbd0ed0c8f645f0"
+gem "ruby_claim_evidence_api", git: "https://github.com/department-of-veterans-affairs/ruby_claim_evidence_api.git", ref: "fed623802afe7303f4b8b5fe27cff0e903699873"
 # Use SCSS for stylesheets
 gem "sass-rails", "~> 5.0"
 # Error reporting to Sentry
diff --git a/Gemfile.lock b/Gemfile.lock
index d9c59a72ca7..bdfc6a46158 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -67,8 +67,8 @@ GIT
 
 GIT
   remote: https://github.com/department-of-veterans-affairs/ruby_claim_evidence_api.git
-  revision: b030bdc1f9bea642f60c44dcbfbd0ed0c8f645f0
-  ref: b030bdc1f9bea642f60c44dcbfbd0ed0c8f645f0
+  revision: fed623802afe7303f4b8b5fe27cff0e903699873
+  ref: fed623802afe7303f4b8b5fe27cff0e903699873
   specs:
     ruby_claim_evidence_api (0.0.1)
       activesupport

From b202eedd3e7a7bc7599559e319ac9d597beeee18 Mon Sep 17 00:00:00 2001
From: piedram <110848569+piedram@users.noreply.github.com>
Date: Thu, 8 Feb 2024 10:34:10 -0500
Subject: [PATCH 067/237] Piedram/appeals 37878 (#20640)

* APPEALS-29410 Response letter section

* create componenet to add letter

* fix button

* enabled and disabled continue buttom

* custom part

* selector element

* move state variable

* slector value

* error in selector

* Selectors

* Selectors 2

* change selector

* change selector

* remove part

* Response windows

* Response windows again

* updation radio

* clean values

* Fix option for custom radio

* fix reason value

* Fix option in the radio buttom

* Fix rubocop error

* Add spec file

* Add spec file

* Remove comments for the code

* modified options in the response wimdows and refactor de code

* remove import in AddCorrespondenceView

* fix custom field

* fix response windows

* refactor

* continue funcionality

* contiue button

---------

Co-authored-by: Kamala Madamanchi <kamala.madamanchi@va.gov>
Co-authored-by: cacevesva <109166981+cacevesva@users.noreply.github.com>
---
 app/controllers/correspondence_controller.rb  |   3 +-
 client/app/queue/constants.js                 |   3 +
 .../correspondenceActions.js                  |   9 +
 .../correspondenceConstants.js                |   1 +
 .../correspondenceReducer.js                  |   8 +
 .../AddCorrespondenceView.jsx                 |  26 +-
 .../AddCorrespondence/AddLetter.jsx           | 422 ++++++++++++++++++
 .../queue/correspondence/intake_form_spec.rb  | 126 ++++++
 8 files changed, 584 insertions(+), 14 deletions(-)
 create mode 100644 client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx

diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index ac35b37d55c..f6cb21b84e5 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -15,7 +15,8 @@ def intake
         render json: {
           currentCorrespondence: current_correspondence,
           correspondence: correspondence_load,
-          veteranInformation: veteran_information
+          veteranInformation: veteran_information,
+          responseLetters: 0
         }
       end
     end
diff --git a/client/app/queue/constants.js b/client/app/queue/constants.js
index 159b930fe93..b567f3518be 100644
--- a/client/app/queue/constants.js
+++ b/client/app/queue/constants.js
@@ -12,6 +12,7 @@ import COPY from '../../COPY';
 import VACOLS_COLUMN_MAX_LENGTHS from '../../constants/VACOLS_COLUMN_MAX_LENGTHS';
 import LEGACY_APPEAL_TYPES_BY_ID from '../../constants/LEGACY_APPEAL_TYPES_BY_ID';
 import QUEUE_INTAKE_FORM_TASK_TYPES from '../../constants/QUEUE_INTAKE_FORM_TASK_TYPES';
+import CORRESPONDENCE_LETTER_SELECTIONS from '../../constants/CORRESPONDENCE_LETTER_SELECTIONS';
 
 export const COLORS = {
   QUEUE_LOGO_PRIMARY: '#11598D',
@@ -144,6 +145,8 @@ const formatRemandReasons = (reasons) => Object.assign({},
   }))
 );
 
+export const ADD_CORRESPONDENCE_LETTER_SELECTIONS = CORRESPONDENCE_LETTER_SELECTIONS;
+
 export const LEGACY_REMAND_REASONS = formatRemandReasons(LEGACY_REMAND_REASONS_BY_ID);
 export const REMAND_REASONS = formatRemandReasons(REMAND_REASONS_BY_ID);
 
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
index 4866db8154b..c4cdf2888da 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
@@ -123,3 +123,12 @@ export const setWaivedEvidenceTasks = (task) => (dispatch) => {
     }
   });
 };
+
+export const setResponseLetters = (responseLetters) => (dispatch) => {
+  dispatch({
+    type: ACTIONS.SET_RESPONSE_LETTERS,
+    payload: {
+      responseLetters
+    }
+  });
+};
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
index 5ccbf472a5b..2daeda6b1a7 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
@@ -12,4 +12,5 @@ export const ACTIONS = {
   SET_FETCHED_APPEALS: 'SET_FETCHED_APPEALS',
   SET_NEW_APPEAL_RELATED_TASKS: 'SET_NEW_APPEAL_RELATED_TASKS',
   SET_WAIVED_EVIDENCE_TASKS: 'SET_WAIVED_EVIDENCE_TASKS',
+  SET_RESPONSE_LETTERS: 'SET_RESPONSE_LETTERS',
 };
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
index 5ab2391e9d5..3367cc15e65 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
@@ -13,6 +13,7 @@ export const initialState = {
   currentCorrespondence: [],
   veteranInformation: [],
   waivedEvidenceTasks: [],
+  responseLetters: 0,
 };
 
 export const intakeCorrespondenceReducer = (state = initialState, action = {}) => {
@@ -116,6 +117,13 @@ export const intakeCorrespondenceReducer = (state = initialState, action = {}) =
       }
     });
 
+  case ACTIONS.SET_RESPONSE_LETTERS:
+    return update(state, {
+      responseLetters: {
+        $set: [...action.payload.responseLetters]
+      }
+    });
+
   default:
     return state;
   }
diff --git a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx
index 32fb7ab6424..874a4d34064 100644
--- a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx
+++ b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx
@@ -4,17 +4,18 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import Checkbox from '../../../../../components/Checkbox';
-import Button from '../../../../../components/Button';
 import RadioField from '../../../../../components/RadioField';
 import ApiUtil from '../../../../../util/ApiUtil';
 import CorrespondencePaginationWrapper from '../../../CorrespondencePaginationWrapper';
+import AddLetter from '../AddCorrespondence/AddLetter';
 import {
   loadCurrentCorrespondence,
   loadCorrespondences,
   loadVeteranInformation,
   updateRadioValue,
   saveCheckboxState,
-  clearCheckboxState
+  clearCheckboxState,
+  setResponseLetters
 } from '../../../correspondenceReducer/correspondenceActions';
 
 const RELATED_NO = '0';
@@ -45,7 +46,6 @@ class AddCorrespondenceView extends React.Component {
       this.props.loadCurrentCorrespondence(currentCorrespondence);
       this.props.loadCorrespondences(correspondences);
       this.props.loadVeteranInformation(veteranInformation);
-
     }).
       catch((err) => {
         // allow HTTP errors to fall on the floor via the console.
@@ -198,14 +198,10 @@ class AddCorrespondenceView extends React.Component {
         <h1 style={{ marginBottom: '20px' }}>Add Related Correspondence</h1>
         <p style={{ marginTop: '0px' }}>Add any related correspondence to the mail package that is in progress.</p>
         <h2 style={{ margin: '30px auto 20px auto' }}>Response Letter</h2>
-        <div style={{ width: '80%', marginBottom: '30px' }}>
-          <Button
-            type="button"
-            name="addLetter"
-            className={['cf-left-side']}>
-          + Add letter
-          </Button>
-        </div>
+        {/* add letter here */}
+        <AddLetter
+          onContinueStatusChange={this.props.onContinueStatusChange}
+        />
         <hr style={{ borderTop: '1px solid #d6d7d9' }} />
         <h2 style={{ margin: '30px auto 20px auto' }}>Associate with prior Mail</h2>
         <p style={{ marginTop: '0px', marginBottom: '-7px' }}>Is this correspondence related to prior mail?</p>
@@ -253,7 +249,9 @@ AddCorrespondenceView.propTypes = {
   onContinueStatusChange: PropTypes.func,
   onCheckboxChange: PropTypes.func.isRequired,
   clearCheckboxState: PropTypes.func.isRequired,
-  checkboxes: PropTypes.array
+  checkboxes: PropTypes.array,
+  setResponseLetters: PropTypes.func,
+  currentLetters: PropTypes.number
 };
 
 const mapStateToProps = (state) => ({
@@ -262,6 +260,7 @@ const mapStateToProps = (state) => ({
   correspondences: state.intakeCorrespondence.correspondences,
   radioValue: state.intakeCorrespondence.radioValue,
   checkboxes: state.intakeCorrespondence.relatedCorrespondences,
+  currentLetters: state.intakeCorrespondence.responseLetters,
 });
 
 const mapDispatchToProps = (dispatch) => (
@@ -271,7 +270,8 @@ const mapDispatchToProps = (dispatch) => (
     loadVeteranInformation,
     updateRadioValue,
     saveCheckboxState,
-    clearCheckboxState
+    clearCheckboxState,
+    setResponseLetters
   }, dispatch)
 );
 
diff --git a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx
new file mode 100644
index 00000000000..c94e48320de
--- /dev/null
+++ b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx
@@ -0,0 +1,422 @@
+import React, { useState, useEffect } from 'react';
+import PropTypes from 'prop-types';
+import TextField from '../../../../../components/TextField';
+import Button from '../../../../../components/Button';
+import SearchableDropdown from 'app/components/SearchableDropdown';
+import DateSelector from 'app/components/DateSelector';
+import RadioField from '../../../../../components/RadioField';
+import { ADD_CORRESPONDENCE_LETTER_SELECTIONS } from '../../../../constants';
+import moment from 'moment';
+
+export const AddLetter = (props) => {
+  const onContinueStatusChange = props.onContinueStatusChange;
+
+  const [letters, setLetters] = useState([]);
+
+  const addLetter = (index) => {
+    setLetters([...letters, index]);
+  };
+
+  const [unrelatedTasksCanContinue, setUnrelatedTasksCanContinue] = useState(true);
+
+  const removeLetter = (index) => {
+    const restLetters = letters.filter((letter) => letter !== index);
+
+    setLetters(restLetters);
+  };
+
+  useEffect(() => {
+    onContinueStatusChange(unrelatedTasksCanContinue);
+  }, [unrelatedTasksCanContinue]);
+
+  useEffect(() => {
+    if (letters.length > 0) {
+      setUnrelatedTasksCanContinue(false);
+    } else {
+      setUnrelatedTasksCanContinue(true);
+    }
+  }, [letters]);
+
+  return (
+    <>
+      { letters.map((letter) => (
+        <div id={letter} style={{ width: '50%', display: 'inline-block' }} key={letter}>
+          <NewLetter
+            index={letter}
+            removeLetter={removeLetter}
+            setUnrelatedTasksCanContinue= {setUnrelatedTasksCanContinue}
+          />
+        </div>
+      )) }
+
+      <div style={{ width: '80%', marginBottom: '30px' }}>
+        <Button
+          type="button"
+          name="addLetter"
+          className={['cf-left-side']}
+          disabled= {!(letters.length < 3)}
+          onClick={() => {
+            addLetter(letters.length + 1);
+          }}>
+        + Add letter
+        </Button>
+      </div>
+    </>
+
+  );
+};
+
+AddLetter.propTypes = {
+  removeLetter: PropTypes.func,
+  index: PropTypes.number,
+  setUnrelatedTasksCanContinue: PropTypes.func,
+  onContinueStatusChange: PropTypes.func,
+};
+
+const currentDate = moment.utc(new Date()).format('YYYY-MM-DD');
+
+export const NewLetter = (props) => {
+  const index = props.index;
+  const setUnrelatedTasksCanContinue = props.setUnrelatedTasksCanContinue;
+  const [letterCard, setLetterCard] = useState({
+    id: index,
+    date: currentDate,
+    type: '',
+    title: '',
+    subType: '',
+    reason: '',
+    responseWindows: '',
+    customValue: ''
+  });
+
+  const [letterTitleSelector, setLetterTitleSelector] = useState('');
+  const [letterSubSelector, setLetterSubSelector] = useState('');
+  const [letterSubReason, setLetterSubReason] = useState('');
+  const [customResponseWindowState, setCustomResponseWindowState] = useState(false);
+
+  const [stateOptions, setStateOptions] = useState(true);
+
+  const [responseWindows, setResponseWindows] = useState('');
+  const naValue = 'N/A';
+
+  const radioOptions = [
+    { displayText: '65 days',
+      value: '65 days',
+      disabled: stateOptions },
+    { displayText: 'No response window',
+      value: 'No response window',
+      disabled: stateOptions },
+    { displayText: 'Custom',
+      value: 'Custom',
+      disabled: stateOptions }
+  ];
+
+  const [valueOptions, setValueOptions] = useState(radioOptions);
+
+  const handleDays = (value) => {
+    const currentNumber = value.trim();
+
+    if (currentNumber <= 64) {
+      setLetterCard({ ...letterCard,
+        customValue: value });
+    } else {
+      setLetterCard({ ...letterCard,
+        customValue: '' });
+    }
+  };
+
+  const handleCustomWindowState = (currentOpt) => {
+    if (currentOpt === radioOptions[2].value) {
+      setResponseWindows(radioOptions[2].value);
+      setCustomResponseWindowState(true);
+    } else {
+      setResponseWindows(currentOpt);
+      setCustomResponseWindowState(false);
+      setLetterCard({ ...letterCard,
+        customValue: '' });
+    }
+  };
+
+  const letterTypesData = ADD_CORRESPONDENCE_LETTER_SELECTIONS.map((option) => ({ label: (option.letter_type),
+    value: option.letter_type }));
+
+  const selectResponseWindows = (option, aux) => {
+    if (option.response_window_option_default) {
+      setLetterCard({ ...letterCard,
+        responseWindows: option.response_window_option_default });
+      setResponseWindows(option.response_window_option_default);
+    } else if (option.letter_titles[aux].letter_title === letterCard.title) {
+      setLetterCard({ ...letterCard,
+        responseWindows: option.letter_titles[aux].response_window_option_default });
+      setResponseWindows(option.letter_titles[aux].response_window_option_default);
+    }
+  };
+
+  const canContinue = () => {
+    const output = [];
+
+    for (const [, value] of Object.entries(letterCard)) {
+      if ((value !== null) && (value !== '')) {
+        output.push(value);
+      }
+    }
+
+    if ((output.length === 7) && (output[6] !== 'Custom')) {
+      return true;
+    } else if (output.length === 8) {
+      return true;
+    }
+
+    return false;
+  };
+
+  const findSub = (option, aux) => {
+    const subCate = [];
+    const listReason = [];
+
+    selectResponseWindows(option, aux);
+
+    for (let aux1 = 0; aux1 < option.letter_titles[aux].letter_subcategories.length; aux1++) {
+      subCate.push({ label: option.letter_titles[aux].letter_subcategories[aux1].subcategory,
+        value: option.letter_titles[aux].letter_subcategories[aux1].subcategory });
+    }
+
+    if (subCate.length === 0) {
+      setLetterSubSelector([{ label: naValue, value: naValue }]);
+    } else {
+      setLetterSubSelector(subCate);
+    }
+
+    for (let aux1 = 0; aux1 < option.letter_titles[aux].letter_subcategories.length; aux1++) {
+      if (letterCard.subType === option.letter_titles[aux].letter_subcategories[aux1].subcategory) {
+        option.letter_titles[aux].letter_subcategories[aux1].reasons.map((currentReason) =>
+          listReason.push({ label: currentReason, value: currentReason }));
+      }
+    }
+
+    if (listReason.length === 0) {
+      setLetterSubReason([{ label: naValue, value: naValue }]);
+    } else {
+      setLetterSubReason(listReason);
+    }
+  };
+
+  const findSubCategoryReason = (option) => {
+    for (let aux = 0; aux < option.letter_titles.length; aux++) {
+      if (option.letter_titles[aux].letter_title === letterCard.title) {
+        findSub(option, aux);
+      } else {
+        selectResponseWindows(option, aux);
+      }
+    }
+  };
+
+  const activateWindowsOption = () => {
+    if (responseWindows.trim().length > 0) {
+      for (let i = 0; i < valueOptions.length; i++) {
+        const option = valueOptions[i];
+
+        setStateOptions(false);
+        option.disabled = false;
+      }
+      setValueOptions(valueOptions);
+    } else {
+      for (let i = 0; i < valueOptions.length; i++) {
+        const option = valueOptions[i];
+
+        setStateOptions(true);
+        option.disabled = true;
+      }
+      setValueOptions(valueOptions);
+    }
+  };
+
+  const letterTitlesData = () => {
+    for (let i = 0; i < ADD_CORRESPONDENCE_LETTER_SELECTIONS.length; i++) {
+      const option = ADD_CORRESPONDENCE_LETTER_SELECTIONS[i];
+
+      if (option.letter_type === letterCard.type) {
+        setLetterTitleSelector(option.letter_titles.map((current) => ({
+          label: current.letter_title, value: current.letter_title
+        })));
+
+        if (letterCard.type.length > 0) {
+          findSubCategoryReason(option);
+        }
+      }
+    }
+  };
+
+  useEffect(() => {
+    if (canContinue()) {
+      setUnrelatedTasksCanContinue(true);
+    } else {
+      setUnrelatedTasksCanContinue(false);
+    }
+  }, [letterCard]);
+
+  useEffect(() => {
+    activateWindowsOption();
+    setLetterCard({ ...letterCard,
+      responseWindows });
+  }, [responseWindows]);
+
+  useEffect(() => {
+    if (letterCard.type.length > 0) {
+      letterTitlesData();
+    }
+  }, [letterCard.type]);
+
+  useEffect(() => {
+    if (letterCard.subType.length > 0) {
+      letterTitlesData();
+    }
+  }, [letterCard.subType]);
+
+  const changeLetterType = (val) => {
+    setLetterCard({ ...letterCard,
+      type: val,
+      title: '',
+      subType: '',
+      reason: '',
+      responseWindows: ''
+    });
+  };
+
+  useEffect(() => {
+    if (letterCard.title.length > 0) {
+      letterTitlesData();
+      if (responseWindows.length > 0) {
+        activateWindowsOption();
+      }
+    }
+  }, [letterCard.title]);
+
+  const changeLetterTitle = (val) => {
+    setLetterCard({ ...letterCard,
+      title: val,
+      subType: '',
+      reason: '',
+      responseWindows: ''
+    });
+  };
+
+  const changeLetterSubTitle = (val) => {
+    setLetterCard({ ...letterCard,
+      subType: val,
+      reason: ''
+    });
+  };
+
+  const changeSubReason = (val) => {
+    setLetterCard({ ...letterCard,
+      reason: val
+    });
+  };
+
+  const changeDate = (val) => {
+    setLetterCard({ ...letterCard,
+      date: val
+    });
+  };
+
+  const removeLetter = () => {
+    props.removeLetter(index);
+  };
+
+  return (
+    <div className="gray-border" style={
+      { display: 'inline-block', padding: '2rem 2rem', marginLeft: '3rem', marginBottom: '3rem', width: '90%' }
+    }>
+      <div className="response_letter_date">
+        <DateSelector
+          name="date-set"
+          label="Date sent"
+          value= {letterCard.date}
+          onChange={(val) => changeDate(val)}
+          type="date"
+        />
+      </div>
+      <br />
+      <SearchableDropdown
+        name="response-letter-type"
+        label="Letter type"
+        placeholder="Select..."
+        styling={{ maxWidth: '100%' }}
+        options={letterTypesData}
+        value={letterCard.type}
+        onChange={(val) => changeLetterType(val.value)}
+      />
+      <br />
+      <SearchableDropdown
+        name="response-letter-title"
+        label="Letter title"
+        placeholder="Select..."
+        readOnly = {letterCard.type.length === 0}
+        options={letterTitleSelector}
+        value={letterCard.title}
+        onChange={(val) => changeLetterTitle(val.value)}
+      />
+      <br />
+      <SearchableDropdown
+        name="response-letter-subcategory"
+        label="Letter subcategory"
+        placeholder="Select..."
+        readOnly = {letterCard.title.length === 0}
+        options={letterSubSelector}
+        value={letterCard.subType}
+        onChange={(val) => changeLetterSubTitle(val.value)}
+      />
+      <br />
+      <SearchableDropdown
+        name="response-letter-subcategory-reason"
+        label="Letter subcategory reason"
+        placeholder="Select..."
+        readOnly = {letterCard.subType.length === 0}
+        options={letterSubReason}
+        value={letterCard.reason}
+        onChange={(val) => changeSubReason(val.value)}
+      />
+      <br />
+      <RadioField
+        label="How long should the response window be for this response letter?"
+        name={`How long should the response window be for this response letter?-${index}`}
+        options={valueOptions}
+        value = {responseWindows}
+        onChange={(val) => handleCustomWindowState(val)}
+      />
+
+      { customResponseWindowState &&
+        <TextField
+          label="Number of days (Value must be between 1 and 64)"
+          name="content"
+          useAriaLabel
+          onChange={handleDays}
+          value={letterCard.customValue}
+        />
+      }
+      <br />
+      <Button
+        name="Remove"
+        styling={{ style: { paddingLeft: '0rem', paddingRight: '0rem' } }}
+        onClick={() => removeLetter()}
+        classNames={['cf-btn-link', 'cf-right-side']}
+      >
+        <i className="fa fa-trash-o" aria-hidden="true"></i>&nbsp;Remove letter
+      </Button>
+    </div>
+  );
+};
+
+NewLetter.propTypes = {
+  removeLetter: PropTypes.func.isRequired,
+  index: PropTypes.number.isRequired,
+  setLetterType: PropTypes.func,
+  letterType: PropTypes.string,
+  letterTitle: PropTypes.string,
+  setLetterTitle: PropTypes.func,
+  setUnrelatedTasksCanContinue: PropTypes.func,
+  onContinueStatusChange: PropTypes.func,
+};
+
+export default AddLetter;
diff --git a/spec/feature/queue/correspondence/intake_form_spec.rb b/spec/feature/queue/correspondence/intake_form_spec.rb
index e00ef2008bd..fa6c4223dfa 100644
--- a/spec/feature/queue/correspondence/intake_form_spec.rb
+++ b/spec/feature/queue/correspondence/intake_form_spec.rb
@@ -41,5 +41,131 @@
       expect(radio_choices[0]).to have_content("Yes")
       expect(radio_choices[1]).to have_content("No")
     end
+
+    it "displays Response Letter header" do
+      expect(page).to have_content("Response Letter")
+      expect(page).to have_content("+ Add letter")
+    end
+
+    it "create response letter only 3 times" do
+      position = 0
+      [0, 1, 2].each do |aux|
+        position = aux
+        click_on("+ Add letter")
+        expect(page).to have_button("Continue", disabled: true)
+      end
+      if position == 2
+        expect(page).to have_button("Continue", disabled: true)
+        expect(page).to have_button("+ Add letter", disabled: true)
+      end
+    end
+
+    it "Create Response letter" do
+      click_on("+ Add letter")
+      expect(page).to have_field("Date sent")
+      mydate = page.all("#date-set")
+      expect(mydate[0].value == Time.zone.today.strftime("%Y-%m-%d"))
+
+      page.should has_selector?("Letter type")
+      page.should has_selector?("Letter title", visible: false)
+      page.should has_selector?("Letter subcategory", visible: false)
+      page.should has_selector?("Letter subcategory reason", visible: false)
+
+      radio_choices = page.all(".cf-form-radio-option > label", visible: false)
+      expect(radio_choices[0]).to have_content("65 days")
+      expect(radio_choices[1]).to have_content("No response window")
+      expect(radio_choices[2]).to have_content("Custom")
+
+      expect(page).to have_button("Remove letter")
+    end
+
+    it "Add values to response letter for response window = No respondense windows" do
+      click_on("+ Add letter")
+
+      dropdowns = page.all(".cf-select__control")
+      dropdowns[0].click
+      dropdowns[0].sibling(".cf-select__menu").find(
+        "div .cf-select__option", text: "Pre-docketing"
+      ).click
+      expect(page).to have_field("Letter title", readonly: false)
+
+      dropdowns[1].click
+      dropdowns[1].sibling(".cf-select__menu").find(
+        "div .cf-select__option", text: "Intake 10182 Recv Needs AOJ Development"
+      ).click
+      expect(page).to have_field("Letter subcategory", readonly: false)
+
+      radio_choices = page.all(".cf-form-radio-option> label.disabled", visible: true)
+      radio_choices.each do |opt|
+        opt.text != "No response window"
+      end
+
+      dropdowns[2].click
+      dropdowns[2].sibling(".cf-select__menu").find(
+        "div .cf-select__option", text: "Issues(s) is VHA"
+      ).click
+      expect(page).to have_field("Letter subcategory reason", readonly: false)
+
+      dropdowns[3].click
+      dropdowns[3].sibling(".cf-select__menu").find("div .cf-select__option", text: "N/A").click
+    end
+
+    it "Add values to response letter for response window =  65 day" do
+      click_on("+ Add letter")
+
+      dropdowns = page.all(".cf-select__control")
+      dropdowns[0].click
+      dropdowns[0].sibling(".cf-select__menu").find(
+        "div .cf-select__option", text: "General"
+      ).click
+      expect(page).to have_field("Letter title", readonly: false)
+
+      dropdowns[1].click
+      dropdowns[1].sibling(".cf-select__menu").find(
+        "div .cf-select__option", text: "Intake AMA Corrective App Receipt"
+      ).click
+      expect(page).to have_field("Letter subcategory", readonly: false)
+
+      radio_choices = page.all(".cf-form-radio-option> label.disabled", visible: true)
+
+      radio_choices.each do |opt|
+        opt.text == "No response window"
+      end
+
+      dropdowns[2].click
+      dropdowns[2].sibling(".cf-select__menu").find(
+        "div .cf-select__option", text: "N/A"
+      ).click
+      expect(page).to have_field("Letter subcategory reason", readonly: false)
+
+      dropdowns[3].click
+      dropdowns[3].sibling(".cf-select__menu").find(
+        "div .cf-select__option", text: "N/A"
+      ).click
+    end
+
+    it "Add values to response letter for response window =  Custom" do
+      click_on("+ Add letter")
+
+      dropdowns = page.all(".cf-select__control")
+      dropdowns[0].click
+      dropdowns[0].sibling(".cf-select__menu").find(
+        "div .cf-select__option", text: "General"
+      ).click
+      expect(page).to have_field("Letter title", readonly: false)
+
+      dropdowns[1].click
+      dropdowns[1].sibling(".cf-select__menu").find(
+        "div .cf-select__option", text: "Intake AMA Corrective App Receipt"
+      ).click
+      expect(page).to have_field("Letter subcategory", readonly: false)
+
+      radio_choices = page.all(".cf-form-radio-option> label")
+      radio_choices[2].click
+      page.has_field?("Number of days (Value must be between 0 and 65)")
+
+      radio_choices[0].click
+      page.has_no_field?("Number of days (Value must be between 0 and 65)")
+    end
   end
 end

From 99663e55832aef202c0cdc6069e057cbf6ce84d9 Mon Sep 17 00:00:00 2001
From: sulak-j <95875751+sulak-j@users.noreply.github.com>
Date: Thu, 8 Feb 2024 11:44:03 -0600
Subject: [PATCH 068/237] Justin/APPEALS-35470 (#20651)

* adding correspondence task default route

* adding intake and review package route overrides

* adding efolder ulpoad failed logic for routing

* adding efolder failed upload task depending on parent task

* fixing intake scoping

* adding task_url attribute to column serializer

* attempting a correspondence root task addition

* Moved constant file for access

* removing root task method, since all defaults to /under_construction

* replacing task urls from a newly created constants file

* code cleanup

* adding tests

* rubocop and linting errors

* rubocop fixes

* Serialize attributes regardless of values

---------

Co-authored-by: William Medders <medders_william@bah.com>
---
 .../correspondence_task_column_serializer.rb  | 26 +++-----
 .../tasks/correspondence_intake_task.rb       |  4 ++
 app/models/tasks/correspondence_task.rb       |  4 ++
 .../tasks/efolder_upload_failed_task.rb       |  7 +++
 app/models/tasks/review_package_task.rb       |  4 ++
 client/constants/CORRESPONDENCE_TASK_URL.json |  4 ++
 spec/models/task_spec.rb                      | 60 +++++++++++++++++++
 7 files changed, 91 insertions(+), 18 deletions(-)
 create mode 100644 client/constants/CORRESPONDENCE_TASK_URL.json

diff --git a/app/models/serializers/work_queue/correspondence_task_column_serializer.rb b/app/models/serializers/work_queue/correspondence_task_column_serializer.rb
index 1d573331e63..4e7f87f53be 100644
--- a/app/models/serializers/work_queue/correspondence_task_column_serializer.rb
+++ b/app/models/serializers/work_queue/correspondence_task_column_serializer.rb
@@ -7,9 +7,7 @@ class WorkQueue::CorrespondenceTaskColumnSerializer
     object.id.to_s
   end
 
-  attribute :instructions do |object|
-    object.instructions
-  end
+  attribute :instructions
 
   attribute :veteran_details do |object|
     vet = Veteran.find(object.correspondence.veteran_id)
@@ -24,29 +22,21 @@ class WorkQueue::CorrespondenceTaskColumnSerializer
     object.correspondence.cmp_packet_number
   end
 
-  attribute :completion_date do |object|
-    object.closed_at
-  end
+  attribute(:completion_date, &:closed_at)
 
-  attribute :days_waiting do |object|
-    object.days_waiting
-  end
+  attribute :days_waiting
 
   attribute :va_date_of_receipt do |object|
     object.correspondence.va_date_of_receipt
   end
 
-  attribute :label do |object|
-    object.label
-  end
+  attribute :label
 
-  attribute :status do |object|
-    object.status
-  end
+  attribute :status
 
-  attribute :assigned_at do |object|
-    object.assigned_at
-  end
+  attribute :assigned_at
+
+  attribute :task_url
 
   attribute :assigned_to do |object|
     assignee = object.assigned_to
diff --git a/app/models/tasks/correspondence_intake_task.rb b/app/models/tasks/correspondence_intake_task.rb
index 7e63dba9fc7..461c9d39311 100644
--- a/app/models/tasks/correspondence_intake_task.rb
+++ b/app/models/tasks/correspondence_intake_task.rb
@@ -27,4 +27,8 @@ def verify_current_user_can_create!(user)
       MailTeam.singleton.user_has_access?(user)
     end
   end
+
+  def task_url
+    Constants.CORRESPONDENCE_TASK_URL.INTAKE_TASK_URL.sub("uuid", correspondence.uuid)
+  end
 end
diff --git a/app/models/tasks/correspondence_task.rb b/app/models/tasks/correspondence_task.rb
index d9623098a30..bb4da1d5227 100644
--- a/app/models/tasks/correspondence_task.rb
+++ b/app/models/tasks/correspondence_task.rb
@@ -46,6 +46,10 @@ def correspondence
     appeal
   end
 
+  def task_url
+    "/under_construction"
+  end
+
   private
 
   # rubocop:disable Metrics/CyclomaticComplexity
diff --git a/app/models/tasks/efolder_upload_failed_task.rb b/app/models/tasks/efolder_upload_failed_task.rb
index 3bafaf1c87f..7eca744c2a6 100644
--- a/app/models/tasks/efolder_upload_failed_task.rb
+++ b/app/models/tasks/efolder_upload_failed_task.rb
@@ -1,4 +1,11 @@
 # frozen_string_literal: true
 
 class EfolderUploadFailedTask < ReviewPackageTask
+  def task_url
+    if parent.is_a?(ReviewPackageTask)
+      Constants.CORRESPONDENCE_TASK_URL.REVIEW_PACKAGE_TASK_URL.sub("uuid", correspondence.uuid)
+    elsif parent.is_a?(CorrespondenceIntakeTask)
+      Constants.CORRESPONDENCE_TASK_URL.INTAKE_TASK_URL.sub("uuid", correspondence.uuid)
+    end
+  end
 end
diff --git a/app/models/tasks/review_package_task.rb b/app/models/tasks/review_package_task.rb
index 85d6ac257c3..44015e3be5d 100644
--- a/app/models/tasks/review_package_task.rb
+++ b/app/models/tasks/review_package_task.rb
@@ -16,4 +16,8 @@ def create_from_params(params, user)
   def when_child_task_created(_child_task)
     true
   end
+
+  def task_url
+    Constants.CORRESPONDENCE_TASK_URL.REVIEW_PACKAGE_TASK_URL.sub("uuid", correspondence.uuid)
+  end
 end
diff --git a/client/constants/CORRESPONDENCE_TASK_URL.json b/client/constants/CORRESPONDENCE_TASK_URL.json
new file mode 100644
index 00000000000..55b4a26a4a4
--- /dev/null
+++ b/client/constants/CORRESPONDENCE_TASK_URL.json
@@ -0,0 +1,4 @@
+{
+  "INTAKE_TASK_URL": "/queue/correspondence/uuid/intake",
+  "REVIEW_PACKAGE_TASK_URL": "/queue/correspondence/uuid/review_package"
+}
diff --git a/spec/models/task_spec.rb b/spec/models/task_spec.rb
index 21bac51e3b6..43280b566ce 100644
--- a/spec/models/task_spec.rb
+++ b/spec/models/task_spec.rb
@@ -1997,4 +1997,64 @@ def next_assignee(_options = {})
       end
     end
   end
+
+  describe "Correspondence Tasks" do
+    context "Correspondence Intake Task" do
+      it "has a task_url" do
+        cit = create(:correspondence_intake_task)
+        expect(cit.task_url).to eq("/queue/correspondence/#{cit.correspondence.uuid}/intake")
+      end
+    end
+
+    context "Review Package Task" do
+      it "has a task_url" do
+        correspondence = create(:correspondence)
+        rpt = ReviewPackageTask.find_or_create_by(
+          appeal_id: correspondence.id,
+          assigned_to: MailTeamSupervisor.singleton,
+          appeal_type: "Correspondence"
+        )
+
+        expect(rpt.task_url).to eq("/queue/correspondence/#{correspondence.uuid}/review_package")
+      end
+    end
+
+    context "eFolder Upload Failed Task" do
+      it "has a review_package task_url if parent is review package task" do
+        correspondence = create(:correspondence)
+        rpt = ReviewPackageTask.find_or_create_by(
+          appeal_id: correspondence.id,
+          assigned_to: MailTeamSupervisor.singleton,
+          appeal_type: "Correspondence"
+        )
+
+        uft = EfolderUploadFailedTask.create(
+          appeal_id: correspondence.id,
+          assigned_to: MailTeamSupervisor.singleton,
+          appeal_type: "Correspondence",
+          parent_id: rpt.id
+        )
+
+        expect(uft.task_url).to eq("/queue/correspondence/#{correspondence.uuid}/review_package")
+      end
+
+      it "has an intake task_url if parent is correspondence intake task" do
+        correspondence = create(:correspondence)
+        cit = CorrespondenceIntakeTask.find_or_create_by(
+          appeal_id: correspondence.id,
+          assigned_to: MailTeamSupervisor.singleton,
+          appeal_type: "Correspondence"
+        )
+
+        uft = EfolderUploadFailedTask.create(
+          appeal_id: correspondence.id,
+          assigned_to: MailTeamSupervisor.singleton,
+          appeal_type: "Correspondence",
+          parent_id: cit.id
+        )
+
+        expect(uft.task_url).to eq("/queue/correspondence/#{correspondence.uuid}/intake")
+      end
+    end
+  end
 end

From 718216f823fa91655bcb897066514f63f6d87643 Mon Sep 17 00:00:00 2001
From: Rnmarshall93 <110805785+Rnmarshall93@users.noreply.github.com>
Date: Thu, 8 Feb 2024 09:56:26 -0800
Subject: [PATCH 069/237] Fixed issue causing VA DOR to display incorrectly in
 the table. (#20748)

Co-authored-by: cacevesva <109166981+cacevesva@users.noreply.github.com>
---
 client/app/queue/components/TaskTableColumns.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/app/queue/components/TaskTableColumns.jsx b/client/app/queue/components/TaskTableColumns.jsx
index 13faf17a864..3ecea1a34aa 100644
--- a/client/app/queue/components/TaskTableColumns.jsx
+++ b/client/app/queue/components/TaskTableColumns.jsx
@@ -235,7 +235,7 @@ export const vaDor = () => {
   return {
     header: 'VA DOR',
     valueFunction: (task) => {
-      return moment(task.vador).format('MM/DD/YYYY');
+      return moment(task.vaDor).format('MM/DD/YYYY');
     }
   };
 };

From 2de677ea3a78eac15fd115c2802fef9e15d812a3 Mon Sep 17 00:00:00 2001
From: vinner57 <128258952+vinner57@users.noreply.github.com>
Date: Thu, 8 Feb 2024 15:44:49 -0500
Subject: [PATCH 070/237] confirmation of response letters (#20705)

* APPEALS-29410 Response letter section

* create componenet to add letter

* fix button

* enabled and disabled continue buttom

* custom part

* selector element

* move state variable

* slector value

* error in selector

* Selectors

* Selectors 2

* change selector

* change selector

* remove part

* Response windows

* Response windows again

* updation radio

* clean values

* Fix option for custom radio

* fix reason value

* Fix option in the radio buttom

* Fix rubocop error

* Add spec file

* Add spec file

* Remove comments for the code

* modified options in the response wimdows and refactor de code

* remove import in AddCorrespondenceView

* confirmation of response letters

* fix custom field

* adding dispatch

* fix response windows

* refactor

* continue funcionality

* contiue button

* adding response letter section

* fixing lint

* fixing table

* lint fixes

* refactoring

* appending days to custom value

* fixing lint errors

* fixing lint

* fixing lint

---------

Co-authored-by: Kamala Madamanchi <kamala.madamanchi@va.gov>
Co-authored-by: piedram <maite.piedrayera@va.gov>
---
 .../correspondenceActions.js                  | 17 +++---
 .../correspondenceReducer.js                  |  6 +--
 .../AddCorrespondenceView.jsx                 |  2 +-
 .../AddCorrespondence/AddLetter.jsx           | 36 +++++++++----
 .../ConfirmCorrespondenceView.jsx             | 54 ++++++++++++++++++-
 client/app/styles/_table.scss                 | 34 ++++++++++++
 6 files changed, 127 insertions(+), 22 deletions(-)

diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
index c4cdf2888da..867e0a22dc9 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
@@ -124,11 +124,12 @@ export const setWaivedEvidenceTasks = (task) => (dispatch) => {
   });
 };
 
-export const setResponseLetters = (responseLetters) => (dispatch) => {
-  dispatch({
-    type: ACTIONS.SET_RESPONSE_LETTERS,
-    payload: {
-      responseLetters
-    }
-  });
-};
+export const setResponseLetters = (responseLetters) =>
+  (dispatch) => {
+    dispatch({
+      type: ACTIONS.SET_RESPONSE_LETTERS,
+      payload: {
+        responseLetters
+      }
+    });
+  };
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
index 3367cc15e65..ed87788319a 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
@@ -13,8 +13,8 @@ export const initialState = {
   currentCorrespondence: [],
   veteranInformation: [],
   waivedEvidenceTasks: [],
-  responseLetters: 0,
-};
+  responseLetters: {}
+}
 
 export const intakeCorrespondenceReducer = (state = initialState, action = {}) => {
   switch (action.type) {
@@ -120,7 +120,7 @@ export const intakeCorrespondenceReducer = (state = initialState, action = {}) =
   case ACTIONS.SET_RESPONSE_LETTERS:
     return update(state, {
       responseLetters: {
-        $set: [...action.payload.responseLetters]
+        $merge: action.payload.responseLetters
       }
     });
 
diff --git a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx
index 874a4d34064..d021c6cca08 100644
--- a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx
+++ b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx
@@ -7,7 +7,7 @@ import Checkbox from '../../../../../components/Checkbox';
 import RadioField from '../../../../../components/RadioField';
 import ApiUtil from '../../../../../util/ApiUtil';
 import CorrespondencePaginationWrapper from '../../../CorrespondencePaginationWrapper';
-import AddLetter from '../AddCorrespondence/AddLetter';
+import { AddLetter } from '../AddCorrespondence/AddLetter';
 import {
   loadCurrentCorrespondence,
   loadCorrespondences,
diff --git a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx
index c94e48320de..e33db359249 100644
--- a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx
+++ b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx
@@ -7,6 +7,11 @@ import DateSelector from 'app/components/DateSelector';
 import RadioField from '../../../../../components/RadioField';
 import { ADD_CORRESPONDENCE_LETTER_SELECTIONS } from '../../../../constants';
 import moment from 'moment';
+import { connect, useDispatch } from 'react-redux';
+import { bindActionCreators } from 'redux';
+import {
+  setResponseLetters
+} from '../../../correspondenceReducer/correspondenceActions';
 
 export const AddLetter = (props) => {
   const onContinueStatusChange = props.onContinueStatusChange;
@@ -74,9 +79,9 @@ AddLetter.propTypes = {
 };
 
 const currentDate = moment.utc(new Date()).format('YYYY-MM-DD');
-
-export const NewLetter = (props) => {
+const NewLetter = (props) => {
   const index = props.index;
+  const letterHash = {};
   const setUnrelatedTasksCanContinue = props.setUnrelatedTasksCanContinue;
   const [letterCard, setLetterCard] = useState({
     id: index,
@@ -86,7 +91,7 @@ export const NewLetter = (props) => {
     subType: '',
     reason: '',
     responseWindows: '',
-    customValue: ''
+    customValue: null
   });
 
   const [letterTitleSelector, setLetterTitleSelector] = useState('');
@@ -98,6 +103,7 @@ export const NewLetter = (props) => {
 
   const [responseWindows, setResponseWindows] = useState('');
   const naValue = 'N/A';
+  const dispatch = useDispatch();
 
   const radioOptions = [
     { displayText: '65 days',
@@ -114,14 +120,14 @@ export const NewLetter = (props) => {
   const [valueOptions, setValueOptions] = useState(radioOptions);
 
   const handleDays = (value) => {
-    const currentNumber = value.trim();
+    const currentNumber = parseInt(value.trim(), 10);
 
     if (currentNumber <= 64) {
       setLetterCard({ ...letterCard,
-        customValue: value });
+        customValue: currentNumber });
     } else {
       setLetterCard({ ...letterCard,
-        customValue: '' });
+        customValue: null });
     }
   };
 
@@ -133,7 +139,7 @@ export const NewLetter = (props) => {
       setResponseWindows(currentOpt);
       setCustomResponseWindowState(false);
       setLetterCard({ ...letterCard,
-        customValue: '' });
+        customValue: null });
     }
   };
 
@@ -249,6 +255,8 @@ export const NewLetter = (props) => {
 
   useEffect(() => {
     if (canContinue()) {
+      letterHash[index] = letterCard;
+      dispatch(setResponseLetters(letterHash));
       setUnrelatedTasksCanContinue(true);
     } else {
       setUnrelatedTasksCanContinue(false);
@@ -415,8 +423,18 @@ NewLetter.propTypes = {
   letterType: PropTypes.string,
   letterTitle: PropTypes.string,
   setLetterTitle: PropTypes.func,
+  setResponseLetters: PropTypes.func,
   setUnrelatedTasksCanContinue: PropTypes.func,
-  onContinueStatusChange: PropTypes.func,
+  onContinueStatusChange: PropTypes.func
 };
 
-export default AddLetter;
+const mapDispatchToProps = (dispatch) => (
+  bindActionCreators({
+    setResponseLetters
+  }, dispatch)
+);
+
+export default connect(
+  mapDispatchToProps
+)(NewLetter);
+
diff --git a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmCorrespondenceView.jsx b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmCorrespondenceView.jsx
index 9b43291f8e0..5f634518d1e 100644
--- a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmCorrespondenceView.jsx
+++ b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmCorrespondenceView.jsx
@@ -28,7 +28,10 @@ const tableStyling = css({
 export const ConfirmCorrespondenceView = (props) => {
 
   const checkedMailTasks = props.mailTasks;
-  const relatedCorrespondences = useSelector((state) => state.intakeCorrespondence.relatedCorrespondences);
+  const intakeCorrespondence = useSelector((state) => state.intakeCorrespondence);
+  const relatedCorrespondences = intakeCorrespondence.relatedCorrespondences;
+  const responseLetters = intakeCorrespondence.responseLetters;
+
   let correspondenceTable = null;
   let mailTaskTable = null;
 
@@ -168,6 +171,55 @@ export const ConfirmCorrespondenceView = (props) => {
         If you need to make changes, please go back to the associated section.
       </p>
       <CorrespondenceDetailsTable />
+      <div>
+        <div className="corr-flex">
+          <h2 className="corr-h2">Response Letters</h2>
+          <div className="corr-autoleft">
+            <Button className="corr-button" linkStyling onClick={() => props.goToStep(1)}>
+              <span className="corr-icon"><PencilIcon /></span>
+              <span className="corr-sectionlink">Edit Section</span>
+            </Button>
+          </div>
+        </div>
+        <div {...css({ backgroundColor: COLORS.GREY_BACKGROUND })}>
+          <div {...css({ backgroundColor: COLORS.GREY_BACKGROUND, paddingTop: '20px', paddingBottom: '20px' })}>
+            <table className="correspondence-response-letters-table">
+              <tbody>
+                <tr>
+                  <th className="cf-txt-c"> Date Sent </th>
+                  <th className="cf-txt-c"> Letter Type </th>
+                  <th className="cf-txt-c"> Letter Title </th>
+                  <th className="cf-txt-c"> Letter Subcategory </th>
+                  <th className="cf-txt-c"> Letter Subcategory Reasons</th>
+                  <th className="cf-txt-c"> Response Window </th>
+                </tr>
+              </tbody>
+              { Object.keys(responseLetters)?.map((indexValue) => {
+                const responseLetter = responseLetters[indexValue];
+
+                return (
+                  <tbody key={indexValue}>
+                    <tr>
+                      <td> {responseLetter?.date} </td>
+                      <td> {responseLetter?.type} </td>
+                      <td> {responseLetter?.title} </td>
+                      <td> {responseLetter?.subType} </td>
+                      <td> {responseLetter?.reason} </td>
+                      <td>
+                        {
+                          responseLetter?.customValue === null ?
+                           responseLetter?.responseWindows :
+                            `${responseLetter?.customValue } days`
+                        }
+                      </td>
+                    </tr>
+                  </tbody>
+                );
+              })}
+            </table>
+          </div>
+        </div>
+      </div>
       <div>
         <div className="corr-flex">
           <h2 className="corr-h2">Associated Prior Mail</h2>
diff --git a/client/app/styles/_table.scss b/client/app/styles/_table.scss
index 5c6b9c1b6dc..82403deb637 100644
--- a/client/app/styles/_table.scss
+++ b/client/app/styles/_table.scss
@@ -1,3 +1,5 @@
+$letter-table-bg-color: #f9f9f9;
+
 .usa-table-borderless {
   width: 100%;
 
@@ -60,6 +62,38 @@
   }
 }
 
+.correspondence-response-letters-table {
+  width: 100%;
+
+  table {
+    width: 100%;
+  }
+
+  th {
+    text-align: left;
+    width: auto;
+    font-weight: bold;
+  }
+
+  tr,
+  th,
+  td {
+    position: relative;
+    border: none;
+    background-color: $letter-table-bg-color;
+
+    &::after {
+      content: '';
+      position: absolute;
+      bottom: 0;
+      width: 95%;
+      left: 1%;
+      border-bottom: 1px solid $color-gray-lighter;
+
+    }
+  }
+}
+
 .cf-filter-option-row {
   margin: 0;
 

From 0a1392247638575bc5873c2ce1eff12a53a84bcf Mon Sep 17 00:00:00 2001
From: youfoundmanesh <129548081+youfoundmanesh@users.noreply.github.com>
Date: Fri, 9 Feb 2024 10:57:05 -0500
Subject: [PATCH 071/237] Update gem reference (#20767)

Co-authored-by: Kevin Ma <magavakevin10@gmail.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 662e91c57b5..d6b9e68f08c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -66,7 +66,7 @@ gem "redis-namespace"
 gem "redis-rails", "~> 5.0.2"
 gem "request_store"
 gem "roo", "~> 2.7"
-gem "ruby_claim_evidence_api", git: "https://github.com/department-of-veterans-affairs/ruby_claim_evidence_api.git", ref: "fed623802afe7303f4b8b5fe27cff0e903699873"
+gem "ruby_claim_evidence_api", git: "https://github.com/department-of-veterans-affairs/ruby_claim_evidence_api.git", ref: "a2ecb0bf7f3d3aa8fd1429bfd78aa00e7270b0c8"
 # Use SCSS for stylesheets
 gem "sass-rails", "~> 5.0"
 # Error reporting to Sentry
diff --git a/Gemfile.lock b/Gemfile.lock
index bdfc6a46158..d0ff2ade85b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -67,8 +67,8 @@ GIT
 
 GIT
   remote: https://github.com/department-of-veterans-affairs/ruby_claim_evidence_api.git
-  revision: fed623802afe7303f4b8b5fe27cff0e903699873
-  ref: fed623802afe7303f4b8b5fe27cff0e903699873
+  revision: a2ecb0bf7f3d3aa8fd1429bfd78aa00e7270b0c8
+  ref: a2ecb0bf7f3d3aa8fd1429bfd78aa00e7270b0c8
   specs:
     ruby_claim_evidence_api (0.0.1)
       activesupport

From e8fcb535a13cab3d73ad286f9b6cd163538e1606 Mon Sep 17 00:00:00 2001
From: cacevesva <109166981+cacevesva@users.noreply.github.com>
Date: Fri, 9 Feb 2024 12:32:57 -0800
Subject: [PATCH 072/237] Vinner57/appeals 34975 (#20778)

* APPEALS-29410 Response letter section

* create componenet to add letter

* fix button

* enabled and disabled continue buttom

* custom part

* corrspondence response letter changes

* specs and refactoring

* selector element

* move state variable

* slector value

* error in selector

* Selectors

* Selectors 2

* change selector

* change selector

* remove part

* Response windows

* Response windows again

* updation radio

* clean values

* Fix option for custom radio

* rubocop fix

* fix reason value

* Fix option in the radio buttom

* Fix rubocop error

* Update migration and rubocop fixes

* Add spec file

* Add spec file

* Remove comments for the code

* modified options in the response wimdows and refactor de code

* remove import in AddCorrespondenceView

* confirmation of response letters

* fix custom field

* adding dispatch

* fix response windows

* refactor

* continue funcionality

* contiue button

* adding response letter section

* fixing lint

* fixing table

* lint fixes

* Add continue botton

* Save data in DB

* change style

* Save values

* fix continue buttom

* dix submit button

---------

Co-authored-by: Kamala Madamanchi <kamala.madamanchi@va.gov>
Co-authored-by: piedram <maite.piedrayera@va.gov>
Co-authored-by: vinner57 <128258952+vinner57@users.noreply.github.com>
---
 .../correspondence_intake_processor.rb        | 28 +++++++++++++
 .../correspondenceReducer.js                  |  4 +-
 .../AddCorrespondence/AddLetter.jsx           | 40 ++++++++++++++++---
 .../SubmitCorrespondenceModal.jsx             |  4 +-
 client/app/styles/_table.scss                 |  1 -
 5 files changed, 68 insertions(+), 9 deletions(-)

diff --git a/app/services/correspondence_intake_processor.rb b/app/services/correspondence_intake_processor.rb
index 059e89fe163..99420bbadba 100644
--- a/app/services/correspondence_intake_processor.rb
+++ b/app/services/correspondence_intake_processor.rb
@@ -28,6 +28,7 @@ def do_upload_success_actions(parent_task, intake_params, correspondence, curren
 
       create_correspondence_relations(intake_params, correspondence.id)
       link_appeals_to_correspondence(intake_params, correspondence.id)
+      create_response_letter(intake_params, correspondence.id)
       add_tasks_to_related_appeals(intake_params, current_user)
       complete_waived_evidence_submission_tasks(intake_params)
       create_tasks_not_related_to_appeals(intake_params, correspondence, current_user)
@@ -50,6 +51,33 @@ def create_correspondence_relations(intake_params, correspondence_id)
     end
   end
 
+  def create_response_letter(intake_params, correspondence_id)
+    current_user = RequestStore.store[:current_user] ||= User.system_user
+
+    intake_params[:response_letters]&.map do |data|
+      current_value = nil
+      if (data[:responseWindows] == 'Custom')
+        current_value = data[:customValue]
+      end
+
+      if (data[:responseWindows] == '65 days')
+        current_value = 65
+      end
+
+      CorrespondenceResponseLetter.create!(
+        correspondence_id: correspondence_id,
+        date_sent: data[:date],
+        title: data[:title],
+        subcategory: data[:subType],
+        reason: data[:reason],
+        response_window: current_value,
+        letter_type: data[:type],
+        user_id: current_user.id
+      )
+    end
+  end
+
+
   def link_appeals_to_correspondence(intake_params, correspondence_id)
     intake_params[:related_appeal_ids]&.map do |appeal_id|
       CorrespondencesAppeal.find_or_create_by(correspondence_id: correspondence_id, appeal_id: appeal_id)
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
index ed87788319a..0b531550d48 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
@@ -13,8 +13,8 @@ export const initialState = {
   currentCorrespondence: [],
   veteranInformation: [],
   waivedEvidenceTasks: [],
-  responseLetters: {}
-}
+  responseLetters: [],
+};
 
 export const intakeCorrespondenceReducer = (state = initialState, action = {}) => {
   switch (action.type) {
diff --git a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx
index e33db359249..1f7f0e9545c 100644
--- a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx
+++ b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx
@@ -24,10 +24,30 @@ export const AddLetter = (props) => {
 
   const [unrelatedTasksCanContinue, setUnrelatedTasksCanContinue] = useState(true);
 
-  const removeLetter = (index) => {
+  const canContinue = (letterCard) => {
+    const output = [];
+    const opts = ['65 days', 'No response window'];
+
+    for (const [, value] of Object.entries(letterCard)) {
+      if ((value !== null) && (value !== '')) {
+        output.push(value);
+      }
+    }
+
+    if ((output.length === 7) && (opts.includes(output[6]))) {
+      return true;
+    } else if (output.length === 8) {
+      return true;
+    }
+
+    return false;
+  };
+
+  const removeLetter = (index, letterCard) => {
     const restLetters = letters.filter((letter) => letter !== index);
 
     setLetters(restLetters);
+    canContinue(letterCard);
   };
 
   useEffect(() => {
@@ -35,11 +55,15 @@ export const AddLetter = (props) => {
   }, [unrelatedTasksCanContinue]);
 
   useEffect(() => {
+    // if canContinue() {
+    //   setUnrelatedTasksCanContinue(true);
+    // } else {
     if (letters.length > 0) {
       setUnrelatedTasksCanContinue(false);
     } else {
       setUnrelatedTasksCanContinue(true);
     }
+    // }
   }, [letters]);
 
   return (
@@ -160,6 +184,7 @@ const NewLetter = (props) => {
 
   const canContinue = () => {
     const output = [];
+    const opts = ['65 days', 'No response window'];
 
     for (const [, value] of Object.entries(letterCard)) {
       if ((value !== null) && (value !== '')) {
@@ -167,7 +192,7 @@ const NewLetter = (props) => {
       }
     }
 
-    if ((output.length === 7) && (output[6] !== 'Custom')) {
+    if ((output.length === 7) && (opts.includes(output[6]))) {
       return true;
     } else if (output.length === 8) {
       return true;
@@ -289,6 +314,7 @@ const NewLetter = (props) => {
       reason: '',
       responseWindows: ''
     });
+    setCustomResponseWindowState(false);
   };
 
   useEffect(() => {
@@ -307,18 +333,22 @@ const NewLetter = (props) => {
       reason: '',
       responseWindows: ''
     });
+    setCustomResponseWindowState(false);
   };
 
   const changeLetterSubTitle = (val) => {
     setLetterCard({ ...letterCard,
       subType: val,
-      reason: ''
+      reason: '',
+      customValue: null
     });
+    setCustomResponseWindowState(false);
   };
 
   const changeSubReason = (val) => {
     setLetterCard({ ...letterCard,
-      reason: val
+      reason: val,
+      customValue: null
     });
   };
 
@@ -329,7 +359,7 @@ const NewLetter = (props) => {
   };
 
   const removeLetter = () => {
-    props.removeLetter(index);
+    props.removeLetter(index, letterCard);
   };
 
   return (
diff --git a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/SubmitCorrespondenceModal.jsx b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/SubmitCorrespondenceModal.jsx
index 2cc5e52d867..b76cb8c1cfa 100644
--- a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/SubmitCorrespondenceModal.jsx
+++ b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/SubmitCorrespondenceModal.jsx
@@ -17,6 +17,7 @@ export const SubmitCorrespondenceModal = ({ setSubmitCorrespondenceModalVisible,
   const tasksRelatedToAppeal = useSelector((state) => state.intakeCorrespondence.newAppealRelatedTasks);
   const tasksNotRelatedToAppeal = useSelector((state) => state.intakeCorrespondence.unrelatedTasks);
   const mailTasks = useSelector((state) => state.intakeCorrespondence.mailTasks);
+  const responseLetters = useSelector((state) => state.intakeCorrespondence.responseLetters);
   const [loading, setLoading] = useState(false);
 
   const onCancel = () => {
@@ -57,7 +58,8 @@ export const SubmitCorrespondenceModal = ({ setSubmitCorrespondenceModalVisible,
       waived_evidence_submission_window_tasks: serializedWaivedEvidenceTasks,
       related_appeal_ids: relatedAppealIds,
       tasks_not_related_to_appeal: serializedTasksNotRelatedToAppeal,
-      mail_tasks: mailTasks
+      mail_tasks: mailTasks,
+      response_letters: responseLetters
     };
 
     setLoading(true);
diff --git a/client/app/styles/_table.scss b/client/app/styles/_table.scss
index 82403deb637..9e7279e05f9 100644
--- a/client/app/styles/_table.scss
+++ b/client/app/styles/_table.scss
@@ -64,7 +64,6 @@ $letter-table-bg-color: #f9f9f9;
 
 .correspondence-response-letters-table {
   width: 100%;
-
   table {
     width: 100%;
   }

From 2ca120992e457f455016ddca577f7254efd9ee35 Mon Sep 17 00:00:00 2001
From: piedram <110848569+piedram@users.noreply.github.com>
Date: Fri, 9 Feb 2024 16:02:30 -0500
Subject: [PATCH 073/237] merge with feature branch (#20780)

---
 .../AddCorrespondence/AddLetter.jsx           | 24 ++-----------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx
index 1f7f0e9545c..fd78e7fbafc 100644
--- a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx
+++ b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx
@@ -24,30 +24,10 @@ export const AddLetter = (props) => {
 
   const [unrelatedTasksCanContinue, setUnrelatedTasksCanContinue] = useState(true);
 
-  const canContinue = (letterCard) => {
-    const output = [];
-    const opts = ['65 days', 'No response window'];
-
-    for (const [, value] of Object.entries(letterCard)) {
-      if ((value !== null) && (value !== '')) {
-        output.push(value);
-      }
-    }
-
-    if ((output.length === 7) && (opts.includes(output[6]))) {
-      return true;
-    } else if (output.length === 8) {
-      return true;
-    }
-
-    return false;
-  };
-
-  const removeLetter = (index, letterCard) => {
+  const removeLetter = (index) => {
     const restLetters = letters.filter((letter) => letter !== index);
 
     setLetters(restLetters);
-    canContinue(letterCard);
   };
 
   useEffect(() => {
@@ -359,7 +339,7 @@ const NewLetter = (props) => {
   };
 
   const removeLetter = () => {
-    props.removeLetter(index, letterCard);
+    props.removeLetter(index);
   };
 
   return (

From 214f88aa2c4b5087c5b6142e480ef6cf900cb585 Mon Sep 17 00:00:00 2001
From: youfoundmanesh <maneshreddy.kommidi@va.gov>
Date: Mon, 12 Feb 2024 14:48:27 -0500
Subject: [PATCH 074/237] Data seed fix

---
 db/seeds.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/db/seeds.rb b/db/seeds.rb
index 090bc416f9e..871bf6415fa 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -61,7 +61,6 @@ def seed
     call_and_log_seed_step Seeds::Notifications
     call_and_log_seed_step Seeds::CavcDashboardData
     call_and_log_seed_step Seeds::VbmsExtClaim
-    call_and_log_seed_step Seeds::CasesTiedToJudgesNoLongerWithBoard
     call_and_log_seed_step Seeds::CorrespondenceTypes
     call_and_log_seed_step Seeds::PackageDocumentTypes
     call_and_log_seed_step Seeds::Correspondence

From 02a9f7a88c12a8381e83b590e8c0794d89712ec7 Mon Sep 17 00:00:00 2001
From: Will Medders <93014155+wmedders21@users.noreply.github.com>
Date: Mon, 12 Feb 2024 17:25:13 -0600
Subject: [PATCH 075/237] Wmedders21/appeals 39418 (#20750)

* adding correspondence task default route

* adding intake and review package route overrides

* adding efolder ulpoad failed logic for routing

* adding efolder failed upload task depending on parent task

* fixing intake scoping

* adding task_url attribute to column serializer

* attempting a correspondence root task addition

* Moved constant file for access

* removing root task method, since all defaults to /under_construction

* replacing task urls from a newly created constants file

* code cleanup

* adding tests

* rubocop and linting errors

* rubocop fixes

* Serialize attributes regardless of values

* Make CorrespondenceTask an abstract class

* Make package action tasks inherit from CorrespondenceTask

* Update to not intatiate abstract CorrespondenceTasks

* Refactor queue correspondences seeds

* Fix broken pagination on Correspondence Cases team page

* Merge with feature 32900

* Randomize va date of receipt

* Remove expectation to find instance of CorrespondenceTask - an abstract class

* Remove expectation for abstract class to appear in task tree

* Assign ReviewPackageTask before creating EfolderUploadFailedTask

* Rubocop fixes

---------

Co-authored-by: sulak-j <justin.sulak@va.gov>
Co-authored-by: Christopher Aceves <christopher.aceves@va.gov>
---
 app/models/correspondence_config.rb           |   4 +-
 .../correspondence/reassign_package_task.rb   |   2 +-
 app/models/tasks/correspondence_task.rb       |   3 +-
 app/models/tasks/merge_package_task.rb        |   2 +-
 app/models/tasks/remove_package_task.rb       |   2 +-
 app/models/tasks/split_package_task.rb        |   2 +-
 .../correspondence_root_task_factory.rb       |  18 +-
 db/seeds/helpers/queue_helpers.rb             | 156 ++++++------------
 db/seeds/queue_correspondences.rb             | 153 ++++++-----------
 spec/controllers/explain_controller_spec.rb   |   1 -
 spec/models/correspondence_spec.rb            |   7 -
 11 files changed, 121 insertions(+), 229 deletions(-)

diff --git a/app/models/correspondence_config.rb b/app/models/correspondence_config.rb
index 195886aec8e..e4451cac974 100644
--- a/app/models/correspondence_config.rb
+++ b/app/models/correspondence_config.rb
@@ -22,9 +22,9 @@ def attach_tasks_to_tab(tab)
     )
     endpoint = "task_pages?#{Constants.QUEUE_CONFIG.TAB_NAME_REQUEST_PARAM}=#{tab.name}"
     base_path = if assignee_is_org?
-                  "organizations/#{assignee.id}/"
+                  "organizations/#{assignee.id}/#{endpoint}"
                 else
-                  "correspondence/users/#{assignee.id}/}#{endpoint}"
+                  "correspondence/users/#{assignee.id}/#{endpoint}"
                 end
 
     tab.to_hash.merge(
diff --git a/app/models/tasks/correspondence/reassign_package_task.rb b/app/models/tasks/correspondence/reassign_package_task.rb
index 0feb2e7bcf9..71a1e26df11 100644
--- a/app/models/tasks/correspondence/reassign_package_task.rb
+++ b/app/models/tasks/correspondence/reassign_package_task.rb
@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
-class ReassignPackageTask < ReviewPackageTask
+class ReassignPackageTask < CorrespondenceTask
 end
diff --git a/app/models/tasks/correspondence_task.rb b/app/models/tasks/correspondence_task.rb
index bb4da1d5227..6c25b436ecc 100644
--- a/app/models/tasks/correspondence_task.rb
+++ b/app/models/tasks/correspondence_task.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class CorrespondenceTask < Task
+  self.abstract_class = true
+
   before_create :verify_org_task_unique
   validate :status_is_valid_on_create, on: :create
   validate :assignee_status_is_valid_on_create, on: :create
@@ -24,7 +26,6 @@ def remove_package
       appeal_id: @correspondence.id,
       assigned_to: MailTeamSupervisor.singleton,
       appeal_type: "Correspondence",
-      parent_id: @correspondence_task.id,
       type: "CorrespondenceRootTask"
     )
     root_task.cancel_task_and_child_subtasks
diff --git a/app/models/tasks/merge_package_task.rb b/app/models/tasks/merge_package_task.rb
index fcc94564c1f..dc9d90b9d40 100644
--- a/app/models/tasks/merge_package_task.rb
+++ b/app/models/tasks/merge_package_task.rb
@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
-class MergePackageTask < ReviewPackageTask
+class MergePackageTask < CorrespondenceTask
 end
diff --git a/app/models/tasks/remove_package_task.rb b/app/models/tasks/remove_package_task.rb
index 63af99adfbb..80259331e3a 100644
--- a/app/models/tasks/remove_package_task.rb
+++ b/app/models/tasks/remove_package_task.rb
@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
-class RemovePackageTask < ReviewPackageTask
+class RemovePackageTask < CorrespondenceTask
 end
diff --git a/app/models/tasks/split_package_task.rb b/app/models/tasks/split_package_task.rb
index d12f057fbf0..5bcaf609f3e 100644
--- a/app/models/tasks/split_package_task.rb
+++ b/app/models/tasks/split_package_task.rb
@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
-class SplitPackageTask < ReviewPackageTask
+class SplitPackageTask < CorrespondenceTask
 end
diff --git a/app/workflows/correspondence_root_task_factory.rb b/app/workflows/correspondence_root_task_factory.rb
index 668e15be1b8..780edc12973 100644
--- a/app/workflows/correspondence_root_task_factory.rb
+++ b/app/workflows/correspondence_root_task_factory.rb
@@ -17,24 +17,12 @@ def create_root_and_sub_tasks!
   private
 
   def create_root!
-    @correspondence_task = CorrespondenceTask.find_or_create_by!(
-      appeal_id: @correspondence.id,
-      assigned_to: MailTeamSupervisor.singleton,
-      appeal_type: "Correspondence",
-      type: "CorrespondenceTask"
-    )
-
-    @correspondence_task.update(status: "on_hold")
-
     @root_task = CorrespondenceRootTask.find_or_create_by!(
       appeal_id: @correspondence.id,
       assigned_to: MailTeamSupervisor.singleton,
       appeal_type: "Correspondence",
-      parent_id: @correspondence_task.id,
-      type: "CorrespondenceRootTask"
+      type: CorrespondenceRootTask.name
     )
-
-    @root_task.update(status: "on_hold")
   end
 
   def create_subtasks!
@@ -43,7 +31,9 @@ def create_subtasks!
       assigned_to: MailTeamSupervisor.singleton,
       appeal_type: "Correspondence",
       parent_id: @root_task.id,
-      type: "ReviewPackageTask"
+      type: ReviewPackageTask.name
     )
+
+    @review_package_task.update!(status: Constants.TASK_STATUSES.unassigned)
   end
 end
diff --git a/db/seeds/helpers/queue_helpers.rb b/db/seeds/helpers/queue_helpers.rb
index defa21240cb..716e1449298 100644
--- a/db/seeds/helpers/queue_helpers.rb
+++ b/db/seeds/helpers/queue_helpers.rb
@@ -1,46 +1,45 @@
 # frozen_string_literal: true
 
+# rubocop:disable Metrics/ModuleLength
 module QueueHelpers
   def create_veteran(options = {})
     @file_number += 1
     @participant_id += 1
+    @cmp_packet_number ||= 1_000_000_000
     params = {
       file_number: format("%<n>09d", n: @file_number),
       participant_id: format("%<n>09d", n: @participant_id)
     }
-    create(:veteran, params.merge(options))
+    veteran = create(:veteran, params.merge(options))
+    2.times do
+      appeal = create(:appeal, veteran_file_number: veteran.file_number)
+      InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
+    end
+    veteran
   end
 
-  def create_appeal(veteran)
-    ::Appeal.create!(
-      veteran_file_number: veteran.file_number,
-      docket_type: Constants.AMA_DOCKETS.direct_review
-    )
-  end
-  def create_correspondence(appeal)
-    correspondence = ::Correspondence.create!(
+  def create_correspondence
+    vet = create_veteran
+    ::Correspondence.create!(
       uuid: SecureRandom.uuid,
       portal_entry_date: Time.zone.now,
       source_type: "Mail",
       package_document_type_id: (1..20).to_a.sample,
-      correspondence_type_id: CorrespondenceType.find_by_name("Congressional interest").id,
+      correspondence_type_id: CorrespondenceType.all.sample&.id,
       cmp_queue_id: 1,
       cmp_packet_number: @cmp_packet_number,
-      va_date_of_receipt: Time.zone.yesterday,
-      notes: "Notes from CMP - Multi Correspondence Seed",
+      va_date_of_receipt: rand(1.month.ago..1.day.ago),
+      notes: "Notes from CMP - Queue Correspondence Seed",
       assigned_by_id: 81,
       updated_by_id: 81,
-      veteran_id: appeal.veteran.id
+      veteran_id: vet.id
     ).tap { @cmp_packet_number += 1 }
 
-    correspondence.appeals << appeal
-
-    create_correspondence_document(correspondence, appeal.veteran)
-    correspondence
+    # create_correspondence_document(correspondence, vet)
   end
 
   def create_correspondence_document(correspondence, veteran)
-    CorrespondenceDocument.create!(
+    CorrespondenceDocument.find_or_create_by!(
       document_file_number: veteran.file_number,
       uuid: SecureRandom.uuid,
       vbms_document_type_id: 1250,
@@ -50,50 +49,24 @@ def create_correspondence_document(correspondence, veteran)
     )
   end
 
-  def create_correspondence_intake(correspondence, status:)
-    cit = CorrespondenceIntakeTask.create!(
-      appeal_id: correspondence.id,
-      appeal_type: "Correspondence",
-      assigned_to: MailTeamSupervisor.singleton
-    )
-
-    cit.update!(status: status)
-    cit
+  def create_correspondence_intake(correspondence, user)
+    parent = correspondence&.root_task
+    CorrespondenceIntakeTask.create_from_params(parent, user)
   end
 
-  def create_review_package_task(correspondence, status:)
-    review_package_task = ReviewPackageTask.find_or_create_by!(
-      appeal_id: correspondence.id,
-      assigned_to: MailTeamSupervisor.singleton,
-      appeal_type: "Correspondence",
-    )
-
-    review_package_task.update(status: status)
-    review_package_task
+  def assign_review_package_task(correspondence, user)
+    review_package_task = ReviewPackageTask.find_by(appeal_id: correspondence.id)
+    review_package_task.update!(assigned_to: user, status: Constants.TASK_STATUSES.assigned)
   end
 
-  def create_efolderupload_failed_task(correspondence, ptask:)
-    euft = EfolderUploadFailedTask.create!(
-      parent_id: ptask.id,
+  def create_efolderupload_failed_task(correspondence, parent)
+    EfolderUploadFailedTask.create!(
+      parent_id: parent.id,
       appeal_id: correspondence.id,
       appeal_type: "Correspondence",
-      assigned_to: MailTeamSupervisor.singleton
+      assigned_to: parent.assigned_to,
+      status: Constants.TASK_STATUSES.in_progress
     )
-
-    euft.update!(status: Constants.TASK_STATUSES.in_progress)
-
-    euft
-  end
-
-  def create_correspondence_root_task(correspondence, status:)
-    root_task = CorrespondenceRootTask.find_or_create_by!(
-      appeal_id: correspondence.id,
-      assigned_to: MailTeamSupervisor.singleton,
-      appeal_type: "Correspondence",
-    )
-
-    root_task.update(status: status)
-    root_task
   end
 
   def create_action_required_tasks(correspondence, status:, parent_task:, task_type:)
@@ -106,72 +79,51 @@ def create_action_required_tasks(correspondence, status:, parent_task:, task_typ
     )
   end
 
-  def create_in_progress_root_task_and_completed_mail_task(correspondence, status:, parent_task:)
+  def create_and_complete_mail_task(correspondence, user)
+    process_correspondence(correspondence, user)
+    assigned_by = CorrespondenceIntakeTask.find_by(appeal_id: correspondence.id).completed_by
     cavct = CavcCorrespondenceMailTask.find_or_create_by!(
-      parent_id: parent_task.id,
+      parent_id: correspondence&.root_task&.id,
       appeal_id: correspondence.id,
       appeal_type: "Correspondence",
+      assigned_by: assigned_by,
       assigned_to: MailTeamSupervisor.singleton
     )
-    cavct.update!(status: status)
-
-
-    review_package_task = ReviewPackageTask.find_or_create_by!(
-      parent_id: parent_task.id,
-      appeal_id: correspondence.id,
-      appeal_type: "Correspondence",
-      assigned_to: MailTeamSupervisor.singleton
-    )
-
-    review_package_task.update!(status: status)
-
-    cit = CorrespondenceIntakeTask.find_or_create_by!(
-      parent_id: parent_task.id,
-      appeal_id: correspondence.id,
-      appeal_type: "Correspondence",
-      assigned_to: MailTeamSupervisor.singleton
-    )
-    cit.update!(status: status)
+    cavct.update!(status: Constants.TASK_STATUSES.completed)
+    cavct
   end
 
-  def pending_tab_cavc_mailtask(correspondence, status:)
-    cavct = CavcCorrespondenceMailTask.create!(
+  def create_cavc_mailtask(correspondence, user)
+    process_correspondence(correspondence, user)
+    assigned_by = CorrespondenceIntakeTask.find_by(appeal_id: correspondence.id).completed_by
+    CavcCorrespondenceMailTask.create!(
       appeal_id: correspondence.id,
       appeal_type: "Correspondence",
+      assigned_by: assigned_by,
       assigned_to: CavcLitigationSupport.singleton,
-      status: status
+      status: Constants.TASK_STATUSES.assigned
     )
-    cavct
   end
 
-  def pending_tab_congress_interest_mailtask(correspondence, status:)
-   cmt = CongressionalInterestMailTask.create!(
+  def create_congress_interest_mailtask(correspondence, user)
+    process_correspondence(correspondence, user)
+    assigned_by = CorrespondenceIntakeTask.find_by(appeal_id: correspondence.id).completed_by
+    CongressionalInterestMailTask.create!(
       appeal_id: correspondence.id,
       appeal_type: "Correspondence",
+      assigned_by: assigned_by,
       assigned_to: LitigationSupport.singleton,
-      status: status
+      status: Constants.TASK_STATUSES.assigned,
+      parent_id: correspondence&.root_task&.id
     )
-    cmt
   end
 
-  def create_pending_tasks_for_tasks_not_related_to_appeal(correspondence, parent_task:)
-    # Creating Completed ReviewPackageTask
-    review_package_task = ReviewPackageTask.find_by(
-      appeal_id: correspondence.id,
-      assigned_to: MailTeamSupervisor.singleton,
-      appeal_type: "Correspondence"
-    )
+  def process_correspondence(correspondence, user)
+    rpt = ReviewPackageTask.find_by(appeal_id: correspondence.id)
+    rpt.update!(status: Constants.TASK_STATUSES.completed, completed_by_id: user.id)
 
-    if review_package_task.present? && review_package_task.status != Constants.TASK_STATUSES.completed
-      review_package_task.update!(status: Constants.TASK_STATUSES.completed, parent_id: parent_task.id)
-    end
-    # Creating Completed CorrespondenceIntakeTask
-    correspondence_intake_task = CorrespondenceIntakeTask.create!(
-      parent_id: parent_task.id,
-      appeal_id: correspondence.id,
-      assigned_to: MailTeamSupervisor.singleton,
-      appeal_type: "Correspondence"
-    )
-    correspondence_intake_task.update!(status: Constants.TASK_STATUSES.completed)
+    cit = CorrespondenceIntakeTask.create_from_params(correspondence&.root_task, user)
+    cit.update!(status: Constants.TASK_STATUSES.completed, completed_by_id: user.id)
   end
 end
+# rubocop:enable Metrics/ModuleLength
diff --git a/db/seeds/queue_correspondences.rb b/db/seeds/queue_correspondences.rb
index ff26d4d65fa..374608aa16f 100644
--- a/db/seeds/queue_correspondences.rb
+++ b/db/seeds/queue_correspondences.rb
@@ -6,7 +6,6 @@
 module Seeds
   # :reek:InstanceVariableAssumption
   class QueueCorrespondences < Base
-
     include QueueHelpers
 
     def initialize
@@ -14,6 +13,10 @@ def initialize
       RequestStore[:current_user] = User.find_by_css_id("JOLLY_POSTMAN")
     end
 
+    def mail_team_user
+      @mail_team_user ||= User.find_by_css_id("JOLLY_POSTMAN")
+    end
+
     def seed!
       create_queue_correspondences
     end
@@ -32,158 +35,112 @@ def initial_id_values
       @cmp_packet_number += 10_000 while ::Correspondence.find_by(cmp_packet_number: @cmp_packet_number + 1)
     end
 
+    # rubocop:disable Metrics/MethodLength
     def create_queue_correspondences
-      # 20 Correspondences with eFolderFailedUploadTask with a parent CorrespondenceIntakeTask
-      veteran = create_veteran(first_name: "John", last_name: "Doe")
-      appeal = create_appeal(veteran)
-
-      ptask = create_correspondence_intake(create_correspondence(appeal), status: "on_hold")
-
       # 20 Correspondences with eFolderFailedUploadTask with a parent CorrespondenceIntakeTask
       20.times do
-        corres = create_correspondence_with_intake_and_failed_upload_task(ptask, appeal)
+        create_correspondence_with_intake_and_failed_upload_task(
+          create_correspondence_intake(create_correspondence, mail_team_user)
+        )
       end
 
       # 20 Correspondences with CorrespondenceIntakeTask with a status of in_progress
       20.times do
-        corres = create_correspondence_with_intake_task(appeal)
+        create_correspondence_with_intake_task
       end
 
       # 20 Correspondences with eFolderFailedUploadTask with a parent ReviewPackageTask
       20.times do
-        corres = create_correspondence_with_review_package_and_failed_upload_task(appeal)
+        create_correspondence_with_review_package_and_failed_upload_task
       end
 
       # 20 Correspondences with the CorrespondenceRootTask with the status of completed
       20.times do
-        corres = create_correspondence_with_completed_root_task(appeal)
+        create_correspondence_with_completed_root_task
       end
 
       # 20 Correspondences with ReviewPackageTask in progress
       20.times do
-        corres = create_correspondence_with_review_package_task(appeal)
+        create_correspondence_with_review_package_task
       end
 
       # 20 Correspondences with the tasks for Action Required tab and an on_hold ReviewPackageTask as their parent
-      20.times do
-        corres = create_correspondence_with_action_required_tasks(appeal)
+      5.times do
+        # below method creates 4 correspondence records
+        create_correspondence_with_action_required_tasks
       end
 
       # 10 Correspondences with in-progress CorrespondenceRootTask and completed Mail Task
       10.times do
-        corres = create_correspondence_with_in_progress_root_task_and_completed_mail_task(appeal)
+        create_correspondence_with_completed_mail_task
       end
 
       # 5 Correspondences with the CorrespondenceRootTask with the status of canceled
       5.times do
-        corres = create_correspondence_with_canceled_root_task(appeal)
+        create_correspondence_with_canceled_root_task
       end
 
       # 20 Correspondences with the tasks for CAVC and Congress Interest
-      mail_task_pid_for_cavc = pending_tab_cavc_mailtask(create_correspondence(appeal), status: "assigned")
       20.times do
-        corres = create_pending_tasks(mail_task_pid_for_cavc, appeal)
+        create_cavc_mailtask(create_correspondence, mail_team_user)
       end
 
-      mail_task_pid_for_congressInterest = pending_tab_congress_interest_mailtask(create_correspondence(appeal), status: "assigned")
       20.times do
-        corres = create_pending_tasks(mail_task_pid_for_congressInterest, appeal)
+        create_congress_interest_mailtask(create_correspondence, mail_team_user)
       end
-
     end
+    # rubocop:enable Metrics/MethodLength
 
-    def create_correspondence_with_intake_and_failed_upload_task(ptask, appeal)
-
-      corres = create_correspondence(appeal)
-
-      create_efolderupload_failed_task(corres, ptask: ptask)
-
-      corres
+    def create_correspondence_with_intake_and_failed_upload_task(parent_task)
+      corres = create_correspondence
+      create_efolderupload_failed_task(corres, parent_task)
     end
 
-    def create_correspondence_with_intake_task(appeal)
-      corres = create_correspondence(appeal)
-
-      create_correspondence_intake(corres, status: "in_progress")
-
-      corres
+    def create_correspondence_with_intake_task
+      corres = create_correspondence
+      create_correspondence_intake(corres, mail_team_user)
     end
 
-    def create_correspondence_with_review_package_task(appeal)
-      corres = create_correspondence(appeal)
-
-      create_review_package_task(corres, status: "in_progress")
-
-      corres
+    def create_correspondence_with_review_package_task
+      corres = create_correspondence
+      assign_review_package_task(corres, mail_team_user)
     end
 
-    def create_correspondence_with_review_package_and_failed_upload_task(appeal)
-      corres = create_correspondence(appeal)
-
-      ptask = ReviewPackageTask.find_by(appeal_id: corres.id, type: ReviewPackageTask.name)
-      create_efolderupload_failed_task(corres, ptask: ptask)
-      ptask.update!(status: "on_hold")
-
-      corres
+    def create_correspondence_with_review_package_and_failed_upload_task
+      corres = create_correspondence
+      assign_review_package_task(corres, mail_team_user)
+      parent_task = ReviewPackageTask.find_by(appeal_id: corres.id, type: ReviewPackageTask.name)
+      create_efolderupload_failed_task(corres, parent_task)
     end
 
-    def create_correspondence_with_completed_root_task(appeal)
-      corres = create_correspondence(appeal)
-
-      create_correspondence_root_task(corres, status: "completed")
-
-      corres
-    end
-
-    def create_correspondence_with_action_required_tasks(appeal)
-      corres = create_correspondence(appeal)
-
-      review_package_task = ReviewPackageTask.find_by(appeal_id: corres.id, type: ReviewPackageTask.name)
-
-      [ReassignPackageTask, RemovePackageTask, SplitPackageTask, MergePackageTask].each do |task_type|
-        check_and_create_action_required_task(corres, review_package_task, task_type)
-      end
-
-      review_package_task.update!(status: "on_hold")
-
-      corres
-
+    def create_correspondence_with_completed_root_task
+      corres = create_correspondence
+      corres.root_task.update!(status: Constants.TASK_STATUSES.completed)
     end
 
-    def check_and_create_action_required_task(corres, review_package_task, task_type)
-      existing_task = task_type.find_by(appeal_id: corres.id, parent_id: review_package_task.id)
-
-      if existing_task.present?
-        puts "Existing #{task_type.name} task. Only one #{task_type.name} task may be made at a time."
-      else
-        create_action_required_tasks(corres, parent_task: review_package_task, status: "assigned", task_type: task_type)
+    def create_correspondence_with_action_required_tasks
+      corres_array = (1..4).map { create_correspondence }
+      task_array = [ReassignPackageTask, RemovePackageTask, SplitPackageTask, MergePackageTask]
+
+      corres_array.each_with_index do |corres, index|
+        rpt = ReviewPackageTask.find_by(appeal_id: corres.id)
+        task_array[index].create!(
+          parent_id: rpt.id,
+          appeal_id: corres.id,
+          appeal_type: "Correspondence",
+          assigned_to: MailTeamSupervisor.singleton
+        )
       end
     end
 
-    def create_correspondence_with_in_progress_root_task_and_completed_mail_task(appeal)
-      corres = create_correspondence(appeal)
-
-      ptask = CorrespondenceRootTask.find_by(appeal_id: corres.id, type: CorrespondenceRootTask.name)
-      create_in_progress_root_task_and_completed_mail_task(corres, parent_task: ptask, status: "completed")
-      ptask.update!(status: "in_progress")
-
-      corres
+    def create_correspondence_with_completed_mail_task
+      correspondence = create_correspondence
+      create_and_complete_mail_task(correspondence, mail_team_user)
     end
 
-    def create_correspondence_with_canceled_root_task(appeal)
-      corres = create_correspondence(appeal)
-
-      create_correspondence_root_task(corres, status: "cancelled")
-
-      corres
-    end
-
-    def create_pending_tasks(mail_task_parent, appeal)
-      corres = create_correspondence(appeal)
-
-      create_pending_tasks_for_tasks_not_related_to_appeal(corres, parent_task: mail_task_parent)
-
-      corres
+    def create_correspondence_with_canceled_root_task
+      corres = create_correspondence
+      corres.root_task.update!(status: Constants.TASK_STATUSES.cancelled)
     end
   end
 end
diff --git a/spec/controllers/explain_controller_spec.rb b/spec/controllers/explain_controller_spec.rb
index d220d6a4d03..c9c1263471a 100644
--- a/spec/controllers/explain_controller_spec.rb
+++ b/spec/controllers/explain_controller_spec.rb
@@ -199,7 +199,6 @@
         # task tree
         expect(response.body).to include "Correspondence #{correspondence.id}"
         expect(response.body).to include "CorrespondenceRootTask"
-        expect(response.body).to include "CorrespondenceTask"
         expect(response.body).to include "ReviewPackageTask"
       end
     end
diff --git a/spec/models/correspondence_spec.rb b/spec/models/correspondence_spec.rb
index d1be1c309cd..5d27276dee1 100644
--- a/spec/models/correspondence_spec.rb
+++ b/spec/models/correspondence_spec.rb
@@ -32,17 +32,10 @@
     it "Create Root Task and Review Package task for correspondence" do
       correspondence = create(:correspondence)
 
-      ct = CorrespondenceTask.find_by(appeal_id: correspondence.id, type: "CorrespondenceTask")
-      expect(ct.appeal_id).to eq(correspondence.id)
-      expect(ct.status).to eq("on_hold")
-      expect(ct.type).to eq("CorrespondenceTask")
-      expect(ct.assigned_to).to eq(MailTeamSupervisor.singleton)
-
       crt = CorrespondenceRootTask.find_by(appeal_id: correspondence.id)
       expect(crt.appeal_id).to eq(correspondence.id)
       expect(crt.status).to eq("on_hold")
       expect(crt.type).to eq("CorrespondenceRootTask")
-      expect(crt.parent_id).to eq(ct.id)
       expect(crt.assigned_to).to eq(MailTeamSupervisor.singleton)
 
       rpt = ReviewPackageTask.find_by(appeal_id: correspondence.id)

From 6e9c8126081fa3694ec019e3800c3d45c4a4d67b Mon Sep 17 00:00:00 2001
From: SanthiParakal133 <132940479+SanthiParakal133@users.noreply.github.com>
Date: Thu, 18 Jan 2024 13:11:10 -0500
Subject: [PATCH 076/237] Update MailTeamSupervisor with InboundOpsTeam
 (#20529)

---
 app/controllers/correspondence_controller.rb       |  4 ++--
 app/controllers/correspondence_tasks_controller.rb |  6 +++---
 app/controllers/team_management_controller.rb      |  2 +-
 ...mail_team_supervisor.rb => inbound_ops_team.rb} |  6 +++---
 app/models/tasks/correspondence_task.rb            |  2 +-
 app/workflows/correspondence_root_task_factory.rb  |  6 +++---
 .../review_package/CorrespondenceReviewPackage.jsx |  4 ++--
 db/seeds/users.rb                                  | 14 +++++++-------
 spec/controllers/correspondence_controller_spec.rb |  4 ++--
 .../correspondence/correspondence_cases_spec.rb    |  2 +-
 .../correspondence/edit_cmp_information_spec.rb    |  6 +++---
 .../queue/correspondence/review_package_spec.rb    |  6 +++---
 spec/models/correspondence_spec.rb                 |  6 +++---
 13 files changed, 34 insertions(+), 34 deletions(-)
 rename app/models/organizations/{mail_team_supervisor.rb => inbound_ops_team.rb} (56%)

diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index ac35b37d55c..1d36aacae74 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -94,7 +94,7 @@ def show
       correspondence: correspondence,
       package_document_type: correspondence&.package_document_type,
       general_information: general_information,
-      user_can_edit_vador: MailTeamSupervisor.singleton.user_has_access?(current_user),
+      user_can_edit_vador: InboundOpsTeam.singleton.user_has_access?(current_user),
       correspondence_documents: corres_docs.map do |doc|
         WorkQueue::CorrespondenceDocumentSerializer.new(doc).serializable_hash[:data][:attributes]
       end,
@@ -200,7 +200,7 @@ def set_flash_intake_success_message
   end
 
   def verify_correspondence_access
-    return true if MailTeamSupervisor.singleton.user_has_access?(current_user) ||
+    return true if InboundOpsTeam.singleton.user_has_access?(current_user) ||
                    MailTeam.singleton.user_has_access?(current_user)
 
     redirect_to "/unauthorized"
diff --git a/app/controllers/correspondence_tasks_controller.rb b/app/controllers/correspondence_tasks_controller.rb
index 1822faf07a0..35a771cac09 100644
--- a/app/controllers/correspondence_tasks_controller.rb
+++ b/app/controllers/correspondence_tasks_controller.rb
@@ -19,7 +19,7 @@ def create_package_action_task
       task_params = {
         parent_id: review_package_task.id,
         instructions: params[:instructions],
-        assigned_to: MailTeamSupervisor.singleton,
+        assigned_to: InboundOpsTeam.singleton,
         appeal_id: params[:correspondence_id],
         appeal_type: "Correspondence",
         status: Constants.TASK_STATUSES.assigned,
@@ -27,7 +27,7 @@ def create_package_action_task
       }
 
       ReviewPackageTask.create_from_params(task_params, current_user)
-      review_package_task.update!(assigned_to: MailTeamSupervisor.singleton, status: :on_hold)
+      review_package_task.update!(assigned_to: InboundOpsTeam.singleton, status: :on_hold)
       render json: { status: :ok }
     end
   end
@@ -59,7 +59,7 @@ def create_correspondence_intake_task
   def remove_package
     root_task = CorrespondenceRootTask.find_by!(
       appeal_id: params[:id],
-      assigned_to: MailTeamSupervisor.singleton,
+      assigned_to: InboundOpsTeam.singleton,
       appeal_type: "Correspondence",
       type: "CorrespondenceRootTask"
     )
diff --git a/app/controllers/team_management_controller.rb b/app/controllers/team_management_controller.rb
index bc5b51f4503..98e8c51eb8f 100644
--- a/app/controllers/team_management_controller.rb
+++ b/app/controllers/team_management_controller.rb
@@ -120,7 +120,7 @@ def other_orgs
       VhaProgramOffice,
       VhaRegionalOffice,
       EducationRpo,
-      MailTeamSupervisor
+      InboundOpsTeam
     ]
     Organization.order(:name).reject do |org|
       rejected_orgs.any? { |excluded_org| org.is_a?(excluded_org) }
diff --git a/app/models/organizations/mail_team_supervisor.rb b/app/models/organizations/inbound_ops_team.rb
similarity index 56%
rename from app/models/organizations/mail_team_supervisor.rb
rename to app/models/organizations/inbound_ops_team.rb
index 3f3b7ada7f9..e0c3a99290d 100644
--- a/app/models/organizations/mail_team_supervisor.rb
+++ b/app/models/organizations/inbound_ops_team.rb
@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-class MailTeamSupervisor < Organization
+class InboundOpsTeam < Organization
   def self.singleton
-    MailTeamSupervisor.first ||
-      MailTeamSupervisor.create(name: "Mail Team Supervisor", url: "mail-team-supervisor")
+    InboundOpsTeam.first ||
+      InboundOpsTeam.create(name: "Inbound Ops Team", url: "inbound-ops-team")
   end
 
   # :reek:UtilityFunction
diff --git a/app/models/tasks/correspondence_task.rb b/app/models/tasks/correspondence_task.rb
index 607b856f111..bf2cc52654a 100644
--- a/app/models/tasks/correspondence_task.rb
+++ b/app/models/tasks/correspondence_task.rb
@@ -22,7 +22,7 @@ def verify_org_task_unique
   def remove_package
     root_task = CorrespondenceRootTask.find_by!(
       appeal_id: @correspondence.id,
-      assigned_to: MailTeamSupervisor.singleton,
+      assigned_to: InboundOpsTeam.singleton,
       appeal_type: "Correspondence",
       parent_id: @correspondence_task.id,
       type: "CorrespondenceRootTask"
diff --git a/app/workflows/correspondence_root_task_factory.rb b/app/workflows/correspondence_root_task_factory.rb
index 668e15be1b8..931144e59dd 100644
--- a/app/workflows/correspondence_root_task_factory.rb
+++ b/app/workflows/correspondence_root_task_factory.rb
@@ -19,7 +19,7 @@ def create_root_and_sub_tasks!
   def create_root!
     @correspondence_task = CorrespondenceTask.find_or_create_by!(
       appeal_id: @correspondence.id,
-      assigned_to: MailTeamSupervisor.singleton,
+      assigned_to: InboundOpsTeam.singleton,
       appeal_type: "Correspondence",
       type: "CorrespondenceTask"
     )
@@ -28,7 +28,7 @@ def create_root!
 
     @root_task = CorrespondenceRootTask.find_or_create_by!(
       appeal_id: @correspondence.id,
-      assigned_to: MailTeamSupervisor.singleton,
+      assigned_to: InboundOpsTeam.singleton,
       appeal_type: "Correspondence",
       parent_id: @correspondence_task.id,
       type: "CorrespondenceRootTask"
@@ -40,7 +40,7 @@ def create_root!
   def create_subtasks!
     @review_package_task = ReviewPackageTask.find_or_create_by!(
       appeal_id: @correspondence.id,
-      assigned_to: MailTeamSupervisor.singleton,
+      assigned_to: InboundOpsTeam.singleton,
       appeal_type: "Correspondence",
       parent_id: @root_task.id,
       type: "ReviewPackageTask"
diff --git a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
index 3aa321a7ba4..d4d141da5ef 100644
--- a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
+++ b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
@@ -49,10 +49,10 @@ export const CorrespondenceReviewPackage = (props) => {
     // When a remove package task is active and pending review, the page is read-only
     const isPageReadOnly = (tasks) => {
       const assignedRemoveTask = tasks.find((task) => task.status === 'assigned' && task.type === 'RemovePackageTask');
-      const isMailTeamSupervisor = correspondence.organizations.find((org) => org.name === 'Mail Team Supervisor');
+      const isInboundOpsTeam = correspondence.organizations.find((org) => org.name === 'Inbound Ops Team');
 
       // Return true if a removePackageTask that is currently assigned is found, else false
-      return (typeof assignedRemoveTask !== 'undefined') && isMailTeamSupervisor;
+      return (typeof assignedRemoveTask !== 'undefined') && isInboundOpsTeam;
     };
 
     try {
diff --git a/db/seeds/users.rb b/db/seeds/users.rb
index d9a1c0f61fe..598d9226f68 100644
--- a/db/seeds/users.rb
+++ b/db/seeds/users.rb
@@ -83,7 +83,7 @@ def create_users
       create_lit_support_user
       create_oai_team_user
       create_occ_team_user
-      create_mail_team_supervisor_user
+      create_inbound_ops_team_user
       create_cavc_lit_support_user
       create_pulac_cerullo_user
       create_mail_team_user
@@ -355,13 +355,13 @@ def create_occ_team_user
       OaiTeam.singleton.add_user(u)
     end
 
-    def create_mail_team_supervisor_user
-      u = User.create!(station_id: 101, css_id: "MAIL_TEAM_SUPERVISOR_ADMIN_USER", full_name: "Jon MailTeam Snow Admin")
-      MailTeamSupervisor.singleton.add_user(u)
-      OrganizationsUser.make_user_admin(u, MailTeamSupervisor.singleton)
-      u = User.create!(station_id: 101, css_id: "MAIL_TEAM_SUPERVISOR_MAIL_INTAKE_USER",
+    def create_inbound_ops_team_user
+      u = User.create!(station_id: 101, css_id: "INBOUND_OPS_TEAM_ADMIN_USER", full_name: "Jon MailTeam Snow Admin")
+      InboundOpsTeam.singleton.add_user(u)
+      OrganizationsUser.make_user_admin(u, InboundOpsTeam.singleton)
+      u = User.create!(station_id: 101, css_id: "INBOUND_OPS_TEAM_MAIL_INTAKE_USER",
                        full_name: "Jon MailTeam Snow Mail Intake", roles: ["Mail Intake"])
-      MailTeamSupervisor.singleton.add_user(u)
+      InboundOpsTeam.singleton.add_user(u)
     end
 
     def create_cavc_lit_support_user
diff --git a/spec/controllers/correspondence_controller_spec.rb b/spec/controllers/correspondence_controller_spec.rb
index 5a87342c9e5..a3b0cf07a33 100644
--- a/spec/controllers/correspondence_controller_spec.rb
+++ b/spec/controllers/correspondence_controller_spec.rb
@@ -64,8 +64,8 @@
       expect(response.body).to match(/unauthorized/)
     end
 
-    it "returns a success response when current user is part of MailTeamSupervisor" do
-      MailTeamSupervisor.singleton.add_user(current_user)
+    it "returns a success response when current user is part of InboundOpsTeam" do
+      InboundOpsTeam.singleton.add_user(current_user)
       User.authenticate!(user: current_user)
       get :show, params: { correspondence_uuid: correspondence.uuid }
       expect(response).to have_http_status(:ok)
diff --git a/spec/feature/queue/correspondence/correspondence_cases_spec.rb b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
index 0feb438d9ac..371e6b7ff4d 100644
--- a/spec/feature/queue/correspondence/correspondence_cases_spec.rb
+++ b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
@@ -4,7 +4,7 @@
   context "correspondece cases feature toggle" do
     let(:current_user) { create(:user) }
     before :each do
-      MailTeamSupervisor.singleton.add_user(current_user)
+      InboundOpsTeam.singleton.add_user(current_user)
       User.authenticate!(user: current_user)
       @correspondence_uuid = "123456789"
     end
diff --git a/spec/feature/queue/correspondence/edit_cmp_information_spec.rb b/spec/feature/queue/correspondence/edit_cmp_information_spec.rb
index a5c27f28f30..05c4db38587 100644
--- a/spec/feature/queue/correspondence/edit_cmp_information_spec.rb
+++ b/spec/feature/queue/correspondence/edit_cmp_information_spec.rb
@@ -38,7 +38,7 @@
   context "Review package form shell" do
     before :each do
       FeatureToggle.enable!(:correspondence_queue)
-      MailTeamSupervisor.singleton.add_user(current_user)
+      InboundOpsTeam.singleton.add_user(current_user)
       User.authenticate!(user: current_user)
       visit "/queue/correspondence/#{correspondence.uuid}/review_package"
     end
@@ -133,10 +133,10 @@
     end
   end
 
-  context "Checking VADOR field is enable for Mail Supervisor" do
+  context "Checking VADOR field is enable for InboundOpsTeam" do
     before do
       FeatureToggle.enable!(:correspondence_queue)
-      MailTeamSupervisor.singleton.add_user(current_user)
+      InboundOpsTeam.singleton.add_user(current_user)
       User.authenticate!(user: current_user)
       visit "/queue/correspondence/#{correspondence.uuid}/review_package"
     end
diff --git a/spec/feature/queue/correspondence/review_package_spec.rb b/spec/feature/queue/correspondence/review_package_spec.rb
index 63958c7ced3..129077f3ea9 100644
--- a/spec/feature/queue/correspondence/review_package_spec.rb
+++ b/spec/feature/queue/correspondence/review_package_spec.rb
@@ -6,7 +6,7 @@
   let(:package_document_type) { PackageDocumentType.create(id: 15, active: true, created_at: Time.zone.now, name: "10182", updated_at: Time.zone.now) }
   let(:correspondence) { create(:correspondence, :with_single_doc, veteran_id: veteran.id, package_document_type_id: package_document_type.id) }
   let(:mail_team_supervisor_user) { create(:user, roles: ["Mail Intake"]) }
-  let(:mail_team_supervisor_org) { MailTeamSupervisor.singleton }
+  let(:mail_team_supervisor_org) { InboundOpsTeam.singleton }
   let(:mail_team_user) { create(:user) }
   let(:mail_team_org) { MailTeam.singleton }
 
@@ -65,14 +65,14 @@
         task_params = {
           parent_id: review_package_task.id,
           instructions: ["test remove", "test"],
-          assigned_to: MailTeamSupervisor.singleton,
+          assigned_to: InboundOpsTeam.singleton,
           appeal_id: correspondence.id,
           appeal_type: "Correspondence",
           status: Constants.TASK_STATUSES.assigned,
           type: "RemovePackageTask"
         }
         ReviewPackageTask.create_from_params(task_params, mail_team_supervisor_user)
-        review_package_task.update!(assigned_to: MailTeamSupervisor.singleton, status: :on_hold)
+        review_package_task.update!(assigned_to: InboundOpsTeam.singleton, status: :on_hold)
         visit "/queue/correspondence/#{correspondence.uuid}/review_package"
       end
 
diff --git a/spec/models/correspondence_spec.rb b/spec/models/correspondence_spec.rb
index d1be1c309cd..a6787015fd8 100644
--- a/spec/models/correspondence_spec.rb
+++ b/spec/models/correspondence_spec.rb
@@ -36,21 +36,21 @@
       expect(ct.appeal_id).to eq(correspondence.id)
       expect(ct.status).to eq("on_hold")
       expect(ct.type).to eq("CorrespondenceTask")
-      expect(ct.assigned_to).to eq(MailTeamSupervisor.singleton)
+      expect(ct.assigned_to).to eq(InboundOpsTeam.singleton)
 
       crt = CorrespondenceRootTask.find_by(appeal_id: correspondence.id)
       expect(crt.appeal_id).to eq(correspondence.id)
       expect(crt.status).to eq("on_hold")
       expect(crt.type).to eq("CorrespondenceRootTask")
       expect(crt.parent_id).to eq(ct.id)
-      expect(crt.assigned_to).to eq(MailTeamSupervisor.singleton)
+      expect(crt.assigned_to).to eq(InboundOpsTeam.singleton)
 
       rpt = ReviewPackageTask.find_by(appeal_id: correspondence.id)
       expect(rpt.appeal_id).to eq(correspondence.id)
       expect(rpt.status).to eq("unassigned")
       expect(rpt.type).to eq("ReviewPackageTask")
       expect(rpt.parent_id).to eq(crt.id)
-      expect(rpt.assigned_to).to eq(MailTeamSupervisor.singleton)
+      expect(rpt.assigned_to).to eq(InboundOpsTeam.singleton)
     end
   end
 end

From bf4fe6a210b35bbf74e9a8b543dd7c68d0922866 Mon Sep 17 00:00:00 2001
From: Alex Smith <alex.smith.99@thunderyard.com>
Date: Thu, 18 Jan 2024 12:50:13 -0700
Subject: [PATCH 077/237] Add permissions to Organizations (#20543)

* Create OrganizationPermissions

* Add Column Comments to Migration

* Add Indices Using add_safe_index

* Create OrganizationUserPermission and Related Files

* Change OrganizationUserPermission Inheritance

---------

Co-authored-by: youfoundmanesh <129548081+youfoundmanesh@users.noreply.github.com>
---
 Gemfile                                       |  2 ++
 Gemfile.lock                                  |  3 ++
 app/models/organization.rb                    |  1 +
 app/models/organization_permission.rb         | 14 ++++++++++
 app/models/organization_user_permission.rb    |  8 ++++++
 app/models/organizations_user.rb              |  3 +-
 ...7195653_create_organization_permissions.rb | 19 +++++++++++++
 ...04_create_organization_user_permissions.rb | 16 +++++++++++
 db/schema.rb                                  | 28 ++++++++++++++++++-
 spec/models/organization_permission_spec.rb   | 20 +++++++++++++
 .../organization_user_permission_spec.rb      | 12 ++++++++
 spec/rails_helper.rb                          |  7 +++++
 12 files changed, 131 insertions(+), 2 deletions(-)
 create mode 100644 app/models/organization_permission.rb
 create mode 100644 app/models/organization_user_permission.rb
 create mode 100644 db/migrate/20240117195653_create_organization_permissions.rb
 create mode 100644 db/migrate/20240118184304_create_organization_user_permissions.rb
 create mode 100644 spec/models/organization_permission_spec.rb
 create mode 100644 spec/models/organization_user_permission_spec.rb

diff --git a/Gemfile b/Gemfile
index d6b9e68f08c..0d5e92c5626 100644
--- a/Gemfile
+++ b/Gemfile
@@ -150,6 +150,8 @@ group :test do
   # For retrying failed feature tests. Read more: https://github.com/NoRedInk/rspec-retry
   gem "rspec-retry"
   gem "webmock"
+  gem "rspec-github", require: false
+  gem "shoulda-matchers"
 end
 # rubocop:enable Layout/LineLength
 
diff --git a/Gemfile.lock b/Gemfile.lock
index d0ff2ade85b..e6f1ebd4e35 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -663,6 +663,8 @@ GEM
       aws-sdk-core (>= 2)
       concurrent-ruby
       thor
+    shoulda-matchers (5.3.0)
+      activesupport (>= 5.2.0)
     simplecov-html (0.10.2)
     single_cov (1.3.2)
     sixarm_ruby_unaccent (1.2.0)
@@ -836,6 +838,7 @@ DEPENDENCIES
   scss_lint
   sentry-raven
   shoryuken (= 3.1.11)
+  shoulda-matchers
   simplecov!
   single_cov
   sniffybara!
diff --git a/app/models/organization.rb b/app/models/organization.rb
index 1f6d360f667..25007bf669d 100644
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@@ -6,6 +6,7 @@ class Organization < CaseflowRecord
   has_many :organizations_users, dependent: :destroy
   has_many :users, through: :organizations_users
   has_many :membership_requests
+  has_many :organization_permissions
   has_many :non_admin_users, -> { non_admin }, class_name: "OrganizationsUser"
   require_dependency "dvc_team"
 
diff --git a/app/models/organization_permission.rb b/app/models/organization_permission.rb
new file mode 100644
index 00000000000..e3cab39001e
--- /dev/null
+++ b/app/models/organization_permission.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class OrganizationPermission < CaseflowRecord
+  belongs_to :organization, required: true
+
+  belongs_to :parent_permission, class_name: "OrganizationPermission", optional: true
+  has_many :child_permissions, class_name: "OrganizationPermission", foreign_key: "parent_permission_id", dependent: :destroy
+
+  has_many :organization_user_permissions, dependent: :destroy
+
+  validates_presence_of :permission
+  validates_presence_of :description
+  validates_presence_of :enabled
+end
diff --git a/app/models/organization_user_permission.rb b/app/models/organization_user_permission.rb
new file mode 100644
index 00000000000..a65092ec795
--- /dev/null
+++ b/app/models/organization_user_permission.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class OrganizationUserPermission < CaseflowRecord
+  belongs_to :organizations_user, required: true
+  belongs_to :organization_permission, required: true
+
+  validates_presence_of :permitted
+end
diff --git a/app/models/organizations_user.rb b/app/models/organizations_user.rb
index 189d98de647..99d9d6eb38d 100644
--- a/app/models/organizations_user.rb
+++ b/app/models/organizations_user.rb
@@ -4,8 +4,9 @@ class OrganizationsUser < CaseflowRecord
   belongs_to :organization
   belongs_to :user
 
-  scope :non_admin, -> { where(admin: false) }
+  has_many :organization_user_permissions, dependent: :destroy
 
+  scope :non_admin, -> { where(admin: false) }
   scope :admin, -> { where(admin: true) }
 
   class << self
diff --git a/db/migrate/20240117195653_create_organization_permissions.rb b/db/migrate/20240117195653_create_organization_permissions.rb
new file mode 100644
index 00000000000..9e1f2e36f72
--- /dev/null
+++ b/db/migrate/20240117195653_create_organization_permissions.rb
@@ -0,0 +1,19 @@
+class CreateOrganizationPermissions < Caseflow::Migration
+  def change
+    create_table :organization_permissions do |t|
+      t.string :permission, null: false, comment: "Developer friendly value"
+      t.string :description, null: false, comment: "UX display value"
+      t.boolean :enabled, null: false, default: false, comment: "Whether permission is enabled or disabled"
+
+      t.references :organization, foreign_key: true, null: false, index: false,
+        comment: "Foreign key to organizations table"
+      t.references :parent_permission, foreign_key: { to_table: :organization_permissions }, index: false,
+        comment: "Foreign key to self"
+
+      t.timestamps
+    end
+
+    add_safe_index :organization_permissions, :organization_id
+    add_safe_index :organization_permissions, :parent_permission_id
+  end
+end
diff --git a/db/migrate/20240118184304_create_organization_user_permissions.rb b/db/migrate/20240118184304_create_organization_user_permissions.rb
new file mode 100644
index 00000000000..203f2e315f7
--- /dev/null
+++ b/db/migrate/20240118184304_create_organization_user_permissions.rb
@@ -0,0 +1,16 @@
+class CreateOrganizationUserPermissions < Caseflow::Migration
+  def change
+    create_table :organization_user_permissions do |t|
+      t.references :organizations_user, foreign_key: true, null: false, index: false,
+        comment: "Foreign key to organizations_user table"
+      t.references :organization_permission, foreign_key: true, null: false, index: false,
+        comment: "Foreign key to organization_permission table"
+      t.boolean :permitted, null: false, default: false, comment: "Whether or not the organization_user has the given permission enabled"
+
+      t.timestamps
+    end
+
+    add_safe_index :organization_user_permissions, :organizations_user_id
+    add_safe_index :organization_user_permissions, :organization_permission_id, name: "index_on_organization_permission_id"
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 733eff708a6..e251379ddbb 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2024_01_10_185623) do
+ActiveRecord::Schema.define(version: 2024_01_18_184304) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -1417,6 +1417,28 @@
     t.index ["sms_notification_status"], name: "index_notifications_on_sms_notification_status"
   end
 
+  create_table "organization_permissions", force: :cascade do |t|
+    t.datetime "created_at", null: false
+    t.string "description", null: false, comment: "UX display value"
+    t.boolean "enabled", default: false, null: false, comment: "Whether permission is enabled or disabled"
+    t.bigint "organization_id", null: false, comment: "Foreign key to organizations table"
+    t.bigint "parent_permission_id", comment: "Foreign key to self"
+    t.string "permission", null: false, comment: "Developer friendly value"
+    t.datetime "updated_at", null: false
+    t.index ["organization_id"], name: "index_organization_permissions_on_organization_id"
+    t.index ["parent_permission_id"], name: "index_organization_permissions_on_parent_permission_id"
+  end
+
+  create_table "organization_user_permissions", force: :cascade do |t|
+    t.datetime "created_at", null: false
+    t.bigint "organization_permission_id", null: false, comment: "Foreign key to organization_permission table"
+    t.bigint "organizations_user_id", null: false, comment: "Foreign key to organizations_user table"
+    t.boolean "permitted", default: false, null: false, comment: "Whether or not the organization_user has the given permission enabled"
+    t.datetime "updated_at", null: false
+    t.index ["organization_permission_id"], name: "index_on_organization_permission_id"
+    t.index ["organizations_user_id"], name: "index_organization_user_permissions_on_organizations_user_id"
+  end
+
   create_table "organizations", force: :cascade do |t|
     t.boolean "accepts_priority_pushed_cases", comment: "Whether a JudgeTeam currently accepts distribution of automatically pushed priority cases"
     t.boolean "ama_only_push", default: false, comment: "whether a JudgeTeam should only get AMA appeals during the PushPriorityAppealsToJudgesJob"
@@ -2314,6 +2336,10 @@
   add_foreign_key "nod_date_updates", "users"
   add_foreign_key "non_availabilities", "schedule_periods"
   add_foreign_key "notifications", "notification_events", column: "event_type", primary_key: "event_type"
+  add_foreign_key "organization_permissions", "organization_permissions", column: "parent_permission_id"
+  add_foreign_key "organization_permissions", "organizations"
+  add_foreign_key "organization_user_permissions", "organization_permissions"
+  add_foreign_key "organization_user_permissions", "organizations_users"
   add_foreign_key "organizations_users", "organizations"
   add_foreign_key "organizations_users", "users"
   add_foreign_key "post_decision_motions", "appeals"
diff --git a/spec/models/organization_permission_spec.rb b/spec/models/organization_permission_spec.rb
new file mode 100644
index 00000000000..03cb24b4e3d
--- /dev/null
+++ b/spec/models/organization_permission_spec.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+describe OrganizationPermission do
+  describe "Associations" do
+    it { should belong_to(:organization).required }
+    it { should belong_to(:parent_permission).class_name("OrganizationPermission").optional }
+
+    it {
+      should have_many(:child_permissions).with_foreign_key("parent_permission_id")
+        .class_name("OrganizationPermission").dependent(:destroy)
+    }
+    it { should have_many(:organization_user_permissions).dependent(:destroy) }
+  end
+
+  describe "Validations" do
+    it { should validate_presence_of(:permission) }
+    it { should validate_presence_of(:description) }
+    it { should validate_presence_of(:enabled) }
+  end
+end
diff --git a/spec/models/organization_user_permission_spec.rb b/spec/models/organization_user_permission_spec.rb
new file mode 100644
index 00000000000..d0ffa74afd4
--- /dev/null
+++ b/spec/models/organization_user_permission_spec.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+describe OrganizationUserPermission do
+  describe "Associations" do
+    it { should belong_to(:organizations_user).required }
+    it { should belong_to(:organization_permission).required }
+  end
+
+  describe "Validations" do
+    it { should validate_presence_of(:permitted) }
+  end
+end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 17dfa975b7b..3fd2a9381ec 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -118,3 +118,10 @@ def ensure_stable
   config.include FeatureHelper, type: :feature
   config.include DateTimeHelper
 end
+
+Shoulda::Matchers.configure do |config|
+  config.integrate do |with|
+    with.test_framework :rspec
+    with.library :rails
+  end
+end

From 1174fe08dae472ff01f433f80564bcda47a0b4d6 Mon Sep 17 00:00:00 2001
From: Kevma50287 <104021955+Kevma50287@users.noreply.github.com>
Date: Fri, 19 Jan 2024 13:36:30 -0500
Subject: [PATCH 078/237] Kev ma/appeals 38420 (#20527)

* Initial job files created; added RunAsyncable module to controller

* Added aria-label for spec fix

* Refactor to functional component

* Added Auto Assign Correspondences Button, added route, added method to controller

* Updated spec for future testing

* Added initla business logic for assignment

* Updated seed data for VADOR date

* Update to include current user for seed data when ran individually

* Optimized SQL query by 10%

* Updated instruction details to contain css_id

* Update reek file for job, fixed rubocop and linting

* Updated class name

* Removed unused constant
---
 .reek.yml                                     |   1 +
 app/controllers/correspondence_controller.rb  |   6 +
 app/jobs/auto_assign_correspondence_job.rb    |  42 +++++++
 client/COPY.json                              |   3 +-
 .../correspondence/CorrespondenceCases.jsx    | 119 +++++++++---------
 .../correspondence/CorrespondenceTable.jsx    |   1 +
 config/routes.rb                              |   1 +
 db/seeds/correspondence.rb                    |  13 +-
 db/seeds/multi_correspondences.rb             |  12 +-
 lib/tasks/correspondence.rake                 |  16 +--
 spec/factories/correspondence.rb              |   2 +-
 .../correspondence_cases_spec.rb              |  15 +++
 12 files changed, 153 insertions(+), 78 deletions(-)
 create mode 100644 app/jobs/auto_assign_correspondence_job.rb

diff --git a/.reek.yml b/.reek.yml
index f1de4d08095..44b054a70be 100644
--- a/.reek.yml
+++ b/.reek.yml
@@ -136,6 +136,7 @@ detectors:
       - ExternalApi::PexipService#send_pexip_request
       - ControllerSchema#remove_unknown_keys
       - BusinessLineReporter#as_csv
+      - AutoAssignCorrespondenceJob
   InstanceVariableAssumption:
     exclude:
       - Appeal
diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index 1d36aacae74..8f65ef9caa3 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -2,6 +2,8 @@
 
 # :reek:RepeatedConditional
 class CorrespondenceController < ApplicationController
+  include RunAsyncable
+
   before_action :verify_correspondence_access
   before_action :verify_feature_toggle
   before_action :correspondence
@@ -172,6 +174,10 @@ def process_intake
     end
   end
 
+  def auto_assign_correspondences
+    perform_later_or_now(AutoAssignCorrespondenceJob)
+  end
+
   private
 
   # :reek:FeatureEnvy
diff --git a/app/jobs/auto_assign_correspondence_job.rb b/app/jobs/auto_assign_correspondence_job.rb
new file mode 100644
index 00000000000..7788cbfab01
--- /dev/null
+++ b/app/jobs/auto_assign_correspondence_job.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+class AutoAssignCorrespondenceJob < CaseflowJob
+  queue_with_priority :low_priority
+
+  # rubocop:disable Metrics/MethodLength
+  def perform
+    Rails.logger.info("Auto assign correspondences job in progress.....")
+
+    # An array of [correspondence.id, task.id]
+    unassigned_correspondences_task_id_pairs = Correspondence.joins(
+      "INNER JOIN tasks ON tasks.appeal_id = correspondences.id"
+    )
+      .where("tasks.type" => "ReviewPackageTask")
+      .where("tasks.status" => "unassigned")
+      .order(va_date_of_receipt: :desc)
+      .pluck("correspondences.id", "tasks.id")
+
+    unassigned_correspondences_task_id_pairs.each do |id_pair|
+      begin
+        correspondence_id = id_pair[0]
+        task_id = id_pair[1]
+        unassigned_review_package_task = ReviewPackageTask.find(task_id)
+        task_params = {
+          parent_id: task_id,
+          instructions: ["Auto assigned by #{RequestStore[:current_user].css_id}"],
+          assigned_to: InboundOpsTeam.singleton,
+          appeal_id: correspondence_id,
+          appeal_type: "Correspondence",
+          status: Constants.TASK_STATUSES.assigned,
+          type: ReassignPackageTask.name
+        }
+        ReviewPackageTask.create_from_params(task_params, RequestStore[:current_user])
+        unassigned_review_package_task.update!(assigned_to: InboundOpsTeam.singleton, status: :on_hold)
+      rescue ActiveRecord::RecordInvalid => error
+        invalid_record_error(error.record)
+      end
+    end
+    Rails.logger.info("Auto assign correspondences job resolved.")
+  end
+  # rubocop:enable Metrics/MethodLength
+end
diff --git a/client/COPY.json b/client/COPY.json
index 07ef450131a..71a62a16c78 100644
--- a/client/COPY.json
+++ b/client/COPY.json
@@ -1435,5 +1435,6 @@
   "CORRESPONDENCE_READONLY_BANNER_MESSAGE": "Any further actions cannot be made on this package until a supervisor or superuser reviews the request.",
   "ASSOCIATED_WITH_CLAIMS_FOLDER_MAIL_TASK_LABEL": "Associated with claims folder",
   "VACOLS_UPDATED_MAIL_TASK_LABEL": "VACOLS updated",
-  "SENT_TO_ROJ_MAIL_TASK_LABEL": "Sent to ROJ"
+  "SENT_TO_ROJ_MAIL_TASK_LABEL": "Sent to ROJ",
+  "AUTO_ASSIGN_CORRESPONDENCES_BUTTON": "Auto assign correspondences"
 }
diff --git a/client/app/queue/correspondence/CorrespondenceCases.jsx b/client/app/queue/correspondence/CorrespondenceCases.jsx
index 5b159dfc588..287e808de9e 100644
--- a/client/app/queue/correspondence/CorrespondenceCases.jsx
+++ b/client/app/queue/correspondence/CorrespondenceCases.jsx
@@ -1,4 +1,5 @@
-import * as React from 'react';
+
+import React, { useEffect } from 'react';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import ApiUtil from '../../util/ApiUtil';
@@ -11,70 +12,76 @@ import { css } from 'glamor';
 import CorrespondenceTable from './CorrespondenceTable';
 import QueueOrganizationDropdown from '../components/QueueOrganizationDropdown';
 import Alert from '../../components/Alert';
+import Button from '../../components/Button';
 
-// import {
-//   initialAssignTasksToUser,
-//   initialCamoAssignTasksToVhaProgramOffice
-// } from '../QueueActions';
-
-class CorrespondenceCases extends React.PureComponent {
-
-  // grabs correspondences and loads into intakeCorrespondence redux store.
-  getVeteransWithCorrespondence() {
-    return ApiUtil.get('/queue/correspondence?json').then((response) => {
-      const returnedObject = response.body;
-      const vetCorrespondences = returnedObject.vetCorrespondences;
-
-      this.props.loadVetCorrespondence(vetCorrespondences);
-    }).
-      catch((err) => {
-        // allow HTTP errors to fall on the floor via the console.
-        console.error(new Error(`Problem with GET /queue/correspondence?json ${err}`));
-      });
-  }
+export const CorrespondenceCases = (props) => {
+  const {
+    organizations,
+    currentAction,
+    veteranInformation,
+    vetCorrespondences,
+  } = props;
 
-  // load veteran correspondence info on page load
-  componentDidMount() {
-    // Retry the request after a delay
-    setTimeout(() => {
-      this.getVeteransWithCorrespondence();
-    }, 1000);
-  }
+  useEffect(() => {
+    // grabs correspondences and loads into intakeCorrespondence redux store.
+    const getVeteransWithCorrespondence = async () => {
+      return ApiUtil.get('/queue/correspondence?json').then((response) => {
+        const returnedObject = response.body;
 
-  render = () => {
-    const {
-      organizations,
-      currentAction,
-      veteranInformation
+        props.loadVetCorrespondence(returnedObject.vetCorrespondences);
+      }).
+        catch((err) => {
+          // allow HTTP errors to fall on the floor via the console.
+          console.error(new Error(`Problem with GET /queue/correspondence?json ${err}`));
+        });
+    };
 
-    } = this.props;
+    getVeteransWithCorrespondence();
+  }, []);
 
-    let vetName = '';
+  let vetName = '';
 
-    if (Object.keys(veteranInformation).length > 0) {
-      vetName = `${veteranInformation.veteran_name.first_name.trim()} ${
+  if (Object.keys(veteranInformation).length > 0) {
+    vetName = `${veteranInformation.veteran_name.first_name.trim()} ${
         veteranInformation.veteran_name.last_name.trim()}`;
+  }
+
+  const handleAutoAssign = async () => {
+    try {
+      await ApiUtil.get('/queue/correspondence/auto_assign_correspondences');
+    } catch (error) {
+      console.error(error);
     }
+  };
 
-    return (
-      <React.Fragment>
-        <AppSegment filledBackground>
-          {(Object.keys(veteranInformation).length > 0) &&
-            currentAction.action_type === 'DeleteReviewPackage' &&
-          <Alert type="success" title={sprintf(COPY.CORRESPONDENCE_TITLE_REMOVE_PACKAGE_BANNER, vetName)}
-            message={COPY.CORRESPONDENCE_MESSAGE_REMOVE_PACKAGE_BANNER} scrollOnAlert={false} />}
-          <h1 {...css({ display: 'inline-block' })}>{COPY.CASE_LIST_TABLE_QUEUE_DROPDOWN_CORRESPONDENCE_CASES}</h1>
-          <QueueOrganizationDropdown organizations={organizations} />
-          {this.props.vetCorrespondences &&
-          <CorrespondenceTable
-            vetCorrespondences={this.props.vetCorrespondences}
-          />
-          }
-        </AppSegment>
-      </React.Fragment>
-    );
-  }
-}
+  return (
+    <AppSegment filledBackground>
+      {(Object.keys(veteranInformation).length > 0) &&
+        currentAction.action_type === 'DeleteReviewPackage' &&
+        <Alert
+          type="success"
+          title={sprintf(COPY.CORRESPONDENCE_TITLE_REMOVE_PACKAGE_BANNER, vetName)}
+          message={COPY.CORRESPONDENCE_MESSAGE_REMOVE_PACKAGE_BANNER} scrollOnAlert={false}
+        />
+      }
+      <h1 {...css({ display: 'inline-block' })}>{COPY.CASE_LIST_TABLE_QUEUE_DROPDOWN_CORRESPONDENCE_CASES}</h1>
+      <QueueOrganizationDropdown organizations={organizations} />
+      <div>
+        <Button
+          onClick={handleAutoAssign}
+          ariaLabel="Auto assign correspnodences"
+        >
+          {COPY.AUTO_ASSIGN_CORRESPONDENCES_BUTTON}
+        </Button>
+      </div>
+      {vetCorrespondences &&
+        <CorrespondenceTable
+          vetCorrespondences={vetCorrespondences}
+        />
+      }
+    </AppSegment>
+  );
+};
 
 CorrespondenceCases.propTypes = {
   organizations: PropTypes.array,
diff --git a/client/app/queue/correspondence/CorrespondenceTable.jsx b/client/app/queue/correspondence/CorrespondenceTable.jsx
index 7f828b94e1b..a5e50ca094e 100644
--- a/client/app/queue/correspondence/CorrespondenceTable.jsx
+++ b/client/app/queue/correspondence/CorrespondenceTable.jsx
@@ -27,6 +27,7 @@ class CorrespondenceTable extends React.Component {
         align: 'left',
         valueName: 'packageDocumentType',
         enableFilter: true,
+        label: 'package-document-type-filter',
         getSortValue: (row) => row.packageDocumentType,
         backendCanSort: true
       },
diff --git a/config/routes.rb b/config/routes.rb
index 637d86c2570..b76837a6699 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -297,6 +297,7 @@
   scope path: '/queue' do
     get '/', to: 'queue#index'
     get '/correspondence', to: 'correspondence#correspondence_cases'
+    get '/correspondence/auto_assign_correspondences', to: 'correspondence#auto_assign_correspondences'
     get '/correspondence/:correspondence_uuid/intake', to: 'correspondence#intake', as: :queue_correspondence_intake
     post '/correspondence/:correspondence_uuid/current_step', to: 'correspondence#current_step', as: :queue_correspondence_intake_current_step
     post '/correspondence/:correspondence_uuid/correspondence_intake_task', to: 'correspondence_tasks#create_correspondence_intake_task'
diff --git a/db/seeds/correspondence.rb b/db/seeds/correspondence.rb
index f2499959d8f..5bea65f1dd8 100644
--- a/db/seeds/correspondence.rb
+++ b/db/seeds/correspondence.rb
@@ -5,6 +5,7 @@ module Seeds
   class Correspondence < Base
     def initialize
       initial_id_values
+      RequestStore[:current_user] = User.find_by_css_id("BVADWISE")
     end
 
     def seed!
@@ -34,7 +35,7 @@ def create_veteran(options = {})
       }
       veteran = create(:veteran, params.merge(options))
       5.times do
-        appeal = create(:appeal, veteran_file_number: veteran.file_number)
+        appeal = create(:appeal, veteran: veteran)
         InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
       end
       veteran
@@ -53,11 +54,11 @@ def create_correspondences
           correspondence_type_id: 8,
           cmp_queue_id: 1,
           cmp_packet_number: @cmp_packet_number,
-          va_date_of_receipt: Time.zone.yesterday,
+          va_date_of_receipt: Faker::Date.between(from: 90.days.ago, to: Time.zone.yesterday),
           notes: "This is a note from CMP.",
           assigned_by_id: 81,
           updated_by_id: 81,
-          veteran_id: veteran.id,
+          veteran_id: veteran.id
         )
         create_multiple_docs(corres, veteran)
         @cmp_packet_number += 1
@@ -73,7 +74,7 @@ def create_correspondences
           correspondence_type_id: 8,
           cmp_queue_id: 1,
           cmp_packet_number: @cmp_packet_number,
-          va_date_of_receipt: Time.zone.yesterday,
+          va_date_of_receipt: Faker::Date.between(from: 90.days.ago, to: Time.zone.yesterday),
           notes: "This is a note from CMP.",
           assigned_by_id: 81,
           updated_by_id: 81,
@@ -100,7 +101,7 @@ def create_correspondences
           correspondence_type_id: corres_type_id,
           cmp_queue_id: 1,
           cmp_packet_number: @cmp_packet_number,
-          va_date_of_receipt: Time.zone.yesterday,
+          va_date_of_receipt: Faker::Date.between(from: 90.days.ago, to: Time.zone.yesterday),
           notes: "This is a note from CMP.",
           assigned_by_id: 81,
           updated_by_id: 81,
@@ -127,7 +128,7 @@ def create_correspondences
           correspondence_type_id: 8,
           cmp_queue_id: cmp_queue_id,
           cmp_packet_number: @cmp_packet_number,
-          va_date_of_receipt: Time.zone.yesterday,
+          va_date_of_receipt: Faker::Date.between(from: 90.days.ago, to: Time.zone.yesterday),
           notes: "This is a note from CMP.",
           assigned_by_id: 81,
           updated_by_id: 81,
diff --git a/db/seeds/multi_correspondences.rb b/db/seeds/multi_correspondences.rb
index e29e25e0cda..5b35772b816 100644
--- a/db/seeds/multi_correspondences.rb
+++ b/db/seeds/multi_correspondences.rb
@@ -59,11 +59,11 @@ def create_multi_correspondences
           correspondence_type_id: 4,
           cmp_queue_id: 1,
           cmp_packet_number: @cmp_packet_number,
-          va_date_of_receipt: Time.zone.yesterday,
+          va_date_of_receipt: Faker::Date.between(from: 90.days.ago, to: Time.zone.yesterday),
           notes: "Notes from CMP - Multi Correspondence Seed",
           assigned_by_id: 81,
           updated_by_id: 81,
-          veteran_id: veteran.id,
+          veteran_id: veteran.id
         )
         CorrespondenceDocument.find_or_create_by(
           document_file_number: veteran.file_number,
@@ -101,11 +101,11 @@ def create_multi_correspondences
           correspondence_type_id: 4,
           cmp_queue_id: 1,
           cmp_packet_number: @cmp_packet_number,
-          va_date_of_receipt: Time.zone.yesterday,
+          va_date_of_receipt: Faker::Date.between(from: 90.days.ago, to: Time.zone.yesterday),
           notes: "Notes from CMP - Multi Correspondence Seed",
           assigned_by_id: 81,
           updated_by_id: 81,
-          veteran_id: veteran.id,
+          veteran_id: veteran.id
         )
         CorrespondenceDocument.find_or_create_by(
           document_file_number: veteran.file_number,
@@ -143,11 +143,11 @@ def create_multi_correspondences
           correspondence_type_id: 4,
           cmp_queue_id: 1,
           cmp_packet_number: @cmp_packet_number,
-          va_date_of_receipt: Time.zone.yesterday,
+          va_date_of_receipt: Faker::Date.between(from: 90.days.ago, to: Time.zone.yesterday),
           notes: "Notes from CMP - Multi Correspondence Seed",
           assigned_by_id: 81,
           updated_by_id: 81,
-          veteran_id: veteran.id,
+          veteran_id: veteran.id
         )
         CorrespondenceDocument.find_or_create_by(
           document_file_number: veteran.file_number,
diff --git a/lib/tasks/correspondence.rake b/lib/tasks/correspondence.rake
index 4ceb135959a..494b88f7afb 100644
--- a/lib/tasks/correspondence.rake
+++ b/lib/tasks/correspondence.rake
@@ -123,7 +123,7 @@ namespace :correspondence do
         correspondence_type_id: 4,
         cmp_queue_id: 1,
         cmp_packet_number: rand(2_000_000..2_999_999),
-        va_date_of_receipt: Time.zone.yesterday,
+        va_date_of_receipt: Faker::Date.between(from: 90.days.ago, to: Time.zone.yesterday),
         notes: "Notes from CMP - Multi Correspondence Seed",
         assigned_by_id: 81,
         updated_by_id: 81,
@@ -239,7 +239,7 @@ def create_correspondences_with_documents
       correspondence_type_id: 8,
       cmp_queue_id: 1,
       cmp_packet_number: @cmp_packet_number,
-      va_date_of_receipt: Time.zone.yesterday,
+      va_date_of_receipt: Faker::Date.between(from: 90.days.ago, to: Time.zone.yesterday),
       notes: "This is a note from CMP.",
       assigned_by_id: 81,
       updated_by_id: 81,
@@ -259,7 +259,7 @@ def create_correspondences_with_documents
       correspondence_type_id: 8,
       cmp_queue_id: 1,
       cmp_packet_number: @cmp_packet_number,
-      va_date_of_receipt: Time.zone.yesterday,
+      va_date_of_receipt: Faker::Date.between(from: 90.days.ago, to: Time.zone.yesterday),
       notes: "This is a note from CMP.",
       assigned_by_id: 81,
       updated_by_id: 81,
@@ -286,7 +286,7 @@ def create_correspondences_with_documents
       correspondence_type_id: corres_type_id,
       cmp_queue_id: 1,
       cmp_packet_number: @cmp_packet_number,
-      va_date_of_receipt: Time.zone.yesterday,
+      va_date_of_receipt: Faker::Date.between(from: 90.days.ago, to: Time.zone.yesterday),
       notes: "This is a note from CMP.",
       assigned_by_id: 81,
       updated_by_id: 81,
@@ -313,7 +313,7 @@ def create_correspondences_with_documents
       correspondence_type_id: 8,
       cmp_queue_id: cmp_queue_id,
       cmp_packet_number: @cmp_packet_number,
-      va_date_of_receipt: Time.zone.yesterday,
+      va_date_of_receipt: Faker::Date.between(from: 90.days.ago, to: Time.zone.yesterday),
       notes: "This is a note from CMP.",
       assigned_by_id: 81,
       updated_by_id: 81,
@@ -486,7 +486,7 @@ def create_multi_correspondences
       correspondence_type_id: 4,
       cmp_queue_id: 1,
       cmp_packet_number: @cmp_packet_number,
-      va_date_of_receipt: Time.zone.yesterday,
+      va_date_of_receipt: Faker::Date.between(from: 90.days.ago, to: Time.zone.yesterday),
       notes: "Notes from CMP - Multi Correspondence Seed",
       assigned_by_id: 81,
       updated_by_id: 81,
@@ -531,7 +531,7 @@ def create_multi_correspondences
       correspondence_type_id: 4,
       cmp_queue_id: 1,
       cmp_packet_number: @cmp_packet_number,
-      va_date_of_receipt: Time.zone.yesterday,
+      va_date_of_receipt: Faker::Date.between(from: 90.days.ago, to: Time.zone.yesterday),
       notes: "Notes from CMP - Multi Correspondence Seed",
       assigned_by_id: 81,
       updated_by_id: 81,
@@ -576,7 +576,7 @@ def create_multi_correspondences
       correspondence_type_id: 4,
       cmp_queue_id: 1,
       cmp_packet_number: @cmp_packet_number,
-      va_date_of_receipt: Time.zone.yesterday,
+      va_date_of_receipt: Faker::Date.between(from: 90.days.ago, to: Time.zone.yesterday),
       notes: "Notes from CMP - Multi Correspondence Seed",
       assigned_by_id: 81,
       updated_by_id: 81,
diff --git a/spec/factories/correspondence.rb b/spec/factories/correspondence.rb
index ab1f4cbc98c..2e75df50812 100644
--- a/spec/factories/correspondence.rb
+++ b/spec/factories/correspondence.rb
@@ -7,7 +7,7 @@
     source_type { "Mail" }
     cmp_queue_id { 1 }
     cmp_packet_number { rand(1_000_000_000..9_999_999_999) }
-    va_date_of_receipt { Time.zone.yesterday }
+    va_date_of_receipt { Faker::Date.between(from: 90.days.ago, to: Time.zone.yesterday) }
     notes { "This is a note from CMP." }
     assigned_by factory: :user
 
diff --git a/spec/feature/queue/correspondence/correspondence_cases_spec.rb b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
index 371e6b7ff4d..337e13b62a8 100644
--- a/spec/feature/queue/correspondence/correspondence_cases_spec.rb
+++ b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
@@ -23,10 +23,25 @@
   end
 
   context "correspondence cases form shell" do
+    let(:current_user) { create(:user) }
+    let(:veteran) { create(:veteran) }
+
     before :each do
       FeatureToggle.enable!(:correspondence_queue)
+      InboundOpsTeam.singleton.add_user(current_user)
       User.authenticate!(user: current_user)
       @correspondence_uuid = "123456789"
+      10.times do
+        create(
+          :correspondence,
+          :with_single_doc,
+          assigned_to: current_user,
+          veteran_id: veteran.id,
+          uuid: SecureRandom.uuid,
+          va_date_of_receipt: Time.zone.local(2023, 1, 1)
+        )
+      end
     end
+
   end
 end

From 7567076a2f76e5e86b5538a05f32f6329d9b82ba Mon Sep 17 00:00:00 2001
From: Alex Smith <alex.smith.99@thunderyard.com>
Date: Fri, 19 Jan 2024 14:52:22 -0700
Subject: [PATCH 079/237] Refactor Correspondence Auto-Assign Logic (#20556)

* Refactor Correspondence Auto-Assign Logic

- Move logic into new service class called by auto-assign job.

- Add specs and other supporting files.

* Add Missing Method Name

* Fix Data Setup Causing Spec Failure
---
 .reek.yml                                     |  1 -
 app/controllers/correspondence_controller.rb  |  6 ++-
 app/jobs/auto_assign_correspondence_job.rb    | 41 ++++-------------
 app/services/correspondence_auto_assigner.rb  | 44 +++++++++++++++++++
 spec/factories/task.rb                        |  3 ++
 .../correspondence_auto_assigner_spec.rb      | 22 ++++++++++
 6 files changed, 82 insertions(+), 35 deletions(-)
 create mode 100644 app/services/correspondence_auto_assigner.rb
 create mode 100644 spec/services/correspondence_auto_assigner_spec.rb

diff --git a/.reek.yml b/.reek.yml
index 44b054a70be..f1de4d08095 100644
--- a/.reek.yml
+++ b/.reek.yml
@@ -136,7 +136,6 @@ detectors:
       - ExternalApi::PexipService#send_pexip_request
       - ControllerSchema#remove_unknown_keys
       - BusinessLineReporter#as_csv
-      - AutoAssignCorrespondenceJob
   InstanceVariableAssumption:
     exclude:
       - Appeal
diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index 8f65ef9caa3..a3a74eb58e2 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -175,7 +175,11 @@ def process_intake
   end
 
   def auto_assign_correspondences
-    perform_later_or_now(AutoAssignCorrespondenceJob)
+    job_args = {
+      current_user_id: current_user.id
+    }
+
+    perform_later_or_now(AutoAssignCorrespondenceJob, job_args)
   end
 
   private
diff --git a/app/jobs/auto_assign_correspondence_job.rb b/app/jobs/auto_assign_correspondence_job.rb
index 7788cbfab01..8f2afe11c62 100644
--- a/app/jobs/auto_assign_correspondence_job.rb
+++ b/app/jobs/auto_assign_correspondence_job.rb
@@ -3,40 +3,15 @@
 class AutoAssignCorrespondenceJob < CaseflowJob
   queue_with_priority :low_priority
 
-  # rubocop:disable Metrics/MethodLength
-  def perform
-    Rails.logger.info("Auto assign correspondences job in progress.....")
+  def perform(current_user_id:)
+    correspondence_auto_assigner.do_auto_assignment(current_user_id: current_user_id)
+  rescue StandardError => error
+    log_error(error)
+  end
 
-    # An array of [correspondence.id, task.id]
-    unassigned_correspondences_task_id_pairs = Correspondence.joins(
-      "INNER JOIN tasks ON tasks.appeal_id = correspondences.id"
-    )
-      .where("tasks.type" => "ReviewPackageTask")
-      .where("tasks.status" => "unassigned")
-      .order(va_date_of_receipt: :desc)
-      .pluck("correspondences.id", "tasks.id")
+  private
 
-    unassigned_correspondences_task_id_pairs.each do |id_pair|
-      begin
-        correspondence_id = id_pair[0]
-        task_id = id_pair[1]
-        unassigned_review_package_task = ReviewPackageTask.find(task_id)
-        task_params = {
-          parent_id: task_id,
-          instructions: ["Auto assigned by #{RequestStore[:current_user].css_id}"],
-          assigned_to: InboundOpsTeam.singleton,
-          appeal_id: correspondence_id,
-          appeal_type: "Correspondence",
-          status: Constants.TASK_STATUSES.assigned,
-          type: ReassignPackageTask.name
-        }
-        ReviewPackageTask.create_from_params(task_params, RequestStore[:current_user])
-        unassigned_review_package_task.update!(assigned_to: InboundOpsTeam.singleton, status: :on_hold)
-      rescue ActiveRecord::RecordInvalid => error
-        invalid_record_error(error.record)
-      end
-    end
-    Rails.logger.info("Auto assign correspondences job resolved.")
+  def correspondence_auto_assigner
+    @correspondence_auto_assigner ||= CorrespondenceAutoAssigner.new
   end
-  # rubocop:enable Metrics/MethodLength
 end
diff --git a/app/services/correspondence_auto_assigner.rb b/app/services/correspondence_auto_assigner.rb
new file mode 100644
index 00000000000..a2f0071a497
--- /dev/null
+++ b/app/services/correspondence_auto_assigner.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+class CorrespondenceAutoAssigner
+  def do_auto_assignment(current_user_id:)
+    current_user = User.find(current_user_id)
+
+    unassigned_correspondences_task_id_pairs.each do |id_pair|
+      create_review_package_task(
+        correspondence_id: id_pair[0],
+        task_id: id_pair[1],
+        current_user: current_user
+      )
+    end
+  end
+
+  private
+
+  def unassigned_correspondences_task_id_pairs
+    Correspondence.joins(
+      "INNER JOIN tasks ON tasks.appeal_id = correspondences.id"
+    )
+      .where("tasks.type" => "ReviewPackageTask")
+      .where("tasks.status" => "unassigned")
+      .order(va_date_of_receipt: :desc)
+      .pluck("correspondences.id", "tasks.id")
+  end
+
+  def create_review_package_task(correspondence_id:, task_id:, current_user:)
+    unassigned_review_package_task = ReviewPackageTask.find(task_id)
+
+    task_params = {
+      parent_id: task_id,
+      instructions: ["Auto assigned by #{current_user.css_id}"],
+      assigned_to: InboundOpsTeam.singleton,
+      appeal_id: correspondence_id,
+      appeal_type: "Correspondence",
+      status: Constants.TASK_STATUSES.assigned,
+      type: ReassignPackageTask.name
+    }
+
+    ReviewPackageTask.create_from_params(task_params, current_user)
+    unassigned_review_package_task.update!(assigned_to: InboundOpsTeam.singleton, status: :on_hold)
+  end
+end
diff --git a/spec/factories/task.rb b/spec/factories/task.rb
index 8442215ba36..ec93e89047c 100644
--- a/spec/factories/task.rb
+++ b/spec/factories/task.rb
@@ -617,6 +617,9 @@ def self.find_first_task_or_create(appeal, task_type, **kwargs)
       factory :correspondence_intake_task, class: CorrespondenceIntakeTask do
       end
 
+      factory :review_package_task, class: ReviewPackageTask do
+      end
+
       factory :efolder_upload_failed_task, class: EfolderUploadFailedTask do
       end
 
diff --git a/spec/services/correspondence_auto_assigner_spec.rb b/spec/services/correspondence_auto_assigner_spec.rb
new file mode 100644
index 00000000000..fc39d4d4526
--- /dev/null
+++ b/spec/services/correspondence_auto_assigner_spec.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+describe CorrespondenceAutoAssigner do
+  subject(:described) { described_class.new }
+
+  let(:veteran) { create(:veteran) }
+  let(:current_user) { create(:intake_user) }
+
+  let!(:correspondence) { create(:correspondence, :with_single_doc, veteran_id: veteran.id, uuid: SecureRandom.uuid) }
+
+  describe "#do_auto_assignment" do
+    it "successfully creates a ReviewPackageTask and updates the existing task" do
+      expect do
+        described.do_auto_assignment(current_user_id: current_user.id)
+      end.to change(ReviewPackageTask, :count)
+
+      created = ReviewPackageTask.last
+      expect(created.assigned_to).to eq(InboundOpsTeam.singleton)
+      expect(created.status).to eq("assigned")
+    end
+  end
+end

From c22a6c1e328326ba44a32246c2c922487888ba72 Mon Sep 17 00:00:00 2001
From: Alex Smith <alex.smith.99@thunderyard.com>
Date: Wed, 24 Jan 2024 12:30:25 -0700
Subject: [PATCH 080/237] Create Auto Assignment Permission Check (#20565)

* Refactor for Auto-Assignment Permission Check

- Rework auto-assignment logic and add new check for auto-assign
user permission.

- Add specs and supporting files.

* Fix Linting Issues

* Add Seeds for Auto-Assign Permissions
---
 app/models/organization_permission.rb         |  23 ++-
 app/models/organization_user_permission.rb    |   6 +-
 app/services/correspondence_auto_assigner.rb  |  16 ++-
 .../organization_user_permission_checker.rb   |  46 ++++++
 .../constants/ORGANIZATION_PERMISSIONS.json   |   3 +
 db/seeds.rb                                   |   1 +
 db/seeds/auto_assign.rb                       |  37 +++++
 spec/factories/organization_permission.rb     |  11 ++
 .../factories/organization_user_permission.rb |  10 ++
 .../correspondence_cases_spec.rb              |   1 -
 spec/models/organization_permission_spec.rb   |  13 +-
 .../organization_user_permission_spec.rb      |   3 +-
 .../correspondence_auto_assigner_spec.rb      |   6 +
 ...ganization_user_permission_checker_spec.rb | 134 ++++++++++++++++++
 14 files changed, 297 insertions(+), 13 deletions(-)
 create mode 100644 app/services/organization_user_permission_checker.rb
 create mode 100644 client/constants/ORGANIZATION_PERMISSIONS.json
 create mode 100644 db/seeds/auto_assign.rb
 create mode 100644 spec/factories/organization_permission.rb
 create mode 100644 spec/factories/organization_user_permission.rb
 create mode 100644 spec/services/organization_user_permission_checker_spec.rb

diff --git a/app/models/organization_permission.rb b/app/models/organization_permission.rb
index e3cab39001e..536e2af8c51 100644
--- a/app/models/organization_permission.rb
+++ b/app/models/organization_permission.rb
@@ -1,14 +1,27 @@
 # frozen_string_literal: true
 
 class OrganizationPermission < CaseflowRecord
-  belongs_to :organization, required: true
+  belongs_to :organization, optional: false
 
   belongs_to :parent_permission, class_name: "OrganizationPermission", optional: true
-  has_many :child_permissions, class_name: "OrganizationPermission", foreign_key: "parent_permission_id", dependent: :destroy
+  has_many :child_permissions, class_name: "OrganizationPermission", foreign_key: "parent_permission_id",
+                               dependent: :destroy
 
   has_many :organization_user_permissions, dependent: :destroy
 
-  validates_presence_of :permission
-  validates_presence_of :description
-  validates_presence_of :enabled
+  validates :description, presence: true
+  validates :enabled, inclusion: [true, false]
+
+  validate :valid_permission
+
+  def valid_permission
+    errors.add(:permission, "Invalid permission") unless
+      self.class.valid_permission_names.include?(permission)
+  end
+
+  class << self
+    def valid_permission_names
+      Constants.ORGANIZATION_PERMISSIONS.to_h.values
+    end
+  end
 end
diff --git a/app/models/organization_user_permission.rb b/app/models/organization_user_permission.rb
index a65092ec795..fefad5ea344 100644
--- a/app/models/organization_user_permission.rb
+++ b/app/models/organization_user_permission.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 class OrganizationUserPermission < CaseflowRecord
-  belongs_to :organizations_user, required: true
-  belongs_to :organization_permission, required: true
+  belongs_to :organizations_user, optional: false
+  belongs_to :organization_permission, optional: false
 
-  validates_presence_of :permitted
+  validates :permitted, inclusion: [true, false]
 end
diff --git a/app/services/correspondence_auto_assigner.rb b/app/services/correspondence_auto_assigner.rb
index a2f0071a497..67bf028dda3 100644
--- a/app/services/correspondence_auto_assigner.rb
+++ b/app/services/correspondence_auto_assigner.rb
@@ -38,7 +38,21 @@ def create_review_package_task(correspondence_id:, task_id:, current_user:)
       type: ReassignPackageTask.name
     }
 
-    ReviewPackageTask.create_from_params(task_params, current_user)
+    assign_user_review_package_task(user: current_user, task_params: task_params)
     unassigned_review_package_task.update!(assigned_to: InboundOpsTeam.singleton, status: :on_hold)
   end
+
+  def assign_user_review_package_task(user:, task_params:)
+    return unless permission_checker.can?(
+      permission_name: Constants.ORGANIZATION_PERMISSIONS.auto_assign,
+      organization: InboundOpsTeam.singleton,
+      user: user
+    )
+
+    ReviewPackageTask.create_from_params(task_params, current_user)
+  end
+
+  def permission_checker
+    @permission_checker ||= OrganizationUserPermissionChecker.new
+  end
 end
diff --git a/app/services/organization_user_permission_checker.rb b/app/services/organization_user_permission_checker.rb
new file mode 100644
index 00000000000..d4156a20647
--- /dev/null
+++ b/app/services/organization_user_permission_checker.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+class OrganizationUserPermissionChecker
+  def can_do_all?(permissions:, organization:, user:)
+    permissions.each do |permission|
+      return false if !can?(
+        permission_name: permission,
+        organization: organization,
+        user: user
+      )
+    end
+
+    true
+  end
+
+  def can?(permission_name:, organization:, user:)
+    org_permission = organization_permission(organization, permission_name)
+    return false if org_permission.blank?
+
+    org_user = organization_user(organization, user)
+    return false if org_user.blank?
+
+    OrganizationUserPermission.find_by(
+      organization_permission: org_permission,
+      organizations_user: org_user,
+      permitted: true
+    ).present?
+  end
+
+  private
+
+  def organization_permission(organization, permission_name)
+    OrganizationPermission.find_by(
+      organization: organization,
+      permission: permission_name,
+      enabled: true
+    )
+  end
+
+  def organization_user(organization, user)
+    OrganizationsUser.find_by(
+      organization: organization,
+      user: user
+    )
+  end
+end
diff --git a/client/constants/ORGANIZATION_PERMISSIONS.json b/client/constants/ORGANIZATION_PERMISSIONS.json
new file mode 100644
index 00000000000..4eee06d856c
--- /dev/null
+++ b/client/constants/ORGANIZATION_PERMISSIONS.json
@@ -0,0 +1,3 @@
+{
+  "auto_assign": "auto_assign"
+}
diff --git a/db/seeds.rb b/db/seeds.rb
index 871bf6415fa..f8cb7f62f18 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -73,6 +73,7 @@ def seed
     call_and_log_seed_step Seeds::AutoTexts
     call_and_log_seed_step Seeds::RemandedAmaAppeals
     call_and_log_seed_step Seeds::RemandedLegacyAppeals
+    call_and_log_seed_step Seeds::AutoAssign
   end
 end
 
diff --git a/db/seeds/auto_assign.rb b/db/seeds/auto_assign.rb
new file mode 100644
index 00000000000..5e6184e6203
--- /dev/null
+++ b/db/seeds/auto_assign.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Seeds
+  class AutoAssign < Base
+    def seed!
+      create_auto_assign_permissions
+      create_auto_assign_users
+    end
+
+    private
+
+    def create_auto_assign_permissions
+      OrganizationPermission.valid_permission_names.each do |permission|
+        OrganizationPermission.find_or_create_by(permission: permission, organization: InboundOpsTeam.singleton) do |p|
+          p.description = Faker::Fantasy::Tolkien.poem
+          p.enabled = true
+        end
+      end
+    end
+
+    def create_auto_assign_users
+      user = User.find_or_create_by(css_id: "INBOUND_OPS_TEAM_MAIL_INTAKE_USER_QB") do |u|
+        u.station_id = 101
+        u.full_name = "Tom Brady"
+        u.roles = ["Mail Intake"]
+      end
+      org_user = OrganizationsUser.find_or_create_by!(organization: InboundOpsTeam.singleton, user: user)
+
+      OrganizationPermission.all.each do |permission|
+        OrganizationUserPermission
+          .find_or_create_by(organization_permission: permission, organizations_user: org_user) do |op|
+          op.permitted = true
+        end
+      end
+    end
+  end
+end
diff --git a/spec/factories/organization_permission.rb b/spec/factories/organization_permission.rb
new file mode 100644
index 00000000000..7fa74adcedb
--- /dev/null
+++ b/spec/factories/organization_permission.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :organization_permission do
+    description { Faker::Hipster.sentence }
+    enabled { false }
+    permission { Faker::ProgrammingLanguage.name }
+
+    association :organization, factory: :organization
+  end
+end
diff --git a/spec/factories/organization_user_permission.rb b/spec/factories/organization_user_permission.rb
new file mode 100644
index 00000000000..a5982895dff
--- /dev/null
+++ b/spec/factories/organization_user_permission.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :organization_user_permission do
+    permitted { false }
+
+    association :organization_permission, factory: :organization_permission
+    association :organizations_user, factory: :organizations_user
+  end
+end
diff --git a/spec/feature/queue/correspondence/correspondence_cases_spec.rb b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
index 337e13b62a8..359278c1c47 100644
--- a/spec/feature/queue/correspondence/correspondence_cases_spec.rb
+++ b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
@@ -42,6 +42,5 @@
         )
       end
     end
-
   end
 end
diff --git a/spec/models/organization_permission_spec.rb b/spec/models/organization_permission_spec.rb
index 03cb24b4e3d..6324ad5d30d 100644
--- a/spec/models/organization_permission_spec.rb
+++ b/spec/models/organization_permission_spec.rb
@@ -13,8 +13,17 @@
   end
 
   describe "Validations" do
-    it { should validate_presence_of(:permission) }
     it { should validate_presence_of(:description) }
-    it { should validate_presence_of(:enabled) }
+
+    it { should allow_value(%w(true false)).for(:enabled) }
+    it { should_not allow_value(nil).for(:enabled) }
+
+    context "permission" do
+      it { should_not allow_value("bad_test").for(:permission) }
+
+      OrganizationPermission.valid_permission_names.each do |permission_name|
+        it { should allow_value(permission_name).for(:permission) }
+      end
+    end
   end
 end
diff --git a/spec/models/organization_user_permission_spec.rb b/spec/models/organization_user_permission_spec.rb
index d0ffa74afd4..5703cf8567c 100644
--- a/spec/models/organization_user_permission_spec.rb
+++ b/spec/models/organization_user_permission_spec.rb
@@ -7,6 +7,7 @@
   end
 
   describe "Validations" do
-    it { should validate_presence_of(:permitted) }
+    it { should allow_value(%w(true false)).for(:permitted) }
+    it { should_not allow_value(nil).for(:permitted) }
   end
 end
diff --git a/spec/services/correspondence_auto_assigner_spec.rb b/spec/services/correspondence_auto_assigner_spec.rb
index fc39d4d4526..b0b37e9561b 100644
--- a/spec/services/correspondence_auto_assigner_spec.rb
+++ b/spec/services/correspondence_auto_assigner_spec.rb
@@ -8,6 +8,12 @@
 
   let!(:correspondence) { create(:correspondence, :with_single_doc, veteran_id: veteran.id, uuid: SecureRandom.uuid) }
 
+  let(:mock_permission_checker) { instance_double(OrganizationUserPermissionChecker, can?: true) }
+
+    before do
+      allow(OrganizationUserPermissionChecker).to receive(:new).and_return(mock_permission_checker)
+    end
+
   describe "#do_auto_assignment" do
     it "successfully creates a ReviewPackageTask and updates the existing task" do
       expect do
diff --git a/spec/services/organization_user_permission_checker_spec.rb b/spec/services/organization_user_permission_checker_spec.rb
new file mode 100644
index 00000000000..8c945c24a75
--- /dev/null
+++ b/spec/services/organization_user_permission_checker_spec.rb
@@ -0,0 +1,134 @@
+# frozen_string_literal: true
+
+describe OrganizationUserPermissionChecker do
+  subject(:described) { described_class.new }
+
+  let(:organization) { create(:organization) }
+  let(:user) { create(:user) }
+
+  let!(:org_user) { create(:organizations_user, user: user, organization: organization) }
+  let(:valid_permission_name) { OrganizationPermission.valid_permission_names.first }
+
+  describe "#can_do_all?" do
+    context "when permissions are enabled" do
+      let!(:organization_permission) do
+        create(
+          :organization_permission,
+          organization: organization,
+          permission: valid_permission_name,
+          enabled: true
+        )
+      end
+
+      context "when all permissions are permitted for user" do
+        let!(:org_user_permission) do
+          create(
+            :organization_user_permission,
+            organization_permission: organization_permission,
+            organizations_user: org_user,
+            permitted: true
+          )
+        end
+
+        it "returns true" do
+          expect(
+            described.can_do_all?(
+              permissions: [valid_permission_name],
+              organization: organization,
+              user: user
+            )
+          ).to eq(true)
+        end
+      end
+
+      context "with invalid permission name" do
+        let!(:org_user_permission) do
+          create(
+            :organization_user_permission,
+            organization_permission: organization_permission,
+            organizations_user: org_user,
+            permitted: true
+          )
+        end
+
+        it "returns false" do
+          expect(
+            described.can_do_all?(
+              permissions: [valid_permission_name, "not_exists_yo"],
+              organization: organization,
+              user: user
+            )
+          ).to eq(false)
+        end
+      end
+
+      context "with unpermitted permission" do
+        let!(:org_user_permission) do
+          create(
+            :organization_user_permission,
+            organization_permission: organization_permission,
+            organizations_user: org_user,
+            permitted: false
+          )
+        end
+
+        it "returns false" do
+          expect(
+            described.can_do_all?(
+              permissions: [valid_permission_name],
+              organization: organization,
+              user: user
+            )
+          ).to eq(false)
+        end
+      end
+    end
+  end
+
+  describe "#can?" do
+    context "when permission is enabled" do
+      let!(:organization_permission) do
+        create(
+          :organization_permission,
+          organization: organization,
+          permission: valid_permission_name,
+          enabled: true
+        )
+      end
+
+      context "when permission is permitted for user" do
+        let!(:org_user_permission) do
+          create(
+            :organization_user_permission,
+            organization_permission: organization_permission,
+            organizations_user: org_user,
+            permitted: true
+          )
+        end
+
+        it "returns true" do
+          expect(
+            described.can?(permission_name: valid_permission_name, organization: organization, user: user)
+          ).to eq(true)
+        end
+      end
+
+      context "when permission is NOT permitted for user" do
+        let!(:org_user_permission1) do
+          create(
+            :organization_user_permission,
+            organization_permission: organization_permission,
+            organizations_user: org_user,
+            permitted: false
+          )
+        end
+
+        it "returns false" do
+          expect(
+            described.can?(permission_name: valid_permission_name, organization: organization, user: user)
+          ).to eq(false)
+        end
+      end
+    end
+  end
+end

From 31fa982a9245cbbc765bb07d1d7908bf1fcd1b1b Mon Sep 17 00:00:00 2001
From: SanthiParakal133 <132940479+SanthiParakal133@users.noreply.github.com>
Date: Wed, 24 Jan 2024 15:17:02 -0500
Subject: [PATCH 081/237] Deepak/appeals 38547 (#20578)

* Refactor for Auto-Assignment Permission Check

- Rework auto-assignment logic and add new check for auto-assign
user permission.

- Add specs and supporting files.

* Fix Linting Issues

* Add Seeds for Auto-Assign Permissions

* add nod check

* Update rspec

* small fix

---------

Co-authored-by: Alexander Smith <alex.smith.99@thunderyard.com>
---
 app/services/correspondence_auto_assigner.rb  | 28 ++++++++++++++----
 .../constants/ORGANIZATION_PERMISSIONS.json   |  3 +-
 .../correspondence_auto_assigner_spec.rb      | 29 +++++++++++++++++--
 3 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/app/services/correspondence_auto_assigner.rb b/app/services/correspondence_auto_assigner.rb
index 67bf028dda3..e20dfcdd30d 100644
--- a/app/services/correspondence_auto_assigner.rb
+++ b/app/services/correspondence_auto_assigner.rb
@@ -8,6 +8,7 @@ def do_auto_assignment(current_user_id:)
       create_review_package_task(
         correspondence_id: id_pair[0],
         task_id: id_pair[1],
+        package_document_type_id: id_pair[2],
         current_user: current_user
       )
     end
@@ -22,13 +23,24 @@ def unassigned_correspondences_task_id_pairs
       .where("tasks.type" => "ReviewPackageTask")
       .where("tasks.status" => "unassigned")
       .order(va_date_of_receipt: :desc)
-      .pluck("correspondences.id", "tasks.id")
+      .pluck("correspondences.id", "tasks.id", "package_document_type_id")
   end
 
-  def create_review_package_task(correspondence_id:, task_id:, current_user:)
+  def create_review_package_task(correspondence_id:, task_id:, package_document_type_id:, current_user:)
     unassigned_review_package_task = ReviewPackageTask.find(task_id)
 
-    task_params = {
+    task_params = build_task_params(task_id, correspondence_id, current_user)
+
+    if PackageDocumentType.find_by(name: "10182")&.id == package_document_type_id
+      nod_mail_permission_check(user: current_user, task_params: task_params)
+    else
+      assign_user_review_package_task(user: current_user, task_params: task_params)
+    end
+    unassigned_review_package_task.update!(assigned_to: InboundOpsTeam.singleton, status: :on_hold)
+  end
+
+  def build_task_params(task_id, correspondence_id, current_user)
+    {
       parent_id: task_id,
       instructions: ["Auto assigned by #{current_user.css_id}"],
       assigned_to: InboundOpsTeam.singleton,
@@ -37,9 +49,15 @@ def create_review_package_task(correspondence_id:, task_id:, current_user:)
       status: Constants.TASK_STATUSES.assigned,
       type: ReassignPackageTask.name
     }
+  end
 
-    assign_user_review_package_task(user: current_user, task_params: task_params)
-    unassigned_review_package_task.update!(assigned_to: InboundOpsTeam.singleton, status: :on_hold)
+  def nod_mail_permission_check(user:, task_params:)
+    return unless permission_checker.can?(
+      permission_name: Constants.ORGANIZATION_PERMISSIONS.receive_nod_mail,
+      organization: InboundOpsTeam.singleton,
+      user: user
+    )
+    ReviewPackageTask.create_from_params(task_params, current_user)
   end
 
   def assign_user_review_package_task(user:, task_params:)
diff --git a/client/constants/ORGANIZATION_PERMISSIONS.json b/client/constants/ORGANIZATION_PERMISSIONS.json
index 4eee06d856c..de1196bccde 100644
--- a/client/constants/ORGANIZATION_PERMISSIONS.json
+++ b/client/constants/ORGANIZATION_PERMISSIONS.json
@@ -1,3 +1,4 @@
 {
-  "auto_assign": "auto_assign"
+  "auto_assign": "auto_assign",
+  "receive_nod_mail": "receive_nod_mail"
 }
diff --git a/spec/services/correspondence_auto_assigner_spec.rb b/spec/services/correspondence_auto_assigner_spec.rb
index b0b37e9561b..7f9bd4727c1 100644
--- a/spec/services/correspondence_auto_assigner_spec.rb
+++ b/spec/services/correspondence_auto_assigner_spec.rb
@@ -10,9 +10,9 @@
 
   let(:mock_permission_checker) { instance_double(OrganizationUserPermissionChecker, can?: true) }
 
-    before do
-      allow(OrganizationUserPermissionChecker).to receive(:new).and_return(mock_permission_checker)
-    end
+  before do
+    allow(OrganizationUserPermissionChecker).to receive(:new).and_return(mock_permission_checker)
+  end
 
   describe "#do_auto_assignment" do
     it "successfully creates a ReviewPackageTask and updates the existing task" do
@@ -24,5 +24,28 @@
       expect(created.assigned_to).to eq(InboundOpsTeam.singleton)
       expect(created.status).to eq("assigned")
     end
+
+    context "when package_document_type_id matches '10182'" do
+      let(:package_document_type) { create(:package_document_type, name: "10182") }
+      let!(:correspondence) do
+        create(
+          :correspondence,
+          :with_single_doc,
+          veteran_id: veteran.id,
+          uuid: SecureRandom.uuid,
+          package_document_type_id: package_document_type.id
+        )
+      end
+
+      it "calls nod_mail_permission_check with the correct parameters" do
+        expect do
+          described.do_auto_assignment(current_user_id: current_user.id)
+        end.to change(ReviewPackageTask, :count)
+
+        created = ReviewPackageTask.last
+        expect(created.assigned_to).to eq(InboundOpsTeam.singleton)
+        expect(created.status).to eq("assigned")
+      end
+    end
   end
 end

From 0154774571c8679cea67b78929761a49cda68dc9 Mon Sep 17 00:00:00 2001
From: Alex Smith <alex.smith.99@thunderyard.com>
Date: Wed, 24 Jan 2024 14:09:11 -0700
Subject: [PATCH 082/237] Add Auto-Assignment Logging Tables (#20608)

* Add Auto-Assignment Logging Tables

* Add User Association to BatchAutoAssignmentAttempt
---
 app/models/batch_auto_assignment_attempt.rb   |  9 +++++
 app/models/concerns/auto_assignable.rb        | 20 ++++++++++
 .../individual_auto_assignment_attempt.rb     | 11 +++++
 ...2_create_batch_auto_assignment_attempts.rb | 22 ++++++++++
 ...ate_individual_auto_assignment_attempts.rb | 24 +++++++++++
 db/schema.rb                                  | 40 ++++++++++++++++++-
 .../batch_auto_assignment_attempt_spec.rb     | 14 +++++++
 ...individual_auto_assignment_attempt_spec.rb | 18 +++++++++
 8 files changed, 157 insertions(+), 1 deletion(-)
 create mode 100644 app/models/batch_auto_assignment_attempt.rb
 create mode 100644 app/models/concerns/auto_assignable.rb
 create mode 100644 app/models/individual_auto_assignment_attempt.rb
 create mode 100644 db/migrate/20240123195132_create_batch_auto_assignment_attempts.rb
 create mode 100644 db/migrate/20240124182959_create_individual_auto_assignment_attempts.rb
 create mode 100644 spec/models/batch_auto_assignment_attempt_spec.rb
 create mode 100644 spec/models/individual_auto_assignment_attempt_spec.rb

diff --git a/app/models/batch_auto_assignment_attempt.rb b/app/models/batch_auto_assignment_attempt.rb
new file mode 100644
index 00000000000..4aa51a184df
--- /dev/null
+++ b/app/models/batch_auto_assignment_attempt.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class BatchAutoAssignmentAttempt < CaseflowRecord
+  include AutoAssignable
+
+  belongs_to :user, optional: false
+
+  has_many :individual_auto_assignment_attempts, dependent: :destroy
+end
diff --git a/app/models/concerns/auto_assignable.rb b/app/models/concerns/auto_assignable.rb
new file mode 100644
index 00000000000..ec984a58ddd
--- /dev/null
+++ b/app/models/concerns/auto_assignable.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module AutoAssignable
+  extend ActiveSupport::Concern
+  include ActiveModel::Validations
+
+  STATUS_STARTED = "started"
+  STATUS_COMPLETED = "completed"
+  STATUS_ERROR = "error"
+
+  VALID_STATUSES = [
+    STATUS_STARTED,
+    STATUS_COMPLETED,
+    STATUS_ERROR
+  ]
+
+  included do
+    validates :status, inclusion: { in: VALID_STATUSES }
+  end
+end
diff --git a/app/models/individual_auto_assignment_attempt.rb b/app/models/individual_auto_assignment_attempt.rb
new file mode 100644
index 00000000000..11dfb2752c1
--- /dev/null
+++ b/app/models/individual_auto_assignment_attempt.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class IndividualAutoAssignmentAttempt < CaseflowRecord
+  include AutoAssignable
+
+  belongs_to :user, optional: false
+  belongs_to :correspondence, optional: false
+  belongs_to :batch_auto_assignment_attempt, optional: false
+
+  validates :nod, inclusion: [true, false]
+end
diff --git a/db/migrate/20240123195132_create_batch_auto_assignment_attempts.rb b/db/migrate/20240123195132_create_batch_auto_assignment_attempts.rb
new file mode 100644
index 00000000000..fc8c9200e74
--- /dev/null
+++ b/db/migrate/20240123195132_create_batch_auto_assignment_attempts.rb
@@ -0,0 +1,22 @@
+class CreateBatchAutoAssignmentAttempts < Caseflow::Migration
+  def change
+    create_table :batch_auto_assignment_attempts do |t|
+      t.references :user, foreign_key: true, null: false, index: false,
+        comment: "Foreign key to users table"
+      t.string :status, null: false
+      t.integer :num_packages_assigned
+      t.integer :num_packages_unassigned
+      t.integer :num_nod_packages_assigned
+      t.integer :num_nod_packages_unassigned
+      t.datetime :completed_at
+      t.datetime :errored_at
+      t.datetime :started_at
+      t.jsonb :error_info
+      t.jsonb :statistics
+
+      t.timestamps
+    end
+
+    add_safe_index :batch_auto_assignment_attempts, :user_id, name: "index_baaa_on_user_id"
+  end
+end
diff --git a/db/migrate/20240124182959_create_individual_auto_assignment_attempts.rb b/db/migrate/20240124182959_create_individual_auto_assignment_attempts.rb
new file mode 100644
index 00000000000..792d268fcde
--- /dev/null
+++ b/db/migrate/20240124182959_create_individual_auto_assignment_attempts.rb
@@ -0,0 +1,24 @@
+class CreateIndividualAutoAssignmentAttempts < Caseflow::Migration
+  def change
+    create_table :individual_auto_assignment_attempts do |t|
+      t.references :user, foreign_key: true, null: false, index: false,
+        comment: "Foreign key to users table"
+      t.references :correspondence, foreign_key: true, null: false, index: false,
+        comment: "Foreign key to correspondences table"
+      t.references :batch_auto_assignment_attempt, foreign_key: true, null: false, index: false,
+        comment: "Foreign key to batch_auto_assignment_attempts table"
+      t.string :status, null: false
+      t.datetime :completed_at
+      t.datetime :errored_at
+      t.datetime :started_at
+      t.boolean :nod, null: false, default: false
+      t.jsonb :statistics
+
+      t.timestamps
+    end
+
+    add_safe_index :individual_auto_assignment_attempts, :user_id, name: "index_iaaa_on_user_id"
+    add_safe_index :individual_auto_assignment_attempts, :correspondence_id, name: "index_iaaa_on_correspondence_id"
+    add_safe_index :individual_auto_assignment_attempts, :batch_auto_assignment_attempt_id, name: "index_iaaa_on_batch_auto_assignment_attempt_id"
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index e251379ddbb..93154ccb80c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2024_01_18_184304) do
+ActiveRecord::Schema.define(version: 2024_01_24_182959) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -224,6 +224,23 @@
     t.index ["veteran_file_number"], name: "index_available_hearing_locations_on_veteran_file_number"
   end
 
+  create_table "batch_auto_assignment_attempts", force: :cascade do |t|
+    t.datetime "completed_at"
+    t.datetime "created_at", null: false
+    t.jsonb "error_info"
+    t.datetime "errored_at"
+    t.integer "num_nod_packages_assigned"
+    t.integer "num_nod_packages_unassigned"
+    t.integer "num_packages_assigned"
+    t.integer "num_packages_unassigned"
+    t.datetime "started_at"
+    t.jsonb "statistics"
+    t.string "status", null: false
+    t.datetime "updated_at", null: false
+    t.bigint "user_id", null: false, comment: "Foreign key to users table"
+    t.index ["user_id"], name: "index_baaa_on_user_id"
+  end
+
   create_table "batch_processes", primary_key: "batch_id", id: :uuid, default: -> { "uuid_generate_v4()" }, comment: "A generalized table for batching and processing records within caseflow", force: :cascade do |t|
     t.string "batch_type", null: false, comment: "Indicates what type of record is being batched"
     t.datetime "created_at", null: false, comment: "Date and Time that batch was created."
@@ -1138,6 +1155,23 @@
     t.index ["appeal_id", "appeal_type", "organization_id"], name: "index_ihp_drafts_on_appeal_and_organization"
   end
 
+  create_table "individual_auto_assignment_attempts", force: :cascade do |t|
+    t.bigint "batch_auto_assignment_attempt_id", null: false, comment: "Foreign key to batch_auto_assignment_attempts table"
+    t.datetime "completed_at"
+    t.bigint "correspondence_id", null: false, comment: "Foreign key to correspondences table"
+    t.datetime "created_at", null: false
+    t.datetime "errored_at"
+    t.boolean "nod", default: false, null: false
+    t.datetime "started_at"
+    t.jsonb "statistics"
+    t.string "status", null: false
+    t.datetime "updated_at", null: false
+    t.bigint "user_id", null: false, comment: "Foreign key to users table"
+    t.index ["batch_auto_assignment_attempt_id"], name: "index_iaaa_on_batch_auto_assignment_attempt_id"
+    t.index ["correspondence_id"], name: "index_iaaa_on_correspondence_id"
+    t.index ["user_id"], name: "index_iaaa_on_user_id"
+  end
+
   create_table "intakes", id: :serial, comment: "Represents the intake of an form or request made by a veteran.", force: :cascade do |t|
     t.string "cancel_other", comment: "Notes added if a user canceled an intake for any reason other than the stock set of options."
     t.string "cancel_reason", comment: "The reason the intake was canceled. Could have been manually canceled by a user, or automatic."
@@ -2234,6 +2268,7 @@
   add_foreign_key "appellant_substitutions", "users", column: "created_by_id"
   add_foreign_key "attorney_case_reviews", "users", column: "attorney_id"
   add_foreign_key "attorney_case_reviews", "users", column: "reviewing_judge_id"
+  add_foreign_key "batch_auto_assignment_attempts", "users"
   add_foreign_key "board_grant_effectuations", "appeals"
   add_foreign_key "board_grant_effectuations", "decision_documents"
   add_foreign_key "board_grant_effectuations", "decision_issues", column: "granted_decision_issue_id"
@@ -2312,6 +2347,9 @@
   add_foreign_key "hearings", "users", column: "judge_id"
   add_foreign_key "hearings", "users", column: "updated_by_id"
   add_foreign_key "ihp_drafts", "organizations"
+  add_foreign_key "individual_auto_assignment_attempts", "batch_auto_assignment_attempts"
+  add_foreign_key "individual_auto_assignment_attempts", "correspondences"
+  add_foreign_key "individual_auto_assignment_attempts", "users"
   add_foreign_key "intakes", "users"
   add_foreign_key "intakes", "veterans"
   add_foreign_key "job_notes", "users"
diff --git a/spec/models/batch_auto_assignment_attempt_spec.rb b/spec/models/batch_auto_assignment_attempt_spec.rb
new file mode 100644
index 00000000000..9736c3e6d08
--- /dev/null
+++ b/spec/models/batch_auto_assignment_attempt_spec.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+describe BatchAutoAssignmentAttempt do
+  describe "Associations" do
+    it { should belong_to(:user).required }
+    it { should have_many(:individual_auto_assignment_attempts).dependent(:destroy) }
+  end
+
+  describe "Validations" do
+    BatchAutoAssignmentAttempt::VALID_STATUSES.each do |status_name|
+      it { should allow_value(status_name).for(:status) }
+    end
+  end
+end
diff --git a/spec/models/individual_auto_assignment_attempt_spec.rb b/spec/models/individual_auto_assignment_attempt_spec.rb
new file mode 100644
index 00000000000..d6cb154eb2b
--- /dev/null
+++ b/spec/models/individual_auto_assignment_attempt_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+describe IndividualAutoAssignmentAttempt do
+  describe "Associations" do
+    it { should belong_to(:user).required }
+    it { should belong_to(:correspondence).required }
+    it { should belong_to(:batch_auto_assignment_attempt).required }
+  end
+
+  describe "Validations" do
+    it { should allow_value(%w(true false)).for(:nod) }
+    it { should_not allow_value(nil).for(:nod) }
+
+    IndividualAutoAssignmentAttempt::VALID_STATUSES.each do |status_name|
+      it { should allow_value(status_name).for(:status) }
+    end
+  end
+end

From 25647c34a659b3698a3dbd752738f222661547be Mon Sep 17 00:00:00 2001
From: Kevma50287 <104021955+Kevma50287@users.noreply.github.com>
Date: Thu, 25 Jan 2024 13:37:45 -0500
Subject: [PATCH 083/237] Created auto assign logger for statistics (#20610)

* Created auto assign logger for statistics

* Added comments for future work

* Updated method

* Update log

* Added current user to initialization

* Added current user to @current_user, changed record methods from private to public, added parameters to assignment method

* Added base code for rspecs
---
 .../correspondence_auto_assign_logger.rb      | 53 ++++++++++++++++++
 app/services/correspondence_auto_assigner.rb  | 13 ++++-
 .../correspondence_auto_assign_logger_spec.rb | 55 +++++++++++++++++++
 3 files changed, 119 insertions(+), 2 deletions(-)
 create mode 100644 app/services/correspondence_auto_assign_logger.rb
 create mode 100644 spec/services/correspondence_auto_assign_logger_spec.rb

diff --git a/app/services/correspondence_auto_assign_logger.rb b/app/services/correspondence_auto_assign_logger.rb
new file mode 100644
index 00000000000..2468250466a
--- /dev/null
+++ b/app/services/correspondence_auto_assign_logger.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+class CorrespondenceAutoAssignLogger
+  attr_reader :total_attempts, :failed_attempts_count, :successful_assignments,
+              :failed_assignments, :batch_assignment, :current_assignment
+
+  def initialize(current_user)
+    @total_attempts = 0
+    @failed_attempts_count = 0
+    @failed_assignments = []
+    @successful_assignments = []
+    @current_user = current_user
+  end
+
+  def begin_logging
+    create_batch_assignment
+  end
+
+  def end_logging(status)
+    Rails.logger.info("#{@failed_attempts_count}/#{@total_attempts} failed")
+
+    # Batch assignment update! method here with status
+  end
+
+  def log_single_attempt(user_id:, correspondence_id:)
+    @total_attempts += 1
+    create_single_assignment(user_id: user_id, correspondence_id: correspondence_id)
+    # Assign individual attempt here to @current_assignment
+  end
+
+  def record_failure
+    @failed_attempts_count += 1
+    @failed_assignments.push(@current_assignment)
+    @current_assignment = nil
+  end
+
+  def record_success
+    @successful_assignments.push(@current_assignment)
+    @current_assignment = nil
+  end
+
+  private
+
+  def create_single_assignment(user_id:, correspondence_id:)
+    # Create individual assignment attempt here using correspondence_id, user_id:, and @batch_assignment
+    Rails.logger.info("IndividualAutoAssignmentAttempt created")
+  end
+
+  def create_batch_assignment
+    # Create @batch_assignment here using @current_user
+    Rails.logger.info("LOGGING started for BatchAutoAssignmentAttempt")
+  end
+end
diff --git a/app/services/correspondence_auto_assigner.rb b/app/services/correspondence_auto_assigner.rb
index e20dfcdd30d..567f6819576 100644
--- a/app/services/correspondence_auto_assigner.rb
+++ b/app/services/correspondence_auto_assigner.rb
@@ -2,16 +2,18 @@
 
 class CorrespondenceAutoAssigner
   def do_auto_assignment(current_user_id:)
-    current_user = User.find(current_user_id)
+    @current_user = User.find(current_user_id)
 
+    correspondence_auto_assign_logger.begin_logging
     unassigned_correspondences_task_id_pairs.each do |id_pair|
       create_review_package_task(
         correspondence_id: id_pair[0],
         task_id: id_pair[1],
         package_document_type_id: id_pair[2],
-        current_user: current_user
+        current_user: @current_user
       )
     end
+    correspondence_auto_assign_logger.end_logging
   end
 
   private
@@ -27,6 +29,7 @@ def unassigned_correspondences_task_id_pairs
   end
 
   def create_review_package_task(correspondence_id:, task_id:, package_document_type_id:, current_user:)
+    correspondence_auto_assign_logger.log_single_attempt(correspondence_id)
     unassigned_review_package_task = ReviewPackageTask.find(task_id)
 
     task_params = build_task_params(task_id, correspondence_id, current_user)
@@ -37,6 +40,7 @@ def create_review_package_task(correspondence_id:, task_id:, package_document_ty
       assign_user_review_package_task(user: current_user, task_params: task_params)
     end
     unassigned_review_package_task.update!(assigned_to: InboundOpsTeam.singleton, status: :on_hold)
+    correspondence_auto_assign_logger.record_success
   end
 
   def build_task_params(task_id, correspondence_id, current_user)
@@ -57,6 +61,7 @@ def nod_mail_permission_check(user:, task_params:)
       organization: InboundOpsTeam.singleton,
       user: user
     )
+
     ReviewPackageTask.create_from_params(task_params, current_user)
   end
 
@@ -73,4 +78,8 @@ def assign_user_review_package_task(user:, task_params:)
   def permission_checker
     @permission_checker ||= OrganizationUserPermissionChecker.new
   end
+
+  def correspondence_auto_assign_logger
+    @correspondence_auto_assign_logger ||= CorrespondenceAutoAssignLogger.new(@current_user)
+  end
 end
diff --git a/spec/services/correspondence_auto_assign_logger_spec.rb b/spec/services/correspondence_auto_assign_logger_spec.rb
new file mode 100644
index 00000000000..3acc7edc638
--- /dev/null
+++ b/spec/services/correspondence_auto_assign_logger_spec.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+describe CorrespondenceAutoAssignLogger do
+  subject(:instance) { described_class.new(current_user) }
+  let(:veteran) { create(:veteran) }
+  let(:current_user) { create(:user) }
+
+  let!(:correspondence) { create(:correspondence, :with_single_doc, veteran_id: veteran.id, uuid: SecureRandom.uuid) }
+
+  describe "#begin_logging" do
+    it "creates a BatchAutoAssignmentAttempt" do
+      expect do
+        instance.begin_logging
+      end.to change(BatchAutoAssignmentAttempt, :count)
+    end
+  end
+
+  describe "#end_logging" do
+    it "updates a BatchAutoAssignmentAttempt with status" do
+      instance.begin_logging
+      expect do
+        instance.end_logging(BatchAutoAssignmentAttempt::STATUS_STARTED)
+      end.to change(instance.batch_assignment.status).to(BatchAutoAssignmentAttempt::STATUS_STARTED)
+    end
+  end
+
+  describe "#log_single_attempt" do
+    it "creates an IndividualAutoAssignmentAttempt" do
+      expect do
+        instance.log_single_attempt(user_id: current_user.id, correspondence_id: correspondence.id)
+      end.to change(IndividualAutoAssignmentAttempt, :count)
+    end
+  end
+
+  describe "#record_failure" do
+    it "increase failed attempts count" do
+      expect do
+        instance.log_single_attempt(user_id: current_user.id, correspondence_id: correspondence.id)
+        instance.record_failure
+      end.to change { instance.failed_attempts_count }.by(1)
+        .and change { instance.failed_assignments.length }.by(1)
+        .and expect { instance.current_assignment }.to(nil)
+    end
+  end
+
+  describe "#record_success" do
+    it "increase failed attempts count" do
+      expect do
+        instance.log_single_attempt(user_id: current_user.id, correspondence_id: correspondence.id)
+        instance.record_success
+      end.to change { instance.successful_assignments }.by(1)
+        .and change { instance.current_assignment }.to(nil)
+    end
+  end
+end

From bc8dc8ece0da1dfcd08bb8e4247e16dd840b4b80 Mon Sep 17 00:00:00 2001
From: Alex Smith <alex.smith.99@thunderyard.com>
Date: Thu, 1 Feb 2024 07:36:38 -0700
Subject: [PATCH 084/237] Refactor Auto-Assignment and Add Sensitivity Check
 (#20670)

- Refactor auto assigner class to follow master algorithm and move
user finding logic piece into separate class.

- Update a few classes with support methods needed and add specs.
---
 app/models/correspondence.rb                  |  4 +
 app/models/package_document_type.rb           |  6 ++
 app/models/tasks/correspondence_task.rb       |  2 +
 app/services/auto_assignable_user_finder.rb   | 93 ++++++++++++++++++
 app/services/correspondence_auto_assigner.rb  | 95 +++++++------------
 app/services/external_api/bgs_service.rb      |  8 +-
 db/seeds/auto_assign.rb                       |  2 -
 .../auto_assignable_user_finder_spec.rb       | 47 +++++++++
 .../correspondence_auto_assigner_spec.rb      | 49 ++++------
 9 files changed, 209 insertions(+), 97 deletions(-)
 create mode 100644 app/services/auto_assignable_user_finder.rb
 create mode 100644 spec/services/auto_assignable_user_finder_spec.rb

diff --git a/app/models/correspondence.rb b/app/models/correspondence.rb
index 8193a768b14..bda788e5faf 100644
--- a/app/models/correspondence.rb
+++ b/app/models/correspondence.rb
@@ -42,6 +42,10 @@ def root_task
     Task.find_by(appeal_id: id, appeal_type: type, type: CorrespondenceRootTask.name)
   end
 
+  def nod?
+    PackageDocumentType.nod == package_document_type
+  end
+
   # Methods below are included to allow Correspondences to render in explain page
 
   # Alias for cmp_packet_number
diff --git a/app/models/package_document_type.rb b/app/models/package_document_type.rb
index b5c5530e040..ad8b5a892ef 100644
--- a/app/models/package_document_type.rb
+++ b/app/models/package_document_type.rb
@@ -1,5 +1,11 @@
 # frozen_string_literal: true
 
 class PackageDocumentType < ApplicationRecord
+  NOD_NAME = "10182"
+
   has_many :correspondences
+
+  def self.nod
+    find_by(name: NOD_NAME)
+  end
 end
diff --git a/app/models/tasks/correspondence_task.rb b/app/models/tasks/correspondence_task.rb
index bf2cc52654a..0ab423d7d38 100644
--- a/app/models/tasks/correspondence_task.rb
+++ b/app/models/tasks/correspondence_task.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class CorrespondenceTask < Task
+  belongs_to :correspondence, foreign_type: "Correspondence", foreign_key: "appeal_id"
+
   before_create :verify_org_task_unique
   validate :status_is_valid_on_create, on: :create
   validate :assignee_status_is_valid_on_create, on: :create
diff --git a/app/services/auto_assignable_user_finder.rb b/app/services/auto_assignable_user_finder.rb
new file mode 100644
index 00000000000..98fa7fbecd7
--- /dev/null
+++ b/app/services/auto_assignable_user_finder.rb
@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+class AutoAssignableUserFinder
+  MAX_ASSIGNED_TASKS = 60
+
+  # TODO: APPEALS-38551: Switch to working directly with DB records.
+  # Correspondence auto-assignment can be triggered via multiple methods,
+  # so a local cache of this data can easily become invalid. Thus, we need
+  # to work with the DB as our source of truth at every step
+  AssignableUser = Struct.new(:id, :last_assigned_date, :num_assigned, :nod?, keyword_init: true)
+
+  def assignable_users_exist?
+    assignable_users.count.positive?
+  end
+
+  def get_first_assignable_user(correspondence:)
+    vbms_id = correspondence.veteran.file_number
+
+    run_auto_assign_algorithm(correspondence, vbms_id)
+  end
+
+  private
+
+  def run_auto_assign_algorithm(correspondence, vbms_id)
+    return auto_assign_nod(vbms_id) if correspondence.nod?
+
+    assignable_users.each do |user|
+      if sensitivity_checker.user_can_access?(vbms_id: vbms_id, user_to_check: user)
+        # TODO: APPEALS-38551: Find not needed here
+        return User.find!(user.id)
+      end
+    end
+
+    nil
+  end
+
+  def auto_assign_nod
+    assignable_users.each do |user|
+      next if !user.nod?
+
+      if sensitivity_checker.user_can_access?(vbms_id: vbms_id, user_to_check: user)
+        # TODO: APPEALS-38551: Find not needed here
+        return User.find!(user.id)
+      end
+    end
+
+    nil
+  end
+
+  # TODO: APPEALS-38551: Stub; complete in ticket
+  # SQL query to get started with; note that you'll need queries for various user types
+  # Helpful: http://www.scuttle.io/
+=begin
+SELECT users.id,
+  COUNT(tasks.id) AS num_assigned
+FROM users
+  INNER JOIN tasks ON tasks.assigned_to_id  = users.id
+WHERE
+  tasks.assigned_to_type = 'User'
+  AND
+  tasks.appeal_type = 'Correspondence'
+  AND
+  tasks.type = 'ReviewPackageTask'
+GROUP BY users.id
+HAVING COUNT(tasks.id) < 60;
+=end
+  def assignable_users
+    return @assignable_users if @assignable_users.present?
+
+    @assignable_users = []
+    # TODO: APPEALS-38551: Filter such that only users with auto_assign == true are in this result set
+    # Need to join to organization_user_permissions
+    eligible = InboundOpsTeam.singleton.users.includes(:tasks)
+
+    eligible.each do |user|
+      # TODO: APPEALS-38551: Remove this struct and switch to working directly with DB records
+      assignable = AssignableUser.new(
+        id: user.id,
+        last_assigned_date: Time.zone.now,
+        num_assigned: user.tasks.count,
+        nod?: true
+      )
+
+      @assignable_users.push(assignable)
+    end
+
+    @assignable_users
+  end
+
+  def sensitivity_checker
+    @sensitivity_checker ||= ExternalApi::BGSService.new
+  end
+end
diff --git a/app/services/correspondence_auto_assigner.rb b/app/services/correspondence_auto_assigner.rb
index 567f6819576..3096e2e0bea 100644
--- a/app/services/correspondence_auto_assigner.rb
+++ b/app/services/correspondence_auto_assigner.rb
@@ -1,85 +1,58 @@
 # frozen_string_literal: true
 
 class CorrespondenceAutoAssigner
-  def do_auto_assignment(current_user_id:)
+  def initialize(current_user_id:)
     @current_user = User.find(current_user_id)
+  end
 
-    correspondence_auto_assign_logger.begin_logging
-    unassigned_correspondences_task_id_pairs.each do |id_pair|
-      create_review_package_task(
-        correspondence_id: id_pair[0],
-        task_id: id_pair[1],
-        package_document_type_id: id_pair[2],
-        current_user: @current_user
-      )
+  def perform
+    if !unassigned_review_package_tasks.count.positive?
+      return
     end
-    correspondence_auto_assign_logger.end_logging
-  end
 
-  private
+    if !assignable_user_finder.assignable_users_exist?
+      return
+    end
 
-  def unassigned_correspondences_task_id_pairs
-    Correspondence.joins(
-      "INNER JOIN tasks ON tasks.appeal_id = correspondences.id"
-    )
-      .where("tasks.type" => "ReviewPackageTask")
-      .where("tasks.status" => "unassigned")
-      .order(va_date_of_receipt: :desc)
-      .pluck("correspondences.id", "tasks.id", "package_document_type_id")
+    unassigned_review_package_tasks.each do |task|
+      assign(task)
+    end
   end
 
-  def create_review_package_task(correspondence_id:, task_id:, package_document_type_id:, current_user:)
-    correspondence_auto_assign_logger.log_single_attempt(correspondence_id)
-    unassigned_review_package_task = ReviewPackageTask.find(task_id)
-
-    task_params = build_task_params(task_id, correspondence_id, current_user)
+  private
 
-    if PackageDocumentType.find_by(name: "10182")&.id == package_document_type_id
-      nod_mail_permission_check(user: current_user, task_params: task_params)
-    else
-      assign_user_review_package_task(user: current_user, task_params: task_params)
+  def assign(task)
+    assignee = assignable_user_finder.get_first_assignable_user(correspondence: task.correspondence)
+    if assignee.blank?
+      return
     end
-    unassigned_review_package_task.update!(assigned_to: InboundOpsTeam.singleton, status: :on_hold)
-    correspondence_auto_assign_logger.record_success
-  end
 
-  def build_task_params(task_id, correspondence_id, current_user)
-    {
-      parent_id: task_id,
-      instructions: ["Auto assigned by #{current_user.css_id}"],
-      assigned_to: InboundOpsTeam.singleton,
-      appeal_id: correspondence_id,
-      appeal_type: "Correspondence",
-      status: Constants.TASK_STATUSES.assigned,
-      type: ReassignPackageTask.name
-    }
+    assign_task_to_user(task, assignee)
   end
 
-  def nod_mail_permission_check(user:, task_params:)
-    return unless permission_checker.can?(
-      permission_name: Constants.ORGANIZATION_PERMISSIONS.receive_nod_mail,
-      organization: InboundOpsTeam.singleton,
-      user: user
+  def assign_task_to_user(task, user)
+    task.update!(
+      assigned_to: user,
+      assigned_at: Time.current,
+      assigned_by: @current_user,
+      assigned_to_type: User.name,
+      status: Constants.TASK_STATUSES.assigned
     )
-
-    ReviewPackageTask.create_from_params(task_params, current_user)
   end
 
-  def assign_user_review_package_task(user:, task_params:)
-    return unless permission_checker.can?(
-      permission_name: Constants.ORGANIZATION_PERMISSIONS.auto_assign,
-      organization: InboundOpsTeam.singleton,
-      user: user
-    )
-
-    ReviewPackageTask.create_from_params(task_params, current_user)
+  def unassigned_review_package_tasks
+    @unassigned_review_package_tasks ||= ReviewPackageTask
+      .where(status: "unassigned")
+      .includes(:correspondence)
+      .references(:correspondence)
+      .merge(Correspondence.order(va_date_of_receipt: :desc))
   end
 
-  def permission_checker
-    @permission_checker ||= OrganizationUserPermissionChecker.new
+  def logger
+    @logger ||= CorrespondenceAutoAssignLogger.new(@current_user)
   end
 
-  def correspondence_auto_assign_logger
-    @correspondence_auto_assign_logger ||= CorrespondenceAutoAssignLogger.new(@current_user)
+  def assignable_user_finder
+    @assignable_user_finder ||= AutoAssignableUserFinder.new
   end
 end
diff --git a/app/services/external_api/bgs_service.rb b/app/services/external_api/bgs_service.rb
index 05db6b81545..af7618e46d7 100644
--- a/app/services/external_api/bgs_service.rb
+++ b/app/services/external_api/bgs_service.rb
@@ -277,8 +277,12 @@ def find_address_by_participant_id(participant_id)
   #
   # We cache at 2 levels: the boolean check per user, and the veteran record itself.
   # The veteran record is so that subsequent calls to fetch_veteran_info can read from cache.
-  def can_access?(vbms_id)
-    Rails.cache.fetch(can_access_cache_key(current_user, vbms_id), expires_in: 2.hours) do
+  def can_access?(vbms_id, user_to_check: nil)
+    user_can_access?(vbms_id: vbms_id, user_to_check: current_user)
+  end
+
+  def user_can_access?(vbms_id:, user_to_check:)
+    Rails.cache.fetch(can_access_cache_key(user_to_check, vbms_id), expires_in: 2.hours) do
       DBService.release_db_connections
 
       MetricsService.record("BGS: can_access? (find_by_file_number): #{vbms_id}",
diff --git a/db/seeds/auto_assign.rb b/db/seeds/auto_assign.rb
index 5e6184e6203..4d7b9b3edc2 100644
--- a/db/seeds/auto_assign.rb
+++ b/db/seeds/auto_assign.rb
@@ -7,8 +7,6 @@ def seed!
       create_auto_assign_users
     end
 
-    private
-
     def create_auto_assign_permissions
       OrganizationPermission.valid_permission_names.each do |permission|
         OrganizationPermission.find_or_create_by(permission: permission, organization: InboundOpsTeam.singleton) do |p|
diff --git a/spec/services/auto_assignable_user_finder_spec.rb b/spec/services/auto_assignable_user_finder_spec.rb
new file mode 100644
index 00000000000..edc0d8f5093
--- /dev/null
+++ b/spec/services/auto_assignable_user_finder_spec.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+describe AutoAssignableUserFinder do
+  subject(:described) { described_class.new }
+
+  let(:mock_sensitivity_checker) { instance_double(ExternalApi::BGSService) }
+
+  before do
+    allow(ExternalApi::BGSService).to receive(:new).and_return(mock_sensitivity_checker)
+  end
+
+  describe "#assignable_users_exist?" do
+    before do
+      5.times do
+        create(:user)
+      end
+    end
+
+    context "when there are no assignable users" do
+      it "returns false" do
+        expect(described.assignable_users_exist?).to eq(false)
+      end
+    end
+
+    context "when there are assignable users" do
+      let(:intake_user) { create(:intake_user) }
+      let!(:org_user) { create(:organizations_user, organization: InboundOpsTeam.singleton, user: intake_user) }
+
+      it "returns true" do
+        expect(described.assignable_users_exist?).to eq(true)
+      end
+    end
+  end
+
+  describe "#get_first_assignable_user" do
+    let(:veteran) { create(:veteran) }
+    let!(:correspondence) { create(:correspondence, veteran_id: veteran.id) }
+
+    xit "returns the first assignable user" do
+    end
+
+    context "with NOD correspondence" do
+      xit "returns the first assignable NOD user" do
+      end
+    end
+  end
+end
diff --git a/spec/services/correspondence_auto_assigner_spec.rb b/spec/services/correspondence_auto_assigner_spec.rb
index 7f9bd4727c1..a329f69014c 100644
--- a/spec/services/correspondence_auto_assigner_spec.rb
+++ b/spec/services/correspondence_auto_assigner_spec.rb
@@ -1,50 +1,35 @@
 # frozen_string_literal: true
 
 describe CorrespondenceAutoAssigner do
-  subject(:described) { described_class.new }
+  subject(:described) { described_class.new(current_user_id: current_user.id) }
 
   let(:veteran) { create(:veteran) }
-  let(:current_user) { create(:intake_user) }
+  let(:current_user) { create(:user) }
 
-  let!(:correspondence) { create(:correspondence, :with_single_doc, veteran_id: veteran.id, uuid: SecureRandom.uuid) }
+  let!(:correspondence) { create(:correspondence, veteran_id: veteran.id) }
 
-  let(:mock_permission_checker) { instance_double(OrganizationUserPermissionChecker, can?: true) }
+  let(:mock_assignable_user_finder) { instance_double(AutoAssignableUserFinder) }
 
   before do
-    allow(OrganizationUserPermissionChecker).to receive(:new).and_return(mock_permission_checker)
+    allow(AutoAssignableUserFinder).to receive(:new).and_return(mock_assignable_user_finder)
   end
 
-  describe "#do_auto_assignment" do
-    it "successfully creates a ReviewPackageTask and updates the existing task" do
-      expect do
-        described.do_auto_assignment(current_user_id: current_user.id)
-      end.to change(ReviewPackageTask, :count)
+  describe "#perform" do
+    context "when assignable users exist" do
+      let(:intake_user) { create(:intake_user) }
+      let!(:org_user) { create(:organizations_user, organization: InboundOpsTeam.singleton, user: intake_user) }
 
-      created = ReviewPackageTask.last
-      expect(created.assigned_to).to eq(InboundOpsTeam.singleton)
-      expect(created.status).to eq("assigned")
-    end
-
-    context "when package_document_type_id matches '10182'" do
-      let(:package_document_type) { create(:package_document_type, name: "10182") }
-      let!(:correspondence) do
-        create(
-          :correspondence,
-          :with_single_doc,
-          veteran_id: veteran.id,
-          uuid: SecureRandom.uuid,
-          package_document_type_id: package_document_type.id
-        )
+      before do
+        expect(mock_assignable_user_finder).to receive(:assignable_users_exist?).and_return(true)
+        expect(mock_assignable_user_finder).to receive(:get_first_assignable_user).and_return(intake_user)
       end
 
-      it "calls nod_mail_permission_check with the correct parameters" do
-        expect do
-          described.do_auto_assignment(current_user_id: current_user.id)
-        end.to change(ReviewPackageTask, :count)
+      it "assigns review package tasks to assignable users" do
+        described.perform
 
-        created = ReviewPackageTask.last
-        expect(created.assigned_to).to eq(InboundOpsTeam.singleton)
-        expect(created.status).to eq("assigned")
+        task = ReviewPackageTask.last
+        expect(task.assigned_to).to eq(intake_user)
+        expect(task.status).to eq("assigned")
       end
     end
   end

From 454b217f44debadec6f7676da5cab8f143360fe0 Mon Sep 17 00:00:00 2001
From: Alex Smith <alex.smith.99@thunderyard.com>
Date: Thu, 1 Feb 2024 09:33:07 -0700
Subject: [PATCH 085/237] Add Logging to Correspondence Auto Assignment
 (#20679)

* Update MailTeamSupervisor with InboundOpsTeam (#20529)

* Add permissions to Organizations (#20543)

* Create OrganizationPermissions

* Add Column Comments to Migration

* Add Indices Using add_safe_index

* Create OrganizationUserPermission and Related Files

* Change OrganizationUserPermission Inheritance

---------

Co-authored-by: youfoundmanesh <129548081+youfoundmanesh@users.noreply.github.com>

* Kev ma/appeals 38420 (#20527)

* Initial job files created; added RunAsyncable module to controller

* Added aria-label for spec fix

* Refactor to functional component

* Added Auto Assign Correspondences Button, added route, added method to controller

* Updated spec for future testing

* Added initla business logic for assignment

* Updated seed data for VADOR date

* Update to include current user for seed data when ran individually

* Optimized SQL query by 10%

* Updated instruction details to contain css_id

* Update reek file for job, fixed rubocop and linting

* Updated class name

* Removed unused constant

* Refactor Correspondence Auto-Assign Logic (#20556)

* Refactor Correspondence Auto-Assign Logic

- Move logic into new service class called by auto-assign job.

- Add specs and other supporting files.

* Add Missing Method Name

* Fix Data Setup Causing Spec Failure

* Create Auto Assignment Permission Check (#20565)

* Refactor for Auto-Assignment Permission Check

- Rework auto-assignment logic and add new check for auto-assign
user permission.

- Add specs and supporting files.

* Fix Linting Issues

* Add Seeds for Auto-Assign Permissions

* Deepak/appeals 38547 (#20578)

* Refactor for Auto-Assignment Permission Check

- Rework auto-assignment logic and add new check for auto-assign
user permission.

- Add specs and supporting files.

* Fix Linting Issues

* Add Seeds for Auto-Assign Permissions

* add nod check

* Update rspec

* small fix

---------

Co-authored-by: Alexander Smith <alex.smith.99@thunderyard.com>

* Add Auto-Assignment Logging Tables (#20608)

* Add Auto-Assignment Logging Tables

* Add User Association to BatchAutoAssignmentAttempt

* Created auto assign logger for statistics (#20610)

* Created auto assign logger for statistics

* Added comments for future work

* Updated method

* Update log

* Added current user to initialization

* Added current user to @current_user, changed record methods from private to public, added parameters to assignment method

* Added base code for rspecs

* Refactor Auto-Assignment and Add Sensitivity Check

- Refactor auto assigner class to follow master algorithm and move
user finding logic piece into separate class.

- Update a few classes with support methods needed and add specs.

* Add Correspondence Auto Assignment Logging

- Rework class to log auto-assignment attempts.

- Add logging to auto-assigner.

- Add specs and rework some constants to follow app guidelines.

---------

Co-authored-by: SanthiParakal133 <132940479+SanthiParakal133@users.noreply.github.com>
Co-authored-by: youfoundmanesh <129548081+youfoundmanesh@users.noreply.github.com>
Co-authored-by: Kevma50287 <104021955+Kevma50287@users.noreply.github.com>
---
 app/models/concerns/auto_assignable.rb        |  10 +-
 app/models/correspondence.rb                  |   4 +
 app/models/package_document_type.rb           |   4 +-
 app/services/auto_assignable_user_finder.rb   |   3 +-
 .../correspondence_auto_assign_logger.rb      | 130 ++++++++++---
 app/services/correspondence_auto_assigner.rb  |  14 +-
 .../CORRESPONDENCE_AUTO_ASSIGNMENT.json       |   8 +
 client/constants/PACKAGE_DOCUMENT_TYPES.json  |   3 +
 spec/factories/correspondence.rb              |   4 +
 spec/factories/package_document_type.rb       |   5 +
 .../correspondence_auto_assign_logger_spec.rb | 181 +++++++++++++++---
 11 files changed, 295 insertions(+), 71 deletions(-)
 create mode 100644 client/constants/CORRESPONDENCE_AUTO_ASSIGNMENT.json
 create mode 100644 client/constants/PACKAGE_DOCUMENT_TYPES.json

diff --git a/app/models/concerns/auto_assignable.rb b/app/models/concerns/auto_assignable.rb
index ec984a58ddd..0f2edea188c 100644
--- a/app/models/concerns/auto_assignable.rb
+++ b/app/models/concerns/auto_assignable.rb
@@ -4,14 +4,10 @@ module AutoAssignable
   extend ActiveSupport::Concern
   include ActiveModel::Validations
 
-  STATUS_STARTED = "started"
-  STATUS_COMPLETED = "completed"
-  STATUS_ERROR = "error"
-
   VALID_STATUSES = [
-    STATUS_STARTED,
-    STATUS_COMPLETED,
-    STATUS_ERROR
+    Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.started,
+    Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.completed,
+    Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.error
   ]
 
   included do
diff --git a/app/models/correspondence.rb b/app/models/correspondence.rb
index bda788e5faf..383f6a9310f 100644
--- a/app/models/correspondence.rb
+++ b/app/models/correspondence.rb
@@ -38,6 +38,10 @@ def tasks
     Task.where(appeal_id: id, appeal_type: type)
   end
 
+  def review_package_tasks
+    Task.where(appeal_id: id, appeal_type: type, type: ReviewPackageTask.name)
+  end
+
   def root_task
     Task.find_by(appeal_id: id, appeal_type: type, type: CorrespondenceRootTask.name)
   end
diff --git a/app/models/package_document_type.rb b/app/models/package_document_type.rb
index ad8b5a892ef..d36db450bf7 100644
--- a/app/models/package_document_type.rb
+++ b/app/models/package_document_type.rb
@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
 class PackageDocumentType < ApplicationRecord
-  NOD_NAME = "10182"
-
   has_many :correspondences
 
   def self.nod
-    find_by(name: NOD_NAME)
+    find_by(name: Constants.PACKAGE_DOCUMENT_TYPES.NOD)
   end
 end
diff --git a/app/services/auto_assignable_user_finder.rb b/app/services/auto_assignable_user_finder.rb
index 98fa7fbecd7..5988531e937 100644
--- a/app/services/auto_assignable_user_finder.rb
+++ b/app/services/auto_assignable_user_finder.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class AutoAssignableUserFinder
-  MAX_ASSIGNED_TASKS = 60
-
   # TODO: APPEALS-38551: Switch to working directly with DB records.
   # Correspondence auto-assignment can be triggered via multiple methods,
   # so a local cache of this data can easily become invalid. Thus, we need
@@ -66,6 +64,7 @@ def auto_assign_nod
 =end
   def assignable_users
     return @assignable_users if @assignable_users.present?
+    max_tasks = Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.max_assigned_tasks
 
     @assignable_users = []
     # TODO: APPEALS-38551: Filter such that only users with auto_assign == true are in this result set
diff --git a/app/services/correspondence_auto_assign_logger.rb b/app/services/correspondence_auto_assign_logger.rb
index 2468250466a..a22b3f93d2a 100644
--- a/app/services/correspondence_auto_assign_logger.rb
+++ b/app/services/correspondence_auto_assign_logger.rb
@@ -1,53 +1,125 @@
 # frozen_string_literal: true
 
 class CorrespondenceAutoAssignLogger
-  attr_reader :total_attempts, :failed_attempts_count, :successful_assignments,
-              :failed_assignments, :batch_assignment, :current_assignment
-
   def initialize(current_user)
-    @total_attempts = 0
-    @failed_attempts_count = 0
-    @failed_assignments = []
-    @successful_assignments = []
     @current_user = current_user
   end
 
-  def begin_logging
-    create_batch_assignment
+  def begin
+    @batch = BatchAutoAssignmentAttempt.create!(
+      user: @current_user,
+      started_at: Time.current,
+      status: Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.started,
+      num_nod_packages_assigned: 0,
+      num_nod_packages_unassigned: 0,
+      num_packages_assigned: 0,
+      num_packages_unassigned: 0
+    )
   end
 
-  def end_logging(status)
-    Rails.logger.info("#{@failed_attempts_count}/#{@total_attempts} failed")
+  def end
+    @batch.assign_attributes(
+      status: Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.completed,
+      completed_at: Time.current
+    )
 
-    # Batch assignment update! method here with status
+    save_run_statistics
   end
 
-  def log_single_attempt(user_id:, correspondence_id:)
-    @total_attempts += 1
-    create_single_assignment(user_id: user_id, correspondence_id: correspondence_id)
-    # Assign individual attempt here to @current_assignment
+  def error(msg:)
+    @batch.assign_attributes(
+      status: Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.error,
+      error_info: { message: msg },
+      errored_at: Time.current
+    )
+
+    save_run_statistics
   end
 
-  def record_failure
-    @failed_attempts_count += 1
-    @failed_assignments.push(@current_assignment)
-    @current_assignment = nil
+  def assigned(task:, started_at:, assigned_to:)
+    correspondence = task.correspondence
+
+    attempt = individual_auto_assignment_attempt
+    attempt.assign_attributes(
+      correspondence: correspondence,
+      completed_at: Time.current,
+      nod: correspondence.nod?,
+      status: Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.completed,
+      started_at: started_at
+    )
+
+    if correspondence.nod?
+      @batch.num_nod_packages_assigned += 1
+    else
+      @batch.num_packages_assigned += 1
+    end
+
+    save_attempt_statistics(
+      attempt: attempt,
+      task: task,
+      result: "Correspondence #{correspondence.id} assigned to User ID #{assigned_to.id}"
+    )
   end
 
-  def record_success
-    @successful_assignments.push(@current_assignment)
-    @current_assignment = nil
+  def no_eligible_assignees(task:, started_at:)
+    correspondence = task.correspondence
+
+    attempt = individual_auto_assignment_attempt
+    attempt.assign_attributes(
+      correspondence: correspondence,
+      errored_at: Time.current,
+      nod: correspondence.nod?,
+      status: Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.error,
+      started_at: started_at
+    )
+
+    if correspondence.nod?
+      @batch.num_nod_packages_unassigned += 1
+    else
+      @batch.num_packages_unassigned += 1
+    end
+
+    save_attempt_statistics(
+      attempt: attempt,
+      task: task,
+      result: "No eligible assignees available"
+    )
   end
 
   private
 
-  def create_single_assignment(user_id:, correspondence_id:)
-    # Create individual assignment attempt here using correspondence_id, user_id:, and @batch_assignment
-    Rails.logger.info("IndividualAutoAssignmentAttempt created")
+  def individual_auto_assignment_attempt
+    IndividualAutoAssignmentAttempt.new(
+      batch_auto_assignment_attempt: @batch,
+      user: @current_user
+    )
+  end
+
+  def save_run_statistics
+    stats = {
+      seconds_elapsed: seconds_elapsed(record: @batch, status: @batch.status)
+    }
+
+    @batch.statistics = stats
+    @batch.save!
+  end
+
+  def save_attempt_statistics(attempt:, task:, result:)
+    stats = {
+      result: result,
+      seconds_elapsed: seconds_elapsed(record: attempt, status: attempt.status),
+      review_package_task_id: task.id
+    }
+
+    attempt.statistics = stats
+    attempt.save!
   end
 
-  def create_batch_assignment
-    # Create @batch_assignment here using @current_user
-    Rails.logger.info("LOGGING started for BatchAutoAssignmentAttempt")
+  def seconds_elapsed(record:, status:)
+    if status == Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.completed
+      record.completed_at - record.started_at
+    else
+      record.errored_at - record.started_at
+    end
   end
 end
diff --git a/app/services/correspondence_auto_assigner.rb b/app/services/correspondence_auto_assigner.rb
index 3096e2e0bea..eb02b228a26 100644
--- a/app/services/correspondence_auto_assigner.rb
+++ b/app/services/correspondence_auto_assigner.rb
@@ -6,28 +6,40 @@ def initialize(current_user_id:)
   end
 
   def perform
+    logger.begin
+
     if !unassigned_review_package_tasks.count.positive?
+      logger.error(msg: "No review package tasks to assign")
       return
     end
 
     if !assignable_user_finder.assignable_users_exist?
+      logger.error(msg: "No auto-assignable users available")
       return
     end
 
     unassigned_review_package_tasks.each do |task|
       assign(task)
     end
+
+    logger.end
   end
 
   private
 
   def assign(task)
-    assignee = assignable_user_finder.get_first_assignable_user(correspondence: task.correspondence)
+    started_at = Time.current
+    correspondence = task.correspondence
+
+    assignee = assignable_user_finder.get_first_assignable_user(correspondence: correspondence)
+
     if assignee.blank?
+      logger.no_eligible_assignees(task: task, started_at: started_at)
       return
     end
 
     assign_task_to_user(task, assignee)
+    logger.assigned(task: task, started_at: started_at, assigned_to: assignee)
   end
 
   def assign_task_to_user(task, user)
diff --git a/client/constants/CORRESPONDENCE_AUTO_ASSIGNMENT.json b/client/constants/CORRESPONDENCE_AUTO_ASSIGNMENT.json
new file mode 100644
index 00000000000..0c3ec1695da
--- /dev/null
+++ b/client/constants/CORRESPONDENCE_AUTO_ASSIGNMENT.json
@@ -0,0 +1,8 @@
+{
+  "max_assigned_tasks": 60,
+  "statuses": {
+    "started": "started",
+    "completed": "completed",
+    "error": "error"
+  }
+}
diff --git a/client/constants/PACKAGE_DOCUMENT_TYPES.json b/client/constants/PACKAGE_DOCUMENT_TYPES.json
new file mode 100644
index 00000000000..911d0678ee4
--- /dev/null
+++ b/client/constants/PACKAGE_DOCUMENT_TYPES.json
@@ -0,0 +1,3 @@
+{
+  "NOD": "10182"
+}
diff --git a/spec/factories/correspondence.rb b/spec/factories/correspondence.rb
index 2e75df50812..d04e649d56e 100644
--- a/spec/factories/correspondence.rb
+++ b/spec/factories/correspondence.rb
@@ -15,6 +15,10 @@
     veteran
     package_document_type
 
+    trait :nod do
+      package_document_type { create(:package_document_type, :nod) }
+    end
+
     trait :with_single_doc do
       after(:create) do |correspondence|
         create(:correspondence_document, correspondence: correspondence)
diff --git a/spec/factories/package_document_type.rb b/spec/factories/package_document_type.rb
index 7fd623155d1..467fa5bec07 100644
--- a/spec/factories/package_document_type.rb
+++ b/spec/factories/package_document_type.rb
@@ -2,5 +2,10 @@
 
 FactoryBot.define do
   factory :package_document_type do
+    name { Faker::Computer.platform }
+
+    trait :nod do
+      name { Constants.PACKAGE_DOCUMENT_TYPES.NOD }
+    end
   end
 end
diff --git a/spec/services/correspondence_auto_assign_logger_spec.rb b/spec/services/correspondence_auto_assign_logger_spec.rb
index 3acc7edc638..1b5fb8c56be 100644
--- a/spec/services/correspondence_auto_assign_logger_spec.rb
+++ b/spec/services/correspondence_auto_assign_logger_spec.rb
@@ -1,55 +1,178 @@
 # frozen_string_literal: true
 
 describe CorrespondenceAutoAssignLogger do
-  subject(:instance) { described_class.new(current_user) }
-  let(:veteran) { create(:veteran) }
+  subject(:described) { described_class.new(current_user) }
+
   let(:current_user) { create(:user) }
+  let(:assignee) { create(:user) }
 
-  let!(:correspondence) { create(:correspondence, :with_single_doc, veteran_id: veteran.id, uuid: SecureRandom.uuid) }
+  let!(:correspondence) { create(:correspondence) }
+  let(:task) { correspondence.review_package_tasks.first }
 
-  describe "#begin_logging" do
-    it "creates a BatchAutoAssignmentAttempt" do
+  describe "#begin" do
+    it "creates a BatchAutoAssignmentAttempt record" do
       expect do
-        instance.begin_logging
-      end.to change(BatchAutoAssignmentAttempt, :count)
+        described.begin
+      end.to change(BatchAutoAssignmentAttempt, :count).by(1)
+
+      batch = BatchAutoAssignmentAttempt.first
+      expect(batch.user).to eq(current_user)
+      expect(batch.status).to eq("started")
     end
   end
 
-  describe "#end_logging" do
-    it "updates a BatchAutoAssignmentAttempt with status" do
-      instance.begin_logging
+  describe "#end" do
+    it "completes the BatchAutoAssignmentAttempt record" do
       expect do
-        instance.end_logging(BatchAutoAssignmentAttempt::STATUS_STARTED)
-      end.to change(instance.batch_assignment.status).to(BatchAutoAssignmentAttempt::STATUS_STARTED)
+        described.begin
+        described.end
+      end.to change(BatchAutoAssignmentAttempt, :count).by(1)
+
+      batch = BatchAutoAssignmentAttempt.last
+      expect(batch.status).to eq("completed")
+      expect(batch.statistics["seconds_elapsed"]).to be > 0
     end
   end
 
-  describe "#log_single_attempt" do
-    it "creates an IndividualAutoAssignmentAttempt" do
+  describe "#error" do
+    it "completes the BatchAutoAssignmentAttempt record with an error state" do
       expect do
-        instance.log_single_attempt(user_id: current_user.id, correspondence_id: correspondence.id)
-      end.to change(IndividualAutoAssignmentAttempt, :count)
+        described.begin
+        described.error(msg: "Test error")
+      end.to change(BatchAutoAssignmentAttempt, :count).by(1)
+
+      batch = BatchAutoAssignmentAttempt.last
+      expect(batch.status).to eq("error")
+      expect(batch.error_info["message"]).to eq("Test error")
     end
   end
 
-  describe "#record_failure" do
-    it "increase failed attempts count" do
+  describe "#assigned" do
+    let(:assignee) { create(:user) }
+
+    before do
+      described.begin
+    end
+
+    it "creates an IndividualAutoAssignmentAttempt record with the results of the assignment" do
       expect do
-        instance.log_single_attempt(user_id: current_user.id, correspondence_id: correspondence.id)
-        instance.record_failure
-      end.to change { instance.failed_attempts_count }.by(1)
-        .and change { instance.failed_assignments.length }.by(1)
-        .and expect { instance.current_assignment }.to(nil)
+        described.assigned(task: task, started_at: Time.current, assigned_to: assignee)
+      end.to change(IndividualAutoAssignmentAttempt, :count).by(1)
+
+      result = IndividualAutoAssignmentAttempt.last
+      expect(result.status).to eq("completed")
+      expect(result.statistics["review_package_task_id"]).to eq(task.id)
     end
   end
 
-  describe "#record_success" do
-    it "increase failed attempts count" do
+  describe "#no_eligible_assignees" do
+    before do
+      described.begin
+    end
+
+    it "creates an IndividualAutoAssignmentAttempt record indicating no assignees" do
       expect do
-        instance.log_single_attempt(user_id: current_user.id, correspondence_id: correspondence.id)
-        instance.record_success
-      end.to change { instance.successful_assignments }.by(1)
-        .and change { instance.current_assignment }.to(nil)
+        described.no_eligible_assignees(task: task, started_at: Time.current)
+      end.to change(IndividualAutoAssignmentAttempt, :count).by(1)
+
+      result = IndividualAutoAssignmentAttempt.last
+      expect(result.status).to eq("error")
+      expect(result.statistics["review_package_task_id"]).to eq(task.id)
+      expect(result.statistics["result"]).to eq("No eligible assignees available")
+    end
+  end
+
+  describe "tracking assignments" do
+    let!(:nod_correspondence) { create(:correspondence, :nod) }
+    let(:nod_task) { nod_correspondence.review_package_tasks.first }
+
+    before do
+      described.begin
+    end
+
+    context "when there are eligible assignees" do
+      it "increments num_packages_assigned" do
+        described.assigned(task: task, started_at: Time.current, assigned_to: assignee)
+        described.end
+
+        batch = BatchAutoAssignmentAttempt.last
+        expect(batch.num_packages_assigned).to eq(1)
+        expect(batch.num_packages_unassigned).to eq(0)
+        expect(batch.num_nod_packages_assigned).to eq(0)
+        expect(batch.num_nod_packages_unassigned).to eq(0)
+      end
+
+      context "with NOD correspondence" do
+        it "increments num_nod_packages_assigned" do
+          described.assigned(task: nod_task, started_at: Time.current, assigned_to: assignee)
+          described.end
+
+          batch = BatchAutoAssignmentAttempt.last
+          expect(batch.num_packages_assigned).to eq(0)
+          expect(batch.num_packages_unassigned).to eq(0)
+          expect(batch.num_nod_packages_assigned).to eq(1)
+          expect(batch.num_nod_packages_unassigned).to eq(0)
+        end
+      end
+    end
+
+    context "when there are NO eligible assignees" do
+      it "increments num_packages_unassigned" do
+        described.no_eligible_assignees(task: task, started_at: Time.current)
+        described.end
+
+        batch = BatchAutoAssignmentAttempt.last
+        expect(batch.num_packages_assigned).to eq(0)
+        expect(batch.num_packages_unassigned).to eq(1)
+        expect(batch.num_nod_packages_assigned).to eq(0)
+        expect(batch.num_nod_packages_unassigned).to eq(0)
+      end
+
+      context "with NOD correspondence" do
+        it "increments num_nod_packages_unassigned" do
+          described.no_eligible_assignees(task: nod_task, started_at: Time.current)
+          described.end
+
+          batch = BatchAutoAssignmentAttempt.last
+          expect(batch.num_packages_assigned).to eq(0)
+          expect(batch.num_packages_unassigned).to eq(0)
+          expect(batch.num_nod_packages_assigned).to eq(0)
+          expect(batch.num_nod_packages_unassigned).to eq(1)
+        end
+      end
+    end
+
+    context "multiple assignments" do
+      it "correctly increments the number of assigned packages" do
+        num_packages_assigned = rand(1..10)
+        num_packages_unassigned = rand(1..10)
+        num_nod_packages_assigned = rand(1..10)
+        num_nod_packages_unassigned = rand(1..10)
+
+        num_packages_assigned.times do
+          described.assigned(task: task, started_at: Time.current, assigned_to: assignee)
+        end
+
+        num_packages_unassigned.times do
+          described.no_eligible_assignees(task: task, started_at: Time.current)
+        end
+
+        num_nod_packages_assigned.times do
+          described.assigned(task: nod_task, started_at: Time.current, assigned_to: assignee)
+        end
+
+        num_nod_packages_unassigned.times do
+          described.no_eligible_assignees(task: nod_task, started_at: Time.current)
+        end
+
+        described.end
+
+        batch = BatchAutoAssignmentAttempt.last
+        expect(batch.num_packages_assigned).to eq(num_packages_assigned)
+        expect(batch.num_packages_unassigned).to eq(num_packages_unassigned)
+        expect(batch.num_nod_packages_assigned).to eq(num_nod_packages_assigned)
+        expect(batch.num_nod_packages_unassigned).to eq(num_nod_packages_unassigned)
+      end
     end
   end
 end

From ec537606674ced9f1ba6f4b3da5ed3e164a4c1ba Mon Sep 17 00:00:00 2001
From: Alex Smith <alex.smith.99@thunderyard.com>
Date: Thu, 1 Feb 2024 13:54:33 -0700
Subject: [PATCH 086/237] Fix Missing Param Bug (#20683)

---
 app/services/auto_assignable_user_finder.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/services/auto_assignable_user_finder.rb b/app/services/auto_assignable_user_finder.rb
index 5988531e937..4f68357632b 100644
--- a/app/services/auto_assignable_user_finder.rb
+++ b/app/services/auto_assignable_user_finder.rb
@@ -32,7 +32,7 @@ def run_auto_assign_algorithm(correspondence, vbms_id)
     nil
   end
 
-  def auto_assign_nod
+  def auto_assign_nod(vbms_id)
     assignable_users.each do |user|
       next if !user.nod?
 
@@ -64,7 +64,9 @@ def auto_assign_nod
 =end
   def assignable_users
     return @assignable_users if @assignable_users.present?
-    max_tasks = Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.max_assigned_tasks
+
+    # TODO: APPEALS-38551: Use in query
+    # max_tasks = Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.max_assigned_tasks
 
     @assignable_users = []
     # TODO: APPEALS-38551: Filter such that only users with auto_assign == true are in this result set

From 11f3784c5ab0f5faaf721209119414a5bb573ea4 Mon Sep 17 00:00:00 2001
From: Kevma50287 <104021955+Kevma50287@users.noreply.github.com>
Date: Mon, 5 Feb 2024 15:29:14 -0500
Subject: [PATCH 087/237] Added correspondence view for inbound ops team
 (#20709)

---
 client/app/queue/components/QueueOrganizationDropdown.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/app/queue/components/QueueOrganizationDropdown.jsx b/client/app/queue/components/QueueOrganizationDropdown.jsx
index 13b89541774..2b7140f765c 100644
--- a/client/app/queue/components/QueueOrganizationDropdown.jsx
+++ b/client/app/queue/components/QueueOrganizationDropdown.jsx
@@ -36,7 +36,7 @@ export default class QueueOrganizationDropdown extends React.Component {
 
     let items = [queueItem, ...organizationItems];
 
-    if (organizations[0].name === 'Mail' || organizations[0].name === 'Mail Team Supervisor') {
+    if (organizations[0].name === 'Mail' || organizations[0].name === 'Inbound Ops Team') {
       const orgHref = '/queue/correspondence';
 
       correspondenceItems = {

From a6dbfdc805aee8535bc1575b358f7729287c80d0 Mon Sep 17 00:00:00 2001
From: Kevma50287 <104021955+Kevma50287@users.noreply.github.com>
Date: Wed, 7 Feb 2024 12:08:04 -0500
Subject: [PATCH 088/237] Moved auto assign button into its own component -
 moved to organization queue (#20743)

---
 client/app/queue/QueueTableBuilder.jsx        | 14 +++++++++-
 .../correspondence/CorrespondenceCases.jsx    | 17 ------------
 .../component/BatchAutoAssignButton.jsx       | 27 +++++++++++++++++++
 3 files changed, 40 insertions(+), 18 deletions(-)
 create mode 100644 client/app/queue/correspondence/component/BatchAutoAssignButton.jsx

diff --git a/client/app/queue/QueueTableBuilder.jsx b/client/app/queue/QueueTableBuilder.jsx
index 9d421e23f0f..0ab2ca12278 100644
--- a/client/app/queue/QueueTableBuilder.jsx
+++ b/client/app/queue/QueueTableBuilder.jsx
@@ -42,6 +42,7 @@ import COPY from '../../COPY';
 import QUEUE_CONFIG from '../../constants/QUEUE_CONFIG';
 import { css } from 'glamor';
 import { isActiveOrganizationVHA } from '../queue/selectors';
+import BatchAutoAssignButton from './correspondence/component/BatchAutoAssignButton';
 
 const rootStyles = css({
   '.usa-alert + &': {
@@ -210,6 +211,9 @@ const QueueTableBuilder = (props) => {
       label: sprintf(tabConfig.label, totalTaskCount),
       page: (
         <React.Fragment>
+          {props.userCanBulkAssign && tabConfig.allow_bulk_assign && props.activeOrganization.type === 'InboundOpsTeam' && (
+            <BatchAutoAssignButton />
+          )}
           <p className="cf-margin-top-0">
             {noCasesMessage || tabConfig.description}
           </p>
@@ -265,6 +269,7 @@ const mapStateToProps = (state) => {
     organizations: state.ui.organizations,
     isVhaOrg: isActiveOrganizationVHA(state),
     userCanBulkAssign: state.ui.activeOrganization.userCanBulkAssign,
+    activeOrganization: state.ui.activeOrganization
   };
 };
 
@@ -278,7 +283,14 @@ QueueTableBuilder.propTypes = {
   requireDasRecord: PropTypes.bool,
   userCanBulkAssign: PropTypes.bool,
   isVhaOrg: PropTypes.bool,
-  featureToggles: PropTypes.object
+  featureToggles: PropTypes.object,
+  activeOrganization: PropTypes.shape({
+    id: PropTypes.number,
+    name: PropTypes.string,
+    isVso: PropTypes.bool,
+    userCanBulkAssign: PropTypes.bool,
+    type: PropTypes.string
+  })
 };
 
 export default connect(mapStateToProps)(QueueTableBuilder);
diff --git a/client/app/queue/correspondence/CorrespondenceCases.jsx b/client/app/queue/correspondence/CorrespondenceCases.jsx
index 287e808de9e..db7e55a486e 100644
--- a/client/app/queue/correspondence/CorrespondenceCases.jsx
+++ b/client/app/queue/correspondence/CorrespondenceCases.jsx
@@ -12,7 +12,6 @@ import { css } from 'glamor';
 import CorrespondenceTable from './CorrespondenceTable';
 import QueueOrganizationDropdown from '../components/QueueOrganizationDropdown';
 import Alert from '../../components/Alert';
-import Button from '../../components/Button';
 
 export const CorrespondenceCases = (props) => {
   const {
@@ -46,14 +45,6 @@ export const CorrespondenceCases = (props) => {
         veteranInformation.veteran_name.last_name.trim()}`;
   }
 
-  const handleAutoAssign = async () => {
-    try {
-      await ApiUtil.get('/queue/correspondence/auto_assign_correspondences');
-    } catch (error) {
-      console.error(error);
-    }
-  };
-
   return (
     <AppSegment filledBackground>
       {(Object.keys(veteranInformation).length > 0) &&
@@ -66,14 +57,6 @@ export const CorrespondenceCases = (props) => {
       }
       <h1 {...css({ display: 'inline-block' })}>{COPY.CASE_LIST_TABLE_QUEUE_DROPDOWN_CORRESPONDENCE_CASES}</h1>
       <QueueOrganizationDropdown organizations={organizations} />
-      <div>
-        <Button
-          onClick={handleAutoAssign}
-          ariaLabel="Auto assign correspnodences"
-        >
-          {COPY.AUTO_ASSIGN_CORRESPONDENCES_BUTTON}
-        </Button>
-      </div>
       {vetCorrespondences &&
         <CorrespondenceTable
           vetCorrespondences={vetCorrespondences}
diff --git a/client/app/queue/correspondence/component/BatchAutoAssignButton.jsx b/client/app/queue/correspondence/component/BatchAutoAssignButton.jsx
new file mode 100644
index 00000000000..51ca5906cef
--- /dev/null
+++ b/client/app/queue/correspondence/component/BatchAutoAssignButton.jsx
@@ -0,0 +1,27 @@
+import React from 'react';
+import Button from '../../../components/Button';
+import ApiUtil from '../../../util/ApiUtil';
+import COPY from '../../../../COPY';
+
+const BatchAutoAssignButton = () => {
+  const handleAutoAssign = async () => {
+    try {
+      await ApiUtil.get('/queue/correspondence/auto_assign_correspondences');
+    } catch (error) {
+      console.error(error);
+    }
+  };
+
+  return (
+    <div>
+      <Button
+        onClick={handleAutoAssign}
+        ariaLabel="Auto assign correspnodences"
+      >
+        {COPY.AUTO_ASSIGN_CORRESPONDENCES_BUTTON}
+      </Button>
+    </div>
+  );
+};
+
+export default BatchAutoAssignButton;

From ad21c02fe210cd23bf7c33e8fe99b41430bf30e5 Mon Sep 17 00:00:00 2001
From: SanthiParakal133 <132940479+SanthiParakal133@users.noreply.github.com>
Date: Mon, 12 Feb 2024 11:04:12 -0500
Subject: [PATCH 089/237] Create Inbound Ops users (#20704)

* Create Inbound Ops users

* create Mail Team and Mail Team super user

* Update name

* update sensitivity_level for users and veterans

* Revert "update sensitivity_level for users and veterans"

This reverts commit 877e94152b96391bc732deae706b34adb6e72bc5.

* small fix
---
 db/seeds/auto_assign.rb | 131 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 121 insertions(+), 10 deletions(-)

diff --git a/db/seeds/auto_assign.rb b/db/seeds/auto_assign.rb
index 4d7b9b3edc2..7e44b3e53f4 100644
--- a/db/seeds/auto_assign.rb
+++ b/db/seeds/auto_assign.rb
@@ -4,7 +4,12 @@ module Seeds
   class AutoAssign < Base
     def seed!
       create_auto_assign_permissions
-      create_auto_assign_users
+      create_inbound_ops_team_nod_user
+      create_inbound_ops_team_auto_assign_user
+      create_inbound_ops_team_user_with_no_permissions
+      create_inbound_ops_team_supervisor
+      create_mail_team_user
+      create_mail_team_superuser
     end
 
     def create_auto_assign_permissions
@@ -16,20 +21,126 @@ def create_auto_assign_permissions
       end
     end
 
-    def create_auto_assign_users
-      user = User.find_or_create_by(css_id: "INBOUND_OPS_TEAM_MAIL_INTAKE_USER_QB") do |u|
-        u.station_id = 101
-        u.full_name = "Tom Brady"
-        u.roles = ["Mail Intake"]
+    def create_inbound_ops_team_nod_user
+      users_info = [
+        { css_id: "INBOUND_OPS_TEAM_MAIL_INTAKE_USER_NOD1", full_name: "Alexandr Johnson" },
+        { css_id: "INBOUND_OPS_TEAM_MAIL_INTAKE_USER_NOD2", full_name: "Sopia Williams" },
+        { css_id: "INBOUND_OPS_TEAM_MAIL_INTAKE_USER_NOD3", full_name: "Etan Davis" },
+        { css_id: "INBOUND_OPS_TEAM_MAIL_INTAKE_USER_NOD4", full_name: "Olia Smith" }
+      ]
+      users_info.map do |user_info|
+        u = User.find_or_create_by!(
+          station_id: 101,
+          css_id: user_info[:css_id],
+          full_name: user_info[:full_name],
+          roles: ["Mail Intake"]
+        )
+        org_user = OrganizationsUser.find_or_create_by!(organization: InboundOpsTeam.singleton, user: u)
+        receive_nod_mail = OrganizationPermission.find_by(permission: "receive_nod_mail")
+        OrganizationUserPermission.find_or_create_by!(
+          organization_permission: receive_nod_mail,
+          organizations_user: org_user
+        ) do |op|
+          op.permitted = true
+        end
       end
-      org_user = OrganizationsUser.find_or_create_by!(organization: InboundOpsTeam.singleton, user: user)
+    end
 
-      OrganizationPermission.all.each do |permission|
-        OrganizationUserPermission
-          .find_or_create_by(organization_permission: permission, organizations_user: org_user) do |op|
+    def create_inbound_ops_team_auto_assign_user
+      users_info = [
+        { css_id: "INBOUND_OPS_TEAM_MAIL_INTAKE_USER_AUTO_ASSIGN_A1", full_name: "Ember Sky" },
+        { css_id: "INBOUND_OPS_TEAM_MAIL_INTAKE_USER_AUTO_ASSIGN_A2", full_name: "Aspen Ridge" },
+        { css_id: "INBOUND_OPS_TEAM_MAIL_INTAKE_USER_AUTO_ASSIGN_A3", full_name: "Clover Haven" },
+        { css_id: "INBOUND_OPS_TEAM_MAIL_INTAKE_USER_AUTO_ASSIGN_A4", full_name: "Blaze Hill" }
+      ]
+      users_info.map do |user_info|
+        u = User.find_or_create_by!(
+          station_id: 101,
+          css_id: user_info[:css_id],
+          full_name: user_info[:full_name],
+          roles: ["Mail Intake"]
+        )
+        org_user = OrganizationsUser.find_or_create_by!(organization: InboundOpsTeam.singleton, user: u)
+        auto_assign = OrganizationPermission.find_by(permission: "auto_assign")
+        OrganizationUserPermission.find_or_create_by!(
+          organization_permission: auto_assign,
+          organizations_user: org_user
+        ) do |op|
           op.permitted = true
         end
       end
     end
+
+    def create_inbound_ops_team_user_with_no_permissions
+      users_info = [
+        { css_id: "INBOUND_OPS_TEAM_MAIL_INTAKE_USER_NP1", full_name: "Noah Taylor" },
+        { css_id: "INBOUND_OPS_TEAM_MAIL_INTAKE_USER_NP2", full_name: "Emma Brown" },
+        { css_id: "INBOUND_OPS_TEAM_MAIL_INTAKE_USER_NP3", full_name: "Benjamin Anderson" },
+        { css_id: "INBOUND_OPS_TEAM_MAIL_INTAKE_USER_NP4", full_name: "Ava Martinez" },
+        { css_id: "INBOUND_OPS_TEAM_MAIL_INTAKE_USER_NP5", full_name: "Liam Miller" }
+      ]
+      users_info.map do |user_info|
+        u = User.find_or_create_by!(
+          station_id: 101,
+          css_id: user_info[:css_id],
+          full_name: user_info[:full_name],
+          roles: ["Mail Intake"]
+        )
+        OrganizationsUser.find_or_create_by!(organization: InboundOpsTeam.singleton, user: u)
+      end
+    end
+
+    def create_inbound_ops_team_supervisor
+      users_info = [
+        { css_id: "INBOUND_OPS_TEAM_ADMIN_USER_S1", full_name: "Caleb Mitchell" },
+        { css_id: "INBOUND_OPS_TEAM_ADMIN_USER_S2", full_name: "Scarlett Reed" },
+        { css_id: "INBOUND_OPS_TEAM_ADMIN_USER_S3", full_name: "Elijah Turner" }
+      ]
+      users_info.map do |user_info|
+        u = User.find_or_create_by!(
+          station_id: 101,
+          css_id: user_info[:css_id],
+          full_name: user_info[:full_name],
+          roles: ["Mail Intake"]
+        )
+        InboundOpsTeam.singleton.add_user(u)
+        OrganizationsUser.make_user_admin(u, InboundOpsTeam.singleton)
+      end
+    end
+
+    def create_mail_team_user
+      users_info = [
+        { css_id: "MAIL_TEAM_USER_U1", full_name: "Cedar Rain" },
+        { css_id: "MAIL_TEAM_USER_U2", full_name: "Ivy Stone" },
+        { css_id: "MAIL_TEAM_USER_U3", full_name: "Ocean Breeze" }
+      ]
+      users_info.map do |user_info|
+        u = User.find_or_create_by!(
+          station_id: 101,
+          css_id: user_info[:css_id],
+          full_name: user_info[:full_name],
+          roles: ["Mail Intake"]
+        )
+        MailTeam.singleton.add_user(u)
+      end
+    end
+
+    def create_mail_team_superuser
+      users_info = [
+        { css_id: "MAIL_TEAM_ADMIN1", full_name: "Willow Green" },
+        { css_id: "MAIL_TEAM_ADMIN2", full_name: "Jasper Bloom" },
+        { css_id: "MAIL_TEAM_ADMIN3", full_name: "Luna Meadows" }
+      ]
+      users_info.map do |user_info|
+        u = User.find_or_create_by!(
+          station_id: 101,
+          css_id: user_info[:css_id],
+          full_name: user_info[:full_name],
+          roles: ["Mail Intake"]
+        )
+        MailTeam.singleton.add_user(u)
+        OrganizationsUser.make_user_admin(u, MailTeam.singleton)
+      end
+    end
   end
 end

From 90b032070b71639ee8c2595ec6209f9210a89d7c Mon Sep 17 00:00:00 2001
From: SanthiParakal133 <132940479+SanthiParakal133@users.noreply.github.com>
Date: Mon, 12 Feb 2024 11:05:01 -0500
Subject: [PATCH 090/237] update job method (#20787)

---
 app/jobs/auto_assign_correspondence_job.rb  | 6 +++---
 app/services/auto_assignable_user_finder.rb | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/jobs/auto_assign_correspondence_job.rb b/app/jobs/auto_assign_correspondence_job.rb
index 8f2afe11c62..88b867873e9 100644
--- a/app/jobs/auto_assign_correspondence_job.rb
+++ b/app/jobs/auto_assign_correspondence_job.rb
@@ -4,14 +4,14 @@ class AutoAssignCorrespondenceJob < CaseflowJob
   queue_with_priority :low_priority
 
   def perform(current_user_id:)
-    correspondence_auto_assigner.do_auto_assignment(current_user_id: current_user_id)
+    correspondence_auto_assigner(current_user_id).perform
   rescue StandardError => error
     log_error(error)
   end
 
   private
 
-  def correspondence_auto_assigner
-    @correspondence_auto_assigner ||= CorrespondenceAutoAssigner.new
+  def correspondence_auto_assigner(current_user_id)
+    @correspondence_auto_assigner ||= CorrespondenceAutoAssigner.new(current_user_id: current_user_id)
   end
 end
diff --git a/app/services/auto_assignable_user_finder.rb b/app/services/auto_assignable_user_finder.rb
index 4f68357632b..90ceec3e8ac 100644
--- a/app/services/auto_assignable_user_finder.rb
+++ b/app/services/auto_assignable_user_finder.rb
@@ -25,7 +25,7 @@ def run_auto_assign_algorithm(correspondence, vbms_id)
     assignable_users.each do |user|
       if sensitivity_checker.user_can_access?(vbms_id: vbms_id, user_to_check: user)
         # TODO: APPEALS-38551: Find not needed here
-        return User.find!(user.id)
+        return User.find(user.id)
       end
     end
 
@@ -38,7 +38,7 @@ def auto_assign_nod(vbms_id)
 
       if sensitivity_checker.user_can_access?(vbms_id: vbms_id, user_to_check: user)
         # TODO: APPEALS-38551: Find not needed here
-        return User.find!(user.id)
+        return User.find(user.id)
       end
     end
 

From 303d2f7ba22c0acf0a60c29d4136ec227d961072 Mon Sep 17 00:00:00 2001
From: Alex Smith <alex.smith.99@thunderyard.com>
Date: Mon, 12 Feb 2024 14:28:17 -0700
Subject: [PATCH 091/237] Create CreateCorrespondenceAutoAssignmentLevers
 (#20797)

* Create CreateCorrespondenceAutoAssignmentLevers

* Add Uniqueness Constraint
---
 .../correspondence_auto_assignment_lever.rb      |  5 +++++
 ...eate_correspondence_auto_assignment_levers.rb | 16 ++++++++++++++++
 db/schema.rb                                     | 12 +++++++++++-
 db/seeds/auto_assign.rb                          | 11 +++++++++++
 .../correspondence_auto_assignment_lever_spec.rb |  9 +++++++++
 spec/spec_helper.rb                              |  1 +
 6 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 app/models/correspondence_auto_assignment_lever.rb
 create mode 100644 db/migrate/20240212195552_create_correspondence_auto_assignment_levers.rb
 create mode 100644 spec/models/correspondence_auto_assignment_lever_spec.rb

diff --git a/app/models/correspondence_auto_assignment_lever.rb b/app/models/correspondence_auto_assignment_lever.rb
new file mode 100644
index 00000000000..89e2aace5c6
--- /dev/null
+++ b/app/models/correspondence_auto_assignment_lever.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class CorrespondenceAutoAssignmentLever < CaseflowRecord
+  has_paper_trail on: [:update, :destroy]
+end
diff --git a/db/migrate/20240212195552_create_correspondence_auto_assignment_levers.rb b/db/migrate/20240212195552_create_correspondence_auto_assignment_levers.rb
new file mode 100644
index 00000000000..bcf329a63e0
--- /dev/null
+++ b/db/migrate/20240212195552_create_correspondence_auto_assignment_levers.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class CreateCorrespondenceAutoAssignmentLevers < Caseflow::Migration
+  def change
+    create_table :correspondence_auto_assignment_levers do |t|
+      t.string :name, null: false
+      t.text :description, null: false
+      t.integer :value, null: false
+      t.boolean :enabled, null: false, default: false
+
+      t.timestamps
+    end
+
+    add_safe_index :correspondence_auto_assignment_levers, :name, unique: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 93154ccb80c..cc466179ec6 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2024_01_24_182959) do
+ActiveRecord::Schema.define(version: 2024_02_12_195552) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -610,6 +610,16 @@
     t.index ["updated_by_id"], name: "index_updated_by_id"
   end
 
+  create_table "correspondence_auto_assignment_levers", force: :cascade do |t|
+    t.datetime "created_at", null: false
+    t.text "description", null: false
+    t.boolean "enabled", default: false, null: false
+    t.string "name", null: false
+    t.datetime "updated_at", null: false
+    t.integer "value", null: false
+    t.index ["name"], name: "index_correspondence_auto_assignment_levers_on_name", unique: true
+  end
+
   create_table "correspondence_documents", force: :cascade do |t|
     t.bigint "correspondence_id"
     t.datetime "created_at", null: false, comment: "Date and Time of creation."
diff --git a/db/seeds/auto_assign.rb b/db/seeds/auto_assign.rb
index 7e44b3e53f4..4ea81f7e403 100644
--- a/db/seeds/auto_assign.rb
+++ b/db/seeds/auto_assign.rb
@@ -10,6 +10,7 @@ def seed!
       create_inbound_ops_team_supervisor
       create_mail_team_user
       create_mail_team_superuser
+      create_auto_assign_levers
     end
 
     def create_auto_assign_permissions
@@ -142,5 +143,15 @@ def create_mail_team_superuser
         OrganizationsUser.make_user_admin(u, MailTeam.singleton)
       end
     end
+
+    def create_auto_assign_levers
+      CorrespondenceAutoAssignmentLever.find_or_create_by(name: "capacity") do |l|
+        l.description = <<~EOS
+          Any Mail Team User or Mail Superuser with equal to or more than this amount will be excluded from Auto-assign
+        EOS
+        l.value = Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.max_assigned_tasks
+        l.enabled = true
+      end
+    end
   end
 end
diff --git a/spec/models/correspondence_auto_assignment_lever_spec.rb b/spec/models/correspondence_auto_assignment_lever_spec.rb
new file mode 100644
index 00000000000..692d1ddce8d
--- /dev/null
+++ b/spec/models/correspondence_auto_assignment_lever_spec.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+describe CorrespondenceAutoAssignmentLever do
+  with_versioning do
+    it "enables paper trail" do
+      is_expected.to be_versioned
+    end
+  end
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index b4007c966c3..1cafe2d5b2e 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -32,6 +32,7 @@
 
 require File.expand_path("../config/environment", __dir__)
 require "rspec/rails"
+require "paper_trail/frameworks/rspec"
 
 # This file was generated by the `rails generate rspec:install` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.

From 16c669127918b6ca2c323801ef900f96917aed98 Mon Sep 17 00:00:00 2001
From: Will Medders <93014155+wmedders21@users.noreply.github.com>
Date: Tue, 13 Feb 2024 13:58:25 -0600
Subject: [PATCH 092/237] Wmedders21/appeals 38925 (#20781)

* adding correspondence task default route

* adding intake and review package route overrides

* adding efolder ulpoad failed logic for routing

* adding efolder failed upload task depending on parent task

* fixing intake scoping

* adding task_url attribute to column serializer

* attempting a correspondence root task addition

* Moved constant file for access

* removing root task method, since all defaults to /under_construction

* replacing task urls from a newly created constants file

* code cleanup

* adding tests

* rubocop and linting errors

* rubocop fixes

* Serialize attributes regardless of values

* Make CorrespondenceTask an abstract class

* Make package action tasks inherit from CorrespondenceTask

* Update to not intatiate abstract CorrespondenceTasks

* Refactor queue correspondences seeds

* Fix broken pagination on Correspondence Cases team page

* Merge with feature 32900

* Randomize va date of receipt

* Remove expectation to find instance of CorrespondenceTask - an abstract class

* Remove expectation for abstract class to appear in task tree

* Merge in task url work

* Add ability to link veterans details to tasks or modals

* Route to under construction if closed

* Assign ReviewPackageTask before creating EfolderUploadFailedTask

* give ids and labels to column items

* Add CorrespondenceTaskHelpers module

* Test: correspondene queue task links spec

* Move url strings into constants file

* Fix extra space

---------

Co-authored-by: sulak-j <justin.sulak@va.gov>
---
 .../correspondence/reassign_package_task.rb   |   3 +
 .../tasks/correspondence_intake_task.rb       |   2 +-
 app/models/tasks/remove_package_task.rb       |   3 +
 app/models/tasks/review_package_task.rb       |   6 +-
 .../app/queue/components/TaskTableColumns.jsx |  47 ++++++-
 .../correspondence/CorrespondenceCases.jsx    |  21 +++-
 .../correspondenceActions.js                  |  18 +++
 .../correspondenceConstants.js                |   2 +
 .../correspondenceReducer.js                  |  16 +++
 client/app/queue/utils.js                     |   1 +
 client/constants/CORRESPONDENCE_TASK_URL.json |   4 +-
 .../correspondence_queue_task_link_spec.rb    | 118 ++++++++++++++++++
 spec/support/correspondence_task_helpers.rb   |  32 +++++
 13 files changed, 267 insertions(+), 6 deletions(-)
 create mode 100644 spec/feature/queue/correspondence/correspondence_queue_task_link_spec.rb
 create mode 100644 spec/support/correspondence_task_helpers.rb

diff --git a/app/models/tasks/correspondence/reassign_package_task.rb b/app/models/tasks/correspondence/reassign_package_task.rb
index 71a1e26df11..ed4be1ee8f0 100644
--- a/app/models/tasks/correspondence/reassign_package_task.rb
+++ b/app/models/tasks/correspondence/reassign_package_task.rb
@@ -1,4 +1,7 @@
 # frozen_string_literal: true
 
 class ReassignPackageTask < CorrespondenceTask
+  def task_url
+    Constants.CORRESPONDENCE_TASK_URL.REMOVE_PACKAGE_TASK_MODAL_URL
+  end
 end
diff --git a/app/models/tasks/correspondence_intake_task.rb b/app/models/tasks/correspondence_intake_task.rb
index 461c9d39311..952b88e3a04 100644
--- a/app/models/tasks/correspondence_intake_task.rb
+++ b/app/models/tasks/correspondence_intake_task.rb
@@ -29,6 +29,6 @@ def verify_current_user_can_create!(user)
   end
 
   def task_url
-    Constants.CORRESPONDENCE_TASK_URL.INTAKE_TASK_URL.sub("uuid", correspondence.uuid)
+    closed? ? "/under_construction" : Constants.CORRESPONDENCE_TASK_URL.INTAKE_TASK_URL.sub("uuid", correspondence.uuid)
   end
 end
diff --git a/app/models/tasks/remove_package_task.rb b/app/models/tasks/remove_package_task.rb
index 80259331e3a..9780a8b6d00 100644
--- a/app/models/tasks/remove_package_task.rb
+++ b/app/models/tasks/remove_package_task.rb
@@ -1,4 +1,7 @@
 # frozen_string_literal: true
 
 class RemovePackageTask < CorrespondenceTask
+  def task_url
+    Constants.CORRESPONDENCE_TASK_URL.REMOVE_PACKAGE_TASK_MODAL_URL
+  end
 end
diff --git a/app/models/tasks/review_package_task.rb b/app/models/tasks/review_package_task.rb
index 44015e3be5d..4f204de93ed 100644
--- a/app/models/tasks/review_package_task.rb
+++ b/app/models/tasks/review_package_task.rb
@@ -18,6 +18,10 @@ def when_child_task_created(_child_task)
   end
 
   def task_url
-    Constants.CORRESPONDENCE_TASK_URL.REVIEW_PACKAGE_TASK_URL.sub("uuid", correspondence.uuid)
+    if closed?
+      "/under_construction"
+    else
+      Constants.CORRESPONDENCE_TASK_URL.REVIEW_PACKAGE_TASK_URL.sub("uuid", correspondence.uuid)
+    end
   end
 end
diff --git a/client/app/queue/components/TaskTableColumns.jsx b/client/app/queue/components/TaskTableColumns.jsx
index 3ecea1a34aa..6084adbf638 100644
--- a/client/app/queue/components/TaskTableColumns.jsx
+++ b/client/app/queue/components/TaskTableColumns.jsx
@@ -14,6 +14,11 @@ import OnHoldLabel, { numDaysOnHold } from './OnHoldLabel';
 import IhpDaysWaitingTooltip from './IhpDaysWaitingTooltip';
 import TranscriptionTaskTooltip from './TranscriptionTaskTooltip';
 import Checkbox from '../../components/Checkbox';
+import { useDispatch } from 'react-redux';
+import {
+  setShowReassignPackageModal,
+  setShowRemovePackageModal
+} from 'app/queue/correspondence/correspondenceReducer/correspondenceActions';
 
 import { taskHasCompletedHold, hasDASRecord, collapseColumn, regionalOfficeCity, renderAppealType } from '../utils';
 import { DateString, daysSinceAssigned, daysSincePlacedOnHold } from '../../util/DateUtil';
@@ -224,9 +229,47 @@ export const assignedByColumn = () => {
 };
 
 export const veteranDetails = () => {
+  const dispatch = useDispatch();
+
+  const showReassignPackageModal = () => {
+    dispatch(setShowReassignPackageModal(true));
+  };
+
+  const showRemovePackageModal = () => {
+    dispatch(setShowRemovePackageModal(true));
+  };
+
   return {
     header: 'Veteran Details',
-    valueFunction: (task) => task.veteranDetails
+    valueFunction: (task) => {
+      if (task.taskUrl === '/modal/reassign_package') {
+        return <a
+          href="#"
+          onClick={showReassignPackageModal}
+          aria-label={`${task.label } Link`}
+          id="task-link"
+        >
+          {task.veteranDetails}
+        </a>;
+      } else if (task.taskUrl === '/modal/remove_package') {
+        return <a
+          href="#"
+          onClick={showRemovePackageModal}
+          aria-label={`${task.label } Link`}
+          id="task-link"
+        >
+          {task.veteranDetails}
+        </a>;
+      }
+
+      return <a
+        href={task.taskUrl}
+        id="task-link"
+        aria-label={`${task.label } Link`}
+      >
+        {task.veteranDetails}
+      </a>;
+    }
   };
 };
 
@@ -250,7 +293,7 @@ export const notes = () => {
 export const checkboxColumn = () => {
   return {
     header: 'Select',
-    valueFunction: (task) => task ? <Checkbox id={task.uniqueId} /> : ''
+    valueFunction: (task) => task ? <Checkbox id={task.uniqueId} ariaLabel={task.uniqueId} /> : ''
   };
 };
 
diff --git a/client/app/queue/correspondence/CorrespondenceCases.jsx b/client/app/queue/correspondence/CorrespondenceCases.jsx
index b0bb954bbc0..3f986cf4e13 100644
--- a/client/app/queue/correspondence/CorrespondenceCases.jsx
+++ b/client/app/queue/correspondence/CorrespondenceCases.jsx
@@ -1,12 +1,17 @@
 import React, { useState, useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { loadCorrespondenceConfig } from './correspondenceReducer/correspondenceActions';
+import {
+  loadCorrespondenceConfig,
+  setShowReassignPackageModal,
+  setShowRemovePackageModal
+} from './correspondenceReducer/correspondenceActions';
 import AppSegment from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/AppSegment';
 import PropTypes from 'prop-types';
 import COPY from '../../../COPY';
 import { sprintf } from 'sprintf-js';
 import CorrespondenceTableBuilder from './CorrespondenceTableBuilder';
 import Alert from '../../components/Alert';
+import Modal from 'app/components/Modal';
 
 const CorrespondenceCases = (props) => {
   const dispatch = useDispatch();
@@ -22,6 +27,16 @@ const CorrespondenceCases = (props) => {
   }, []);
 
   const config = useSelector((state) => state.intakeCorrespondence.correspondenceConfig);
+  const showReassignPackageModal = useSelector((state) => state.intakeCorrespondence.showReassignPackageModal);
+  const showRemovePackageModal = useSelector((state) => state.intakeCorrespondence.showRemovePackageModal);
+
+  const closeReassignPackageModal = () => {
+    dispatch(setShowReassignPackageModal(false));
+  };
+
+  const closeRemovePackageModal = () => {
+    dispatch(setShowRemovePackageModal(false));
+  };
 
   useEffect(() => {
     if (
@@ -46,6 +61,10 @@ const CorrespondenceCases = (props) => {
         )}
         {config &&
         <CorrespondenceTableBuilder />}
+        {showReassignPackageModal &&
+        <Modal title="Reassign Package Modal" closeHandler={closeReassignPackageModal} />}
+        {showRemovePackageModal &&
+        <Modal title="Remove Package Modal" closeHandler={closeRemovePackageModal} />}
       </AppSegment>
     </>
   );
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
index 30a8649f7e1..cfdb8c7ab04 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
@@ -142,3 +142,21 @@ export const setWaivedEvidenceTasks = (task) => (dispatch) => {
     }
   });
 };
+
+export const setShowReassignPackageModal = (isVisible) => (dispatch) => {
+  dispatch({
+    type: ACTIONS.SET_SHOW_REASSIGN_PACKAGE_MODAL,
+    payload: {
+      isVisible
+    }
+  });
+};
+
+export const setShowRemovePackageModal = (isVisible) => (dispatch) => {
+  dispatch({
+    type: ACTIONS.SET_SHOW_REMOVE_PACKAGE_MODAL,
+    payload: {
+      isVisible
+    }
+  });
+};
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
index fcd7baf913d..7b3244ec928 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
@@ -13,4 +13,6 @@ export const ACTIONS = {
   SET_FETCHED_APPEALS: 'SET_FETCHED_APPEALS',
   SET_NEW_APPEAL_RELATED_TASKS: 'SET_NEW_APPEAL_RELATED_TASKS',
   SET_WAIVED_EVIDENCE_TASKS: 'SET_WAIVED_EVIDENCE_TASKS',
+  SET_SHOW_REASSIGN_PACKAGE_MODAL: 'SET_SHOW_REASSIGN_PACKAGE_MODAL',
+  SET_SHOW_REMOVE_PACKAGE_MODAL: 'SET_SHOW_REMOVE_PACKAGE_MODAL',
 };
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
index 3be0251b826..6e41fcd9df4 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
@@ -13,6 +13,8 @@ export const initialState = {
   currentCorrespondence: [],
   veteranInformation: [],
   waivedEvidenceTasks: [],
+  showReassignPackageModal: false,
+  showRemovePackageModal: false,
 };
 
 export const intakeCorrespondenceReducer = (state = initialState, action = {}) => {
@@ -123,6 +125,20 @@ export const intakeCorrespondenceReducer = (state = initialState, action = {}) =
       }
     });
 
+  case ACTIONS.SET_SHOW_REASSIGN_PACKAGE_MODAL:
+    return update(state, {
+      showReassignPackageModal: {
+        $set: action.payload.isVisible
+      }
+    });
+
+  case ACTIONS.SET_SHOW_REMOVE_PACKAGE_MODAL:
+    return update(state, {
+      showRemovePackageModal: {
+        $set: action.payload.isVisible
+      }
+    });
+
   default:
     return state;
   }
diff --git a/client/app/queue/utils.js b/client/app/queue/utils.js
index 2a192197b99..669e3e80c45 100644
--- a/client/app/queue/utils.js
+++ b/client/app/queue/utils.js
@@ -85,6 +85,7 @@ const correspondenceTaskAttributesFromRawTask = (task) => {
     daysWaiting: task.attributes.days_waiting,
     vaDor: task.attributes.va_date_of_receipt,
     label: task.attributes.label,
+    taskUrl: task.attributes.task_url,
     status: task.attributes.status,
     assignedAt: task.attributes.assigned_at,
     assignedTo: {
diff --git a/client/constants/CORRESPONDENCE_TASK_URL.json b/client/constants/CORRESPONDENCE_TASK_URL.json
index 55b4a26a4a4..35770c140a6 100644
--- a/client/constants/CORRESPONDENCE_TASK_URL.json
+++ b/client/constants/CORRESPONDENCE_TASK_URL.json
@@ -1,4 +1,6 @@
 {
   "INTAKE_TASK_URL": "/queue/correspondence/uuid/intake",
-  "REVIEW_PACKAGE_TASK_URL": "/queue/correspondence/uuid/review_package"
+  "REVIEW_PACKAGE_TASK_URL": "/queue/correspondence/uuid/review_package",
+  "REASSIGN_PACKAGE_TASK_MODAL_URL": "/modal/reassign_package",
+  "REMOVE_PACKAGE_TASK_MODAL_URL": "/modal/remove_package"
 }
diff --git a/spec/feature/queue/correspondence/correspondence_queue_task_link_spec.rb b/spec/feature/queue/correspondence/correspondence_queue_task_link_spec.rb
new file mode 100644
index 00000000000..e83c358ac89
--- /dev/null
+++ b/spec/feature/queue/correspondence/correspondence_queue_task_link_spec.rb
@@ -0,0 +1,118 @@
+# frozen_string_literal: true
+
+RSpec.feature "Task Links on Your Correspondence and Correspondence Cases pages" do
+  include CorrespondenceTaskHelpers
+
+  describe "When a user clicks a task link in veterans details column" do
+    let(:current_user) { create(:user) }
+    before :each do
+      FeatureToggle.enable!(:correspondence_queue)
+      MailTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+    end
+
+    context "the task is an active CorrespondenceIntakeTask" do
+      it "routes to the Correspondence Intake page" do
+        correspondence = create(:correspondence)
+        create_correspondence_intake(correspondence, current_user)
+        visit "/queue/correspondence?tab=correspondence_assigned&page=1&sort_by=vaDor&order=asc"
+        find_all("#task-link").last.click
+        using_wait_time(10) do
+          expect(page).to have_content("Add Related Correspondence")
+        end
+      end
+    end
+
+    context "the task is an active ReviewPackageTask" do
+      it "routes to the Review Package page" do
+        correspondence = create(:correspondence)
+        assign_review_package_task(correspondence, current_user)
+        visit "/queue/correspondence?tab=correspondence_assigned&page=1&sort_by=vaDor&order=asc"
+        find_all("#task-link").last.click
+        using_wait_time(10) do
+          expect(page).to have_content("Review Package")
+        end
+      end
+    end
+
+    context "the task is an EfolderFailedUploadTask" do
+      context "with a parent task that is a ReviewPackageTask" do
+        it "routes to the Review Package page" do
+          correspondence = create(:correspondence)
+          assign_review_package_task(correspondence, current_user)
+          process_correspondence(correspondence, current_user)
+          parent_task = ReviewPackageTask.find_by(appeal_id: correspondence.id)
+          create_efolderupload_failed_task(correspondence, parent_task)
+          visit "/queue/correspondence?tab=correspondence_assigned&page=1&sort_by=vaDor&order=asc"
+          find_all("#task-link").last.click
+          using_wait_time(10) do
+            expect(page).to have_content("Review Package")
+          end
+        end
+      end
+
+      context "with a parent task that is a CorrespondenceIntakeTask" do
+        it "routes to the Correspondence Intake page" do
+          correspondence = create(:correspondence)
+          parent_task = create_correspondence_intake(correspondence, current_user)
+          create_efolderupload_failed_task(correspondence, parent_task)
+          visit "/queue/correspondence?tab=correspondence_assigned&page=1&sort_by=vaDor&order=asc"
+          find_all("#task-link").last.click
+          using_wait_time(10) do
+            expect(page).to have_content("Add Related Correspondence")
+          end
+        end
+      end
+    end
+
+    context "the task is a Package Action Task" do
+      context "type ReassignPackageTask" do
+        before do
+          correspondence = create(:correspondence)
+          parent_task = ReviewPackageTask.find_by(appeal_id: correspondence.id)
+          ReassignPackageTask.create!(
+            parent_id: parent_task&.id,
+            appeal_id: correspondence&.id,
+            appeal_type: "Correspondence",
+            assigned_to: MailTeamSupervisor.singleton
+          )
+          MailTeamSupervisor.singleton.add_user(current_user)
+          visit "/queue/correspondence/team?tab=correspondence_team_assigned&page=1&sort_by=vaDor&order=asc"
+          find_all("#task-link").last.click
+        end
+
+        it "user remains on Correspondence Cases" do
+          expect(page).to have_content("Correspondence cases")
+        end
+
+        it "a modal appears on the screen" do
+          expect(page).to have_css(".cf-modal-body")
+        end
+      end
+
+      context "type RemovePackageTask" do
+        before do
+          correspondence = create(:correspondence)
+          parent_task = ReviewPackageTask.find_by(appeal_id: correspondence.id)
+          RemovePackageTask.create!(
+            parent_id: parent_task&.id,
+            appeal_id: correspondence&.id,
+            appeal_type: "Correspondence",
+            assigned_to: MailTeamSupervisor.singleton
+          )
+          MailTeamSupervisor.singleton.add_user(current_user)
+          visit "/queue/correspondence/team?tab=correspondence_team_assigned&page=1&sort_by=vaDor&order=asc"
+          find_all("#task-link").last.click
+        end
+
+        it "user remains on Correspondence Cases" do
+          expect(page).to have_content("Correspondence cases")
+        end
+
+        it "a modal appears on the screen" do
+          expect(page).to have_css(".cf-modal-body")
+        end
+      end
+    end
+  end
+end
diff --git a/spec/support/correspondence_task_helpers.rb b/spec/support/correspondence_task_helpers.rb
new file mode 100644
index 00000000000..150c1161e30
--- /dev/null
+++ b/spec/support/correspondence_task_helpers.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module CorrespondenceTaskHelpers
+  def create_correspondence_intake(correspondence, user)
+    parent = correspondence&.root_task
+    cit = CorrespondenceIntakeTask.create_from_params(parent, user)
+    cit
+  end
+
+  def assign_review_package_task(correspondence, user)
+    review_package_task = ReviewPackageTask.find_by(appeal_id: correspondence.id)
+    review_package_task.update!(assigned_to: user, status: Constants.TASK_STATUSES.assigned)
+  end
+
+  def create_efolderupload_failed_task(correspondence, parent)
+    EfolderUploadFailedTask.create!(
+      parent_id: parent.id,
+      appeal_id: correspondence.id,
+      appeal_type: "Correspondence",
+      assigned_to: parent.assigned_to,
+      status: Constants.TASK_STATUSES.in_progress
+    )
+  end
+
+  def process_correspondence(correspondence, user)
+    rpt = ReviewPackageTask.find_by(appeal_id: correspondence.id)
+    rpt.update!(status: Constants.TASK_STATUSES.completed, completed_by_id: user.id)
+
+    cit = CorrespondenceIntakeTask.create_from_params(correspondence&.root_task, user)
+    cit.update!(status: Constants.TASK_STATUSES.completed, completed_by_id: user.id)
+  end
+end

From a764bf4f204ac7fca709b73985f8193922613a3f Mon Sep 17 00:00:00 2001
From: Ki Mau <ki.mau@va.gov>
Date: Tue, 13 Feb 2024 19:06:10 -0500
Subject: [PATCH 093/237] Ki/APPEALS-39894 - Update Test & Linting Errors
 (#20776)

* APPEALS-39894 - Fixes for Linting and Props

* Spec Updates

---------

Co-authored-by: cacevesva <109166981+cacevesva@users.noreply.github.com>
---
 .../app/queue/components/TaskTableColumns.jsx |  1 +
 .../correspondence/CorrespondenceCases.jsx    |  9 ++++---
 .../CorrespondenceTableBuilder.jsx            |  2 --
 .../correspondenceActions.js                  | 26 +++++++++++--------
 .../correspondence/review_package_spec.rb     |  2 +-
 spec/models/correspondence_spec.rb            |  2 +-
 spec/seeds/users_spec.rb                      |  4 +--
 7 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/client/app/queue/components/TaskTableColumns.jsx b/client/app/queue/components/TaskTableColumns.jsx
index 6084adbf638..bfd41ca066b 100644
--- a/client/app/queue/components/TaskTableColumns.jsx
+++ b/client/app/queue/components/TaskTableColumns.jsx
@@ -293,6 +293,7 @@ export const notes = () => {
 export const checkboxColumn = () => {
   return {
     header: 'Select',
+    name: QUEUE_CONFIG.COLUMNS.CHECKBOX_COLUMN,
     valueFunction: (task) => task ? <Checkbox id={task.uniqueId} ariaLabel={task.uniqueId} /> : ''
   };
 };
diff --git a/client/app/queue/correspondence/CorrespondenceCases.jsx b/client/app/queue/correspondence/CorrespondenceCases.jsx
index 3f986cf4e13..00fcf933bf3 100644
--- a/client/app/queue/correspondence/CorrespondenceCases.jsx
+++ b/client/app/queue/correspondence/CorrespondenceCases.jsx
@@ -40,17 +40,18 @@ const CorrespondenceCases = (props) => {
 
   useEffect(() => {
     if (
-      veteranInformation?.veteran_name?.first_name &&
-      veteranInformation?.veteran_name?.last_name
+      veteranInformation?.veteranName?.firstName &&
+      veteranInformation?.veteranName?.lastName
     ) {
-      setVetName(`${veteranInformation.veteran_name.first_name.trim()} ${veteranInformation.veteran_name.last_name.trim()}`);
+      setVetName(
+        `${veteranInformation.veteranName.firstName.trim()} ${veteranInformation.veteranName.lastName.trim()}`);
     }
   }, [veteranInformation]);
 
   return (
     <>
       <AppSegment filledBackground>
-        {(veteranInformation?.veteran_name?.first_name && veteranInformation?.veteran_name?.last_name) &&
+        {(veteranInformation?.veteranName?.firstName && veteranInformation?.veteranName?.lastName) &&
           currentAction.action_type === 'DeleteReviewPackage' && (
           <Alert
             type="success"
diff --git a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
index 9b7180ad8fe..e69d38f850e 100644
--- a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
+++ b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
@@ -77,7 +77,6 @@ const CorrespondenceTableBuilder = (props) => {
 
   const createColumnObject = (column, config, tasks) => {
 
-    const { requireDasRecord } = props;
     const filterOptions = filterValuesForColumn(column);
     const functionForColumn = {
       [QUEUE_CONFIG.COLUMNS.DAYS_WAITING_CORRESPONDENCE.name]: daysWaitingCorrespondence(),
@@ -205,7 +204,6 @@ CorrespondenceTableBuilder.propTypes = {
     table_title: PropTypes.string,
     active_tab_index: PropTypes.number,
   }),
-  requireDasRecord: PropTypes.bool,
   userCanBulkAssign: PropTypes.bool,
   isVhaOrg: PropTypes.bool,
   featureToggles: PropTypes.object
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
index cfdb8c7ab04..ed873ed7340 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
@@ -43,20 +43,24 @@ export const loadVetCorrespondence = (vetCorrespondences) =>
 
 export const loadCorrespondenceConfig = (configUrl) =>
   (dispatch) => {
-    ApiUtil.get(configUrl)
-      .then((response) => {
+    ApiUtil.get(configUrl).then(
+      (response) => {
         const returnedObject = response.body;
         const correspondenceConfig = returnedObject.correspondence_config;
-        dispatch({
-          type: ACTIONS.LOAD_CORRESPONDENCE_CONFIG,
-          payload: {
-            correspondenceConfig
-          }
+
+        dispatch(
+          {
+            type: ACTIONS.LOAD_CORRESPONDENCE_CONFIG,
+            payload: {
+              correspondenceConfig
+            }
+          });
+
+      }).
+      catch(
+        (err) => {
+          console.error(new Error(`Problem with GET ${configUrl} ${err}`));
         });
-      })
-      .catch((err) => {
-        console.error(new Error(`Problem with GET ${configUrl} ${err}`));
-      });
   };
 
 export const updateRadioValue = (value) =>
diff --git a/spec/feature/queue/correspondence/review_package_spec.rb b/spec/feature/queue/correspondence/review_package_spec.rb
index 63958c7ced3..c503711a4bf 100644
--- a/spec/feature/queue/correspondence/review_package_spec.rb
+++ b/spec/feature/queue/correspondence/review_package_spec.rb
@@ -185,7 +185,7 @@
     end
 
     it "before editing the review package general details" do
-      expect(correspondence.tasks.find_by_type("ReviewPackageTask").status).to eq("unassigned")
+      expect(correspondence.tasks.find_by_type("ReviewPackageTask").status).to eq("assigned")
     end
 
     it "after editing the review package general details" do
diff --git a/spec/models/correspondence_spec.rb b/spec/models/correspondence_spec.rb
index 5d27276dee1..18ddc3cc981 100644
--- a/spec/models/correspondence_spec.rb
+++ b/spec/models/correspondence_spec.rb
@@ -40,7 +40,7 @@
 
       rpt = ReviewPackageTask.find_by(appeal_id: correspondence.id)
       expect(rpt.appeal_id).to eq(correspondence.id)
-      expect(rpt.status).to eq("unassigned")
+      expect(rpt.status).to eq("assigned")
       expect(rpt.type).to eq("ReviewPackageTask")
       expect(rpt.parent_id).to eq(crt.id)
       expect(rpt.assigned_to).to eq(MailTeamSupervisor.singleton)
diff --git a/spec/seeds/users_spec.rb b/spec/seeds/users_spec.rb
index 253dd25fcba..4bba9e09266 100644
--- a/spec/seeds/users_spec.rb
+++ b/spec/seeds/users_spec.rb
@@ -6,8 +6,8 @@
 
     it "creates all kinds of users and organizations" do
       expect { subject }.to_not raise_error
-      expect(User.count).to eq(129)
-      expect(Organization.count).to eq(38)
+      expect(User.count).to eq(131)
+      expect(Organization.count).to eq(39)
     end
   end
 end

From f7fe42d6b268e869deb3fc41b47b83d0c05d25d2 Mon Sep 17 00:00:00 2001
From: SanthiParakal133 <132940479+SanthiParakal133@users.noreply.github.com>
Date: Wed, 14 Feb 2024 11:06:30 -0500
Subject: [PATCH 094/237] Lint fixes (#20793)

* update the length of line

* update count

* update paper_trail
---
 client/app/queue/QueueTableBuilder.jsx                   | 4 +++-
 spec/models/correspondence_auto_assignment_lever_spec.rb | 2 ++
 spec/seeds/users_spec.rb                                 | 4 ++--
 spec/spec_helper.rb                                      | 1 -
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/client/app/queue/QueueTableBuilder.jsx b/client/app/queue/QueueTableBuilder.jsx
index 0ab2ca12278..bd18953c529 100644
--- a/client/app/queue/QueueTableBuilder.jsx
+++ b/client/app/queue/QueueTableBuilder.jsx
@@ -211,7 +211,9 @@ const QueueTableBuilder = (props) => {
       label: sprintf(tabConfig.label, totalTaskCount),
       page: (
         <React.Fragment>
-          {props.userCanBulkAssign && tabConfig.allow_bulk_assign && props.activeOrganization.type === 'InboundOpsTeam' && (
+          {props.userCanBulkAssign &&
+            tabConfig.allow_bulk_assign &&
+            props.activeOrganization.type === 'InboundOpsTeam' && (
             <BatchAutoAssignButton />
           )}
           <p className="cf-margin-top-0">
diff --git a/spec/models/correspondence_auto_assignment_lever_spec.rb b/spec/models/correspondence_auto_assignment_lever_spec.rb
index 692d1ddce8d..619e1946036 100644
--- a/spec/models/correspondence_auto_assignment_lever_spec.rb
+++ b/spec/models/correspondence_auto_assignment_lever_spec.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "paper_trail/frameworks/rspec"
+
 describe CorrespondenceAutoAssignmentLever do
   with_versioning do
     it "enables paper trail" do
diff --git a/spec/seeds/users_spec.rb b/spec/seeds/users_spec.rb
index 253dd25fcba..4bba9e09266 100644
--- a/spec/seeds/users_spec.rb
+++ b/spec/seeds/users_spec.rb
@@ -6,8 +6,8 @@
 
     it "creates all kinds of users and organizations" do
       expect { subject }.to_not raise_error
-      expect(User.count).to eq(129)
-      expect(Organization.count).to eq(38)
+      expect(User.count).to eq(131)
+      expect(Organization.count).to eq(39)
     end
   end
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 1cafe2d5b2e..b4007c966c3 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -32,7 +32,6 @@
 
 require File.expand_path("../config/environment", __dir__)
 require "rspec/rails"
-require "paper_trail/frameworks/rspec"
 
 # This file was generated by the `rails generate rspec:install` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.

From 1554b6cac4dacf25fc49b7d16f0b8798562c7771 Mon Sep 17 00:00:00 2001
From: Kevma50287 <104021955+Kevma50287@users.noreply.github.com>
Date: Wed, 14 Feb 2024 15:07:56 -0500
Subject: [PATCH 095/237] Removed to_json and renamed method (#20839)

---
 app/models/correspondence_document.rb                        | 5 +++--
 app/services/correspondence_documents_efolder_uploader.rb    | 2 +-
 .../correspondence_documents_efolder_uploader_spec.rb        | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/models/correspondence_document.rb b/app/models/correspondence_document.rb
index 8001fbf73f5..1389f8b3755 100644
--- a/app/models/correspondence_document.rb
+++ b/app/models/correspondence_document.rb
@@ -15,7 +15,8 @@ def pdf_location
   end
   # :nocov:
 
-  def claim_evidence_upload_json
+  # contentName, providerData: {contentSource:, documentTypeId:, dateVaReceivedDocument:} are required fields
+  def claim_evidence_upload_hash
     {
       contentName: pdf_name,
       providerData: {
@@ -28,6 +29,6 @@ def claim_evidence_upload_json
         dateVaReceivedDocument: correspondence.va_date_of_receipt.strftime("%Y-%m-%d"),
         actionable: true
       }
-    }.to_json
+    }
   end
 end
diff --git a/app/services/correspondence_documents_efolder_uploader.rb b/app/services/correspondence_documents_efolder_uploader.rb
index a2deeabe6a3..06fe411c267 100644
--- a/app/services/correspondence_documents_efolder_uploader.rb
+++ b/app/services/correspondence_documents_efolder_uploader.rb
@@ -48,7 +48,7 @@ def do_upload(correspondence)
       ExternalApi::ClaimEvidenceService.upload_document(
         doc.pdf_location,
         corresondence_veteran(correspondence).file_number,
-        doc.claim_evidence_upload_json
+        doc.claim_evidence_upload_hash
       )
     end
   end
diff --git a/spec/services/correspondence_documents_efolder_uploader_spec.rb b/spec/services/correspondence_documents_efolder_uploader_spec.rb
index c695506a2da..63b3f31bc48 100644
--- a/spec/services/correspondence_documents_efolder_uploader_spec.rb
+++ b/spec/services/correspondence_documents_efolder_uploader_spec.rb
@@ -15,7 +15,7 @@
 
         expect(FeatureToggle).to receive(:enabled?).with(:ce_api_demo_toggle).and_return(true)
         expect(ExternalApi::ClaimEvidenceService).to receive(:upload_document)
-          .with(doc.pdf_location, veteran.file_number, doc.claim_evidence_upload_json).once
+          .with(doc.pdf_location, veteran.file_number, doc.claim_evidence_upload_hash).once
       end
 
       it "succeeds and does not create any EfolderUploadFailedTask tasks" do

From 4e8761be7d540fc6a585cfe503c0631907b80f67 Mon Sep 17 00:00:00 2001
From: Kamala Madamanchi <110078646+kamala-07@users.noreply.github.com>
Date: Thu, 15 Feb 2024 09:38:48 -0600
Subject: [PATCH 096/237] Fixed Custom value (#20820)

Co-authored-by: cacevesva <109166981+cacevesva@users.noreply.github.com>
---
 .../intake/components/AddCorrespondence/AddLetter.jsx           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx
index fd78e7fbafc..3aff26c30c1 100644
--- a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx
+++ b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx
@@ -126,7 +126,7 @@ const NewLetter = (props) => {
   const handleDays = (value) => {
     const currentNumber = parseInt(value.trim(), 10);
 
-    if (currentNumber <= 64) {
+    if ((currentNumber >= 1) && (currentNumber <= 64)) {
       setLetterCard({ ...letterCard,
         customValue: currentNumber });
     } else {

From 4df8ed43c05ac07341038a7695e758615b71e8ac Mon Sep 17 00:00:00 2001
From: piedram <110848569+piedram@users.noreply.github.com>
Date: Thu, 15 Feb 2024 10:43:09 -0500
Subject: [PATCH 097/237] Piedram/appeals 34975 b (#20800)

* change continue buttom

* Continue button

* add space for taskupdatecallback

---------

Co-authored-by: Kamala Madamanchi <kamala.madamanchi@va.gov>
Co-authored-by: cacevesva <109166981+cacevesva@users.noreply.github.com>
---
 .../AddCorrespondence/AddLetter.jsx           | 58 +++++++++++++++++--
 1 file changed, 53 insertions(+), 5 deletions(-)

diff --git a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx
index 3aff26c30c1..ec02c1f44f8 100644
--- a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx
+++ b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx
@@ -17,6 +17,7 @@ export const AddLetter = (props) => {
   const onContinueStatusChange = props.onContinueStatusChange;
 
   const [letters, setLetters] = useState([]);
+  const [dataLetter, setDataLetter] = useState([]);
 
   const addLetter = (index) => {
     setLetters([...letters, index]);
@@ -24,10 +25,37 @@ export const AddLetter = (props) => {
 
   const [unrelatedTasksCanContinue, setUnrelatedTasksCanContinue] = useState(true);
 
+  const canContinue = (currentLetters) => {
+    const output = [];
+    const opts = ['65 days', 'No response window'];
+
+    for (const [, value] of Object.entries(currentLetters)) {
+      if ((value !== null) && (value !== '')) {
+        output.push(value);
+      }
+    }
+
+    if ((output.length === 7) && (opts.includes(output[6]))) {
+      return true;
+    } else if (output.length === 8) {
+      return true;
+    }
+
+    return false;
+  };
+
+  const taskUpdatedCallback = (updatedTask) => {
+    const filtered = dataLetter.filter((cdl) => cdl.id !== updatedTask.id);
+
+    setDataLetter([...filtered, updatedTask]);
+  };
+
   const removeLetter = (index) => {
     const restLetters = letters.filter((letter) => letter !== index);
+    const dls = dataLetter.filter((dl) => dl.id !== index);
 
     setLetters(restLetters);
+    setDataLetter(dls);
   };
 
   useEffect(() => {
@@ -35,17 +63,30 @@ export const AddLetter = (props) => {
   }, [unrelatedTasksCanContinue]);
 
   useEffect(() => {
-    // if canContinue() {
-    //   setUnrelatedTasksCanContinue(true);
-    // } else {
     if (letters.length > 0) {
       setUnrelatedTasksCanContinue(false);
     } else {
       setUnrelatedTasksCanContinue(true);
     }
-    // }
   }, [letters]);
 
+  useEffect(() => {
+    if ((dataLetter.length > 0) && letters.length === dataLetter.length) {
+      for (let i = 0; i < dataLetter.length; i++) {
+        if (canContinue(dataLetter[i])) {
+          setUnrelatedTasksCanContinue(true);
+        } else {
+          setUnrelatedTasksCanContinue(false);
+        }
+      }
+    } else if (letters.length === 0) {
+      setUnrelatedTasksCanContinue(true);
+    } else {
+      setUnrelatedTasksCanContinue(false);
+    }
+
+  }, [dataLetter]);
+
   return (
     <>
       { letters.map((letter) => (
@@ -53,6 +94,7 @@ export const AddLetter = (props) => {
           <NewLetter
             index={letter}
             removeLetter={removeLetter}
+            taskUpdatedCallback={taskUpdatedCallback}
             setUnrelatedTasksCanContinue= {setUnrelatedTasksCanContinue}
           />
         </div>
@@ -65,7 +107,11 @@ export const AddLetter = (props) => {
           className={['cf-left-side']}
           disabled= {!(letters.length < 3)}
           onClick={() => {
-            addLetter(letters.length + 1);
+            if (letters.length > 0) {
+              addLetter(letters[letters.length - 1] + 1);
+            } else {
+              addLetter(letters.length + 1);
+            }
           }}>
         + Add letter
         </Button>
@@ -263,6 +309,7 @@ const NewLetter = (props) => {
       letterHash[index] = letterCard;
       dispatch(setResponseLetters(letterHash));
       setUnrelatedTasksCanContinue(true);
+      props.taskUpdatedCallback(letterCard);
     } else {
       setUnrelatedTasksCanContinue(false);
     }
@@ -435,6 +482,7 @@ NewLetter.propTypes = {
   setLetterTitle: PropTypes.func,
   setResponseLetters: PropTypes.func,
   setUnrelatedTasksCanContinue: PropTypes.func,
+  taskUpdatedCallback: PropTypes.func,
   onContinueStatusChange: PropTypes.func
 };
 

From a041fdc5bc19842c975050265d6f53157b1b8654 Mon Sep 17 00:00:00 2001
From: Kamala Madamanchi <110078646+kamala-07@users.noreply.github.com>
Date: Thu, 15 Feb 2024 11:27:02 -0600
Subject: [PATCH 098/237] Fixed Date sent (#20846)

Co-authored-by: cacevesva <109166981+cacevesva@users.noreply.github.com>
---
 .../intake/components/AddCorrespondence/AddLetter.jsx           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx
index ec02c1f44f8..ce449421eba 100644
--- a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx
+++ b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx
@@ -128,7 +128,7 @@ AddLetter.propTypes = {
   onContinueStatusChange: PropTypes.func,
 };
 
-const currentDate = moment.utc(new Date()).format('YYYY-MM-DD');
+const currentDate = moment(new Date()).format('YYYY-MM-DD');
 const NewLetter = (props) => {
   const index = props.index;
   const letterHash = {};

From 4507bab33b31fa8b4f40f4d04613a49448e8ec50 Mon Sep 17 00:00:00 2001
From: Kamala Madamanchi <110078646+kamala-07@users.noreply.github.com>
Date: Thu, 15 Feb 2024 14:59:56 -0600
Subject: [PATCH 099/237] Align response letter, dropdown and add letter
 (#20854)

---
 .../intake/components/AddCorrespondence/AddLetter.jsx           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx
index ce449421eba..6b33e312f58 100644
--- a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx
+++ b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx
@@ -391,7 +391,7 @@ const NewLetter = (props) => {
 
   return (
     <div className="gray-border" style={
-      { display: 'inline-block', padding: '2rem 2rem', marginLeft: '3rem', marginBottom: '3rem', width: '90%' }
+      { display: 'inline-block', padding: '2rem 2rem', marginBottom: '3rem', width: '95%' }
     }>
       <div className="response_letter_date">
         <DateSelector

From c1954b3f1f82eafc8507893f7684c652de1237eb Mon Sep 17 00:00:00 2001
From: Will Medders <93014155+wmedders21@users.noreply.github.com>
Date: Thu, 15 Feb 2024 15:29:58 -0600
Subject: [PATCH 100/237] Wmedders21/appeals 39237 (#20834)

* Test: verifies no other open package action task on correspondence before creation

* Rubocop style fixes

* Update expectation to match new requirements

* add more wait time to address flakiness in CI

* fix issue where EfolderFailedUploadTasks had parent task belonging to wrong Correspondence

* fix issue where correspondence queue breaks after completing intake form

* fix wrong url for reassign package task

* Fix test: when remove package task is pending review

* use_history not needed

* Revert "Fix test: when remove package task is pending review"

This reverts commit f2dd043d5a42dd77bcdf47b728dad26ca724a15b.
---
 .../correspondence/reassign_package_task.rb   |  4 +-
 app/models/tasks/correspondence_task.rb       | 23 ++++++++
 app/models/tasks/merge_package_task.rb        |  1 +
 app/models/tasks/remove_package_task.rb       |  2 +
 app/models/tasks/split_package_task.rb        |  1 +
 .../SubmitCorrespondenceModal.jsx             |  2 +-
 .../CorrespondenceReviewPackage.jsx           |  2 -
 db/seeds/queue_correspondences.rb             |  7 +--
 .../correspondence/review_package_spec.rb     |  4 +-
 spec/models/correspondence_spec.rb            |  2 +-
 spec/models/task_spec.rb                      | 56 +++++++++++++++++++
 11 files changed, 93 insertions(+), 11 deletions(-)

diff --git a/app/models/tasks/correspondence/reassign_package_task.rb b/app/models/tasks/correspondence/reassign_package_task.rb
index ed4be1ee8f0..30acc3243db 100644
--- a/app/models/tasks/correspondence/reassign_package_task.rb
+++ b/app/models/tasks/correspondence/reassign_package_task.rb
@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 class ReassignPackageTask < CorrespondenceTask
+  before_create :verify_no_other_open_package_action_task_on_correspondence
+
   def task_url
-    Constants.CORRESPONDENCE_TASK_URL.REMOVE_PACKAGE_TASK_MODAL_URL
+    Constants.CORRESPONDENCE_TASK_URL.REASSIGN_PACKAGE_TASK_MODAL_URL
   end
 end
diff --git a/app/models/tasks/correspondence_task.rb b/app/models/tasks/correspondence_task.rb
index 6c25b436ecc..70ac293cc72 100644
--- a/app/models/tasks/correspondence_task.rb
+++ b/app/models/tasks/correspondence_task.rb
@@ -7,6 +7,17 @@ class CorrespondenceTask < Task
   validate :status_is_valid_on_create, on: :create
   validate :assignee_status_is_valid_on_create, on: :create
 
+  scope :package_action_tasks, -> { where(type: package_action_task_names) }
+
+  def self.package_action_task_names
+    [
+      ReassignPackageTask.name,
+      RemovePackageTask.name,
+      SplitPackageTask.name,
+      MergePackageTask.name
+    ]
+  end
+
   def verify_org_task_unique
     if Task.where(
       appeal_id: appeal_id,
@@ -21,6 +32,14 @@ def verify_org_task_unique
     end
   end
 
+  def verify_no_other_open_package_action_task_on_correspondence
+    return true unless package_action_task?
+
+    if CorrespondenceTask.package_action_tasks.open.where(appeal_id: appeal_id).any?
+      fail Caseflow::Error::MultipleOpenTasksOfSameTypeError, task_type: "package action task"
+    end
+  end
+
   def remove_package
     root_task = CorrespondenceRootTask.find_by!(
       appeal_id: @correspondence.id,
@@ -76,4 +95,8 @@ def assignee_status_is_valid_on_create
 
     true
   end
+
+  def package_action_task?
+    self.class.package_action_task_names.include?(self.class.name)
+  end
 end
diff --git a/app/models/tasks/merge_package_task.rb b/app/models/tasks/merge_package_task.rb
index dc9d90b9d40..664f922a387 100644
--- a/app/models/tasks/merge_package_task.rb
+++ b/app/models/tasks/merge_package_task.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 
 class MergePackageTask < CorrespondenceTask
+  before_create :verify_no_other_open_package_action_task_on_correspondence
 end
diff --git a/app/models/tasks/remove_package_task.rb b/app/models/tasks/remove_package_task.rb
index 9780a8b6d00..759ca363dc0 100644
--- a/app/models/tasks/remove_package_task.rb
+++ b/app/models/tasks/remove_package_task.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class RemovePackageTask < CorrespondenceTask
+  before_create :verify_no_other_open_package_action_task_on_correspondence
+
   def task_url
     Constants.CORRESPONDENCE_TASK_URL.REMOVE_PACKAGE_TASK_MODAL_URL
   end
diff --git a/app/models/tasks/split_package_task.rb b/app/models/tasks/split_package_task.rb
index 5bcaf609f3e..bbedcb47cf6 100644
--- a/app/models/tasks/split_package_task.rb
+++ b/app/models/tasks/split_package_task.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 
 class SplitPackageTask < CorrespondenceTask
+  before_create :verify_no_other_open_package_action_task_on_correspondence
 end
diff --git a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/SubmitCorrespondenceModal.jsx b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/SubmitCorrespondenceModal.jsx
index 2cc5e52d867..0c6fd9a6275 100644
--- a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/SubmitCorrespondenceModal.jsx
+++ b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/SubmitCorrespondenceModal.jsx
@@ -25,7 +25,7 @@ export const SubmitCorrespondenceModal = ({ setSubmitCorrespondenceModalVisible,
 
   const handleRouting = (status) => {
     if (status === 201) {
-      window.location.href = '/queue/correspondence';
+      window.location.href = '/queue/correspondence?tab=correspondence_assigned&page=1&sort_by=vaDor&order=asc';
     } else {
       setErrorBannerVisible(true);
       onCancel();
diff --git a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
index 3aa321a7ba4..5a78f2141f7 100644
--- a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
+++ b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
@@ -10,7 +10,6 @@ import PropTypes from 'prop-types';
 import { setFileNumberSearch, doFileNumberSearch } from '../../../intake/actions/intake';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
-import { useHistory } from 'react-router';
 import PackageActionModal from '../modals/PackageActionModal';
 import ReviewPackageNotificationBanner from './ReviewPackageNotificationBanner';
 import {
@@ -42,7 +41,6 @@ export const CorrespondenceReviewPackage = (props) => {
   // {  title: ,  message: ,  bannerType: }
   const [bannerInformation, setBannerInformation] = useState(null);
 
-  const history = useHistory();
   const fetchData = async () => {
     const correspondence = props;
 
diff --git a/db/seeds/queue_correspondences.rb b/db/seeds/queue_correspondences.rb
index 374608aa16f..31b27521523 100644
--- a/db/seeds/queue_correspondences.rb
+++ b/db/seeds/queue_correspondences.rb
@@ -39,9 +39,7 @@ def initial_id_values
     def create_queue_correspondences
       # 20 Correspondences with eFolderFailedUploadTask with a parent CorrespondenceIntakeTask
       20.times do
-        create_correspondence_with_intake_and_failed_upload_task(
-          create_correspondence_intake(create_correspondence, mail_team_user)
-        )
+        create_correspondence_with_intake_and_failed_upload_task
       end
 
       # 20 Correspondences with CorrespondenceIntakeTask with a status of in_progress
@@ -91,8 +89,9 @@ def create_queue_correspondences
     end
     # rubocop:enable Metrics/MethodLength
 
-    def create_correspondence_with_intake_and_failed_upload_task(parent_task)
+    def create_correspondence_with_intake_and_failed_upload_task
       corres = create_correspondence
+      parent_task = create_correspondence_intake(corres, mail_team_user)
       create_efolderupload_failed_task(corres, parent_task)
     end
 
diff --git a/spec/feature/queue/correspondence/review_package_spec.rb b/spec/feature/queue/correspondence/review_package_spec.rb
index c503711a4bf..9930699a05d 100644
--- a/spec/feature/queue/correspondence/review_package_spec.rb
+++ b/spec/feature/queue/correspondence/review_package_spec.rb
@@ -109,7 +109,7 @@
         click_button "Review removal request"
         page.all(".cf-form-radio-option > label")[0].click
         click_button("Confirm")
-        using_wait_time(10) do
+        using_wait_time(20) do
           expect(page).to have_content("The package has been removed from Caseflow and must be manually uploaded again from the Centralized Mail Portal, if it needs to be processed.")
         end
       end
@@ -185,7 +185,7 @@
     end
 
     it "before editing the review package general details" do
-      expect(correspondence.tasks.find_by_type("ReviewPackageTask").status).to eq("assigned")
+      expect(correspondence.tasks.find_by_type("ReviewPackageTask").status).to eq("unassigned")
     end
 
     it "after editing the review package general details" do
diff --git a/spec/models/correspondence_spec.rb b/spec/models/correspondence_spec.rb
index 18ddc3cc981..5d27276dee1 100644
--- a/spec/models/correspondence_spec.rb
+++ b/spec/models/correspondence_spec.rb
@@ -40,7 +40,7 @@
 
       rpt = ReviewPackageTask.find_by(appeal_id: correspondence.id)
       expect(rpt.appeal_id).to eq(correspondence.id)
-      expect(rpt.status).to eq("assigned")
+      expect(rpt.status).to eq("unassigned")
       expect(rpt.type).to eq("ReviewPackageTask")
       expect(rpt.parent_id).to eq(crt.id)
       expect(rpt.assigned_to).to eq(MailTeamSupervisor.singleton)
diff --git a/spec/models/task_spec.rb b/spec/models/task_spec.rb
index 43280b566ce..d7637cfa3b1 100644
--- a/spec/models/task_spec.rb
+++ b/spec/models/task_spec.rb
@@ -2056,5 +2056,61 @@ def next_assignee(_options = {})
         expect(uft.task_url).to eq("/queue/correspondence/#{correspondence.uuid}/intake")
       end
     end
+
+    context "package action tasks" do
+      it "verifies no other open package action task on correspondence before creation" do
+        correspondence = create(:correspondence)
+        parent_task = ReviewPackageTask.find_by(appeal_id: correspondence.id)
+        reassign_pt = ReassignPackageTask.create!(
+          parent_id: parent_task&.id,
+          appeal_id: correspondence&.id,
+          appeal_type: "Correspondence",
+          assigned_to: MailTeamSupervisor.singleton
+        )
+
+        # creation ok with no pre-existing package action task
+        expect(reassign_pt).to be_a(ReassignPackageTask)
+
+        # creation fails due to pre-existing package action task
+        expect do
+          RemovePackageTask.create!(
+            parent_id: parent_task&.id,
+            appeal_id: correspondence&.id,
+            appeal_type: "Correspondence",
+            assigned_to: MailTeamSupervisor.singleton
+          )
+        end.to raise_error(Caseflow::Error::MultipleOpenTasksOfSameTypeError)
+
+        # creation fails due to pre-existing package action task
+        expect do
+          SplitPackageTask.create!(
+            parent_id: parent_task&.id,
+            appeal_id: correspondence&.id,
+            appeal_type: "Correspondence",
+            assigned_to: MailTeamSupervisor.singleton
+          )
+        end.to raise_error(Caseflow::Error::MultipleOpenTasksOfSameTypeError)
+
+        # creation fails due to pre-existing package action task
+        expect do
+          MergePackageTask.create!(
+            parent_id: parent_task&.id,
+            appeal_id: correspondence&.id,
+            appeal_type: "Correspondence",
+            assigned_to: MailTeamSupervisor.singleton
+          )
+        end.to raise_error(Caseflow::Error::MultipleOpenTasksOfSameTypeError)
+
+        reassign_pt.update!(status: Constants.TASK_STATUSES.completed)
+
+        # creation ok due to pre-existing package action task status update
+        expect(RemovePackageTask.create!(
+                 parent_id: parent_task&.id,
+                 appeal_id: correspondence&.id,
+                 appeal_type: "Correspondence",
+                 assigned_to: MailTeamSupervisor.singleton
+               )).to be_a(RemovePackageTask)
+      end
+    end
   end
 end

From 1b401145e3cb6a45d7992260903c4a676473b6e6 Mon Sep 17 00:00:00 2001
From: Alex Smith <alex.smith.99@thunderyard.com>
Date: Fri, 16 Feb 2024 09:41:52 -0700
Subject: [PATCH 101/237] Create CorrespondenceAutoAssignmentLevers Seed File
 and Improve Seed File Naming (#20861)

* Rework Seed Data Logic

- Rename correspondence seeds files with correspondences in name
in order to clarify their purpose.

- Create seed file for creating correspondence auto-assignment
levers.

* Use organziation when finding OrganizationPermission
---
 db/seeds.rb                                   | 12 ++++--
 db/seeds/auto_texts.rb                        | 41 ------------------
 ...ssign.rb => correspondence_auto_assign.rb} | 17 ++------
 .../correspondence_auto_assignment_levers.rb  | 36 ++++++++++++++++
 db/seeds/correspondence_auto_texts.rb         | 42 +++++++++++++++++++
 5 files changed, 89 insertions(+), 59 deletions(-)
 delete mode 100644 db/seeds/auto_texts.rb
 rename db/seeds/{auto_assign.rb => correspondence_auto_assign.rb} (89%)
 create mode 100644 db/seeds/correspondence_auto_assignment_levers.rb
 create mode 100644 db/seeds/correspondence_auto_texts.rb

diff --git a/db/seeds.rb b/db/seeds.rb
index f8cb7f62f18..0d7609148fb 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -39,11 +39,13 @@ def seed
 
     call_and_log_seed_step Seeds::Annotations
     call_and_log_seed_step Seeds::Tags
+
     # These must be ran before others
     call_and_log_seed_step Seeds::BusinessLineOrg
     call_and_log_seed_step Seeds::Users
     call_and_log_seed_step Seeds::NotificationEvents
     # End of required to exist dependencies
+
     call_and_log_seed_step Seeds::Tasks
     call_and_log_seed_step Seeds::Hearings
     call_and_log_seed_step Seeds::Intake
@@ -67,13 +69,15 @@ def seed
     call_and_log_seed_step Seeds::MultiCorrespondences
     call_and_log_seed_step Seeds::VbmsDocumentTypes
     call_and_log_seed_step Seeds::VhaChangeHistory
+    call_and_log_seed_step Seeds::RemandedAmaAppeals
+    call_and_log_seed_step Seeds::RemandedLegacyAppeals
+    call_and_log_seed_step Seeds::CorrespondenceAutoTexts
+    call_and_log_seed_step Seeds::CorrespondenceAutoAssignmentLevers
+    call_and_log_seed_step Seeds::CorrespondenceAutoAssign
+
     # Always run this as last one
     call_and_log_seed_step Seeds::StaticTestCaseData
     call_and_log_seed_step Seeds::StaticDispatchedAppealsTestData
-    call_and_log_seed_step Seeds::AutoTexts
-    call_and_log_seed_step Seeds::RemandedAmaAppeals
-    call_and_log_seed_step Seeds::RemandedLegacyAppeals
-    call_and_log_seed_step Seeds::AutoAssign
   end
 end
 
diff --git a/db/seeds/auto_texts.rb b/db/seeds/auto_texts.rb
deleted file mode 100644
index 58bc2ff79e9..00000000000
--- a/db/seeds/auto_texts.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-# Create correspondence type seeds
-
-module Seeds
-  class AutoTexts < Base
-    def seed!
-      create_auto_text_data
-    end
-
-    private
-
-    def create_auto_text_data
-      auto_texts_values =
-          ["Address updated in VACOLS",
-          "Decision sent to Senator or Congressman mm/dd/yy",
-          "Interest noted in telephone call of mm/dd/yy",
-          "Interest noted in evidence file regarding current appeal",
-          "Email - responded via email on mm/dd/yy",
-          "Email - written response req; confirmed receipt via email to Congress office on mm/dd/yy",
-          "Possible motion pursuant to BVA decision dated mm/dd/yy",
-          "Motion pursuant to BVA decision dated mm/dd/yy",
-          "Statement in support of appeal by appellant",
-          "Statement in support of appeal by rep",
-          "Medical evidence X-Rays submitted or referred by",
-          "Medical evidence clinical reports submitted or referred by",
-          "Medical evidence examination reports submitted or referred by",
-          "Medical evidence progress notes submitted or referred by",
-          "Medical evidence physician's medical statement submitted or referred by",
-          "C&P exam report",
-          "Consent form (specify)",
-          "Withdrawal of issues",
-          "Response to BVA solicitation letter dated mm/dd/yy",
-          "VAF 9 (specify)"]
-
-          auto_texts_values.each do |text|
-        AutoText.find_or_create_by(name: text)
-      end
-    end
-  end
-end
diff --git a/db/seeds/auto_assign.rb b/db/seeds/correspondence_auto_assign.rb
similarity index 89%
rename from db/seeds/auto_assign.rb
rename to db/seeds/correspondence_auto_assign.rb
index 4ea81f7e403..ace6471a81c 100644
--- a/db/seeds/auto_assign.rb
+++ b/db/seeds/correspondence_auto_assign.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Seeds
-  class AutoAssign < Base
+  class CorrespondenceAutoAssign < Base
     def seed!
       create_auto_assign_permissions
       create_inbound_ops_team_nod_user
@@ -10,7 +10,6 @@ def seed!
       create_inbound_ops_team_supervisor
       create_mail_team_user
       create_mail_team_superuser
-      create_auto_assign_levers
     end
 
     def create_auto_assign_permissions
@@ -37,7 +36,7 @@ def create_inbound_ops_team_nod_user
           roles: ["Mail Intake"]
         )
         org_user = OrganizationsUser.find_or_create_by!(organization: InboundOpsTeam.singleton, user: u)
-        receive_nod_mail = OrganizationPermission.find_by(permission: "receive_nod_mail")
+        receive_nod_mail = OrganizationPermission.find_by(organization: InboundOpsTeam.singleton, permission: "receive_nod_mail")
         OrganizationUserPermission.find_or_create_by!(
           organization_permission: receive_nod_mail,
           organizations_user: org_user
@@ -62,7 +61,7 @@ def create_inbound_ops_team_auto_assign_user
           roles: ["Mail Intake"]
         )
         org_user = OrganizationsUser.find_or_create_by!(organization: InboundOpsTeam.singleton, user: u)
-        auto_assign = OrganizationPermission.find_by(permission: "auto_assign")
+        auto_assign = OrganizationPermission.find_by(organization: InboundOpsTeam.singleton, permission: "auto_assign")
         OrganizationUserPermission.find_or_create_by!(
           organization_permission: auto_assign,
           organizations_user: org_user
@@ -143,15 +142,5 @@ def create_mail_team_superuser
         OrganizationsUser.make_user_admin(u, MailTeam.singleton)
       end
     end
-
-    def create_auto_assign_levers
-      CorrespondenceAutoAssignmentLever.find_or_create_by(name: "capacity") do |l|
-        l.description = <<~EOS
-          Any Mail Team User or Mail Superuser with equal to or more than this amount will be excluded from Auto-assign
-        EOS
-        l.value = Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.max_assigned_tasks
-        l.enabled = true
-      end
-    end
   end
 end
diff --git a/db/seeds/correspondence_auto_assignment_levers.rb b/db/seeds/correspondence_auto_assignment_levers.rb
new file mode 100644
index 00000000000..53d2eead0ba
--- /dev/null
+++ b/db/seeds/correspondence_auto_assignment_levers.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Seeds
+  class CorrespondenceAutoAssignmentLevers < Base
+    def seed!
+      create_auto_assign_levers
+    end
+
+    def create_auto_assign_levers
+      correspondence_auto_assignment_levers.each do |lever|
+        CorrespondenceAutoAssignmentLever.find_or_create_by(name: lever[:name]) do |l|
+          l.description = lever[:description]
+          l.value = lever[:value]
+          l.enabled = lever[:enabled]
+        end
+      end
+    end
+
+    private
+
+    def correspondence_auto_assignment_levers
+      capacity_description = <<~EOS
+        Any Mail Team User or Mail Superuser with equal to or more than this amount will be excluded from Auto-assign
+      EOS
+
+      return [
+        {
+          name: "capacity",
+          description: capacity_description,
+          value: Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.max_assigned_tasks,
+          enabled: true
+        }
+      ]
+    end
+  end
+end
diff --git a/db/seeds/correspondence_auto_texts.rb b/db/seeds/correspondence_auto_texts.rb
new file mode 100644
index 00000000000..7b393b3888c
--- /dev/null
+++ b/db/seeds/correspondence_auto_texts.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Seeds
+  class CorrespondenceAutoTexts < Base
+    def seed!
+      create_auto_text_data
+    end
+
+    def create_auto_text_data
+      correspondence_auto_texts.each do |text|
+        AutoText.find_or_create_by(name: text)
+      end
+    end
+
+    private
+
+    def correspondence_auto_texts
+      [
+        "Address updated in VACOLS",
+        "Decision sent to Senator or Congressman mm/dd/yy",
+        "Interest noted in telephone call of mm/dd/yy",
+        "Interest noted in evidence file regarding current appeal",
+        "Email - responded via email on mm/dd/yy",
+        "Email - written response req; confirmed receipt via email to Congress office on mm/dd/yy",
+        "Possible motion pursuant to BVA decision dated mm/dd/yy",
+        "Motion pursuant to BVA decision dated mm/dd/yy",
+        "Statement in support of appeal by appellant",
+        "Statement in support of appeal by rep",
+        "Medical evidence X-Rays submitted or referred by",
+        "Medical evidence clinical reports submitted or referred by",
+        "Medical evidence examination reports submitted or referred by",
+        "Medical evidence progress notes submitted or referred by",
+        "Medical evidence physician's medical statement submitted or referred by",
+        "C&P exam report",
+        "Consent form (specify)",
+        "Withdrawal of issues",
+        "Response to BVA solicitation letter dated mm/dd/yy",
+        "VAF 9 (specify)"
+      ]
+    end
+  end
+end

From 13a25c148ee8043da4a77db6ceccecf02952f0f8 Mon Sep 17 00:00:00 2001
From: Alex Smith <alex.smith.99@thunderyard.com>
Date: Fri, 16 Feb 2024 09:47:17 -0700
Subject: [PATCH 102/237] Create Capacity Check (#20857)

- Add logic for finding auto-assignable users with capacity for
correspondence tasks.

- Add supporting files and specs.

Co-authored-by: youfoundmanesh <129548081+youfoundmanesh@users.noreply.github.com>
---
 app/models/correspondence.rb                  |   4 +-
 .../correspondence_auto_assignment_lever.rb   |  11 ++
 app/models/organization_permission.rb         |   8 +
 app/models/organizations/inbound_ops_team.rb  |  22 ++-
 app/models/user.rb                            |   6 +
 app/services/auto_assignable_user_finder.rb   | 113 +++++++-----
 spec/factories/task.rb                        |   9 +
 spec/factories/user.rb                        |  52 ++++++
 .../auto_assignable_user_finder_spec.rb       | 173 ++++++++++++++++--
 .../correspondence_auto_assign_logger_spec.rb |   4 +-
 10 files changed, 339 insertions(+), 63 deletions(-)

diff --git a/app/models/correspondence.rb b/app/models/correspondence.rb
index 383f6a9310f..c941bd48d99 100644
--- a/app/models/correspondence.rb
+++ b/app/models/correspondence.rb
@@ -38,8 +38,8 @@ def tasks
     Task.where(appeal_id: id, appeal_type: type)
   end
 
-  def review_package_tasks
-    Task.where(appeal_id: id, appeal_type: type, type: ReviewPackageTask.name)
+  def review_package_task
+    Task.find_by(appeal_id: id, appeal_type: type, type: ReviewPackageTask.name)
   end
 
   def root_task
diff --git a/app/models/correspondence_auto_assignment_lever.rb b/app/models/correspondence_auto_assignment_lever.rb
index 89e2aace5c6..1e1b9ec64b0 100644
--- a/app/models/correspondence_auto_assignment_lever.rb
+++ b/app/models/correspondence_auto_assignment_lever.rb
@@ -2,4 +2,15 @@
 
 class CorrespondenceAutoAssignmentLever < CaseflowRecord
   has_paper_trail on: [:update, :destroy]
+
+  class << self
+    def capacity_rule
+      find_by(name: "capacity")
+    end
+
+    def max_capacity
+      CorrespondenceAutoAssignmentLever.capacity_rule&.value ||
+        Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.max_assigned_tasks
+    end
+  end
 end
diff --git a/app/models/organization_permission.rb b/app/models/organization_permission.rb
index 536e2af8c51..faea6e92d82 100644
--- a/app/models/organization_permission.rb
+++ b/app/models/organization_permission.rb
@@ -23,5 +23,13 @@ class << self
     def valid_permission_names
       Constants.ORGANIZATION_PERMISSIONS.to_h.values
     end
+
+    def auto_assign(organization)
+      find_by(organization: organization, permission: Constants.ORGANIZATION_PERMISSIONS.auto_assign)
+    end
+
+    def receive_nod_mail(organization)
+      find_by(organization: organization, permission: Constants.ORGANIZATION_PERMISSIONS.receive_nod_mail)
+    end
   end
 end
diff --git a/app/models/organizations/inbound_ops_team.rb b/app/models/organizations/inbound_ops_team.rb
index e0c3a99290d..cac267dd5c3 100644
--- a/app/models/organizations/inbound_ops_team.rb
+++ b/app/models/organizations/inbound_ops_team.rb
@@ -1,9 +1,25 @@
 # frozen_string_literal: true
 
 class InboundOpsTeam < Organization
-  def self.singleton
-    InboundOpsTeam.first ||
-      InboundOpsTeam.create(name: "Inbound Ops Team", url: "inbound-ops-team")
+  class << self
+    def singleton
+      InboundOpsTeam.first ||
+        InboundOpsTeam.create(name: "Inbound Ops Team", url: "inbound-ops-team")
+    end
+
+    def super_users
+      super_users = []
+
+      OrganizationsUser.includes(:user).where(organization: InboundOpsTeam.singleton).find_each do |org_user|
+        user = org_user.user
+
+        if user.inbound_ops_team_superuser?
+          super_users.push(user)
+        end
+      end
+
+      super_users
+    end
   end
 
   # :reek:UtilityFunction
diff --git a/app/models/user.rb b/app/models/user.rb
index 000aec8502f..c63b96af0ef 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -11,6 +11,7 @@ class User < CaseflowRecord # rubocop:disable Metrics/ClassLength
   has_many :annotations
   has_many :tasks, as: :assigned_to
   has_many :organizations_users, dependent: :destroy
+  has_many :organization_user_permissions, through: :organizations_users, dependent: :destroy
   has_many :organizations, through: :organizations_users
   has_many :membership_requests, foreign_key: :requestor_id
   has_many :decided_membership_requests, class_name: "MembershipRequest", foreign_key: :decider_id
@@ -95,6 +96,11 @@ def hearings_user?
     can_any_of_these_roles?(["Build HearSched", "Edit HearSched", "RO ViewHearSched", "VSO", "Hearing Prep"])
   end
 
+  def inbound_ops_team_superuser?
+    member_of_organization?(InboundOpsTeam.singleton) &&
+      (administered_teams.include?(BvaIntake.singleton) || administered_teams.include?(MailTeam.singleton))
+  end
+
   def can_assign_hearing_schedule?
     can_any_of_these_roles?(["Edit HearSched", "Build HearSched"])
   end
diff --git a/app/services/auto_assignable_user_finder.rb b/app/services/auto_assignable_user_finder.rb
index 90ceec3e8ac..e4c56580811 100644
--- a/app/services/auto_assignable_user_finder.rb
+++ b/app/services/auto_assignable_user_finder.rb
@@ -1,11 +1,7 @@
 # frozen_string_literal: true
 
 class AutoAssignableUserFinder
-  # TODO: APPEALS-38551: Switch to working directly with DB records.
-  # Correspondence auto-assignment can be triggered via multiple methods,
-  # so a local cache of this data can easily become invalid. Thus, we need
-  # to work with the DB as our source of truth at every step
-  AssignableUser = Struct.new(:id, :last_assigned_date, :num_assigned, :nod?, keyword_init: true)
+  AssignableUser = Struct.new(:user_obj, :last_assigned_date, :num_assigned, :nod?, keyword_init: true)
 
   def assignable_users_exist?
     assignable_users.count.positive?
@@ -23,9 +19,8 @@ def run_auto_assign_algorithm(correspondence, vbms_id)
     return auto_assign_nod(vbms_id) if correspondence.nod?
 
     assignable_users.each do |user|
-      if sensitivity_checker.user_can_access?(vbms_id: vbms_id, user_to_check: user)
-        # TODO: APPEALS-38551: Find not needed here
-        return User.find(user.id)
+      if sensitivity_checker.user_can_access?(vbms_id: vbms_id, user_to_check: user.user_obj)
+        return user.user_obj
       end
     end
 
@@ -36,59 +31,91 @@ def auto_assign_nod(vbms_id)
     assignable_users.each do |user|
       next if !user.nod?
 
-      if sensitivity_checker.user_can_access?(vbms_id: vbms_id, user_to_check: user)
-        # TODO: APPEALS-38551: Find not needed here
-        return User.find(user.id)
+      if sensitivity_checker.user_can_access?(vbms_id: vbms_id, user_to_check: user.user_obj)
+        return user.user_obj
       end
     end
 
     nil
   end
 
-  # TODO: APPEALS-38551: Stub; complete in ticket
-  # SQL query to get started with; note that you'll need queries for various user types
-  # Helpful: http://www.scuttle.io/
-=begin
-SELECT users.id,
-  COUNT(tasks.id) AS num_assigned
-FROM users
-  INNER JOIN tasks ON tasks.assigned_to_id  = users.id
-WHERE
-  tasks.assigned_to_type = 'User'
-  AND
-  tasks.appeal_type = 'Correspondence'
-  AND
-  tasks.type = 'ReviewPackageTask'
-GROUP BY users.id
-HAVING COUNT(tasks.id) < 60;
-=end
   def assignable_users
-    return @assignable_users if @assignable_users.present?
+    users = []
 
-    # TODO: APPEALS-38551: Use in query
-    # max_tasks = Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.max_assigned_tasks
+    find_users.each do |user|
+      num_assigned = num_assigned_user_tasks(user)
 
-    @assignable_users = []
-    # TODO: APPEALS-38551: Filter such that only users with auto_assign == true are in this result set
-    # Need to join to organization_user_permissions
-    eligible = InboundOpsTeam.singleton.users.includes(:tasks)
+      next if num_assigned >= CorrespondenceAutoAssignmentLever.max_capacity
+
+      nod_eligible = permission_checker.can?(
+        permission_name: Constants.ORGANIZATION_PERMISSIONS.receive_nod_mail,
+        organization: InboundOpsTeam.singleton,
+        user: user
+      )
 
-    eligible.each do |user|
-      # TODO: APPEALS-38551: Remove this struct and switch to working directly with DB records
       assignable = AssignableUser.new(
-        id: user.id,
-        last_assigned_date: Time.zone.now,
-        num_assigned: user.tasks.count,
-        nod?: true
+        user_obj: user,
+        last_assigned_date: user_review_package_tasks(user).maximum(:assigned_at),
+        num_assigned: num_assigned,
+        nod?: nod_eligible
       )
 
-      @assignable_users.push(assignable)
+      users.push(assignable)
+    end
+
+    sorted_assignable_users(users)
+  end
+
+  def sorted_assignable_users(users)
+    users.sort do |a, b|
+      if a.num_assigned == b.num_assigned
+        a.last_assigned_date <=> b.last_assigned_date
+      else
+        a.num_assigned <=> b.num_assigned
+      end
+    end
+  end
+
+  def num_assigned_user_tasks(user)
+    count = user_review_package_tasks(user).count
+
+    super_users = InboundOpsTeam.super_users
+    if super_users.include?(user)
+      count += ((MergePackageTask.count + ReassignPackageTask.count + SplitPackageTask.count) / super_users.count).round
     end
 
-    @assignable_users
+    count
+  end
+
+  def user_review_package_tasks(user)
+    user.tasks.where(
+      type: ReviewPackageTask.name,
+      status: [
+        Constants.TASK_STATUSES.assigned,
+        Constants.TASK_STATUSES.in_progress,
+        Constants.TASK_STATUSES.on_hold
+      ]
+    )
+  end
+
+  def find_users
+    # Do NOT use manual caching here!!!
+    # Other processes may update data, so always use the DB as the source of truth and let Rails handle any caching
+    InboundOpsTeam.singleton.users.includes(:tasks, :organization_user_permissions)
+      .where(
+        organization_user_permissions: {
+          organization_permission: OrganizationPermission.auto_assign(InboundOpsTeam.singleton),
+          permitted: true
+        }
+      )
+      .references(:tasks, :organization_user_permissions)
   end
 
   def sensitivity_checker
     @sensitivity_checker ||= ExternalApi::BGSService.new
   end
+
+  def permission_checker
+    @permission_checker ||= OrganizationUserPermissionChecker.new
+  end
 end
diff --git a/spec/factories/task.rb b/spec/factories/task.rb
index ec93e89047c..ce042aa56c4 100644
--- a/spec/factories/task.rb
+++ b/spec/factories/task.rb
@@ -620,6 +620,15 @@ def self.find_first_task_or_create(appeal, task_type, **kwargs)
       factory :review_package_task, class: ReviewPackageTask do
       end
 
+      factory :merge_package_task, class: MergePackageTask do
+      end
+
+      factory :reassign_package_task, class: ReassignPackageTask do
+      end
+
+      factory :split_package_task, class: SplitPackageTask do
+      end
+
       factory :efolder_upload_failed_task, class: EfolderUploadFailedTask do
       end
 
diff --git a/spec/factories/user.rb b/spec/factories/user.rb
index 10480cd686d..63b9b002d9e 100644
--- a/spec/factories/user.rb
+++ b/spec/factories/user.rb
@@ -39,6 +39,58 @@
       roles { ["Admin Intake"] }
     end
 
+    factory :correspondence_auto_assignable_user do
+      after(:create) do |u|
+        # Member of InboundOpsTeam
+        org_user = OrganizationsUser.find_or_create_by!(organization: InboundOpsTeam.singleton, user: u)
+
+        org_permission = OrganizationPermission.find_or_create_by!(
+          organization: InboundOpsTeam.singleton,
+          permission: Constants.ORGANIZATION_PERMISSIONS.auto_assign
+        ) do |op|
+          op.enabled = true
+          op.description = Faker::Fantasy::Tolkien.poem
+        end
+
+        # Has auto-assign permission
+        OrganizationUserPermission.find_or_create_by!(
+          organization_permission: org_permission,
+          organizations_user: org_user
+        ) do |oup|
+          oup.permitted = true
+        end
+      end
+
+      trait :super_user do
+        after(:create) do |u|
+          OrganizationsUser.find_or_create_by!(organization: InboundOpsTeam.singleton, user: u).update!(admin: true)
+          OrganizationsUser.find_or_create_by!(organization: BvaIntake.singleton, user: u).update!(admin: true)
+          OrganizationsUser.find_or_create_by!(organization: MailTeam.singleton, user: u).update!(admin: true)
+        end
+      end
+
+      trait :nod_enabled do
+        after(:create) do |u|
+          org_user = OrganizationsUser.find_or_create_by!(organization: InboundOpsTeam.singleton, user: u)
+
+          org_permission = OrganizationPermission.find_or_create_by!(
+            organization: InboundOpsTeam.singleton,
+            permission: Constants.ORGANIZATION_PERMISSIONS.receive_nod_mail
+          ) do |op|
+            op.enabled = true
+            op.description = Faker::Fantasy::Tolkien.poem
+          end
+
+          OrganizationUserPermission.find_or_create_by!(
+            organization_permission: org_permission,
+            organizations_user: org_user
+          ) do |oup|
+            oup.permitted = true
+          end
+        end
+      end
+    end
+
     trait :inactive do
       status { "inactive" }
     end
diff --git a/spec/services/auto_assignable_user_finder_spec.rb b/spec/services/auto_assignable_user_finder_spec.rb
index edc0d8f5093..64f65eceea6 100644
--- a/spec/services/auto_assignable_user_finder_spec.rb
+++ b/spec/services/auto_assignable_user_finder_spec.rb
@@ -3,28 +3,52 @@
 describe AutoAssignableUserFinder do
   subject(:described) { described_class.new }
 
-  let(:mock_sensitivity_checker) { instance_double(ExternalApi::BGSService) }
+  let(:veteran) { create(:veteran) }
+
+  let(:mock_sensitivity_checker) { instance_double(ExternalApi::BGSService, user_can_access?: true) }
 
   before do
     allow(ExternalApi::BGSService).to receive(:new).and_return(mock_sensitivity_checker)
   end
 
-  describe "#assignable_users_exist?" do
-    before do
-      5.times do
-        create(:user)
-      end
+  def generate_assigned_review_package_tasks(amount:, user:)
+    amount.times do
+      created = create(:correspondence, veteran_id: veteran.id)
+      created.review_package_task.update!(
+        assigned_to: user,
+        status: Constants.TASK_STATUSES.assigned
+      )
     end
+  end
 
+  describe "#assignable_users_exist?" do
     context "when there are no assignable users" do
+      before do
+        5.times do
+          create(:user)
+        end
+      end
+
       it "returns false" do
         expect(described.assignable_users_exist?).to eq(false)
       end
+
+      context "when all users are already at capacity" do
+        let!(:user_1) { create(:correspondence_auto_assignable_user) }
+
+        it "returns nil" do
+          generate_assigned_review_package_tasks(amount: CorrespondenceAutoAssignmentLever.max_capacity, user: user_1)
+          expect(described.assignable_users_exist?).to eq(false)
+        end
+      end
     end
 
     context "when there are assignable users" do
-      let(:intake_user) { create(:intake_user) }
-      let!(:org_user) { create(:organizations_user, organization: InboundOpsTeam.singleton, user: intake_user) }
+      before do
+        5.times do
+          create(:correspondence_auto_assignable_user)
+        end
+      end
 
       it "returns true" do
         expect(described.assignable_users_exist?).to eq(true)
@@ -33,14 +57,137 @@
   end
 
   describe "#get_first_assignable_user" do
-    let(:veteran) { create(:veteran) }
-    let!(:correspondence) { create(:correspondence, veteran_id: veteran.id) }
+    context "when assignable users are NOT present" do
+      let!(:correspondence) { create(:correspondence, veteran_id: veteran.id) }
+
+      it "returns nil" do
+        expect(described.get_first_assignable_user(correspondence: correspondence)).to be nil
+      end
+
+      context "when all users are already at capacity" do
+        let!(:user_1) { create(:correspondence_auto_assignable_user) }
+        let!(:user_2) { create(:correspondence_auto_assignable_user) }
+
+        it "returns nil" do
+          generate_assigned_review_package_tasks(amount: CorrespondenceAutoAssignmentLever.max_capacity, user: user_1)
+          generate_assigned_review_package_tasks(amount: CorrespondenceAutoAssignmentLever.max_capacity, user: user_2)
+
+          expect(described.get_first_assignable_user(correspondence: correspondence)).to be nil
+        end
+      end
+
+      context "with NOD correspondence" do
+        let!(:correspondence_nod) do
+          create(:correspondence, package_document_type: create(:package_document_type, :nod), veteran_id: veteran.id)
+        end
+        let!(:user_1) { create(:correspondence_auto_assignable_user) }
+        let!(:user_2) { create(:correspondence_auto_assignable_user) }
+
+        it "returns nil" do
+          expect(described.get_first_assignable_user(correspondence: correspondence_nod)).to be nil
+        end
+      end
+    end
+
+    context "when assignable users are present" do
+      let!(:already_assigned) { create(:correspondence_auto_assignable_user) }
+      let!(:available) { create(:correspondence_auto_assignable_user) }
 
-    xit "returns the first assignable user" do
+      let!(:correspondence) { create(:correspondence, veteran_id: veteran.id) }
+
+      context "when one user is assigned more tasks than another" do
+        let!(:other_user) { create(:correspondence_auto_assignable_user) }
+
+        before do
+          generate_assigned_review_package_tasks(amount: 5, user: available)
+          generate_assigned_review_package_tasks(
+            amount: CorrespondenceAutoAssignmentLever.max_capacity,
+            user: other_user
+          )
+          generate_assigned_review_package_tasks(amount: 10, user: already_assigned)
+        end
+
+        it "returns the user with the fewer number of assigned tasks" do
+          expect(described.get_first_assignable_user(correspondence: correspondence)).to eq(available)
+        end
+      end
+
+      context "with an equal number of assigned tasks" do
+        it "returns the user longest waiting for an assignment" do
+          generate_assigned_review_package_tasks(amount: 2, user: available)
+          generate_assigned_review_package_tasks(amount: 2, user: already_assigned)
+
+          expect(described.get_first_assignable_user(correspondence: correspondence)).to eq(available)
+        end
+      end
+
+      context "with NOD correspondence" do
+        let!(:nod_user) { create(:correspondence_auto_assignable_user, :nod_enabled) }
+        let!(:correspondence_nod) do
+          create(:correspondence, package_document_type: create(:package_document_type, :nod), veteran_id: veteran.id)
+        end
+
+        before do
+          generate_assigned_review_package_tasks(amount: 10, user: nod_user)
+        end
+
+        it "returns the first assignable NOD user" do
+          expect(described.get_first_assignable_user(correspondence: correspondence_nod)).to eq(nod_user)
+        end
+      end
     end
 
-    context "with NOD correspondence" do
-      xit "returns the first assignable NOD user" do
+    context "with inbound ops team super user" do
+      let!(:correspondence) { create(:correspondence, veteran_id: veteran.id) }
+      let!(:normal_user) { create(:correspondence_auto_assignable_user) }
+      let!(:super_user) { create(:correspondence_auto_assignable_user, :super_user) }
+
+      context "when super user has available capacity" do
+        before do
+          create(:merge_package_task)
+          create(:reassign_package_task)
+          create(:split_package_task)
+          generate_assigned_review_package_tasks(amount: 1, user: super_user)
+          generate_assigned_review_package_tasks(amount: 5, user: normal_user)
+        end
+
+        it "returns the super user" do
+          expect(described.get_first_assignable_user(correspondence: correspondence)).to eq(super_user)
+        end
+      end
+
+      context "when super user has NO available capacity" do
+        before do
+          create(:merge_package_task)
+          create(:reassign_package_task)
+          create(:split_package_task)
+          generate_assigned_review_package_tasks(
+            amount: CorrespondenceAutoAssignmentLever.max_capacity - 3,
+            user: super_user
+          )
+          generate_assigned_review_package_tasks(
+            amount: CorrespondenceAutoAssignmentLever.max_capacity - 1,
+            user: normal_user
+          )
+        end
+
+        it "returns another eligible user" do
+          expect(described.get_first_assignable_user(correspondence: correspondence)).to eq(normal_user)
+        end
+      end
+    end
+
+    context "with sensitivity level check" do
+      let!(:correspondence) { create(:correspondence, veteran_id: veteran.id) }
+      let!(:user_1) { create(:correspondence_auto_assignable_user) }
+      let!(:user_2) { create(:correspondence_auto_assignable_user) }
+
+      before do
+        allow(mock_sensitivity_checker).to receive(:user_can_access?).and_return(false)
+      end
+
+      it "does not allow access for users without the correct sensitivity level" do
+        expect(described.get_first_assignable_user(correspondence: correspondence)).to be nil
       end
     end
   end
diff --git a/spec/services/correspondence_auto_assign_logger_spec.rb b/spec/services/correspondence_auto_assign_logger_spec.rb
index 1b5fb8c56be..ee3aee228e5 100644
--- a/spec/services/correspondence_auto_assign_logger_spec.rb
+++ b/spec/services/correspondence_auto_assign_logger_spec.rb
@@ -7,7 +7,7 @@
   let(:assignee) { create(:user) }
 
   let!(:correspondence) { create(:correspondence) }
-  let(:task) { correspondence.review_package_tasks.first }
+  let(:task) { correspondence.review_package_task }
 
   describe "#begin" do
     it "creates a BatchAutoAssignmentAttempt record" do
@@ -84,7 +84,7 @@
 
   describe "tracking assignments" do
     let!(:nod_correspondence) { create(:correspondence, :nod) }
-    let(:nod_task) { nod_correspondence.review_package_tasks.first }
+    let(:nod_task) { nod_correspondence.review_package_task }
 
     before do
       described.begin

From 05945f40fe838c629ca7b69b9ff0baa05df561a1 Mon Sep 17 00:00:00 2001
From: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
Date: Tue, 20 Feb 2024 16:14:01 -0500
Subject: [PATCH 103/237] rolled back the validation migration for
 correspondence. (#20886)

---
 app/models/correspondence.rb                              | 1 -
 ...20240110185623_validate_correspondence_foreign_keys.rb | 8 --------
 db/schema.rb                                              | 2 +-
 3 files changed, 1 insertion(+), 10 deletions(-)
 delete mode 100644 db/migrate/20240110185623_validate_correspondence_foreign_keys.rb

diff --git a/app/models/correspondence.rb b/app/models/correspondence.rb
index 8193a768b14..aa28c9a6b76 100644
--- a/app/models/correspondence.rb
+++ b/app/models/correspondence.rb
@@ -4,7 +4,6 @@
 # Serves as a collection of all data related to Correspondence workflow
 class Correspondence < CaseflowRecord
   validates :correspondence_type_id, presence: true
-  validates :package_document_type_id, presence: true
   validates :updated_by_id, presence: true, on: :update
   validates :veteran_id, presence: true
 
diff --git a/db/migrate/20240110185623_validate_correspondence_foreign_keys.rb b/db/migrate/20240110185623_validate_correspondence_foreign_keys.rb
deleted file mode 100644
index 43bce6a2709..00000000000
--- a/db/migrate/20240110185623_validate_correspondence_foreign_keys.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class ValidateCorrespondenceForeignKeys < Caseflow::Migration
-  def change
-    validate_foreign_key :correspondences, :correspondence_types
-    validate_foreign_key :correspondences, :package_document_types
-    validate_foreign_key :correspondences, :users
-    validate_foreign_key :correspondences, :veterans
-  end
-end
diff --git a/db/schema.rb b/db/schema.rb
index 733eff708a6..b4955849d63 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2024_01_10_185623) do
+ActiveRecord::Schema.define(version: 2024_01_10_185350) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"

From eaf23a569a28494a79eb67d8f50bf8a80b2d3e51 Mon Sep 17 00:00:00 2001
From: Kevma50287 <104021955+Kevma50287@users.noreply.github.com>
Date: Wed, 21 Feb 2024 08:21:53 -0500
Subject: [PATCH 104/237] Kev ma/appeals 38955 (#20749)

* Added AutoAssignButton, AutoAssignAlertBanner. Updated Correspondence Auto Assign Logger and Assigner, added auto assign status polling route, added factory for BatchAutoAssignmnetAttempts, updated specs, updated bgs fakes service method, CodeClimate fixes, Linting fixes

* Revert private methods placement

* Only allow one job to be ran at a time per user
---
 .fasterer.yml                                 |   4 +
 Gemfile                                       |   3 +-
 app/controllers/correspondence_controller.rb  |  40 +++++-
 app/jobs/auto_assign_correspondence_job.rb    |  16 +--
 app/models/concerns/auto_assignable.rb        |   2 +-
 app/services/auto_assignable_user_finder.rb   |  15 ++-
 .../correspondence_auto_assign_logger.rb      |   8 +-
 app/services/correspondence_auto_assigner.rb  |  37 ++++-
 app/services/external_api/bgs_service.rb      |   4 +-
 client/COPY.json                              |   7 +-
 client/app/queue/OrganizationQueue.jsx        |   2 +
 client/app/queue/QueueTableBuilder.jsx        |   4 +-
 .../correspondence/CorrespondenceCases.jsx    |   1 -
 .../component/AutoAssignAlertBanner.jsx       | 127 ++++++++++++++++++
 .../component/BatchAutoAssignButton.jsx       |  38 +++++-
 .../reviewPackageActions.js                   |  33 +++++
 .../reviewPackageConstants.js                 |   3 +
 .../reviewPackageReducer.js                   |  36 ++++-
 .../AutoAssignAlertBanner.test.js             | 119 ++++++++++++++++
 .../BatchAutoAssignButton.test.js             |  59 ++++++++
 config/routes.rb                              |   1 +
 lib/fakes/bgs_service.rb                      |  10 +-
 .../correspondence_controller_spec.rb         |  47 +++++++
 .../batch_auto_assignment_attempt.rb          |  36 +++++
 ...individual_auto_assignment_attempt_spec.rb |   2 +-
 spec/models/organization_permission_spec.rb   |   3 +-
 .../organization_user_permission_spec.rb      |   2 +-
 .../auto_assignable_user_finder_spec.rb       |   1 +
 .../correspondence_auto_assign_logger_spec.rb |   3 +-
 .../correspondence_auto_assigner_spec.rb      |   8 +-
 30 files changed, 624 insertions(+), 47 deletions(-)
 create mode 100644 client/app/queue/correspondence/component/AutoAssignAlertBanner.jsx
 create mode 100644 client/test/app/queue/correspondences/AutoAssignAlertBanner.test.js
 create mode 100644 client/test/app/queue/correspondences/BatchAutoAssignButton.test.js
 create mode 100644 spec/factories/batch_auto_assignment_attempt.rb

diff --git a/.fasterer.yml b/.fasterer.yml
index 6e0821c009a..b679a509670 100644
--- a/.fasterer.yml
+++ b/.fasterer.yml
@@ -14,3 +14,7 @@ exclude_paths:
   - "db/seeds.rb"
   - "vendor/**/*.rb"
   - "app/mappers/zip_code_to_lat_lng_mapper.rb"
+
+  # Flagged for using sort instead of using sort_by - however due to complexity of sorting
+  # conditionally makes more sense to use sort
+  - "app/services/auto_assignable_user_finder.rb"
diff --git a/Gemfile b/Gemfile
index 0d5e92c5626..66e6632a60f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -149,9 +149,8 @@ group :test do
   gem "rspec-github", require: false
   # For retrying failed feature tests. Read more: https://github.com/NoRedInk/rspec-retry
   gem "rspec-retry"
-  gem "webmock"
-  gem "rspec-github", require: false
   gem "shoulda-matchers"
+  gem "webmock"
 end
 # rubocop:enable Layout/LineLength
 
diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index a3a74eb58e2..e5c2564f5e4 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -175,11 +175,36 @@ def process_intake
   end
 
   def auto_assign_correspondences
-    job_args = {
-      current_user_id: current_user.id
-    }
+    batch = existing_batch_auto_assignment_attempt
 
-    perform_later_or_now(AutoAssignCorrespondenceJob, job_args)
+    if batch.nil?
+      batch = BatchAutoAssignmentAttempt.create!(
+        user: current_user,
+        status: Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.started
+      )
+      job_args = {
+        current_user_id: current_user.id,
+        batch_auto_assignment_attempt_id: batch.id
+      }
+
+      begin
+        perform_later_or_now(AutoAssignCorrespondenceJob, job_args)
+      ensure
+        render json: { batch_auto_assignment_attempt_id: batch.id }, status: :ok
+      end
+    else
+      render json: { batch_auto_assignment_attempt_id: batch.id }, status: :ok
+    end
+  end
+
+  def auto_assign_status
+    batch = BatchAutoAssignmentAttempt.find_by!(user: current_user, id: params["batch_auto_assignment_attempt_id"])
+    status_details = {
+      error_message: batch.error_info,
+      status: batch.status,
+      number_assigned: batch.num_packages_assigned
+    }
+    render json: status_details, status: :ok
   end
 
   private
@@ -314,4 +339,11 @@ def upload_documents_to_claim_evidence
     rpt = ReviewPackageTask.find_by(appeal_id: correspondence.id, type: ReviewPackageTask.name)
     correspondence_documents_efolder_uploader.upload_documents_to_claim_evidence(correspondence, current_user, rpt)
   end
+
+  def existing_batch_auto_assignment_attempt
+    @existing_batch_auto_assignment_attempt ||= BatchAutoAssignmentAttempt.find_by(
+      user: current_user,
+      status: Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.started
+    )
+  end
 end
diff --git a/app/jobs/auto_assign_correspondence_job.rb b/app/jobs/auto_assign_correspondence_job.rb
index 88b867873e9..eacceaea25f 100644
--- a/app/jobs/auto_assign_correspondence_job.rb
+++ b/app/jobs/auto_assign_correspondence_job.rb
@@ -3,15 +3,13 @@
 class AutoAssignCorrespondenceJob < CaseflowJob
   queue_with_priority :low_priority
 
-  def perform(current_user_id:)
-    correspondence_auto_assigner(current_user_id).perform
+  def perform(current_user_id:, batch_auto_assignment_attempt_id:)
+    CorrespondenceAutoAssigner.new(
+      current_user_id: current_user_id,
+      batch_auto_assignment_attempt_id: batch_auto_assignment_attempt_id
+    ).perform
   rescue StandardError => error
-    log_error(error)
-  end
-
-  private
-
-  def correspondence_auto_assigner(current_user_id)
-    @correspondence_auto_assigner ||= CorrespondenceAutoAssigner.new(current_user_id: current_user_id)
+    error_uuid = SecureRandom.uuid
+    log_error(error, extra: { error_uuid: error_uuid })
   end
 end
diff --git a/app/models/concerns/auto_assignable.rb b/app/models/concerns/auto_assignable.rb
index 0f2edea188c..f409a24ca1a 100644
--- a/app/models/concerns/auto_assignable.rb
+++ b/app/models/concerns/auto_assignable.rb
@@ -8,7 +8,7 @@ module AutoAssignable
     Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.started,
     Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.completed,
     Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.error
-  ]
+  ].freeze
 
   included do
     validates :status, inclusion: { in: VALID_STATUSES }
diff --git a/app/services/auto_assignable_user_finder.rb b/app/services/auto_assignable_user_finder.rb
index e4c56580811..7f734b3c35c 100644
--- a/app/services/auto_assignable_user_finder.rb
+++ b/app/services/auto_assignable_user_finder.rb
@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 
+# :reek:FeatureEnvy
 class AutoAssignableUserFinder
   AssignableUser = Struct.new(:user_obj, :last_assigned_date, :num_assigned, :nod?, keyword_init: true)
 
   def assignable_users_exist?
+    return false if FeatureToggle.enabled?(:auto_assign_banner_max_queue) && !Rails.env.production?
+
     assignable_users.count.positive?
   end
 
@@ -66,6 +69,7 @@ def assignable_users
     sorted_assignable_users(users)
   end
 
+  # :reek:UncommunicativeVariableName
   def sorted_assignable_users(users)
     users.sort do |a, b|
       if a.num_assigned == b.num_assigned
@@ -112,7 +116,16 @@ def find_users
   end
 
   def sensitivity_checker
-    @sensitivity_checker ||= ExternalApi::BGSService.new
+    return @sensitivity_checker if @sensitivity_checker.present?
+
+    @sensitivity_checker = BGSService.new
+
+    # TODO: Create seed data for this, add vbms_id here
+    # if !Rails.env.production
+    #   BGSService.mark_veteran_not_accessible()
+    # end
+
+    @sensitivity_checker
   end
 
   def permission_checker
diff --git a/app/services/correspondence_auto_assign_logger.rb b/app/services/correspondence_auto_assign_logger.rb
index a22b3f93d2a..7f2ca775705 100644
--- a/app/services/correspondence_auto_assign_logger.rb
+++ b/app/services/correspondence_auto_assign_logger.rb
@@ -1,13 +1,14 @@
 # frozen_string_literal: true
 
+# :reek:FeatureEnvy
 class CorrespondenceAutoAssignLogger
-  def initialize(current_user)
+  def initialize(current_user, batch)
     @current_user = current_user
+    @batch = batch
   end
 
   def begin
-    @batch = BatchAutoAssignmentAttempt.create!(
-      user: @current_user,
+    @batch.update!(
       started_at: Time.current,
       status: Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.started,
       num_nod_packages_assigned: 0,
@@ -115,6 +116,7 @@ def save_attempt_statistics(attempt:, task:, result:)
     attempt.save!
   end
 
+  # :reek:ControlParameter
   def seconds_elapsed(record:, status:)
     if status == Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.completed
       record.completed_at - record.started_at
diff --git a/app/services/correspondence_auto_assigner.rb b/app/services/correspondence_auto_assigner.rb
index eb02b228a26..3fc0348fbe4 100644
--- a/app/services/correspondence_auto_assigner.rb
+++ b/app/services/correspondence_auto_assigner.rb
@@ -1,36 +1,46 @@
 # frozen_string_literal: true
 
+# :reek:InstanceVariableAssumption
 class CorrespondenceAutoAssigner
-  def initialize(current_user_id:)
+  def initialize(current_user_id:, batch_auto_assignment_attempt_id:)
     @current_user = User.find(current_user_id)
+    @batch = BatchAutoAssignmentAttempt.find_by(user: @current_user, id: batch_auto_assignment_attempt_id)
   end
 
   def perform
     logger.begin
 
+    # Manual error trigger for testing purposes
+    if FeatureToggle.enabled?(:auto_assign_banner_failure) && !Rails.env.production?
+      fail StandardError
+    end
+
     if !unassigned_review_package_tasks.count.positive?
-      logger.error(msg: "No review package tasks to assign")
+      logger.error(msg: COPY::BAAA_NO_UNASSIGNED_CORRESPONDENCE)
       return
     end
 
     if !assignable_user_finder.assignable_users_exist?
-      logger.error(msg: "No auto-assignable users available")
+      logger.error(msg: COPY::BAAA_USERS_MAX_QUEUE_REACHED)
       return
     end
 
     unassigned_review_package_tasks.each do |task|
       assign(task)
     end
-
     logger.end
+  rescue StandardError => error
+    error_uuid = SecureRandom.uuid
+    Raven.capture_exception(error, extra: { error_uuid: error_uuid })
+    logger.error(msg: COPY::BAAA_ERROR_MESSAGE + " (Error code:#{error_uuid})", extras: { error_uuid: error_uuid })
   end
 
   private
 
   def assign(task)
     started_at = Time.current
-    correspondence = task.correspondence
 
+    correspondence = task.correspondence
     assignee = assignable_user_finder.get_first_assignable_user(correspondence: correspondence)
 
     if assignee.blank?
@@ -53,15 +63,28 @@ def assign_task_to_user(task, user)
   end
 
   def unassigned_review_package_tasks
-    @unassigned_review_package_tasks ||= ReviewPackageTask
+    return @unassigned_review_package_tasks if @unassigned_review_package_tasks.present?
+
+    tasks = ReviewPackageTask
       .where(status: "unassigned")
       .includes(:correspondence)
       .references(:correspondence)
       .merge(Correspondence.order(va_date_of_receipt: :desc))
+
+    # Jobs run synchronously in testing and development environments - limit to 10 to prevent timeouts
+    tasks = if !Rails.env.production?
+              if FeatureToggle.enabled?(:auto_assign_banner_no_rpt)
+                []
+              else
+                tasks.limit(10)
+              end
+            end
+
+    @unassigned_review_package_tasks = tasks
   end
 
   def logger
-    @logger ||= CorrespondenceAutoAssignLogger.new(@current_user)
+    @logger ||= CorrespondenceAutoAssignLogger.new(@current_user, @batch)
   end
 
   def assignable_user_finder
diff --git a/app/services/external_api/bgs_service.rb b/app/services/external_api/bgs_service.rb
index af7618e46d7..d950e739b2e 100644
--- a/app/services/external_api/bgs_service.rb
+++ b/app/services/external_api/bgs_service.rb
@@ -277,8 +277,8 @@ def find_address_by_participant_id(participant_id)
   #
   # We cache at 2 levels: the boolean check per user, and the veteran record itself.
   # The veteran record is so that subsequent calls to fetch_veteran_info can read from cache.
-  def can_access?(vbms_id, user_to_check: nil)
-    user_can_access?(vbms_id: vbms_id, user_to_check: current_user)
+  def can_access?(vbms_id, user_to_check: current_user)
+    user_can_access?(vbms_id: vbms_id, user_to_check: user_to_check)
   end
 
   def user_can_access?(vbms_id:, user_to_check:)
diff --git a/client/COPY.json b/client/COPY.json
index 71a62a16c78..c5b850b21ae 100644
--- a/client/COPY.json
+++ b/client/COPY.json
@@ -1436,5 +1436,10 @@
   "ASSOCIATED_WITH_CLAIMS_FOLDER_MAIL_TASK_LABEL": "Associated with claims folder",
   "VACOLS_UPDATED_MAIL_TASK_LABEL": "VACOLS updated",
   "SENT_TO_ROJ_MAIL_TASK_LABEL": "Sent to ROJ",
-  "AUTO_ASSIGN_CORRESPONDENCES_BUTTON": "Auto assign correspondences"
+  "AUTO_ASSIGN_CORRESPONDENCES_BUTTON": "Auto assign correspondences",
+  "BAAA_NO_UNASSIGNED_CORRESPONDENCE": "There are no correspondences available for assignment",
+  "BAAA_USERS_MAX_QUEUE_REACHED": "Queues have reached maximum capacity for all team members",
+  "BAAA_SUCCESS_MESSAGE": "Team members were assigned correspondences based on auto-assignment rules",
+  "BAAA_FAILED_TITLE": "Auto-assignment for correspondence has failed",
+  "BAAA_ERROR_MESSAGE": "Please try again at a later time or contact the Help Desk"
 }
diff --git a/client/app/queue/OrganizationQueue.jsx b/client/app/queue/OrganizationQueue.jsx
index 79ee4a78b73..626c52900ad 100644
--- a/client/app/queue/OrganizationQueue.jsx
+++ b/client/app/queue/OrganizationQueue.jsx
@@ -8,6 +8,7 @@ import QueueTableBuilder from './QueueTableBuilder';
 import Alert from '../components/Alert';
 import AppSegment from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/AppSegment';
 import { clearCaseSelectSearch } from '../reader/CaseSelect/CaseSelectActions';
+import AutoAssignAlertBanner from './correspondence/component/AutoAssignAlertBanner';
 
 const containerStyles = css({
   position: 'relative'
@@ -27,6 +28,7 @@ class OrganizationQueue extends React.PureComponent {
 
     return <React.Fragment>
       {success && <Alert styling={alertPaddingStyles} type="success" title={success.title} message={success.detail} />}
+      {featureToggles.correspondence_queue && <AutoAssignAlertBanner />}
       <AppSegment filledBackground styling={containerStyles}>
         <QueueTableBuilder featureToggles={featureToggles} />
       </AppSegment>
diff --git a/client/app/queue/QueueTableBuilder.jsx b/client/app/queue/QueueTableBuilder.jsx
index bd18953c529..cc054109078 100644
--- a/client/app/queue/QueueTableBuilder.jsx
+++ b/client/app/queue/QueueTableBuilder.jsx
@@ -212,8 +212,8 @@ const QueueTableBuilder = (props) => {
       page: (
         <React.Fragment>
           {props.userCanBulkAssign &&
-            tabConfig.allow_bulk_assign &&
-            props.activeOrganization.type === 'InboundOpsTeam' && (
+          tabConfig.allow_bulk_assign &&
+          props.activeOrganization.type === 'InboundOpsTeam' && (
             <BatchAutoAssignButton />
           )}
           <p className="cf-margin-top-0">
diff --git a/client/app/queue/correspondence/CorrespondenceCases.jsx b/client/app/queue/correspondence/CorrespondenceCases.jsx
index db7e55a486e..6f0f8d86c32 100644
--- a/client/app/queue/correspondence/CorrespondenceCases.jsx
+++ b/client/app/queue/correspondence/CorrespondenceCases.jsx
@@ -1,4 +1,3 @@
-
 import React, { useEffect } from 'react';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
diff --git a/client/app/queue/correspondence/component/AutoAssignAlertBanner.jsx b/client/app/queue/correspondence/component/AutoAssignAlertBanner.jsx
new file mode 100644
index 00000000000..17516acedc9
--- /dev/null
+++ b/client/app/queue/correspondence/component/AutoAssignAlertBanner.jsx
@@ -0,0 +1,127 @@
+import React, { useEffect, useRef } from 'react';
+import PropTypes from 'prop-types';
+import COPY from '../../../../COPY';
+import Alert from '../../../components/Alert';
+import {
+  setAutoAssignmentAlertBanner,
+  setAutoAssignButtonDisabled
+} from '../correspondenceReducer/reviewPackageActions';
+import { connect } from 'react-redux';
+import { bindActionCreators } from 'redux';
+import ApiUtil from '../../../util/ApiUtil';
+import CORRESPONDENCE_AUTO_ASSIGNMENT from '../../../../../client/constants/CORRESPONDENCE_AUTO_ASSIGNMENT';
+
+const AutoAssignAlertBanner = (props) => {
+  const {
+    batchId,
+    bannerAlert,
+  } = { ...props };
+
+  const AUTO_ASSIGN_POLLING_INTERVAL = 60000;
+  const intervalIdRef = useRef();
+
+  const clearIntervalRef = () => {
+    clearInterval(intervalIdRef.current);
+    intervalIdRef.current = null;
+  };
+
+  const handleBatchAutoAssignmentBanner = async (response) => {
+    if (response.status === CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.error) {
+      const bannerPayload = {
+        title: COPY.BAAA_FAILED_TITLE,
+        message: response.error_message.message,
+      };
+
+      if (response.error_message.error_uuid) {
+        bannerPayload.type = 'error';
+      } else {
+        bannerPayload.type = 'info';
+      }
+
+      props.setAutoAssignmentAlertBanner(bannerPayload);
+    } else if (response.status === CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.completed) {
+      props.setAutoAssignmentAlertBanner({
+        title: `You have successfully assigned ${response.number_assigned} correspondences`,
+        message: COPY.BAAA_SUCCESS_MESSAGE,
+        type: 'success'
+      });
+    } else {
+      props.setAutoAssignmentAlertBanner({
+        type: 'pending'
+      });
+    }
+  };
+
+  const fetchAutoAssignBannerInfo = async () => {
+    if (batchId) {
+      try {
+        const response = await ApiUtil.get(`/queue/correspondence/${batchId}/auto_assign_status`);
+        const data = await response.body;
+
+        handleBatchAutoAssignmentBanner(data);
+      } catch (error) {
+        clearIntervalRef();
+        console.error('Failed to fetch auto assign banner info', error);
+      }
+    }
+  };
+
+  // UseEffect to trigger an immediate fetch after button click
+  useEffect(() => {
+    fetchAutoAssignBannerInfo();
+
+    // setInterval in useRef to clearInterval() outside local scope of useEffect
+    // and removes an extra async call from being added to the call stack
+    if (!intervalIdRef.current) {
+      intervalIdRef.current = setInterval(() => {
+        fetchAutoAssignBannerInfo();
+      }, AUTO_ASSIGN_POLLING_INTERVAL);
+    }
+
+    return () => {
+      clearIntervalRef();
+    };
+  }, [batchId]);
+
+  useEffect(() => {
+    if (bannerAlert.type !== 'pending' && bannerAlert.message) {
+      clearIntervalRef();
+      props.setAutoAssignButtonDisabled(false);
+    }
+  }, [bannerAlert]);
+
+  return (
+    <>
+      { batchId && bannerAlert.message &&
+        <Alert
+          type={bannerAlert.type}
+          title={bannerAlert.title}
+          message={bannerAlert.message}
+          scrollOnAlert={false}
+        />
+      }
+    </>
+  );
+};
+
+AutoAssignAlertBanner.propTypes = {
+  setAutoAssignmentAlertBanner: PropTypes.func,
+  setAutoAssignButtonDisabled: PropTypes.func
+};
+
+const mapStateToProps = (state) => ({
+  batchId: state.reviewPackage.autoAssign.batchId,
+  bannerAlert: state.reviewPackage.autoAssign.bannerAlert
+});
+
+const mapDispatchToProps = (dispatch) => (
+  bindActionCreators({
+    setAutoAssignmentAlertBanner,
+    setAutoAssignButtonDisabled
+  }, dispatch)
+);
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(AutoAssignAlertBanner);
diff --git a/client/app/queue/correspondence/component/BatchAutoAssignButton.jsx b/client/app/queue/correspondence/component/BatchAutoAssignButton.jsx
index 51ca5906cef..870cd5aaff2 100644
--- a/client/app/queue/correspondence/component/BatchAutoAssignButton.jsx
+++ b/client/app/queue/correspondence/component/BatchAutoAssignButton.jsx
@@ -2,11 +2,20 @@ import React from 'react';
 import Button from '../../../components/Button';
 import ApiUtil from '../../../util/ApiUtil';
 import COPY from '../../../../COPY';
+import PropTypes from 'prop-types';
+import { connect } from 'react-redux';
+import { bindActionCreators } from 'redux';
+import { setBatchAutoAssignmentAttemptId,
+  setAutoAssignButtonDisabled } from '../correspondenceReducer/reviewPackageActions';
 
-const BatchAutoAssignButton = () => {
+const BatchAutoAssignButton = (props) => {
   const handleAutoAssign = async () => {
     try {
-      await ApiUtil.get('/queue/correspondence/auto_assign_correspondences');
+      props.setAutoAssignButtonDisabled(true);
+      const response = await ApiUtil.get('/queue/correspondence/auto_assign_correspondences');
+      const data = await response.body;
+
+      props.setBatchAutoAssignmentAttemptId(data.batch_auto_assignment_attempt_id);
     } catch (error) {
       console.error(error);
     }
@@ -16,7 +25,8 @@ const BatchAutoAssignButton = () => {
     <div>
       <Button
         onClick={handleAutoAssign}
-        ariaLabel="Auto assign correspnodences"
+        ariaLabel="Auto assign correspondences"
+        disabled={props.disabled}
       >
         {COPY.AUTO_ASSIGN_CORRESPONDENCES_BUTTON}
       </Button>
@@ -24,4 +34,24 @@ const BatchAutoAssignButton = () => {
   );
 };
 
-export default BatchAutoAssignButton;
+BatchAutoAssignButton.propTypes = {
+  disabled: PropTypes.bool,
+  setBatchAutoAssignmentAttemptId: PropTypes.func,
+  setAutoAssignButtonDisabled: PropTypes.func
+};
+
+const mapStateToProps = (state) => ({
+  disabled: state.reviewPackage.autoAssign.isButtonDisabled
+});
+
+const mapDispatchToProps = (dispatch) => (
+  bindActionCreators({
+    setBatchAutoAssignmentAttemptId,
+    setAutoAssignButtonDisabled
+  }, dispatch)
+);
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(BatchAutoAssignButton);
diff --git a/client/app/queue/correspondence/correspondenceReducer/reviewPackageActions.js b/client/app/queue/correspondence/correspondenceReducer/reviewPackageActions.js
index 8ae8145b2e9..b8a0c81574d 100644
--- a/client/app/queue/correspondence/correspondenceReducer/reviewPackageActions.js
+++ b/client/app/queue/correspondence/correspondenceReducer/reviewPackageActions.js
@@ -81,3 +81,36 @@ export const setReasonRemovePackage = (reasonForRemove) =>
       }
     });
   };
+
+export const setBatchAutoAssignmentAttemptId = (batchId) =>
+  (dispatch) => {
+    dispatch({
+      type: ACTIONS.SET_BATCH_AUTO_ASSIGN_ATTEMPT_ID,
+      payload: {
+        batchId
+      }
+    });
+  };
+
+export const setAutoAssignmentAlertBanner = (bannerDetails) =>
+  (dispatch) => {
+    dispatch({
+      type: ACTIONS.SET_AUTO_ASSIGN_BANNER,
+      payload: {
+        title: bannerDetails.title,
+        message: bannerDetails.message,
+        type: bannerDetails.type
+      }
+    });
+  };
+
+export const setAutoAssignButtonDisabled = (isButtonDisabled) =>
+  (dispatch) => {
+    dispatch({
+      type: ACTIONS.SET_AUTO_ASSIGN_BUTTON_DISABLED,
+      payload: {
+        isButtonDisabled
+      }
+    });
+  };
+
diff --git a/client/app/queue/correspondence/correspondenceReducer/reviewPackageConstants.js b/client/app/queue/correspondence/correspondenceReducer/reviewPackageConstants.js
index b71bb87cd69..e72bc462707 100644
--- a/client/app/queue/correspondence/correspondenceReducer/reviewPackageConstants.js
+++ b/client/app/queue/correspondence/correspondenceReducer/reviewPackageConstants.js
@@ -7,4 +7,7 @@ export const ACTIONS = {
   UPDATE_DOCUMENT_TYPE_NAME: 'UPDATE_DOCUMENT_TYPE_NAME',
   REMOVE_PACKAGE_ACTION: 'REMOVE_PACKAGE_ACTION',
   SET_REASON_REMOVE_PACKAGE: 'SET_REASON_REMOVE_PACKAGE',
+  SET_AUTO_ASSIGN_BANNER: 'SET_AUTO_ASSIGN_BANNER',
+  SET_BATCH_AUTO_ASSIGN_ATTEMPT_ID: 'SET_BATCH_AUTO_ASSIGN_ATTEMPT_ID',
+  SET_AUTO_ASSIGN_BUTTON_DISABLED: 'AUTO_ASSIGN_BUTTON_DISABLED'
 };
diff --git a/client/app/queue/correspondence/correspondenceReducer/reviewPackageReducer.js b/client/app/queue/correspondence/correspondenceReducer/reviewPackageReducer.js
index 51083c7c98c..a46645b009e 100644
--- a/client/app/queue/correspondence/correspondenceReducer/reviewPackageReducer.js
+++ b/client/app/queue/correspondence/correspondenceReducer/reviewPackageReducer.js
@@ -7,7 +7,12 @@ export const initialState = {
   packageDocumentType: {},
   veteranInformation: {},
   lastAction: {},
-  reasonForRemovePackage: {}
+  reasonForRemovePackage: {},
+  autoAssign: {
+    isButtonDisabled: false,
+    batchId: null,
+    bannerAlert: {},
+  }
 };
 
 export const reviewPackageReducer = (state = initialState, action = {}) => {
@@ -87,6 +92,35 @@ export const reviewPackageReducer = (state = initialState, action = {}) => {
       }
     });
 
+  case ACTIONS.SET_BATCH_AUTO_ASSIGN_ATTEMPT_ID:
+    return update(state, {
+      autoAssign: {
+        batchId: {
+          $set: action.payload.batchId
+        }
+      }
+    });
+
+  case ACTIONS.SET_AUTO_ASSIGN_BANNER:
+    return update(state, {
+      autoAssign: {
+        bannerAlert: {
+          title: { $set: action.payload.title },
+          message: { $set: action.payload.message },
+          type: { $set: action.payload.type }
+        }
+      }
+    });
+
+  case ACTIONS.SET_AUTO_ASSIGN_BUTTON_DISABLED:
+    return update(state, {
+      autoAssign: {
+        isButtonDisabled: {
+          $set: action.payload.isButtonDisabled
+        }
+      }
+    });
+
   default:
     return state;
   }
diff --git a/client/test/app/queue/correspondences/AutoAssignAlertBanner.test.js b/client/test/app/queue/correspondences/AutoAssignAlertBanner.test.js
new file mode 100644
index 00000000000..d325d41e423
--- /dev/null
+++ b/client/test/app/queue/correspondences/AutoAssignAlertBanner.test.js
@@ -0,0 +1,119 @@
+// Import your actual component and dependencies
+import React from 'react';
+import { render, waitFor } from '@testing-library/react';
+import { Provider } from 'react-redux';
+import { createStore, applyMiddleware, combineReducers } from 'redux';
+import reviewPackageReducer from '../../../../app/queue/correspondence/correspondenceReducer/reviewPackageReducer';
+import AutoAssignAlertBanner from '../../../../app/queue/correspondence/component/AutoAssignAlertBanner';
+import thunk from 'redux-thunk';
+import COPY from '../../../../COPY';
+import ApiUtil from '../../../../app/util/ApiUtil';
+jest.mock('../../../../app/util/ApiUtil');
+
+const rootReducer = combineReducers({
+  reviewPackage: reviewPackageReducer
+});
+
+const initialReviewPackageState = {
+  reviewPackage: {
+    autoAssign: {
+      batchId: 123,
+      bannerAlert: {}
+    }
+  }
+};
+
+const renderWithProviders = (
+  component,
+  { initialState, store = createStore(rootReducer, initialState, applyMiddleware(thunk)) }) => {
+
+  return {
+    ...render(
+      <Provider store={store}>
+        { component }
+      </Provider>
+    ),
+    store
+  };
+};
+
+describe('AutoAssignAlertBanner', () => {
+  beforeEach(() => {
+    jest.resetAllMocks();
+    jest.useFakeTimers();
+  });
+  afterEach(() => {
+    jest.clearAllMocks();
+    jest.clearAllTimers();
+  });
+
+  it('displays success banner after successful auto assignment', async () => {
+    const mockResponse = { body: { number_assigned: 5, status: 'completed' } };
+
+    ApiUtil.get.mockResolvedValue(mockResponse);
+
+    const { getByText } = renderWithProviders(
+      <AutoAssignAlertBanner />,
+      { initialState: initialReviewPackageState }
+    );
+
+    await waitFor(() => {
+      expect(getByText('You have successfully assigned 5 correspondences')).toBeInTheDocument();
+    });
+
+  });
+
+  it('displays error banner after failed auto assignment', async () => {
+    const mockResponse = { body: {
+      error_message: {
+        message: COPY.BAAA_NO_UNASSIGNED_CORRESPONDENCE
+      },
+      status: 'error'
+    } };
+
+    ApiUtil.get.mockResolvedValue(mockResponse);
+
+    const { getByText } = renderWithProviders(
+      <AutoAssignAlertBanner />,
+      { initialState: initialReviewPackageState }
+    );
+
+    await waitFor(() => {
+      expect(getByText(COPY.BAAA_FAILED_TITLE)).toBeInTheDocument();
+    });
+
+  });
+
+  it('polls every minute until status is completed', async () => {
+    const mockCompletedResponse = { body: { status: 'completed' } };
+    const mockPendingResponse = { body: { status: 'pending' } };
+
+    ApiUtil.get.
+      mockResolvedValueOnce(mockPendingResponse).
+      mockResolvedValueOnce(mockCompletedResponse);
+
+    const { store } = renderWithProviders(
+      <AutoAssignAlertBanner />,
+      { initialState: initialReviewPackageState }
+    );
+
+    await waitFor(() => {
+      expect(ApiUtil.get).toHaveBeenCalledTimes(1);
+      expect(store.getState().reviewPackage.autoAssign.bannerAlert.type).toBe('pending');
+    });
+
+    jest.advanceTimersByTime(60001);
+
+    await waitFor(() => {
+      expect(ApiUtil.get).toHaveBeenCalledTimes(2);
+      expect(store.getState().reviewPackage.autoAssign.bannerAlert.type).toBe('success');
+    });
+
+    jest.advanceTimersByTime(60001);
+
+    await waitFor(() => {
+      expect(ApiUtil.get).toHaveBeenCalledTimes(2);
+      expect(store.getState().reviewPackage.autoAssign.bannerAlert.type).toBe('success');
+    });
+  });
+});
diff --git a/client/test/app/queue/correspondences/BatchAutoAssignButton.test.js b/client/test/app/queue/correspondences/BatchAutoAssignButton.test.js
new file mode 100644
index 00000000000..01d12ed2322
--- /dev/null
+++ b/client/test/app/queue/correspondences/BatchAutoAssignButton.test.js
@@ -0,0 +1,59 @@
+// Import your actual component and dependencies
+import React from 'react';
+import { render, fireEvent, waitFor } from '@testing-library/react';
+import { Provider } from 'react-redux';
+import { createStore, applyMiddleware, combineReducers } from 'redux';
+import reviewPackageReducer from '../../../../app/queue/correspondence/correspondenceReducer/reviewPackageReducer';
+import BatchAutoAssignButton from '../../../../app/queue/correspondence/component/BatchAutoAssignButton';
+import thunk from 'redux-thunk';
+import COPY from '../../../../COPY';
+import ApiUtil from '../../../../app/util/ApiUtil';
+jest.mock('../../../../app/util/ApiUtil');
+
+const rootReducer = combineReducers({
+  reviewPackage: reviewPackageReducer
+});
+
+const initialReviewPackageState = {
+  reviewPackage: {
+    autoAssign: {
+      isButtondisabled: false,
+    }
+  }
+};
+
+const renderWithProviders = (
+  component,
+  { initialState, store = createStore(rootReducer, initialState, applyMiddleware(thunk)) }) => {
+
+  return {
+    ...render(
+      <Provider store={store}>
+        { component }
+      </Provider>
+    ),
+    store
+  };
+};
+
+describe('BatchAutoAssignButton', () => {
+  it('renders the enabled button', () => {
+    const { getByText } = renderWithProviders(
+      <BatchAutoAssignButton />,
+      { initialState: initialReviewPackageState }
+    );
+
+    expect(getByText(COPY.AUTO_ASSIGN_CORRESPONDENCES_BUTTON)).not.toBeDisabled();
+  });
+
+  it('calls handleAutoAssign and makes api call to correspondence_controller#auto_assign_correspondences', async () => {
+    const { getByText } = renderWithProviders(
+      <BatchAutoAssignButton />,
+      { initialState: initialReviewPackageState }
+    );
+
+    fireEvent.click(getByText(COPY.AUTO_ASSIGN_CORRESPONDENCES_BUTTON));
+
+    await waitFor(() => expect(ApiUtil.get).toHaveBeenCalledWith('/queue/correspondence/auto_assign_correspondences'));
+  });
+});
diff --git a/config/routes.rb b/config/routes.rb
index b76837a6699..0e88d273d50 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -298,6 +298,7 @@
     get '/', to: 'queue#index'
     get '/correspondence', to: 'correspondence#correspondence_cases'
     get '/correspondence/auto_assign_correspondences', to: 'correspondence#auto_assign_correspondences'
+    get '/correspondence/:batch_auto_assignment_attempt_id/auto_assign_status', to: 'correspondence#auto_assign_status'
     get '/correspondence/:correspondence_uuid/intake', to: 'correspondence#intake', as: :queue_correspondence_intake
     post '/correspondence/:correspondence_uuid/current_step', to: 'correspondence#current_step', as: :queue_correspondence_intake_current_step
     post '/correspondence/:correspondence_uuid/correspondence_intake_task', to: 'correspondence_tasks#create_correspondence_intake_task'
diff --git a/lib/fakes/bgs_service.rb b/lib/fakes/bgs_service.rb
index 4ffcd9db5bb..7a7c2ea7115 100644
--- a/lib/fakes/bgs_service.rb
+++ b/lib/fakes/bgs_service.rb
@@ -316,11 +316,15 @@ def station_conflict?(vbms_id, _veteran_participant_id)
     (self.class.inaccessible_appeal_vbms_ids || []).include?(vbms_id)
   end
 
-  def can_access?(vbms_id)
+  def can_access?(vbms_id, user_to_check: current_user)
+    user_can_access?(vbms_id: vbms_id, user_to_check: user_to_check)
+  end
+
+  def user_can_access?(vbms_id:, user_to_check:)
     is_accessible = !(self.class.inaccessible_appeal_vbms_ids || []).include?(vbms_id)
 
-    if current_user
-      Rails.cache.fetch(can_access_cache_key(current_user, vbms_id), expires_in: 1.minute) do
+    if user_to_check
+      Rails.cache.fetch(can_access_cache_key(user_to_check, vbms_id), expires_in: 1.minute) do
         is_accessible
       end
     else
diff --git a/spec/controllers/correspondence_controller_spec.rb b/spec/controllers/correspondence_controller_spec.rb
index a3b0cf07a33..4366bf90a49 100644
--- a/spec/controllers/correspondence_controller_spec.rb
+++ b/spec/controllers/correspondence_controller_spec.rb
@@ -208,4 +208,51 @@
       )
     end
   end
+
+  describe "GET #auto_assign_correpsondences" do
+    before do
+      InboundOpsTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+    end
+
+    context "when there is no existing batch assignment attempt" do
+      it "creates batch auto assignment attempt and returns the id" do
+        expect { get :auto_assign_correspondences }.to change(BatchAutoAssignmentAttempt, :count).by(1)
+        expect(response).to have_http_status(:ok)
+        expect(JSON.parse(response.body)["batch_auto_assignment_attempt_id"]).to eq(BatchAutoAssignmentAttempt.last.id)
+      end
+    end
+
+    context "when there is an existing batch assignment attempt" do
+      it "does not create batch auto assignment attempt and returns the id" do
+        BatchAutoAssignmentAttempt.create!(
+          user: current_user,
+          status: Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.started
+        )
+        expect { get :auto_assign_correspondences }.to_not change(BatchAutoAssignmentAttempt, :count)
+        expect(response).to have_http_status(:ok)
+        expect(JSON.parse(response.body)["batch_auto_assignment_attempt_id"]).to eq(BatchAutoAssignmentAttempt.last.id)
+      end
+    end
+  end
+
+  describe "POST #auto_assign_status" do
+    let(:error_baaa) do
+      create(:batch_auto_assignment_attempt, :max_capacity_error, :packages_assigned, user_id: current_user.id)
+    end
+
+    before do
+      InboundOpsTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+    end
+
+    it "returns status details" do
+      get :auto_assign_status, params: { batch_auto_assignment_attempt_id: error_baaa.id }
+      expect(response).to have_http_status(:ok)
+      body = JSON.parse(response.body)
+      expect(body["status"]).to eq(error_baaa.status)
+      expect(body["number_assigned"]).to eq(error_baaa.num_packages_assigned)
+      expect(body["error_message"]).to eq(error_baaa.error_info)
+    end
+  end
 end
diff --git a/spec/factories/batch_auto_assignment_attempt.rb b/spec/factories/batch_auto_assignment_attempt.rb
new file mode 100644
index 00000000000..3adc99c664e
--- /dev/null
+++ b/spec/factories/batch_auto_assignment_attempt.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :batch_auto_assignment_attempt do
+    created_at { 12.hours.ago }
+    started_at { 12.hours.ago }
+    updated_at { 12.hours.ago }
+    status { Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.started }
+    user_id { User.first.id || create(:user).id }
+
+    trait :packages_assigned do
+      num_nod_packages_assigned { 5 }
+      num_nod_packages_unassigned { 2 }
+      num_packages_assigned { 8 }
+      num_packages_unassigned { 3 }
+    end
+
+    trait :completed do
+      status { Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.completed }
+      completed_at { Time.current }
+    end
+
+    trait :max_capacity_error do
+      status { Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.error }
+      error_info { { message: COPY::BAAA_USERS_MAX_QUEUE_REACHED } }
+      errored_at { Time.current }
+    end
+
+    trait :no_correspondences_error do
+      status { Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.error }
+      error_info { { message: COPY::BAAA_NO_UNASSIGNED_CORRESPONDENCE } }
+      errored_at { Time.current }
+      statistics { { seconds_elapsed: 1 } }
+    end
+  end
+end
diff --git a/spec/models/individual_auto_assignment_attempt_spec.rb b/spec/models/individual_auto_assignment_attempt_spec.rb
index d6cb154eb2b..d05aaa81327 100644
--- a/spec/models/individual_auto_assignment_attempt_spec.rb
+++ b/spec/models/individual_auto_assignment_attempt_spec.rb
@@ -8,7 +8,7 @@
   end
 
   describe "Validations" do
-    it { should allow_value(%w(true false)).for(:nod) }
+    it { should allow_value(%w[true false]).for(:nod) }
     it { should_not allow_value(nil).for(:nod) }
 
     IndividualAutoAssignmentAttempt::VALID_STATUSES.each do |status_name|
diff --git a/spec/models/organization_permission_spec.rb b/spec/models/organization_permission_spec.rb
index 6324ad5d30d..662be255da4 100644
--- a/spec/models/organization_permission_spec.rb
+++ b/spec/models/organization_permission_spec.rb
@@ -14,8 +14,7 @@
 
   describe "Validations" do
     it { should validate_presence_of(:description) }
-
-    it { should allow_value(%w(true false)).for(:enabled) }
+    it { should allow_value(%w[true false]).for(:enabled) }
     it { should_not allow_value(nil).for(:enabled) }
 
     context "permission" do
diff --git a/spec/models/organization_user_permission_spec.rb b/spec/models/organization_user_permission_spec.rb
index 5703cf8567c..b9a2ef15590 100644
--- a/spec/models/organization_user_permission_spec.rb
+++ b/spec/models/organization_user_permission_spec.rb
@@ -7,7 +7,7 @@
   end
 
   describe "Validations" do
-    it { should allow_value(%w(true false)).for(:permitted) }
+    it { should allow_value(%w[true false]).for(:permitted) }
     it { should_not allow_value(nil).for(:permitted) }
   end
 end
diff --git a/spec/services/auto_assignable_user_finder_spec.rb b/spec/services/auto_assignable_user_finder_spec.rb
index 64f65eceea6..2f91bc023d6 100644
--- a/spec/services/auto_assignable_user_finder_spec.rb
+++ b/spec/services/auto_assignable_user_finder_spec.rb
@@ -187,6 +187,7 @@ def generate_assigned_review_package_tasks(amount:, user:)
       end
 
       it "does not allow access for users without the correct sensitivity level" do
+        allow_any_instance_of(BGSService).to receive(:user_can_access?).and_return(nil)
         expect(described.get_first_assignable_user(correspondence: correspondence)).to be nil
       end
     end
diff --git a/spec/services/correspondence_auto_assign_logger_spec.rb b/spec/services/correspondence_auto_assign_logger_spec.rb
index ee3aee228e5..4c8346d95b4 100644
--- a/spec/services/correspondence_auto_assign_logger_spec.rb
+++ b/spec/services/correspondence_auto_assign_logger_spec.rb
@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
 describe CorrespondenceAutoAssignLogger do
-  subject(:described) { described_class.new(current_user) }
+  subject(:described) { described_class.new(current_user, batch_auto_assignment_attempt) }
 
+  let(:batch_auto_assignment_attempt) { create(:batch_auto_assignment_attempt, user_id: current_user.id) }
   let(:current_user) { create(:user) }
   let(:assignee) { create(:user) }
 
diff --git a/spec/services/correspondence_auto_assigner_spec.rb b/spec/services/correspondence_auto_assigner_spec.rb
index a329f69014c..946bae25d75 100644
--- a/spec/services/correspondence_auto_assigner_spec.rb
+++ b/spec/services/correspondence_auto_assigner_spec.rb
@@ -1,8 +1,14 @@
 # frozen_string_literal: true
 
 describe CorrespondenceAutoAssigner do
-  subject(:described) { described_class.new(current_user_id: current_user.id) }
+  subject(:described) do
+    described_class.new(
+      current_user_id: current_user.id,
+      batch_auto_assignment_attempt_id: batch_auto_assignment_attempt.id
+    )
+  end
 
+  let(:batch_auto_assignment_attempt) { create(:batch_auto_assignment_attempt, user_id: current_user.id) }
   let(:veteran) { create(:veteran) }
   let(:current_user) { create(:user) }
 

From 4a65390284bed8514b35ef52325ab4efd39af0b9 Mon Sep 17 00:00:00 2001
From: piedram <110848569+piedram@users.noreply.github.com>
Date: Wed, 21 Feb 2024 12:48:42 -0500
Subject: [PATCH 105/237] Add Response Letters windows Alignment changing on
 selection of Custom field (#20893)

* align letter

* fix size of selector

---------

Co-authored-by: cacevesva <109166981+cacevesva@users.noreply.github.com>
---
 .../AddCorrespondence/AddLetter.jsx           | 43 +++++++++++++------
 1 file changed, 31 insertions(+), 12 deletions(-)

diff --git a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx
index 6b33e312f58..e39b5c3aced 100644
--- a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx
+++ b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx
@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import TextField from '../../../../../components/TextField';
 import Button from '../../../../../components/Button';
+import { css } from 'glamor';
 import SearchableDropdown from 'app/components/SearchableDropdown';
 import DateSelector from 'app/components/DateSelector';
 import RadioField from '../../../../../components/RadioField';
@@ -89,17 +90,18 @@ export const AddLetter = (props) => {
 
   return (
     <>
-      { letters.map((letter) => (
-        <div id={letter} style={{ width: '50%', display: 'inline-block' }} key={letter}>
-          <NewLetter
-            index={letter}
-            removeLetter={removeLetter}
-            taskUpdatedCallback={taskUpdatedCallback}
-            setUnrelatedTasksCanContinue= {setUnrelatedTasksCanContinue}
-          />
-        </div>
-      )) }
-
+      <div className="myletters" style={{width: '100%', display: 'inline-block' }}>
+        { letters.map((letter) => (
+          <div id={letter} style={{ width: '50%', float: 'left', height: '840px' }} key={letter}>
+            <NewLetter
+              index={letter}
+              removeLetter={removeLetter}
+              taskUpdatedCallback={taskUpdatedCallback}
+              setUnrelatedTasksCanContinue= {setUnrelatedTasksCanContinue}
+            />
+          </div>
+        )) }
+      </div>
       <div style={{ width: '80%', marginBottom: '30px' }}>
         <Button
           type="button"
@@ -389,6 +391,18 @@ const NewLetter = (props) => {
     props.removeLetter(index);
   };
 
+  const letterSelectorStyling = css({
+    '& .cf-select__control': {
+      maxWidth: '60rem !important',
+    },
+  });
+
+  const letterDateStyling = css({
+    '.cf-form-textinput': {
+      maxWidth: '60rem !important',
+    },
+  });
+
   return (
     <div className="gray-border" style={
       { display: 'inline-block', padding: '2rem 2rem', marginBottom: '3rem', width: '95%' }
@@ -400,6 +414,7 @@ const NewLetter = (props) => {
           value= {letterCard.date}
           onChange={(val) => changeDate(val)}
           type="date"
+          inputStyling={letterDateStyling}
         />
       </div>
       <br />
@@ -407,7 +422,7 @@ const NewLetter = (props) => {
         name="response-letter-type"
         label="Letter type"
         placeholder="Select..."
-        styling={{ maxWidth: '100%' }}
+        styling={letterSelectorStyling}
         options={letterTypesData}
         value={letterCard.type}
         onChange={(val) => changeLetterType(val.value)}
@@ -417,6 +432,7 @@ const NewLetter = (props) => {
         name="response-letter-title"
         label="Letter title"
         placeholder="Select..."
+        styling={letterSelectorStyling}
         readOnly = {letterCard.type.length === 0}
         options={letterTitleSelector}
         value={letterCard.title}
@@ -427,6 +443,7 @@ const NewLetter = (props) => {
         name="response-letter-subcategory"
         label="Letter subcategory"
         placeholder="Select..."
+        styling={letterSelectorStyling}
         readOnly = {letterCard.title.length === 0}
         options={letterSubSelector}
         value={letterCard.subType}
@@ -437,6 +454,7 @@ const NewLetter = (props) => {
         name="response-letter-subcategory-reason"
         label="Letter subcategory reason"
         placeholder="Select..."
+        styling={letterSelectorStyling}
         readOnly = {letterCard.subType.length === 0}
         options={letterSubReason}
         value={letterCard.reason}
@@ -456,6 +474,7 @@ const NewLetter = (props) => {
           label="Number of days (Value must be between 1 and 64)"
           name="content"
           useAriaLabel
+          inputStyling={letterDateStyling}
           onChange={handleDays}
           value={letterCard.customValue}
         />

From d002ea1c96bb93717096c445d9f50c9189a16e21 Mon Sep 17 00:00:00 2001
From: SanthiParakal133 <132940479+SanthiParakal133@users.noreply.github.com>
Date: Wed, 21 Feb 2024 14:51:32 -0500
Subject: [PATCH 106/237] Lint fixes  (#20903)

* fixing AutoTexts

* Renamed Seed file

---------

Co-authored-by: Kevin Ma <magavakevin10@gmail.com>
---
 db/seeds.rb                                                  | 1 -
 spec/feature/queue/correspondence/submit_intake_form_spec.rb | 2 +-
 spec/support/correspondence_helpers.rb                       | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/db/seeds.rb b/db/seeds.rb
index 682c48d87c8..6e6c991f5e2 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -79,7 +79,6 @@ def seed
     # Always run this as last one
     call_and_log_seed_step Seeds::StaticTestCaseData
     call_and_log_seed_step Seeds::StaticDispatchedAppealsTestData
-    call_and_log_seed_step Seeds::AutoTexts
     call_and_log_seed_step Seeds::RemandedAmaAppeals
     call_and_log_seed_step Seeds::RemandedLegacyAppeals
     call_and_log_seed_step Seeds::PopulateCaseflowFromVacols
diff --git a/spec/feature/queue/correspondence/submit_intake_form_spec.rb b/spec/feature/queue/correspondence/submit_intake_form_spec.rb
index 146b5f8cf0d..b57078261a5 100644
--- a/spec/feature/queue/correspondence/submit_intake_form_spec.rb
+++ b/spec/feature/queue/correspondence/submit_intake_form_spec.rb
@@ -73,7 +73,7 @@
         allow(CorrespondenceIntakeProcessor).to receive(:new).and_return(mock_correspondence_intake_processor)
         require Rails.root.join("db/seeds/base.rb").to_s
         Dir[Rails.root.join("db/seeds/*.rb")].sort.each { |f| require f }
-        Seeds::AutoTexts.new.seed!
+        Seeds::CorrespondenceAutoTexts.new.seed!
       end
       it "displays a failed submission error banner" do
         visit_intake_form_step_2_with_appeals
diff --git a/spec/support/correspondence_helpers.rb b/spec/support/correspondence_helpers.rb
index 2e1254fc296..6da98d7bb1b 100644
--- a/spec/support/correspondence_helpers.rb
+++ b/spec/support/correspondence_helpers.rb
@@ -154,7 +154,7 @@ def setup_and_visit_intake
   def seed_autotext_table
     require Rails.root.join("db/seeds/base.rb").to_s
     Dir[Rails.root.join("db/seeds/*.rb")].sort.each { |f| require f }
-    Seeds::AutoTexts.new.seed!
+    Seeds::CorrespondenceAutoTexts.new.seed!
   end
   # rubocop:enable Metrics/ModuleLength
 end

From acb7d27a3358106eda640c1e6fa1e1e96bb93d3a Mon Sep 17 00:00:00 2001
From: Rnmarshall93 <110805785+Rnmarshall93@users.noreply.github.com>
Date: Wed, 21 Feb 2024 14:57:51 -0800
Subject: [PATCH 107/237] Your Correspondence - In Progress Tab (#20888)

* cherrypicked files

* second cherrypick

* more cherry picking.

* Reformatted code to be more OOP friendly and less verbose.

* big fix in logic

* added appeal_type, fixing many errors.

* added appeal type to factory

* improved filter, and fixed some unit tests.

* fixed efolder uploader spec

* fixed task_spec

* potential fix

* unit test fix

* fixed Correspondence Intake Task

* fixed linting issues.

* removed comments and binding pry

---------

Co-authored-by: Jim Foley <james.foley4@va.gov>
Co-authored-by: HunJerBAH <Jeremy.Hunton@va.gov>
---
 app/jobs/no_available_modifiers_fix_job.rb    |   1 -
 app/models/correspondence_queue_column.rb     |  33 ++-
 app/models/correspondence_queue_tab.rb        |   8 +-
 app/models/correspondence_task_pager.rb       |   8 +
 app/models/queue_column.rb                    |   7 +-
 app/models/task_sorter.rb                     |  13 +-
 app/models/tasks/correspondence_task.rb       |   2 +-
 .../tasks/correspondence_task_filter.rb       |  60 ++++++
 client/app/components/FilterOption.jsx        |   1 -
 client/app/components/ReceiptDatePicker.jsx   | 100 +++++++++
 client/app/components/TableFilter.jsx         |   5 +
 client/app/queue/QueueDropdownFilter.jsx      |  80 ++++++-
 client/app/queue/QueueTable.jsx               |   3 +-
 .../app/queue/components/TaskTableColumns.jsx |  23 +-
 .../CorrespondenceTableBuilder.jsx            |   2 +-
 db/seeds/helpers/queue_helpers.rb             |   4 +-
 spec/factories/correspondence.rb              |   7 +-
 spec/factories/task.rb                        |   1 +
 .../correspondence_cases_spec.rb              | 196 ++++++++++++++++++
 spec/models/task_spec.rb                      |  12 +-
 ...ondence_documents_efolder_uploader_spec.rb |   3 +-
 spec/support/correspondence_task_helpers.rb   |   2 +-
 22 files changed, 539 insertions(+), 32 deletions(-)
 create mode 100644 app/models/tasks/correspondence_task_filter.rb
 create mode 100644 client/app/components/ReceiptDatePicker.jsx

diff --git a/app/jobs/no_available_modifiers_fix_job.rb b/app/jobs/no_available_modifiers_fix_job.rb
index 6cbf4c65a50..cd2fe35bc32 100644
--- a/app/jobs/no_available_modifiers_fix_job.rb
+++ b/app/jobs/no_available_modifiers_fix_job.rb
@@ -50,7 +50,6 @@ def process_records(supp_claims, available_space)
     supp_claims.each do |sc|
       next if available_space <= 0
 
-      # binding.pry
       @stuck_job_report_service.append_single_record(sc.class.name, sc.id)
       ActiveRecord::Base.transaction do
         DecisionReviewProcessJob.perform_now(sc)
diff --git a/app/models/correspondence_queue_column.rb b/app/models/correspondence_queue_column.rb
index dcb2ff84e3d..561ed6116d7 100644
--- a/app/models/correspondence_queue_column.rb
+++ b/app/models/correspondence_queue_column.rb
@@ -1,11 +1,40 @@
 # frozen_string_literal: true
 
 class CorrespondenceQueueColumn < QueueColumn
+  include ActiveModel::Model
+
+  attr_accessor :filterable, :name
+
+  def initialize(args)
+    super
+    @filterable ||= false
+  end
+
   def to_hash(tasks)
     {
       name: name,
-      filterable: false,
-      filter_options: []
+      filterable: filterable,
+      filter_options: filterable ? filter_options(tasks) : []
     }
   end
+
+  FILTER_OPTIONS = {
+    Constants.QUEUE_CONFIG.COLUMNS.TASK_TYPE.name => :task_type_options,
+    Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name => :va_dor_options,
+    Constants.QUEUE_CONFIG.COLUMNS.TASK_ASSIGNEE.name => :task_type_options
+  }.freeze
+
+  private
+
+  def task_type_options(tasks)
+    tasks.group(:type).count.each_pair.map do |option, count|
+      label = self.class.format_option_label(Object.const_get(option).label, count)
+      self.class.filter_option_hash(option, label)
+    end
+  end
+
+  # placeholder method because the function is required
+  def va_dor_options(dummy)
+    dummy
+  end
 end
diff --git a/app/models/correspondence_queue_tab.rb b/app/models/correspondence_queue_tab.rb
index 1815587fa0c..b02036426de 100644
--- a/app/models/correspondence_queue_tab.rb
+++ b/app/models/correspondence_queue_tab.rb
@@ -2,9 +2,7 @@
 
 class CorrespondenceQueueTab < QueueTab
   def columns
-    column_names.map do |column_name|
-      CorrespondenceQueueColumn.new(name: column_name)
-    end
+    column_names.map { |column_name| CorrespondenceQueueColumn.from_name(column_name) }
   end
 
   def task_includes
@@ -21,8 +19,8 @@ def default_sorting_column
     CorrespondenceQueueColumn.from_name(Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name)
   end
 
-   # If you don't create your own tab name it will default to the tab defined in QueueTab
-   def self.from_name(tab_name)
+  # If you don't create your own tab name it will default to the tab defined in QueueTab
+  def self.from_name(tab_name)
     tab = descendants.find { |subclass| subclass.tab_name == tab_name }
     fail(Caseflow::Error::InvalidTaskTableTab, tab_name: tab_name) unless tab
 
diff --git a/app/models/correspondence_task_pager.rb b/app/models/correspondence_task_pager.rb
index 25f384b004f..53a6eb494c6 100644
--- a/app/models/correspondence_task_pager.rb
+++ b/app/models/correspondence_task_pager.rb
@@ -1,6 +1,14 @@
 # frozen_string_literal: true
 
 class CorrespondenceTaskPager < TaskPager
+  def filtered_tasks
+    CorrespondenceTaskFilter.new(filter_params: filters, tasks: tasks_for_tab).filtered_tasks
+  end
+
+  def queue_tab
+    @queue_tab ||= CorrespondenceQueueTab.from_name(tab_name).new(assignee: assignee)
+  end
+
   def paged_tasks
     @paged_tasks ||= begin
       tasks = sorted_tasks(filtered_tasks)
diff --git a/app/models/queue_column.rb b/app/models/queue_column.rb
index b848c345925..576acde7bcf 100644
--- a/app/models/queue_column.rb
+++ b/app/models/queue_column.rb
@@ -41,7 +41,8 @@ def to_hash(tasks)
   }.freeze
 
   def filter_options(tasks)
-    filter_option_func = FILTER_OPTIONS[name]
+    filter_option_func = self.class::FILTER_OPTIONS[name]
+    # binding.pry
     if filter_option_func
       send(filter_option_func, tasks)
     else
@@ -68,6 +69,10 @@ def self.filter_option_hash(value, label)
 
   private
 
+  def va_dor_options
+    nil
+  end
+
   def case_type_options(tasks)
     options = tasks.with_cached_appeals.group(:case_type).count.each_pair.map do |option, count|
       label = self.class.format_option_label(option, count)
diff --git a/app/models/task_sorter.rb b/app/models/task_sorter.rb
index 13c364866cd..a1d3ddbb498 100644
--- a/app/models/task_sorter.rb
+++ b/app/models/task_sorter.rb
@@ -21,13 +21,24 @@ def initialize(args)
     fail(Caseflow::Error::MissingRequiredProperty, message: errors.full_messages.join(", ")) unless valid?
   end
 
+  # rubocop:disable Metrics/AbcSize
   def sorted_tasks
     return tasks unless tasks.any?
 
     # Always join to the CachedAppeal and users tables because we sometimes need it, joining does not slow down the
     # application, and conditional logic to only join sometimes adds unnecessary complexity.
-    tasks.with_assignees.with_assigners.with_cached_appeals.order(order_clause)
+    case column.name
+    when Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name
+      tasks.joins(appeal: :veteran).order(last_name: sort_order.to_sym, first_name: sort_order.to_sym)
+    when Constants.QUEUE_CONFIG.COLUMNS.NOTES.name
+      tasks.joins(:appeal).order(notes: sort_order.to_sym)
+    when Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name
+      tasks.joins(:appeal).order(va_date_of_receipt: sort_order.to_sym)
+    else
+      tasks.with_assignees.with_assigners.with_cached_appeals.order(order_clause)
+    end
   end
+  # rubocop:enable Metrics/AbcSize
 
   private
 
diff --git a/app/models/tasks/correspondence_task.rb b/app/models/tasks/correspondence_task.rb
index 70ac293cc72..6851f2d4848 100644
--- a/app/models/tasks/correspondence_task.rb
+++ b/app/models/tasks/correspondence_task.rb
@@ -2,8 +2,8 @@
 
 class CorrespondenceTask < Task
   self.abstract_class = true
-
   before_create :verify_org_task_unique
+  belongs_to :appeal, class_name: "Correspondence", foreign_key: :appeal_id
   validate :status_is_valid_on_create, on: :create
   validate :assignee_status_is_valid_on_create, on: :create
 
diff --git a/app/models/tasks/correspondence_task_filter.rb b/app/models/tasks/correspondence_task_filter.rb
new file mode 100644
index 00000000000..efd7a3ebdf1
--- /dev/null
+++ b/app/models/tasks/correspondence_task_filter.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+class CorrespondenceTaskFilter < TaskFilter
+  def filter_by_va_dor(date_info)
+    date_type, first_date, second_date = date_info.split(",")
+
+    case date_type
+    when "0"
+      filter_between_dates(first_date, second_date)
+    when "1"
+      filter_before_date(first_date)
+    when "2"
+      filter_after_date(first_date)
+    when "3"
+      filter_on_date(first_date)
+    end
+  end
+
+  def filter_by_task(task_type)
+    tasks.where("type = (?)", task_type)
+  end
+
+  def filtered_tasks
+    va_dor_params = filter_params.select { |param| param.include?("col=vaDor") }
+    task_column_params = filter_params.select { |param| param.include?("col=completedDateColumn") }
+    result = tasks.all # Assuming Task is the name of your ActiveRecord model
+    va_dor_params.each do |param|
+      value_hash = Rack::Utils.parse_nested_query(param).deep_symbolize_keys
+      result = result.merge(filter_by_va_dor(value_hash[:val]))
+    end
+
+    task_column_params.each do |param|
+      value_hash = Rack::Utils.parse_nested_query(param).deep_symbolize_keys
+      result = result.merge(filter_by_date(value_hash[:val]))
+    end
+
+    result
+  end
+
+  private
+
+  def filter_between_dates(start_date, end_date)
+    tasks.joins(:appeal)
+      .where("correspondences.va_date_of_receipt > ? AND correspondences.va_date_of_receipt < ?",
+             Time.zone.parse(start_date),
+             Time.zone.parse(end_date))
+  end
+
+  def filter_before_date(date)
+    tasks.joins(:appeal).where("correspondences.va_date_of_receipt < ?", Time.zone.parse(date))
+  end
+
+  def filter_after_date(date)
+    tasks.joins(:appeal).where("correspondences.va_date_of_receipt > ?", Time.zone.parse(date))
+  end
+
+  def filter_on_date(date)
+    tasks.joins(:appeal).where("DATE(correspondences.va_date_of_receipt) = (?)", Time.zone.parse(date))
+  end
+end
diff --git a/client/app/components/FilterOption.jsx b/client/app/components/FilterOption.jsx
index 311e4873d7e..c7a7e55bc57 100644
--- a/client/app/components/FilterOption.jsx
+++ b/client/app/components/FilterOption.jsx
@@ -36,7 +36,6 @@ const FilterOption = ({ options, setSelectedValue,
         <label htmlFor={`${index}-${option.value}`}>
           {option.displayText}
         </label>
-
       </li>;
     })}
   </ul>;
diff --git a/client/app/components/ReceiptDatePicker.jsx b/client/app/components/ReceiptDatePicker.jsx
new file mode 100644
index 00000000000..c9dd4dfdd86
--- /dev/null
+++ b/client/app/components/ReceiptDatePicker.jsx
@@ -0,0 +1,100 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ReactSelectDropdown from '../../../client/app/components/ReactSelectDropdown';
+import DateSelector from './DateSelector';
+import Button from './Button';
+
+const dateDropdownMap = [
+  { value: 0, label: 'Between these dates' },
+  { value: 1, label: 'Before this date' },
+  { value: 2, label: 'After this date' },
+  { value: 3, label: 'On this date' }
+];
+
+const receiptDatePicker = (props) => {
+
+  const getDatePickerElements = () => {
+    const receiptDateFilterStates = props.receiptDateFilterStates;
+
+    switch (props.receiptDateState) {
+    case receiptDateFilterStates.BETWEEN: return (
+      <div style={{ marginLeft: '5%', marginRight: '5%' }}>
+        <DateSelector
+          onChange={props.handleDateChange}
+          label="From"
+          type="date" />
+        <DateSelector
+          onChange={props.handleSecondaryDateChange}
+          label="To"
+          type="date" />
+      </div>);
+    case receiptDateFilterStates.BEFORE: return (
+      <div style={{ marginLeft: '5%', marginRight: '5%' }}>
+        <DateSelector
+          onChange={(value) => props.handleDateChange(value)}
+          type="date" />
+      </div>
+    );
+    case receiptDateFilterStates.AFTER: return (
+      <div style={{ marginLeft: '5%', marginRight: '5%' }}>
+        <DateSelector
+          onChange={(value) => props.handleDateChange(value)}
+          type="date" />
+      </div>
+    );
+    case receiptDateFilterStates.ON: return (
+      <div style={{ marginLeft: '5%', marginRight: '5%' }}>
+        <DateSelector
+          onChange={(value) => props.handleDateChange(value)}
+          type="date" />
+      </div>
+    );
+
+    default:
+    }
+  };
+
+  return <div id="dropdown">
+    <div style={{ marginLeft: '5%', marginRight: '5%' }}>
+      <ReactSelectDropdown
+        label="Date filter parameters"
+        options={dateDropdownMap}
+        onChangeMethod={props.onChangeMethod}
+      />
+    </div>
+    <div style={{ width: '100%', margin: 'auto' }}>
+      {getDatePickerElements()}
+    </div>
+
+    <div style={{ display: 'flex', margin: '10px 0px', justifyContent: 'center', width: '190px' }}>
+      <Button disabled={props.isApplyButtonEnabled} onClick={props.handleApplyFilter}>
+        <span>Apply Filter</span>
+      </Button>
+    </div>
+
+  </div>;
+};
+
+receiptDatePicker.propTypes = {
+  receiptDateFilterStates: PropTypes.object,
+  receiptDateState: PropTypes.number,
+  handleApplyFilter: PropTypes.func.isRequired,
+  handleDateChange: PropTypes.func.isRequired,
+  handleSecondaryDateChange: PropTypes.func.isRequired,
+  isApplyButtonEnabled: PropTypes.bool.isRequired,
+  onChange: PropTypes.func,
+  options: PropTypes.arrayOf(
+    PropTypes.shape({
+      value: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+      displayText: PropTypes.string,
+    })
+  ),
+  defaultValue: PropTypes.object,
+  label: PropTypes.string,
+  onChangeMethod: PropTypes.func,
+  className: PropTypes.string,
+  disabled: PropTypes.bool,
+  customPlaceholder: PropTypes.string
+};
+
+export default receiptDatePicker;
diff --git a/client/app/components/TableFilter.jsx b/client/app/components/TableFilter.jsx
index bccd70ce974..553c2c2b57b 100644
--- a/client/app/components/TableFilter.jsx
+++ b/client/app/components/TableFilter.jsx
@@ -153,6 +153,7 @@ class TableFilter extends React.PureComponent {
     let newFilteredByList = _.clone(filteredByList);
 
     newFilteredByList[columnName] = newFilters;
+
     this.props.updateFilters(newFilteredByList);
     this.toggleDropdown();
   }
@@ -209,10 +210,13 @@ class TableFilter extends React.PureComponent {
         {this.state.open &&
           <QueueDropdownFilter
             clearFilters={this.clearFilteredByList}
+            isReceiptDateFilter={this.props.isReceiptDateFilter}
             name={valueName || columnName}
             isClearEnabled={anyFiltersAreSet}
             handleClose={this.toggleDropdown}
+            setSelectedValue={(value) => this.updateSelectedFilter(value, columnName)}
             addClearFiltersRow>
+
             <FilterOption
               options={filterOptions}
               setSelectedValue={(value) => this.updateSelectedFilter(value, columnName)} />
@@ -228,6 +232,7 @@ TableFilter.defaultProps = {
 };
 
 TableFilter.propTypes = {
+  isReceiptDateFilter: PropTypes.bool,
   enableFilter: PropTypes.bool,
   enableFilterTextTransform: PropTypes.bool,
   getFilterIconRef: PropTypes.func,
diff --git a/client/app/queue/QueueDropdownFilter.jsx b/client/app/queue/QueueDropdownFilter.jsx
index 8444a439381..a9cf7498d1b 100644
--- a/client/app/queue/QueueDropdownFilter.jsx
+++ b/client/app/queue/QueueDropdownFilter.jsx
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import { COLORS } from '@department-of-veterans-affairs/caseflow-frontend-toolkit/util/StyleConstants';
 import { css } from 'glamor';
 import { startCase } from 'lodash';
+import ReceiptDatePicker from '../components/ReceiptDatePicker';
 
 const dropdownFilterViewListStyle = css({
   margin: 0
@@ -18,14 +19,72 @@ const dropdownFilterViewListItemStyle = css(
   }
 );
 
+const receiptDateFilterStates = {
+  UNINITIALIZED: '',
+  BETWEEN: 0,
+  BEFORE: 1,
+  AFTER: 2,
+  ON: 3
+};
+
 class QueueDropdownFilter extends React.PureComponent {
   constructor() {
     super();
     this.state = {
-      rootElemWidth: null
+      rootElemWidth: null,
+      receiptDateState: -1,
+      receiptDatePrimaryValue: '',
+      receiptDateSecondaryValue: ''
     };
   }
 
+  setreceiptDateState = (value) => {
+    this.setState({ receiptDateState: value.value });
+  };
+
+  handleDateChange = (value) => {
+    this.setState({ receiptDatePrimaryValue: value });
+  }
+
+  // Used when the between dates option is selected to store the second date.
+  handleSecondaryDateChange = (value) => {
+    this.setState({ receiptDateSecondaryValue: value });
+  }
+
+  handleApplyFilter = () => {
+    if (this.state.receiptDateState === 0) {
+      this.props.setSelectedValue(
+        [
+          this.state.receiptDateState,
+          this.state.receiptDatePrimaryValue,
+          this.state.receiptDateSecondaryValue
+        ], 'vaDor');
+    } else {
+      this.props.setSelectedValue([this.state.receiptDateState, this.state.receiptDatePrimaryValue], 'vaDor');
+    }
+  }
+
+  isApplyButtonEnabled = () => {
+    if (this.state.receiptDateState >= 1 && this.state.receiptDatePrimaryValue !== '') {
+      return false;
+    }
+    if (this.state.receiptDateState === 0 &&
+      this.state.receiptDatePrimaryValue.length > 0 &&
+      this.state.receiptDateSecondaryValue.length > 0) {
+      return false;
+    }
+
+    return true;
+  }
+
+  clearAllFilters = () => {
+    this.setreceiptDateState(-1);
+    this.setState({ receiptDatePrimaryValue: '' });
+    this.setState({ receiptDateSecondaryValue: '' });
+    this.props.clearFilters();
+
+  }
+
   render() {
     const { children, name } = this.props;
 
@@ -42,8 +101,8 @@ class QueueDropdownFilter extends React.PureComponent {
         this.rootElem = rootElem;
       }}>
         {this.props.addClearFiltersRow &&
-          <div className="cf-filter-option-row">
-            <button className="cf-text-button" onClick={this.props.clearFilters}
+          <div className="cf-filter-option-row" onClick={this.clearAllFilters}>
+            <button className="cf-text-button"
               disabled={!this.props.isClearEnabled}>
               <div className="cf-clear-filter-button-wrapper">
                 Clear {displayName} filter
@@ -51,7 +110,18 @@ class QueueDropdownFilter extends React.PureComponent {
             </button>
           </div>
         }
-        {React.cloneElement(React.Children.only(children), {
+        {this.props.isReceiptDateFilter && <ReceiptDatePicker
+          handleDateChange={this.handleDateChange}
+          handleSecondaryDateChange={this.handleSecondaryDateChange}
+          setSelectedValue={this.props.setSelectedValue}
+          handleApplyFilter={this.handleApplyFilter}
+          onChangeMethod={this.setreceiptDateState}
+          receiptDateState={this.state.receiptDateState}
+          receiptDateValues={this.state.receiptDateValues}
+          receiptDateFilterStates={receiptDateFilterStates}
+          isApplyButtonEnabled={this.isApplyButtonEnabled()}
+        />}
+        {!this.props.isReceiptDateFilter && React.cloneElement(React.Children.only(children), {
           dropdownFilterViewListStyle,
           dropdownFilterViewListItemStyle
         })}
@@ -87,6 +157,8 @@ QueueDropdownFilter.propTypes = {
   handleClose: PropTypes.func,
   addClearFiltersRow: PropTypes.bool,
   name: PropTypes.string,
+  setSelectedValue: PropTypes.func.isRequired,
+  isReceiptDateFilter: PropTypes.func.isRequired
 };
 
 export default QueueDropdownFilter;
diff --git a/client/app/queue/QueueTable.jsx b/client/app/queue/QueueTable.jsx
index 9102c4e78fd..33090171a8f 100644
--- a/client/app/queue/QueueTable.jsx
+++ b/client/app/queue/QueueTable.jsx
@@ -171,6 +171,7 @@ export const HeaderRow = (props) => {
                 filterOptionsFromApi={props.useTaskPagesApi && column.filterOptions}
                 updateFilters={(newFilters) => props.updateFilteredByList(newFilters)}
                 filteredByList={props.filteredByList}
+                isReceiptDateFilter={column.name === QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name}
               />
             );
           }
@@ -845,7 +846,7 @@ HeaderRow.propTypes = FooterRow.propTypes = Row.propTypes = BodyRows.propTypes =
   }),
   onHistoryUpdate: PropTypes.func,
   preserveFilter: PropTypes.bool,
-  isCorrespondenceTable: PropTypes.bool,
+  isCorrespondenceTable: PropTypes.bool
 };
 
 Row.propTypes.rowObjects = PropTypes.arrayOf(PropTypes.object);
diff --git a/client/app/queue/components/TaskTableColumns.jsx b/client/app/queue/components/TaskTableColumns.jsx
index bfd41ca066b..a8eebf0dbde 100644
--- a/client/app/queue/components/TaskTableColumns.jsx
+++ b/client/app/queue/components/TaskTableColumns.jsx
@@ -241,6 +241,10 @@ export const veteranDetails = () => {
 
   return {
     header: 'Veteran Details',
+    label: 'Veteran Details',
+    name: QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
+    backendCanSort: true,
+    getSortValue: (task) => task.veteranDetails,
     valueFunction: (task) => {
       if (task.taskUrl === '/modal/reassign_package') {
         return <a
@@ -274,9 +278,15 @@ export const veteranDetails = () => {
 };
 
 export const vaDor = () => {
-
   return {
     header: 'VA DOR',
+    filterOptions: [],
+    columnName: 'Receipt Date',
+    backendCanSort: true,
+    enableFilter: true,
+    getSortValue: (task) => task.vaDor,
+    name: QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
+    label: QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
     valueFunction: (task) => {
       return moment(task.vaDor).format('MM/DD/YYYY');
     }
@@ -286,10 +296,12 @@ export const vaDor = () => {
 export const notes = () => {
   return {
     header: 'Notes',
-    valueFunction: (task) => task.notes
+    name: QUEUE_CONFIG.COLUMNS.NOTES.name,
+    valueFunction: (task) => task.notes,
+    backendCanSort: true,
+    getSortValue: (task) => task.notes
   };
 };
-
 export const checkboxColumn = () => {
   return {
     header: 'Select',
@@ -308,7 +320,10 @@ export const actionType = () => {
 export const daysWaitingCorrespondence = () => {
   return {
     header: 'Days Waiting',
-    valueFunction: (task) => task.daysWaiting
+    name: QUEUE_CONFIG.COLUMNS.DAYS_WAITING.name,
+    valueFunction: (task) => task.daysWaiting,
+    backendCanSort: true,
+    getSortValue: (task) => task.daysWaiting
   };
 };
 
diff --git a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
index e69d38f850e..1b42a5f1532 100644
--- a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
+++ b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
@@ -88,7 +88,7 @@ const CorrespondenceTableBuilder = (props) => {
       [QUEUE_CONFIG.COLUMNS.TASK_CLOSED_DATE.name]: taskCompletedDateColumn(),
       [QUEUE_CONFIG.COLUMNS.TASK_TYPE.name]: taskColumn(tasks, filterOptions),
       [QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name]: veteranDetails(),
-      [QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name]: vaDor(),
+      [QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name]: vaDor(tasks, filterOptions),
       [QUEUE_CONFIG.COLUMNS.NOTES.name]: notes(),
       [QUEUE_CONFIG.COLUMNS.CHECKBOX_COLUMN.name]: checkboxColumn(),
       [QUEUE_CONFIG.COLUMNS.ACTION_TYPE.name]: actionType(),
diff --git a/db/seeds/helpers/queue_helpers.rb b/db/seeds/helpers/queue_helpers.rb
index 716e1449298..6afafd64952 100644
--- a/db/seeds/helpers/queue_helpers.rb
+++ b/db/seeds/helpers/queue_helpers.rb
@@ -29,13 +29,11 @@ def create_correspondence
       cmp_queue_id: 1,
       cmp_packet_number: @cmp_packet_number,
       va_date_of_receipt: rand(1.month.ago..1.day.ago),
-      notes: "Notes from CMP - Queue Correspondence Seed",
+      notes: "Notes from CMP - Queue Correspondence Seed".split(" ").shuffle.join,
       assigned_by_id: 81,
       updated_by_id: 81,
       veteran_id: vet.id
     ).tap { @cmp_packet_number += 1 }
-
-    # create_correspondence_document(correspondence, vet)
   end
 
   def create_correspondence_document(correspondence, veteran)
diff --git a/spec/factories/correspondence.rb b/spec/factories/correspondence.rb
index ab1f4cbc98c..253f71f6bb4 100644
--- a/spec/factories/correspondence.rb
+++ b/spec/factories/correspondence.rb
@@ -27,7 +27,12 @@
       end
 
       after(:create) do |correspondence, evaluator|
-        create(:correspondence_intake_task, appeal: correspondence, assigned_to: evaluator.assigned_to)
+        create(
+          :correspondence_intake_task,
+          appeal: correspondence,
+          assigned_to: evaluator.assigned_to,
+          appeal_type: "Correspondence"
+        )
       end
     end
   end
diff --git a/spec/factories/task.rb b/spec/factories/task.rb
index 8442215ba36..847537ffe2e 100644
--- a/spec/factories/task.rb
+++ b/spec/factories/task.rb
@@ -615,6 +615,7 @@ def self.find_first_task_or_create(appeal, task_type, **kwargs)
       end
 
       factory :correspondence_intake_task, class: CorrespondenceIntakeTask do
+        appeal_type { "Correspondence" }
       end
 
       factory :efolder_upload_failed_task, class: EfolderUploadFailedTask do
diff --git a/spec/feature/queue/correspondence/correspondence_cases_spec.rb b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
index 06a5c7582b0..c16dd94db75 100644
--- a/spec/feature/queue/correspondence/correspondence_cases_spec.rb
+++ b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
@@ -1,6 +1,11 @@
 # frozen_string_literal: true
 
 RSpec.feature("The Correspondence Cases page") do
+  include CorrespondenceTaskHelpers
+  # alias this to avoid the method name collision
+  alias_method :create_efolderupload_task, :create_efolderupload_failed_task
+  include QueueHelpers
+
   context "correspondece cases feature toggle" do
     let(:current_user) { create(:user) }
     before :each do
@@ -29,4 +34,195 @@
       @correspondence_uuid = "123456789"
     end
   end
+
+  context "correspondence tasks in-progress tab" do
+    let(:current_user) { create(:user) }
+    before :each do
+      MailTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+    end
+
+    before do
+      Timecop.freeze(Time.zone.local(2020, 5, 15))
+      20.times do
+        correspondence = create(:correspondence)
+        parent_task = create_correspondence_intake(correspondence, current_user)
+        task = create_efolderupload_task(correspondence, parent_task)
+        task.correspondence.updated_by_id = current_user.id
+        task.update!(assigned_to_id: current_user.id)
+      end
+      # Used to mock a single task to compare task sorting
+      EfolderUploadFailedTask.first.update!(type: "ReviewPackageTask")
+      EfolderUploadFailedTask.first.correspondence.update!(va_date_of_receipt: Date.new(2000, 10, 10), updated_by_id: 1)
+      EfolderUploadFailedTask.last.correspondence.update!(va_date_of_receipt: Date.new(2024, 10, 10), updated_by_id: 1)
+    end
+
+    it "successfully loads the in progress tab" do
+      FeatureToggle.enable!(:correspondence_queue)
+      FeatureToggle.enable!(:user_queue_pagination)
+      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
+      expect(page).to have_content("Correspondence in progress")
+    end
+
+    it "uses veteran details sort correctly." do
+      FeatureToggle.enable!(:correspondence_queue)
+      FeatureToggle.enable!(:user_queue_pagination)
+      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by Veteran Details']").click
+      first_vet_info = page.all("#task-link")[0].text
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by Veteran Details']").click
+      last_vet_info = page.all("#task-link")[0].text
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by Veteran Details']").click
+      expect(page.all("#task-link")[0].text == first_vet_info)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by Veteran Details']").click
+      expect(page.all("#task-link")[0].text == last_vet_info)
+    end
+
+    it "uses VA DOR sort correctly." do
+      FeatureToggle.enable!(:correspondence_queue)
+      FeatureToggle.enable!(:user_queue_pagination)
+      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by VA DOR']").click
+      first_date = find("tbody > tr:nth-child(1) > td:nth-child(2)")
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by VA DOR']").click
+      last_date = find("tbody > tr:nth-child(1) > td:nth-child(2)")
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by VA DOR']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == first_date)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by VA DOR']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == last_date)
+    end
+
+    it "uses tasks sort correctly." do
+      FeatureToggle.enable!(:correspondence_queue)
+      FeatureToggle.enable!(:user_queue_pagination)
+      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by Tasks']").click
+      first_task_type = find("tbody > tr:nth-child(1) > td:nth-child(3)").text
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by Tasks']").click
+      second_task_type = find("tbody > tr:nth-child(1) > td:nth-child(3)").text
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by Tasks']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(3)").text == first_task_type)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by Tasks']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(3)").text == second_task_type)
+    end
+
+    it "uses days waiting sort correctly" do
+      FeatureToggle.enable!(:correspondence_queue)
+      FeatureToggle.enable!(:user_queue_pagination)
+      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by Days Waiting']").click
+      first_day_amount = find("tbody > tr:nth-child(1) > td:nth-child(4)").text
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by Days Waiting']").click
+      second_day_amount = find("tbody > tr:nth-child(1) > td:nth-child(4)").text
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by Days Waiting']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(4)").text == first_day_amount)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by Days Waiting']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(4)").text == second_day_amount)
+    end
+
+    it "uses notes sort correctly" do
+      FeatureToggle.enable!(:correspondence_queue)
+      FeatureToggle.enable!(:user_queue_pagination)
+      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by Notes']").click
+      first_note = find("tbody > tr:nth-child(1) > td:nth-child(5)").text
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by Notes']").click
+      second_note = find("tbody > tr:nth-child(1) > td:nth-child(5)").text
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by Notes']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(5)").text == first_note)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by Notes']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(5)").text == second_note)
+    end
+
+    it "uses receipt date between filter correctly" do
+      FeatureToggle.enable!(:correspondence_queue)
+      FeatureToggle.enable!(:user_queue_pagination)
+      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-2-option-0").click
+      all("div.input-container > input")[0].fill_in(with: "10/09/2000")
+      all("div.input-container > input")[1].fill_in(with: "10/11/2000")
+      find(".cf-submit").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+
+    it "uses receipt date between filter correctly" do
+      FeatureToggle.enable!(:correspondence_queue)
+      FeatureToggle.enable!(:user_queue_pagination)
+      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-2-option-0").click
+      all("div.input-container > input")[0].fill_in(with: "10/09/2000")
+      all("div.input-container > input")[1].fill_in(with: "10/11/2000")
+      find(".cf-submit").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+
+    it "uses receipt date before filter correctly" do
+      FeatureToggle.enable!(:correspondence_queue)
+      FeatureToggle.enable!(:user_queue_pagination)
+      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-2-option-1").click
+      all("div.input-container > input")[0].fill_in(with: "10/01/2001")
+      find(".cf-submit").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+
+    it "uses receipt date after filter correctly" do
+      FeatureToggle.enable!(:correspondence_queue)
+      FeatureToggle.enable!(:user_queue_pagination)
+      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-2-option-2").click
+      all("div.input-container > input")[0].fill_in(with: "10/01/2024")
+      find(".cf-submit").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+
+    it "uses receipt date on filter correctly" do
+      FeatureToggle.enable!(:correspondence_queue)
+      FeatureToggle.enable!(:user_queue_pagination)
+      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-2-option-3").click
+      all("div.input-container > input")[0].fill_in(with: "10/10/2000")
+      find(".cf-submit").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+
+    it "uses uses task filter correctly" do
+      FeatureToggle.enable!(:correspondence_queue)
+      FeatureToggle.enable!(:user_queue_pagination)
+      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
+      all(".unselected-filter-icon")[1].click
+      find("label", text: "Review Package Task (1)").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+  end
 end
diff --git a/spec/models/task_spec.rb b/spec/models/task_spec.rb
index d7637cfa3b1..0b0fa2b72c2 100644
--- a/spec/models/task_spec.rb
+++ b/spec/models/task_spec.rb
@@ -2001,7 +2001,13 @@ def next_assignee(_options = {})
   describe "Correspondence Tasks" do
     context "Correspondence Intake Task" do
       it "has a task_url" do
-        cit = create(:correspondence_intake_task)
+        correspondence = create(:correspondence)
+        cit = create(
+          :correspondence_intake_task,
+          appeal: correspondence,
+          appeal_type: Correspondence.name,
+          assigned_to: create(:user)
+        )
         expect(cit.task_url).to eq("/queue/correspondence/#{cit.correspondence.uuid}/intake")
       end
     end
@@ -2011,8 +2017,8 @@ def next_assignee(_options = {})
         correspondence = create(:correspondence)
         rpt = ReviewPackageTask.find_or_create_by(
           appeal_id: correspondence.id,
-          assigned_to: MailTeamSupervisor.singleton,
-          appeal_type: "Correspondence"
+          appeal_type: "Correspondence",
+          assigned_to: create(:user)
         )
 
         expect(rpt.task_url).to eq("/queue/correspondence/#{correspondence.uuid}/review_package")
diff --git a/spec/services/correspondence_documents_efolder_uploader_spec.rb b/spec/services/correspondence_documents_efolder_uploader_spec.rb
index 63b3f31bc48..41f42750b01 100644
--- a/spec/services/correspondence_documents_efolder_uploader_spec.rb
+++ b/spec/services/correspondence_documents_efolder_uploader_spec.rb
@@ -52,8 +52,7 @@
       end
 
       context "with existing EfolderUploadFailedTask" do
-        let!(:existing_failed_task) { create(:efolder_upload_failed_task, appeal: correspondence) }
-
+        let!(:existing_failed_task) { create(:efolder_upload_failed_task, appeal: correspondence, appeal_type: "Correspondence") }
         it "does not create a new EfolderUploadFailedTask if one already exists" do
           expect do
             described.upload_documents_to_claim_evidence(correspondence, current_user, parent_task)
diff --git a/spec/support/correspondence_task_helpers.rb b/spec/support/correspondence_task_helpers.rb
index 150c1161e30..253c9ddd5f6 100644
--- a/spec/support/correspondence_task_helpers.rb
+++ b/spec/support/correspondence_task_helpers.rb
@@ -17,7 +17,7 @@ def create_efolderupload_failed_task(correspondence, parent)
       parent_id: parent.id,
       appeal_id: correspondence.id,
       appeal_type: "Correspondence",
-      assigned_to: parent.assigned_to,
+      assigned_to: create(:user),
       status: Constants.TASK_STATUSES.in_progress
     )
   end

From d80c49ddee0154f25f37df91fa75adc30c7ffcd2 Mon Sep 17 00:00:00 2001
From: vinner57 <128258952+vinner57@users.noreply.github.com>
Date: Thu, 22 Feb 2024 11:32:21 -0500
Subject: [PATCH 108/237] Vinner57/appeals 40155 (#20845)

* basic edit letters canges

* edit section

* refactoring and lint fixes

* resolving conflicts

* bug fix for date and custom value

* fixing remove letter bug

* fixing lint

* fies for lint error

* lint fix

* adding response letters
---
 .../correspondenceActions.js                  | 10 +++
 .../correspondenceConstants.js                |  1 +
 .../correspondenceReducer.js                  | 11 ++-
 .../AddCorrespondence/AddLetter.jsx           | 68 +++++++++++--------
 .../ConfirmCorrespondenceView.jsx             |  6 +-
 .../SubmitCorrespondenceModal.jsx             |  8 ++-
 6 files changed, 70 insertions(+), 34 deletions(-)

diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
index 867e0a22dc9..66f3eea9b46 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
@@ -133,3 +133,13 @@ export const setResponseLetters = (responseLetters) =>
       }
     });
   };
+
+export const removeResponseLetters = (index) =>
+  (dispatch) => {
+    dispatch({
+      type: ACTIONS.REMOVE_RESPONSE_LETTERS,
+      payload: {
+        index
+      }
+    });
+  };
\ No newline at end of file
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
index 2daeda6b1a7..88637ce5a6d 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
@@ -13,4 +13,5 @@ export const ACTIONS = {
   SET_NEW_APPEAL_RELATED_TASKS: 'SET_NEW_APPEAL_RELATED_TASKS',
   SET_WAIVED_EVIDENCE_TASKS: 'SET_WAIVED_EVIDENCE_TASKS',
   SET_RESPONSE_LETTERS: 'SET_RESPONSE_LETTERS',
+  REMOVE_RESPONSE_LETTERS: 'REMOVE_RESPONSE_LETTERS'    
 };
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
index 0b531550d48..b37743d031e 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
@@ -13,7 +13,7 @@ export const initialState = {
   currentCorrespondence: [],
   veteranInformation: [],
   waivedEvidenceTasks: [],
-  responseLetters: [],
+  responseLetters: {},
 };
 
 export const intakeCorrespondenceReducer = (state = initialState, action = {}) => {
@@ -124,6 +124,15 @@ export const intakeCorrespondenceReducer = (state = initialState, action = {}) =
       }
     });
 
+  case ACTIONS.REMOVE_RESPONSE_LETTERS:
+    const newResponseLetters = state.responseLetters
+    delete newResponseLetters[action.payload.index]
+    return update(state, {
+      responseLetters: {
+        $set: newResponseLetters
+      }
+    });
+
   default:
     return state;
   }
diff --git a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx
index e39b5c3aced..1b7f2903b7a 100644
--- a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx
+++ b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx
@@ -8,16 +8,19 @@ import DateSelector from 'app/components/DateSelector';
 import RadioField from '../../../../../components/RadioField';
 import { ADD_CORRESPONDENCE_LETTER_SELECTIONS } from '../../../../constants';
 import moment from 'moment';
-import { connect, useDispatch } from 'react-redux';
+import { connect, useDispatch, useSelector } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import {
-  setResponseLetters
+  setResponseLetters, removeResponseLetters
 } from '../../../correspondenceReducer/correspondenceActions';
 
 export const AddLetter = (props) => {
   const onContinueStatusChange = props.onContinueStatusChange;
 
-  const [letters, setLetters] = useState([]);
+  const responseLetters = useSelector((state) => state.intakeCorrespondence.responseLetters);
+
+  const [letters, setLetters] = useState(Object.keys(responseLetters));
+
   const [dataLetter, setDataLetter] = useState([]);
 
   const addLetter = (index) => {
@@ -90,6 +93,7 @@ export const AddLetter = (props) => {
 
   return (
     <>
+    
       <div className="myletters" style={{width: '100%', display: 'inline-block' }}>
         { letters.map((letter) => (
           <div id={letter} style={{ width: '50%', float: 'left', height: '840px' }} key={letter}>
@@ -98,10 +102,12 @@ export const AddLetter = (props) => {
               removeLetter={removeLetter}
               taskUpdatedCallback={taskUpdatedCallback}
               setUnrelatedTasksCanContinue= {setUnrelatedTasksCanContinue}
+              currentLetter = {responseLetters && responseLetters[letter]}
             />
           </div>
         )) }
       </div>
+
       <div style={{ width: '80%', marginBottom: '30px' }}>
         <Button
           type="button"
@@ -119,7 +125,6 @@ export const AddLetter = (props) => {
         </Button>
       </div>
     </>
-
   );
 };
 
@@ -133,27 +138,29 @@ AddLetter.propTypes = {
 const currentDate = moment(new Date()).format('YYYY-MM-DD');
 const NewLetter = (props) => {
   const index = props.index;
+  const currentLetter = props.currentLetter;
   const letterHash = {};
   const setUnrelatedTasksCanContinue = props.setUnrelatedTasksCanContinue;
+  const displayLetter = (typeof currentLetter !== 'undefined');
   const [letterCard, setLetterCard] = useState({
     id: index,
-    date: currentDate,
-    type: '',
-    title: '',
-    subType: '',
-    reason: '',
-    responseWindows: '',
-    customValue: null
+    date: displayLetter ? currentLetter.date : currentDate,
+    type: displayLetter ? currentLetter.type : '',
+    title: displayLetter ? currentLetter.title : '',
+    subType: displayLetter ? currentLetter.subType : '',
+    reason: displayLetter ? currentLetter.reason : '',
+    responseWindows: displayLetter ? currentLetter.responseWindows : '',
+    customValue: displayLetter ? currentLetter.customValue : ''
   });
-
   const [letterTitleSelector, setLetterTitleSelector] = useState('');
   const [letterSubSelector, setLetterSubSelector] = useState('');
   const [letterSubReason, setLetterSubReason] = useState('');
-  const [customResponseWindowState, setCustomResponseWindowState] = useState(false);
+  const customResponseVal = Boolean(displayLetter && currentLetter?.customValue > 0);
+  const [customResponseWindowState, setCustomResponseWindowState] = useState(customResponseVal);
 
   const [stateOptions, setStateOptions] = useState(true);
 
-  const [responseWindows, setResponseWindows] = useState('');
+  const [responseWindows, setResponseWindows] = useState(displayLetter ? currentLetter.responseWindows : '');
   const naValue = 'N/A';
   const dispatch = useDispatch();
 
@@ -199,10 +206,18 @@ const NewLetter = (props) => {
     value: option.letter_type }));
 
   const selectResponseWindows = (option, aux) => {
-    if (option.response_window_option_default) {
+    if (displayLetter) {
+      const responseWindowsValue = currentLetter.responseWindows;
+
       setLetterCard({ ...letterCard,
-        responseWindows: option.response_window_option_default });
-      setResponseWindows(option.response_window_option_default);
+        responseWindows: responseWindowsValue });
+      setResponseWindows(responseWindowsValue);
+    } else if (option.response_window_option_default) {
+      const responseWindowsValue = option.response_window_option_default;
+
+      setLetterCard({ ...letterCard,
+        responseWindows: responseWindowsValue });
+      setResponseWindows(responseWindowsValue);
     } else if (option.letter_titles[aux].letter_title === letterCard.title) {
       setLetterCard({ ...letterCard,
         responseWindows: option.letter_titles[aux].response_window_option_default });
@@ -343,7 +358,6 @@ const NewLetter = (props) => {
       reason: '',
       responseWindows: ''
     });
-    setCustomResponseWindowState(false);
   };
 
   useEffect(() => {
@@ -357,27 +371,19 @@ const NewLetter = (props) => {
 
   const changeLetterTitle = (val) => {
     setLetterCard({ ...letterCard,
-      title: val,
-      subType: '',
-      reason: '',
-      responseWindows: ''
+      title: val
     });
-    setCustomResponseWindowState(false);
   };
 
   const changeLetterSubTitle = (val) => {
     setLetterCard({ ...letterCard,
-      subType: val,
-      reason: '',
-      customValue: null
+      subType: val
     });
-    setCustomResponseWindowState(false);
   };
 
   const changeSubReason = (val) => {
     setLetterCard({ ...letterCard,
-      reason: val,
-      customValue: null
+      reason: val
     });
   };
 
@@ -388,6 +394,7 @@ const NewLetter = (props) => {
   };
 
   const removeLetter = () => {
+    dispatch(removeResponseLetters(index));
     props.removeLetter(index);
   };
 
@@ -468,7 +475,6 @@ const NewLetter = (props) => {
         value = {responseWindows}
         onChange={(val) => handleCustomWindowState(val)}
       />
-
       { customResponseWindowState &&
         <TextField
           label="Number of days (Value must be between 1 and 64)"
@@ -500,7 +506,9 @@ NewLetter.propTypes = {
   letterTitle: PropTypes.string,
   setLetterTitle: PropTypes.func,
   setResponseLetters: PropTypes.func,
+  removeResponseLetters: PropTypes.func,
   setUnrelatedTasksCanContinue: PropTypes.func,
+  currentLetter: PropTypes.func,
   taskUpdatedCallback: PropTypes.func,
   onContinueStatusChange: PropTypes.func
 };
diff --git a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmCorrespondenceView.jsx b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmCorrespondenceView.jsx
index 5f634518d1e..2b8f4d146a6 100644
--- a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmCorrespondenceView.jsx
+++ b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmCorrespondenceView.jsx
@@ -196,18 +196,20 @@ export const ConfirmCorrespondenceView = (props) => {
               </tbody>
               { Object.keys(responseLetters)?.map((indexValue) => {
                 const responseLetter = responseLetters[indexValue];
+                const responseDate = new Date(responseLetter?.date);
 
                 return (
                   <tbody key={indexValue}>
                     <tr>
-                      <td> {responseLetter?.date} </td>
+                      <td> {responseDate?.toLocaleDateString('en-US', {
+                        month: '2-digit', day: '2-digit', year: 'numeric' })} </td>
                       <td> {responseLetter?.type} </td>
                       <td> {responseLetter?.title} </td>
                       <td> {responseLetter?.subType} </td>
                       <td> {responseLetter?.reason} </td>
                       <td>
                         {
-                          responseLetter?.customValue === null ?
+                          (responseLetter?.customValue === '' || responseLetter?.customValue === null) ?
                            responseLetter?.responseWindows :
                             `${responseLetter?.customValue } days`
                         }
diff --git a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/SubmitCorrespondenceModal.jsx b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/SubmitCorrespondenceModal.jsx
index b76cb8c1cfa..89b512374ab 100644
--- a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/SubmitCorrespondenceModal.jsx
+++ b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/SubmitCorrespondenceModal.jsx
@@ -17,7 +17,13 @@ export const SubmitCorrespondenceModal = ({ setSubmitCorrespondenceModalVisible,
   const tasksRelatedToAppeal = useSelector((state) => state.intakeCorrespondence.newAppealRelatedTasks);
   const tasksNotRelatedToAppeal = useSelector((state) => state.intakeCorrespondence.unrelatedTasks);
   const mailTasks = useSelector((state) => state.intakeCorrespondence.mailTasks);
-  const responseLetters = useSelector((state) => state.intakeCorrespondence.responseLetters);
+  const responseLettersHash = useSelector((state) => state.intakeCorrespondence.responseLetters);
+  let responseLetters = [];
+
+  if (responseLettersHash && Object.values(responseLettersHash).length > 0) {
+    responseLetters = Object.values(responseLettersHash);
+  }
+
   const [loading, setLoading] = useState(false);
 
   const onCancel = () => {

From abf4854eab6ad98f56d43deeca165403a0a68cbc Mon Sep 17 00:00:00 2001
From: Will Medders <93014155+wmedders21@users.noreply.github.com>
Date: Thu, 22 Feb 2024 11:18:10 -0600
Subject: [PATCH 109/237] Wmedders21/appeals 35483 (#20896)

* update seed file to create package action tasks with assigned_by value

* Update tasks call for action required tab

* Update columns in QUEUE_COLUMN constants file

* Add sorting to columns

* refactor query to use scope

* always use task pages api for this workflow

* ensure assigned by is a user

* merge with ryan/APPEALS-35479-check

* add cancel link to package action modals

* add tests for action required tab

* remove pry

* refactor tasks method

* refactor correspondence task filter

* include appeal_type when creating

* refactor test setup

* remove duplicate tests

* add current user

* add appeal type

* refactor to remove magic string

* Add required fields for correspondence_intake_task creation

* Add modal titles to constants file

* remove pry

* update test for new tab requirements

* update jest snapshot
---
 app/models/correspondence_config.rb           |   2 +-
 app/models/queue_column.rb                    |   1 -
 ...orrespondence_action_required_tasks_tab.rb |   8 +-
 client/COPY.json                              |   2 +
 .../app/queue/components/TaskTableColumns.jsx |  11 +-
 .../correspondence/CorrespondenceCases.jsx    |  13 +-
 client/constants/QUEUE_CONFIG.json            |   8 +-
 .../__snapshots__/QueueTable.test.js.snap     |   1 +
 db/seeds/queue_correspondences.rb             |   3 +-
 spec/factories/correspondence.rb              |   2 +-
 spec/factories/task.rb                        |   3 +-
 .../correspondence_cases_spec.rb              | 214 ++++++++++++++----
 .../correspondence_queue_task_link_spec.rb    |   8 +-
 spec/models/correspondence_config_spec.rb     |   4 +
 spec/models/task_spec.rb                      |  22 +-
 spec/support/correspondence_task_helpers.rb   |   2 +-
 16 files changed, 233 insertions(+), 71 deletions(-)

diff --git a/app/models/correspondence_config.rb b/app/models/correspondence_config.rb
index e4451cac974..7df7e52782b 100644
--- a/app/models/correspondence_config.rb
+++ b/app/models/correspondence_config.rb
@@ -6,7 +6,7 @@ def to_hash
       table_title: table_title,
       active_tab: default_active_tab,
       tasks_per_page: 15,
-      use_task_pages_api: assignee.use_task_pages_api?,
+      use_task_pages_api: true,
       tabs: assignee.correspondence_queue_tabs.map { |tab| attach_tasks_to_tab(tab) }
     }
   end
diff --git a/app/models/queue_column.rb b/app/models/queue_column.rb
index 576acde7bcf..6b25ddef2ac 100644
--- a/app/models/queue_column.rb
+++ b/app/models/queue_column.rb
@@ -42,7 +42,6 @@ def to_hash(tasks)
 
   def filter_options(tasks)
     filter_option_func = self.class::FILTER_OPTIONS[name]
-    # binding.pry
     if filter_option_func
       send(filter_option_func, tasks)
     else
diff --git a/app/models/queue_tabs/organization_correspondence_action_required_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_action_required_tasks_tab.rb
index 46b177fc2d3..a2fcf3de06b 100644
--- a/app/models/queue_tabs/organization_correspondence_action_required_tasks_tab.rb
+++ b/app/models/queue_tabs/organization_correspondence_action_required_tasks_tab.rb
@@ -16,7 +16,13 @@ def description
   end
 
   def tasks
-    CorrespondenceTask.includes(*task_includes).where(assigned_to: assignee).on_hold
+    tasks = CorrespondenceTask.includes(*task_includes).package_action_tasks
+
+    tasks = if RequestStore[:current_user].mail_supervisor?
+      tasks.where(assigned_to: assignee).active
+    else
+      tasks.where.not(type: RemovePackageTask.name).where(assigned_to: assignee).active
+    end
   end
 
   def column_names
diff --git a/client/COPY.json b/client/COPY.json
index 3eb7d5a2f28..74ebdbbc348 100644
--- a/client/COPY.json
+++ b/client/COPY.json
@@ -1434,6 +1434,8 @@
   "CORRESPONDENCE_READONLY_BANNER_HEADER": "This package has a pending request",
   "CORRESPONDENCE_READONLY_BANNER_MESSAGE": "Any further actions cannot be made on this package until a supervisor or superuser reviews the request.",
   "ASSOCIATED_WITH_CLAIMS_FOLDER_MAIL_TASK_LABEL": "Associated with claims folder",
+  "CORRESPONDENCE_CASES_REMOVE_PACKAGE_MODAL_TITLE": "Review request",
+  "CORRESPONDENCE_CASES_REASSIGN_PACKAGE_MODAL_TITLE": "Review request",
   "VACOLS_UPDATED_MAIL_TASK_LABEL": "VACOLS updated",
   "SENT_TO_ROJ_MAIL_TASK_LABEL": "Sent to ROJ"
 }
diff --git a/client/app/queue/components/TaskTableColumns.jsx b/client/app/queue/components/TaskTableColumns.jsx
index a8eebf0dbde..586b0ce6485 100644
--- a/client/app/queue/components/TaskTableColumns.jsx
+++ b/client/app/queue/components/TaskTableColumns.jsx
@@ -313,17 +313,20 @@ export const checkboxColumn = () => {
 export const actionType = () => {
   return {
     header: 'Action Type',
-    valueFunction: (task) => task.actionType
+    name: QUEUE_CONFIG.COLUMNS.ACTION_TYPE.name,
+    backendCanSort: true,
+    getSortValue: (task) => task.label,
+    valueFunction: (task) => task.label.split(' ')[0]
   };
 };
 
 export const daysWaitingCorrespondence = () => {
   return {
     header: 'Days Waiting',
-    name: QUEUE_CONFIG.COLUMNS.DAYS_WAITING.name,
-    valueFunction: (task) => task.daysWaiting,
+    name: QUEUE_CONFIG.COLUMNS.DAYS_WAITING_CORRESPONDENCE.name,
     backendCanSort: true,
-    getSortValue: (task) => task.daysWaiting
+    getSortValue: (task) => task.daysWaiting,
+    valueFunction: (task) => task.daysWaiting
   };
 };
 
diff --git a/client/app/queue/correspondence/CorrespondenceCases.jsx b/client/app/queue/correspondence/CorrespondenceCases.jsx
index 00fcf933bf3..2494520333f 100644
--- a/client/app/queue/correspondence/CorrespondenceCases.jsx
+++ b/client/app/queue/correspondence/CorrespondenceCases.jsx
@@ -12,6 +12,7 @@ import { sprintf } from 'sprintf-js';
 import CorrespondenceTableBuilder from './CorrespondenceTableBuilder';
 import Alert from '../../components/Alert';
 import Modal from 'app/components/Modal';
+import Button from '../../components/Button';
 
 const CorrespondenceCases = (props) => {
   const dispatch = useDispatch();
@@ -63,9 +64,17 @@ const CorrespondenceCases = (props) => {
         {config &&
         <CorrespondenceTableBuilder />}
         {showReassignPackageModal &&
-        <Modal title="Reassign Package Modal" closeHandler={closeReassignPackageModal} />}
+        <Modal
+          title={COPY.CORRESPONDENCE_CASES_REASSIGN_PACKAGE_MODAL_TITLE}
+          closeHandler={closeReassignPackageModal}
+          cancelButton={<Button linkStyling onClick={closeReassignPackageModal}>Cancel</Button>}
+        />}
         {showRemovePackageModal &&
-        <Modal title="Remove Package Modal" closeHandler={closeRemovePackageModal} />}
+        <Modal
+          title={COPY.CORRESPONDENCE_CASES_REMOVE_PACKAGE_MODAL_TITLE}
+          closeHandler={closeRemovePackageModal}
+          cancelButton={<Button linkStyling onClick={closeRemovePackageModal}>Cancel</Button>}
+        />}
       </AppSegment>
     </>
   );
diff --git a/client/constants/QUEUE_CONFIG.json b/client/constants/QUEUE_CONFIG.json
index 03300ef6425..0dd27fc682a 100644
--- a/client/constants/QUEUE_CONFIG.json
+++ b/client/constants/QUEUE_CONFIG.json
@@ -73,7 +73,9 @@
 
   "COLUMNS": {
     "ACTION_TYPE": {
-      "name": "actionType"
+      "name": "actionType",
+      "sorting_table": "tasks",
+      "sorting_columns": ["type"]
     },
     "APPEAL_TYPE": {
       "filterable": true,
@@ -114,7 +116,9 @@
       "sorting_columns": ["assigned_at"]
     },
     "DAYS_WAITING_CORRESPONDENCE": {
-      "name": "daysWaitingCorrespondence"
+      "name": "daysWaitingCorrespondence",
+      "sorting_table": "tasks",
+      "sorting_columns": ["assigned_at"]
     },
     "LAST_ACTION": {
       "name": "lastActionColumn"
diff --git a/client/test/app/queue/__snapshots__/QueueTable.test.js.snap b/client/test/app/queue/__snapshots__/QueueTable.test.js.snap
index 7ef3c929441..45f7a57a4b8 100644
--- a/client/test/app/queue/__snapshots__/QueueTable.test.js.snap
+++ b/client/test/app/queue/__snapshots__/QueueTable.test.js.snap
@@ -399,6 +399,7 @@ exports[`QueueTable HeaderRow Can filter when using task pages API and column ha
           filterOptions={Array []}
           filterOptionsFromApi={Array []}
           header="Third"
+          isReceiptDateFilter={false}
           tableData={
             Array [
               Object {
diff --git a/db/seeds/queue_correspondences.rb b/db/seeds/queue_correspondences.rb
index 31b27521523..3f89e770a29 100644
--- a/db/seeds/queue_correspondences.rb
+++ b/db/seeds/queue_correspondences.rb
@@ -127,7 +127,8 @@ def create_correspondence_with_action_required_tasks
           parent_id: rpt.id,
           appeal_id: corres.id,
           appeal_type: "Correspondence",
-          assigned_to: MailTeamSupervisor.singleton
+          assigned_to: MailTeamSupervisor.singleton,
+          assigned_by_id: rpt.assigned_to_id
         )
       end
     end
diff --git a/spec/factories/correspondence.rb b/spec/factories/correspondence.rb
index 253f71f6bb4..5687efee792 100644
--- a/spec/factories/correspondence.rb
+++ b/spec/factories/correspondence.rb
@@ -31,7 +31,7 @@
           :correspondence_intake_task,
           appeal: correspondence,
           assigned_to: evaluator.assigned_to,
-          appeal_type: "Correspondence"
+          appeal_type: Correspondence.name
         )
       end
     end
diff --git a/spec/factories/task.rb b/spec/factories/task.rb
index 847537ffe2e..4b715f3b5e5 100644
--- a/spec/factories/task.rb
+++ b/spec/factories/task.rb
@@ -400,6 +400,7 @@ def self.find_first_task_or_create(appeal, task_type, **kwargs)
       # > overridden parameters in the instance variable @overrides.
       # It's a clean solution that doesn't require updating tests or adding a new transient attribute.
       appeal { @overrides[:parent] ? @overrides[:parent].appeal : create(:appeal) }
+      appeal_type { appeal.class.name }
 
       before :create do |task, _eval|
         task.update(type: task.class.name)
@@ -615,7 +616,7 @@ def self.find_first_task_or_create(appeal, task_type, **kwargs)
       end
 
       factory :correspondence_intake_task, class: CorrespondenceIntakeTask do
-        appeal_type { "Correspondence" }
+        appeal_type { Correspondence.name }
       end
 
       factory :efolder_upload_failed_task, class: EfolderUploadFailedTask do
diff --git a/spec/feature/queue/correspondence/correspondence_cases_spec.rb b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
index c16dd94db75..ceb2a1e56cf 100644
--- a/spec/feature/queue/correspondence/correspondence_cases_spec.rb
+++ b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
@@ -4,7 +4,6 @@
   include CorrespondenceTaskHelpers
   # alias this to avoid the method name collision
   alias_method :create_efolderupload_task, :create_efolderupload_failed_task
-  include QueueHelpers
 
   context "correspondece cases feature toggle" do
     let(:current_user) { create(:user) }
@@ -47,26 +46,27 @@
       20.times do
         correspondence = create(:correspondence)
         parent_task = create_correspondence_intake(correspondence, current_user)
-        task = create_efolderupload_task(correspondence, parent_task)
-        task.correspondence.updated_by_id = current_user.id
-        task.update!(assigned_to_id: current_user.id)
+        create_efolderupload_task(correspondence, parent_task)
       end
       # Used to mock a single task to compare task sorting
       EfolderUploadFailedTask.first.update!(type: "ReviewPackageTask")
-      EfolderUploadFailedTask.first.correspondence.update!(va_date_of_receipt: Date.new(2000, 10, 10), updated_by_id: 1)
-      EfolderUploadFailedTask.last.correspondence.update!(va_date_of_receipt: Date.new(2024, 10, 10), updated_by_id: 1)
+      EfolderUploadFailedTask.first.correspondence.update!(
+        va_date_of_receipt: Date.new(2000, 10, 10),
+        updated_by_id: current_user.id
+      )
+      EfolderUploadFailedTask.last.correspondence.update!(
+        va_date_of_receipt: Date.new(2024, 10, 10),
+        updated_by_id: current_user.id
+      )
+      FeatureToggle.enable!(:correspondence_queue)
     end
 
     it "successfully loads the in progress tab" do
-      FeatureToggle.enable!(:correspondence_queue)
-      FeatureToggle.enable!(:user_queue_pagination)
       visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
       expect(page).to have_content("Correspondence in progress")
     end
 
     it "uses veteran details sort correctly." do
-      FeatureToggle.enable!(:correspondence_queue)
-      FeatureToggle.enable!(:user_queue_pagination)
       visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
       # put page in the sorted A-Z state
       find("[aria-label='Sort by Veteran Details']").click
@@ -83,8 +83,6 @@
     end
 
     it "uses VA DOR sort correctly." do
-      FeatureToggle.enable!(:correspondence_queue)
-      FeatureToggle.enable!(:user_queue_pagination)
       visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
       # put page in the sorted A-Z state
       find("[aria-label='Sort by VA DOR']").click
@@ -101,8 +99,6 @@
     end
 
     it "uses tasks sort correctly." do
-      FeatureToggle.enable!(:correspondence_queue)
-      FeatureToggle.enable!(:user_queue_pagination)
       visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
       # put page in the sorted A-Z state
       find("[aria-label='Sort by Tasks']").click
@@ -119,8 +115,6 @@
     end
 
     it "uses days waiting sort correctly" do
-      FeatureToggle.enable!(:correspondence_queue)
-      FeatureToggle.enable!(:user_queue_pagination)
       visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
       # put page in the sorted A-Z state
       find("[aria-label='Sort by Days Waiting']").click
@@ -137,8 +131,6 @@
     end
 
     it "uses notes sort correctly" do
-      FeatureToggle.enable!(:correspondence_queue)
-      FeatureToggle.enable!(:user_queue_pagination)
       visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
       # put page in the sorted A-Z state
       find("[aria-label='Sort by Notes']").click
@@ -155,21 +147,6 @@
     end
 
     it "uses receipt date between filter correctly" do
-      FeatureToggle.enable!(:correspondence_queue)
-      FeatureToggle.enable!(:user_queue_pagination)
-      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
-      all(".unselected-filter-icon")[0].click
-      find_by_id("reactSelectContainer").click
-      find_by_id("react-select-2-option-0").click
-      all("div.input-container > input")[0].fill_in(with: "10/09/2000")
-      all("div.input-container > input")[1].fill_in(with: "10/11/2000")
-      find(".cf-submit").click
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
-    end
-
-    it "uses receipt date between filter correctly" do
-      FeatureToggle.enable!(:correspondence_queue)
-      FeatureToggle.enable!(:user_queue_pagination)
       visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
       all(".unselected-filter-icon")[0].click
       find_by_id("reactSelectContainer").click
@@ -181,8 +158,6 @@
     end
 
     it "uses receipt date before filter correctly" do
-      FeatureToggle.enable!(:correspondence_queue)
-      FeatureToggle.enable!(:user_queue_pagination)
       visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
       all(".unselected-filter-icon")[0].click
       find_by_id("reactSelectContainer").click
@@ -193,8 +168,6 @@
     end
 
     it "uses receipt date after filter correctly" do
-      FeatureToggle.enable!(:correspondence_queue)
-      FeatureToggle.enable!(:user_queue_pagination)
       visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
       all(".unselected-filter-icon")[0].click
       find_by_id("reactSelectContainer").click
@@ -205,8 +178,6 @@
     end
 
     it "uses receipt date on filter correctly" do
-      FeatureToggle.enable!(:correspondence_queue)
-      FeatureToggle.enable!(:user_queue_pagination)
       visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
       all(".unselected-filter-icon")[0].click
       find_by_id("reactSelectContainer").click
@@ -217,12 +188,173 @@
     end
 
     it "uses uses task filter correctly" do
-      FeatureToggle.enable!(:correspondence_queue)
-      FeatureToggle.enable!(:user_queue_pagination)
       visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
       all(".unselected-filter-icon")[1].click
       find("label", text: "Review Package Task (1)").click
       expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
     end
   end
+
+  context "correspondence cases action required tab" do
+    let(:current_user) { create(:user) }
+    before :each do
+      MailTeamSupervisor.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+    end
+
+    before do
+      Timecop.freeze(Time.zone.local(2020, 5, 15))
+      5.times do
+        corres_array = (1..4).map { create(:correspondence) }
+        task_array = [ReassignPackageTask, RemovePackageTask, SplitPackageTask, MergePackageTask]
+
+        corres_array.each_with_index do |corres, index|
+          rpt = ReviewPackageTask.find_by(appeal_id: corres.id)
+          task_array[index].create!(
+            parent_id: rpt.id,
+            appeal_id: corres.id,
+            appeal_type: "Correspondence",
+            assigned_to: MailTeamSupervisor.singleton,
+            assigned_by_id: rpt.assigned_to_id
+          )
+        end
+      end
+       # Used to mock a single task to compare task sorting
+       ReassignPackageTask.first.correspondence.update!(
+        va_date_of_receipt: Date.new(2000, 10, 10),
+        updated_by_id: current_user.id
+      )
+       ReassignPackageTask.last.correspondence.update!(
+        va_date_of_receipt: Date.new(2050, 10, 10),
+        updated_by_id: current_user.id
+      )
+      FeatureToggle.enable!(:correspondence_queue)
+    end
+
+    it "successfully loads the action required tab" do
+      visit "/queue/correspondence/team?tab=correspondence_action_required"
+      expect(page).to have_content("Correspondence with pending requests:")
+    end
+
+    it "uses veteran details sort correctly." do
+      visit "/queue/correspondence/team?tab=correspondence_action_required"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by Veteran Details']").click
+      first_vet_info = page.all("#task-link")[0].text
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by Veteran Details']").click
+      last_vet_info = page.all("#task-link")[0].text
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by Veteran Details']").click
+      expect(page.all("#task-link")[0].text == first_vet_info)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by Veteran Details']").click
+      expect(page.all("#task-link")[0].text == last_vet_info)
+    end
+
+    it "uses VA DOR sort correctly." do
+      visit "/queue/correspondence/team?tab=correspondence_action_required"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by VA DOR']").click
+      first_date = find("tbody > tr:nth-child(1) > td:nth-child(2)")
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by VA DOR']").click
+      last_date = find("tbody > tr:nth-child(1) > td:nth-child(2)")
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by VA DOR']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == first_date)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by VA DOR']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == last_date)
+    end
+
+    it "uses action type sort correctly." do
+      visit "/queue/correspondence/team?tab=correspondence_action_required"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by Action Type']").click
+      first_task_type = find("tbody > tr:nth-child(1) > td:nth-child(3)").text
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by Action Type']").click
+      second_task_type = find("tbody > tr:nth-child(1) > td:nth-child(3)").text
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by Action Type']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(3)").text == first_task_type)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by Action Type']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(3)").text == second_task_type)
+    end
+
+    it "uses days waiting sort correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_action_required"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by Days Waiting']").click
+      first_day_amount = find("tbody > tr:nth-child(1) > td:nth-child(4)").text
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by Days Waiting']").click
+      second_day_amount = find("tbody > tr:nth-child(1) > td:nth-child(4)").text
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by Days Waiting']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(4)").text == first_day_amount)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by Days Waiting']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(4)").text == second_day_amount)
+    end
+
+    it "uses notes sort correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_action_required"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by Notes']").click
+      first_note = find("tbody > tr:nth-child(1) > td:nth-child(5)").text
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by Notes']").click
+      second_note = find("tbody > tr:nth-child(1) > td:nth-child(5)").text
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by Notes']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(5)").text == first_note)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by Notes']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(5)").text == second_note)
+    end
+
+    it "uses receipt date between filter correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_action_required"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-2-option-0").click
+      all("div.input-container > input")[0].fill_in(with: "10/09/2000")
+      all("div.input-container > input")[1].fill_in(with: "10/11/2000")
+      find(".cf-submit").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+
+    it "uses receipt date before filter correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_action_required"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-2-option-1").click
+      all("div.input-container > input")[0].fill_in(with: "10/01/2001")
+      find(".cf-submit").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+
+    it "uses receipt date after filter correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_action_required"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-2-option-2").click
+      all("div.input-container > input")[0].fill_in(with: "10/01/2024")
+      find(".cf-submit").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+
+    it "uses receipt date on filter correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_action_required"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-2-option-3").click
+      all("div.input-container > input")[0].fill_in(with: "10/10/2000")
+      find(".cf-submit").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+  end
 end
diff --git a/spec/feature/queue/correspondence/correspondence_queue_task_link_spec.rb b/spec/feature/queue/correspondence/correspondence_queue_task_link_spec.rb
index e83c358ac89..12cb7f6fad3 100644
--- a/spec/feature/queue/correspondence/correspondence_queue_task_link_spec.rb
+++ b/spec/feature/queue/correspondence/correspondence_queue_task_link_spec.rb
@@ -43,7 +43,7 @@
           process_correspondence(correspondence, current_user)
           parent_task = ReviewPackageTask.find_by(appeal_id: correspondence.id)
           create_efolderupload_failed_task(correspondence, parent_task)
-          visit "/queue/correspondence?tab=correspondence_assigned&page=1&sort_by=vaDor&order=asc"
+          visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
           find_all("#task-link").last.click
           using_wait_time(10) do
             expect(page).to have_content("Review Package")
@@ -56,7 +56,7 @@
           correspondence = create(:correspondence)
           parent_task = create_correspondence_intake(correspondence, current_user)
           create_efolderupload_failed_task(correspondence, parent_task)
-          visit "/queue/correspondence?tab=correspondence_assigned&page=1&sort_by=vaDor&order=asc"
+          visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
           find_all("#task-link").last.click
           using_wait_time(10) do
             expect(page).to have_content("Add Related Correspondence")
@@ -77,7 +77,7 @@
             assigned_to: MailTeamSupervisor.singleton
           )
           MailTeamSupervisor.singleton.add_user(current_user)
-          visit "/queue/correspondence/team?tab=correspondence_team_assigned&page=1&sort_by=vaDor&order=asc"
+          visit "/queue/correspondence/team?tab=correspondence_action_required&page=1&sort_by=vaDor&order=asc"
           find_all("#task-link").last.click
         end
 
@@ -101,7 +101,7 @@
             assigned_to: MailTeamSupervisor.singleton
           )
           MailTeamSupervisor.singleton.add_user(current_user)
-          visit "/queue/correspondence/team?tab=correspondence_team_assigned&page=1&sort_by=vaDor&order=asc"
+          visit "/queue/correspondence/team?tab=correspondence_action_required&page=1&sort_by=vaDor&order=asc"
           find_all("#task-link").last.click
         end
 
diff --git a/spec/models/correspondence_config_spec.rb b/spec/models/correspondence_config_spec.rb
index 2e7661f243c..d44c7c96b30 100644
--- a/spec/models/correspondence_config_spec.rb
+++ b/spec/models/correspondence_config_spec.rb
@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
 describe CorrespondenceConfig, :postgres do
+  before do
+    RequestStore[:current_user] = user
+  end
+
   describe ".to_hash" do
     let(:assignee) { create(:organization) }
     let(:user) { create(:user) }
diff --git a/spec/models/task_spec.rb b/spec/models/task_spec.rb
index 0b0fa2b72c2..9331b60e05b 100644
--- a/spec/models/task_spec.rb
+++ b/spec/models/task_spec.rb
@@ -2017,8 +2017,8 @@ def next_assignee(_options = {})
         correspondence = create(:correspondence)
         rpt = ReviewPackageTask.find_or_create_by(
           appeal_id: correspondence.id,
-          appeal_type: "Correspondence",
-          assigned_to: create(:user)
+          assigned_to: MailTeamSupervisor.singleton,
+          appeal_type: Correspondence.name
         )
 
         expect(rpt.task_url).to eq("/queue/correspondence/#{correspondence.uuid}/review_package")
@@ -2031,13 +2031,13 @@ def next_assignee(_options = {})
         rpt = ReviewPackageTask.find_or_create_by(
           appeal_id: correspondence.id,
           assigned_to: MailTeamSupervisor.singleton,
-          appeal_type: "Correspondence"
+          appeal_type: Correspondence.name
         )
 
         uft = EfolderUploadFailedTask.create(
           appeal_id: correspondence.id,
           assigned_to: MailTeamSupervisor.singleton,
-          appeal_type: "Correspondence",
+          appeal_type: Correspondence.name,
           parent_id: rpt.id
         )
 
@@ -2049,13 +2049,13 @@ def next_assignee(_options = {})
         cit = CorrespondenceIntakeTask.find_or_create_by(
           appeal_id: correspondence.id,
           assigned_to: MailTeamSupervisor.singleton,
-          appeal_type: "Correspondence"
+          appeal_type: Correspondence.name
         )
 
         uft = EfolderUploadFailedTask.create(
           appeal_id: correspondence.id,
           assigned_to: MailTeamSupervisor.singleton,
-          appeal_type: "Correspondence",
+          appeal_type: Correspondence.name,
           parent_id: cit.id
         )
 
@@ -2070,7 +2070,7 @@ def next_assignee(_options = {})
         reassign_pt = ReassignPackageTask.create!(
           parent_id: parent_task&.id,
           appeal_id: correspondence&.id,
-          appeal_type: "Correspondence",
+          appeal_type: Correspondence.name,
           assigned_to: MailTeamSupervisor.singleton
         )
 
@@ -2082,7 +2082,7 @@ def next_assignee(_options = {})
           RemovePackageTask.create!(
             parent_id: parent_task&.id,
             appeal_id: correspondence&.id,
-            appeal_type: "Correspondence",
+            appeal_type: Correspondence.name,
             assigned_to: MailTeamSupervisor.singleton
           )
         end.to raise_error(Caseflow::Error::MultipleOpenTasksOfSameTypeError)
@@ -2092,7 +2092,7 @@ def next_assignee(_options = {})
           SplitPackageTask.create!(
             parent_id: parent_task&.id,
             appeal_id: correspondence&.id,
-            appeal_type: "Correspondence",
+            appeal_type: Correspondence.name,
             assigned_to: MailTeamSupervisor.singleton
           )
         end.to raise_error(Caseflow::Error::MultipleOpenTasksOfSameTypeError)
@@ -2102,7 +2102,7 @@ def next_assignee(_options = {})
           MergePackageTask.create!(
             parent_id: parent_task&.id,
             appeal_id: correspondence&.id,
-            appeal_type: "Correspondence",
+            appeal_type: Correspondence.name,
             assigned_to: MailTeamSupervisor.singleton
           )
         end.to raise_error(Caseflow::Error::MultipleOpenTasksOfSameTypeError)
@@ -2113,7 +2113,7 @@ def next_assignee(_options = {})
         expect(RemovePackageTask.create!(
                  parent_id: parent_task&.id,
                  appeal_id: correspondence&.id,
-                 appeal_type: "Correspondence",
+                 appeal_type: Correspondence.name,
                  assigned_to: MailTeamSupervisor.singleton
                )).to be_a(RemovePackageTask)
       end
diff --git a/spec/support/correspondence_task_helpers.rb b/spec/support/correspondence_task_helpers.rb
index 253c9ddd5f6..150c1161e30 100644
--- a/spec/support/correspondence_task_helpers.rb
+++ b/spec/support/correspondence_task_helpers.rb
@@ -17,7 +17,7 @@ def create_efolderupload_failed_task(correspondence, parent)
       parent_id: parent.id,
       appeal_id: correspondence.id,
       appeal_type: "Correspondence",
-      assigned_to: create(:user),
+      assigned_to: parent.assigned_to,
       status: Constants.TASK_STATUSES.in_progress
     )
   end

From 358cf44ed0d922bd14c45e76fd10d26cb4d32a19 Mon Sep 17 00:00:00 2001
From: divyadasari-va <135847343+divyadasari-va@users.noreply.github.com>
Date: Thu, 22 Feb 2024 12:56:19 -0700
Subject: [PATCH 110/237] Div/appeals 35477 (#20792)

* correspondence_queue_colomn.rb shell

* Removing binding.pry

* Reverted some changes on queue column

* Updated correspondence_queue_colomn.rb shell

* temporary seed data waiting for clarification

* Initial commit for Veteran Detail sorting

* resolved merge conflicts

* CorrespondenceTask is now abstract

* Correspondence Root Task no longer creates (it's abstract)

* jolly postman seed data update

* fixed error on corr queue column.

* Sorting feature for Veteran details

* sorting on Notes

* Task filter setup

* added filter option to VA DOR column

* added isReceiptFilter to TableFilter props.

* Added isReceiptFilter props to TableFilter.

* Added  empty recieptdaterPicker component

* fixed spelling mistakes.

* Fixed the bug when changing to mailteamSupervisor user

* Days waiting sorting functionality

* Front end reciepdate picker now has basic functionality. Backend query sent.

* Displaying tasks queues according to the Correspondence Cases and Your Correspondence Case

* rubocop fixes

* rubocop fixes

* Commit for rubocop fix

* checkpoint

* Fixed team page pager issue

* fixed list items showing for vaDor filter

* Missing features from merge request

* Updated changes to frontend.

* Completed functionality for everything but between date filters.

* Filter options for VA DOR

* Updated ReceiptDatePicker to be standalone

* updated filter to be a little more clear

* add seed file to populate judges and attorneys from VACOLS

* Revert "Revert "Feature/appeals 26736""

* hotfix/APPEALS-39368: fix bug where nil ends up in @appeals array (#20668)

* fix bug where nil ends up in @appeals array

* add ama_statistics error handling

* clarify error message when rescuing in ama_statistics

* fix priority push job

* fix tests

* added nonpriority iterations to until clause in requested_distribution

* add tests for limiting nonpriority iterations

* change iterations limit to batch_size

* fix test

* Ki/APPEALS-39894 - Update Test & Linting Errors (#20776)

* APPEALS-39894 - Fixes for Linting and Props

* Spec Updates

---------

Co-authored-by: cacevesva <109166981+cacevesva@users.noreply.github.com>

* Commit for frontend changes for Date Completed column

* debug and linting fix

* Re-enabled filtering by veteran details.

* Cleaned up code and fixed a bug in the filtering.

* Added proptypes, removed unused variables.

* Frontend datePicker changes for DateCompleted

* Fixed receipt spelling.

* fixed rubocop issues

* Frontend datepicker changes

* DateCompleted filtering updated with required options

* reorganized the code so that styles don't get overwritten.

* changed name column to be more consistent with wireframes.

* Lint fixes

* fixed linting issues and made UI match wireframes.

* add seed file to populate judges and attorneys from VACOLS

* Revert "Revert "Feature/appeals 26736""

* hotfix/APPEALS-39368: fix bug where nil ends up in @appeals array (#20668)

* fix bug where nil ends up in @appeals array

* add ama_statistics error handling

* clarify error message when rescuing in ama_statistics

* fix priority push job

* fix tests

* added nonpriority iterations to until clause in requested_distribution

* add tests for limiting nonpriority iterations

* change iterations limit to batch_size

* fix test

* Wmedders21/appeals 39237 (#20834)

* Test: verifies no other open package action task on correspondence before creation

* Rubocop style fixes

* Update expectation to match new requirements

* add more wait time to address flakiness in CI

* fix issue where EfolderFailedUploadTasks had parent task belonging to wrong Correspondence

* fix issue where correspondence queue breaks after completing intake form

* fix wrong url for reassign package task

* Fix test: when remove package task is pending review

* use_history not needed

* Revert "Fix test: when remove package task is pending review"

This reverts commit f2dd043d5a42dd77bcdf47b728dad26ca724a15b.

* Removed to_json and renamed method (#20839)

* Reimplemented disabling of receiptdate filter.

* fixed clear filters, made clicking the reset button more consistent in the UI.

* filtering enabled and disabled feature

* Lint issues

* Lint fixes

* updated notes to be a little more varied.

* added support for correctly filtering veteran info & notes.

* fixed VA DOR sorting.

* fixed sorting for receipt date filter

* Date filter dropdown issue fixed

* Commit for lint fix and feature test cases

* Removed commented lines

* lint issues

* PG::NotNullViolation issue fix

* Jest errors snapshots updated

* Modified the changes as requested

* Rubocop fixes

* Improvement for filter logic

* Spec failing fixes

* Some other rspec fail fix

* Spec fixes

* Spec fixes after merge

* Modified completed tasks to aviod eager loading message in the logs

---------

Co-authored-by: Dev-KRedd <khalin.redding@va.gov>
Co-authored-by: Ryan Marshall <rnmarshall1993@gmail.com>
Co-authored-by: IsaiahBar <isaiah.barnett@va.gov>
Co-authored-by: Craig Reese <Reese_Craig@bah.com>
Co-authored-by: Craig Reese <109101548+craigrva@users.noreply.github.com>
Co-authored-by: Ki Mau <ki.mau@va.gov>
Co-authored-by: cacevesva <109166981+cacevesva@users.noreply.github.com>
Co-authored-by: Will Medders <93014155+wmedders21@users.noreply.github.com>
Co-authored-by: Kevma50287 <104021955+Kevma50287@users.noreply.github.com>
---
 app/models/correspondence_queue_column.rb     |   5 +
 app/models/queue_column.rb                    |   5 +
 .../correspondence_completed_tasks_tab.rb     |  15 +-
 ...tion_correspondence_completed_tasks_tab.rb |  14 +-
 .../tasks/correspondence_task_filter.rb       |  15 ++
 client/app/components/TableFilter.jsx         |   2 +
 .../components/TaskCompletedDatePicker.jsx    | 104 ++++++++++++
 client/app/queue/QueueDropdownFilter.jsx      |  67 +++++++-
 client/app/queue/QueueTable.jsx               |   1 +
 .../app/queue/components/TaskTableColumns.jsx |  16 +-
 .../CaseWorkerIndex.test.js.snap              |  89 +++++------
 .../__snapshots__/QueueTable.test.js.snap     |   2 +
 .../correspondence_cases_spec.rb              | 148 +++++++++++++++++-
 .../correspondence_queue_task_link_spec.rb    |   4 +-
 spec/support/correspondence_task_helpers.rb   |   9 +-
 15 files changed, 432 insertions(+), 64 deletions(-)
 create mode 100644 client/app/components/TaskCompletedDatePicker.jsx

diff --git a/app/models/correspondence_queue_column.rb b/app/models/correspondence_queue_column.rb
index 561ed6116d7..80ffa3d347d 100644
--- a/app/models/correspondence_queue_column.rb
+++ b/app/models/correspondence_queue_column.rb
@@ -21,6 +21,7 @@ def to_hash(tasks)
   FILTER_OPTIONS = {
     Constants.QUEUE_CONFIG.COLUMNS.TASK_TYPE.name => :task_type_options,
     Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name => :va_dor_options,
+    Constants.QUEUE_CONFIG.COLUMNS.TASK_CLOSED_DATE.name => :date_completed_options,
     Constants.QUEUE_CONFIG.COLUMNS.TASK_ASSIGNEE.name => :task_type_options
   }.freeze
 
@@ -37,4 +38,8 @@ def task_type_options(tasks)
   def va_dor_options(dummy)
     dummy
   end
+
+  def date_completed_options(dummy)
+    dummy
+  end
 end
diff --git a/app/models/queue_column.rb b/app/models/queue_column.rb
index 6b25ddef2ac..162d0dae631 100644
--- a/app/models/queue_column.rb
+++ b/app/models/queue_column.rb
@@ -42,6 +42,7 @@ def to_hash(tasks)
 
   def filter_options(tasks)
     filter_option_func = self.class::FILTER_OPTIONS[name]
+
     if filter_option_func
       send(filter_option_func, tasks)
     else
@@ -72,6 +73,10 @@ def va_dor_options
     nil
   end
 
+  def date_completed_options
+    nil
+  end
+
   def case_type_options(tasks)
     options = tasks.with_cached_appeals.group(:case_type).count.each_pair.map do |option, count|
       label = self.class.format_option_label(option, count)
diff --git a/app/models/queue_tabs/correspondence_completed_tasks_tab.rb b/app/models/queue_tabs/correspondence_completed_tasks_tab.rb
index 57630c68204..baa305f3ad5 100644
--- a/app/models/queue_tabs/correspondence_completed_tasks_tab.rb
+++ b/app/models/queue_tabs/correspondence_completed_tasks_tab.rb
@@ -16,7 +16,20 @@ def description
   end
 
   def tasks
-    CorrespondenceTask.where(assigned_to: assignee).recently_completed
+    completed_root_tasks = CorrespondenceRootTask.includes(:children).where(
+      status: Constants.TASK_STATUSES.completed,
+      assigned_to: assignee
+    ).pluck(:id)
+
+    tasks_with_completed_children = CorrespondenceRootTask.includes(:children)
+      .where.not(status: Constants.TASK_STATUSES.completed)
+      .filter do |task|
+        task.children.all?(&:completed?) && task.children.any? { |child| child.assigned_to == assignee }
+      end
+      .pluck(:id)
+
+    CorrespondenceTask.includes(*task_includes)
+      .where(id: completed_root_tasks + tasks_with_completed_children).recently_completed
   end
 
   def column_names
diff --git a/app/models/queue_tabs/organization_correspondence_completed_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_completed_tasks_tab.rb
index b13a3dd4c00..1fe773a1b27 100644
--- a/app/models/queue_tabs/organization_correspondence_completed_tasks_tab.rb
+++ b/app/models/queue_tabs/organization_correspondence_completed_tasks_tab.rb
@@ -16,7 +16,19 @@ def description
   end
 
   def tasks
-    CorrespondenceTask.includes(*task_includes).where(assigned_to: assignee).recently_completed
+    completed_root_tasks = CorrespondenceRootTask.includes(:children).where(
+      status: Constants.TASK_STATUSES.completed,
+      assigned_to: assignee
+    ).pluck(:id)
+
+    tasks_with_completed_children = CorrespondenceRootTask.includes(:children).where.not(
+      status: Constants.TASK_STATUSES.completed
+    ).select do |task|
+      task.children.all?(&:completed?)
+    end.pluck(:id)
+
+    CorrespondenceTask.includes(*task_includes)
+      .where(id: completed_root_tasks + tasks_with_completed_children).recently_completed
   end
 
   def column_names
diff --git a/app/models/tasks/correspondence_task_filter.rb b/app/models/tasks/correspondence_task_filter.rb
index efd7a3ebdf1..feb51b079b3 100644
--- a/app/models/tasks/correspondence_task_filter.rb
+++ b/app/models/tasks/correspondence_task_filter.rb
@@ -16,6 +16,21 @@ def filter_by_va_dor(date_info)
     end
   end
 
+  def filter_by_date(date_info)
+    date_type, first_date, second_date = date_info.split(",")
+
+    case date_type
+    when "0"
+      tasks.where("closed_at > ? AND closed_at < ?", Time.zone.parse(first_date), Time.zone.parse(second_date))
+    when "1"
+      tasks.where("closed_at < ?", Time.zone.parse(first_date))
+    when "2"
+      tasks.where("closed_at > ?", Time.zone.parse(first_date))
+    when "3"
+      tasks.where("DATE(closed_at) = (?)", Time.zone.parse(first_date))
+    end
+  end
+
   def filter_by_task(task_type)
     tasks.where("type = (?)", task_type)
   end
diff --git a/client/app/components/TableFilter.jsx b/client/app/components/TableFilter.jsx
index 553c2c2b57b..736d255cf8e 100644
--- a/client/app/components/TableFilter.jsx
+++ b/client/app/components/TableFilter.jsx
@@ -211,6 +211,7 @@ class TableFilter extends React.PureComponent {
           <QueueDropdownFilter
             clearFilters={this.clearFilteredByList}
             isReceiptDateFilter={this.props.isReceiptDateFilter}
+            isTaskCompletedDateFilter={this.props.isTaskCompletedDateFilter}
             name={valueName || columnName}
             isClearEnabled={anyFiltersAreSet}
             handleClose={this.toggleDropdown}
@@ -233,6 +234,7 @@ TableFilter.defaultProps = {
 
 TableFilter.propTypes = {
   isReceiptDateFilter: PropTypes.bool,
+  isTaskCompletedDateFilter: PropTypes.bool,
   enableFilter: PropTypes.bool,
   enableFilterTextTransform: PropTypes.bool,
   getFilterIconRef: PropTypes.func,
diff --git a/client/app/components/TaskCompletedDatePicker.jsx b/client/app/components/TaskCompletedDatePicker.jsx
new file mode 100644
index 00000000000..962d1929dfb
--- /dev/null
+++ b/client/app/components/TaskCompletedDatePicker.jsx
@@ -0,0 +1,104 @@
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+import ReactSelectDropdown from '../../../client/app/components/ReactSelectDropdown';
+import DateSelector from './DateSelector';
+import Button from './Button';
+
+const dateDropdownMap = [
+  { value: 0, label: 'Between these dates' },
+  { value: 1, label: 'Before this date' },
+  { value: 2, label: 'After this date' },
+  { value: 3, label: 'On this date' }
+];
+
+const TaskCompletedDatePicker = (props) => {
+  const [isDateSelected, setDateSelected] = useState(false);
+  const [isSecondaryDateSelected, setSecondaryDateSelected] = useState(false);
+
+  const handleDateChange = (value) => {
+    props.handleTaskCompletedDateChange(value);
+    setDateSelected(Boolean(value));
+  };
+
+  const handleSecondaryDateChange = (value) => {
+    props.handleTaskCompletedSecondaryDateChange(value);
+    setSecondaryDateSelected(Boolean(value));
+  };
+
+  const handleApplyFilter = () => {
+    props.handleTaskCompletedApplyFilter();
+  };
+
+  const taskCompletedDateFilterStates = props.taskCompletedDateFilterStates;
+  const isApplyFilterButtonDisabled =
+    props.taskCompletedDateState === taskCompletedDateFilterStates.BETWEEN ?
+      !(isDateSelected && isSecondaryDateSelected) :
+      !isDateSelected;
+
+  const getDatePickerElements = () => {
+
+    switch (props.taskCompletedDateState) {
+    case taskCompletedDateFilterStates.BETWEEN: return (
+      <div style={{ margin: '5% 5%' }}>
+        <DateSelector onChange={handleDateChange} label="From" type="date" />
+        <DateSelector onChange={handleSecondaryDateChange} label="To" type="date" />
+      </div>);
+    case taskCompletedDateFilterStates.BEFORE: return (
+      <div style={{ margin: '5% 5%' }}>
+        <DateSelector onChange={handleDateChange} label="To" type="date" />
+      </div>
+    );
+    case taskCompletedDateFilterStates.AFTER: return (
+      <div style={{ margin: '5% 5%' }}>
+        <DateSelector onChange={handleDateChange} type="date" />
+      </div>
+    );
+    case taskCompletedDateFilterStates.ON: return (
+      <div style={{ margin: '5% 5%' }}>
+        <DateSelector onChange={handleDateChange} label="Date Completed" type="date" />
+      </div>
+    );
+
+    default:
+    }
+  };
+
+  return <div id="dropdown">
+    <div style={{ marginLeft: '5%', marginRight: '5%' }}>
+      <ReactSelectDropdown
+        label="Date filter parameters"
+        options={dateDropdownMap}
+        onChangeMethod={props.onChangeMethod} />
+    </div>
+
+    <div style={{ width: '100%', margin: 'auto' }}>
+      {getDatePickerElements()}
+    </div>
+    <div style={{ margin: '10px 20px', display: 'flex', justifyContent: 'end', width: '190px' }}>
+      <Button onClick={handleApplyFilter} disabled={isApplyFilterButtonDisabled}>Apply filter</Button>
+    </div>
+  </div>;
+};
+
+TaskCompletedDatePicker.propTypes = {
+  taskCompletedDateFilterStates: PropTypes.object,
+  taskCompletedDateState: PropTypes.number,
+  handleTaskCompletedApplyFilter: PropTypes.func.isRequired,
+  handleTaskCompletedDateChange: PropTypes.func.isRequired,
+  handleTaskCompletedSecondaryDateChange: PropTypes.func.isRequired,
+  onChange: PropTypes.func,
+  options: PropTypes.arrayOf(
+    PropTypes.shape({
+      value: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+      displayText: PropTypes.string,
+    })
+  ),
+  defaultValue: PropTypes.object,
+  label: PropTypes.string,
+  onChangeMethod: PropTypes.func,
+  className: PropTypes.string,
+  disabled: PropTypes.bool,
+  customPlaceholder: PropTypes.string
+};
+
+export default TaskCompletedDatePicker;
diff --git a/client/app/queue/QueueDropdownFilter.jsx b/client/app/queue/QueueDropdownFilter.jsx
index a9cf7498d1b..de7b217e111 100644
--- a/client/app/queue/QueueDropdownFilter.jsx
+++ b/client/app/queue/QueueDropdownFilter.jsx
@@ -4,6 +4,7 @@ import { COLORS } from '@department-of-veterans-affairs/caseflow-frontend-toolki
 import { css } from 'glamor';
 import { startCase } from 'lodash';
 import ReceiptDatePicker from '../components/ReceiptDatePicker';
+import TaskCompletedDatePicker from '../components/TaskCompletedDatePicker';
 
 const dropdownFilterViewListStyle = css({
   margin: 0
@@ -27,6 +28,14 @@ const receiptDateFilterStates = {
   ON: 3
 };
 
+const taskCompletedDateFilterStates = {
+  UNINITIALIZED: '',
+  BETWEEN: 0,
+  BEFORE: 1,
+  AFTER: 2,
+  ON: 3
+};
+
 class QueueDropdownFilter extends React.PureComponent {
   constructor() {
     super();
@@ -34,7 +43,10 @@ class QueueDropdownFilter extends React.PureComponent {
       rootElemWidth: null,
       receiptDateState: -1,
       receiptDatePrimaryValue: '',
-      receiptDateSecondaryValue: ''
+      receiptDateSecondaryValue: '',
+      taskCompletedDateState: -1,
+      taskCompletedDatePrimaryValue: '',
+      taskCompletedDateSecondaryValue: ''
     };
   }
 
@@ -42,15 +54,27 @@ class QueueDropdownFilter extends React.PureComponent {
     this.setState({ receiptDateState: value.value });
   };
 
+  setTaskCompletedDateState = (value) => {
+    this.setState({ taskCompletedDateState: value.value });
+  };
+
   handleDateChange = (value) => {
     this.setState({ receiptDatePrimaryValue: value });
   }
 
+  handleTaskCompletedDateChange = (value) => {
+    this.setState({ taskCompletedDatePrimaryValue: value });
+  }
+
   // Used when the between dates option is selected to store the second date.
   handleSecondaryDateChange = (value) => {
     this.setState({ receiptDateSecondaryValue: value });
   }
 
+  handleTaskCompletedSecondaryDateChange = (value) => {
+    this.setState({ taskCompletedDateSecondaryValue: value });
+  }
+
   handleApplyFilter = () => {
     if (this.state.receiptDateState === 0) {
       this.props.setSelectedValue(
@@ -81,10 +105,27 @@ class QueueDropdownFilter extends React.PureComponent {
     this.setreceiptDateState(-1);
     this.setState({ receiptDatePrimaryValue: '' });
     this.setState({ receiptDateSecondaryValue: '' });
+    this.setTaskCompletedDateState(-1);
+    this.setState({ taskCompletedDatePrimaryValue: '' });
+    this.setState({ taskCompletedDateSecondaryValue: '' });
     this.props.clearFilters();
 
   }
 
+  handleTaskCompletedApplyFilter = () => {
+    if (this.state.taskCompletedDateState === 0) {
+      this.props.setSelectedValue(
+        [
+          this.state.taskCompletedDateState,
+          this.state.taskCompletedDatePrimaryValue,
+          this.state.taskCompletedDateSecondaryValue
+        ], 'completedDateColumn');
+    } else {
+      this.props.setSelectedValue([this.state.taskCompletedDateState, this.state.taskCompletedDatePrimaryValue],
+        'completedDateColumn');
+    }
+  }
+
   render() {
     const { children, name } = this.props;
 
@@ -121,10 +162,23 @@ class QueueDropdownFilter extends React.PureComponent {
           receiptDateFilterStates={receiptDateFilterStates}
           isApplyButtonEnabled={this.isApplyButtonEnabled()}
         />}
-        {!this.props.isReceiptDateFilter && React.cloneElement(React.Children.only(children), {
-          dropdownFilterViewListStyle,
-          dropdownFilterViewListItemStyle
-        })}
+        {this.props.isTaskCompletedDateFilter && <TaskCompletedDatePicker
+          handleTaskCompletedDateChange={this.handleTaskCompletedDateChange}
+          handleTaskCompletedSecondaryDateChange={this.handleTaskCompletedSecondaryDateChange}
+          setSelectedValue={this.props.setSelectedValue}
+          handleTaskCompletedApplyFilter={this.handleTaskCompletedApplyFilter}
+          onChangeMethod={this.setTaskCompletedDateState}
+          taskCompletedDateState={this.state.taskCompletedDateState}
+          taskCompletedDateValues={this.state.taskCompletedDateValues}
+          taskCompletedDateFilterStates={taskCompletedDateFilterStates}
+        />
+
+        }
+        {!(this.props.isReceiptDateFilter || this.props.isTaskCompletedDateFilter) &&
+          React.cloneElement(React.Children.only(children), {
+            dropdownFilterViewListStyle,
+            dropdownFilterViewListItemStyle
+          })}
       </div>
     </div>;
   }
@@ -158,7 +212,8 @@ QueueDropdownFilter.propTypes = {
   addClearFiltersRow: PropTypes.bool,
   name: PropTypes.string,
   setSelectedValue: PropTypes.func.isRequired,
-  isReceiptDateFilter: PropTypes.func.isRequired
+  isReceiptDateFilter: PropTypes.func.isRequired,
+  isTaskCompletedDateFilter: PropTypes.func.isRequired
 };
 
 export default QueueDropdownFilter;
diff --git a/client/app/queue/QueueTable.jsx b/client/app/queue/QueueTable.jsx
index 33090171a8f..d0b040a145c 100644
--- a/client/app/queue/QueueTable.jsx
+++ b/client/app/queue/QueueTable.jsx
@@ -172,6 +172,7 @@ export const HeaderRow = (props) => {
                 updateFilters={(newFilters) => props.updateFilteredByList(newFilters)}
                 filteredByList={props.filteredByList}
                 isReceiptDateFilter={column.name === QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name}
+                isTaskCompletedDateFilter={column.name === QUEUE_CONFIG.COLUMNS.TASK_CLOSED_DATE.name}
               />
             );
           }
diff --git a/client/app/queue/components/TaskTableColumns.jsx b/client/app/queue/components/TaskTableColumns.jsx
index 586b0ce6485..7ad6137f93b 100644
--- a/client/app/queue/components/TaskTableColumns.jsx
+++ b/client/app/queue/components/TaskTableColumns.jsx
@@ -21,7 +21,7 @@ import {
 } from 'app/queue/correspondence/correspondenceReducer/correspondenceActions';
 
 import { taskHasCompletedHold, hasDASRecord, collapseColumn, regionalOfficeCity, renderAppealType } from '../utils';
-import { DateString, daysSinceAssigned, daysSincePlacedOnHold } from '../../util/DateUtil';
+import { daysSinceAssigned, daysSincePlacedOnHold } from '../../util/DateUtil';
 
 import COPY from '../../../COPY';
 import QUEUE_CONFIG from '../../../constants/QUEUE_CONFIG';
@@ -273,7 +273,7 @@ export const veteranDetails = () => {
       >
         {task.veteranDetails}
       </a>;
-    }
+    },
   };
 };
 
@@ -565,8 +565,18 @@ export const taskCompletedDateColumn = () => {
   return {
     header: COPY.CASE_LIST_TABLE_COMPLETED_ON_DATE_COLUMN_TITLE,
     name: QUEUE_CONFIG.COLUMNS.TASK_CLOSED_DATE.name,
-    valueFunction: (task) => task.closedAt ? <DateString date={task.closedAt} /> : null,
+    filterOptions: [],
+    valueName: 'Date Completed',
+    customFilterLabels: CO_LOCATED_ADMIN_ACTIONS,
+    label: 'Filter by date completed',
+    columnName: QUEUE_CONFIG.COLUMNS.TASK_CLOSED_DATE.name,
+    anyFiltersAreSet: true,
     backendCanSort: true,
+    enableFilter: true,
+    filterable: true,
+    valueFunction: (task) => {
+      return moment(task.closedAt).format('MM/DD/YYYY');
+    },
     getSortValue: (task) => task.closedAt ? new Date(task.closedAt) : null
   };
 };
diff --git a/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap b/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap
index a467c6c7045..72a7022346d 100644
--- a/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap
+++ b/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap
@@ -14,58 +14,53 @@ exports[`CaseWorkerIndex renders correctly 1`] = `
             class="cf-push-left"
             data-css-1vh8afw=""
           >
-            <a
-              href="/dispatch/establish-claim/"
+            <p
+              data-css-14vgq4z=""
             >
-              <p
-                data-css-14vgq4z=""
+              <a
+                href="/dispatch/establish-claim/"
               >
-                <a
-                  href="/dispatch/establish-claim/"
+                <svg
+                  data-css-fu31os=""
+                  height="500px"
+                  version="1.1"
+                  viewBox="0 0 500 500"
+                  width="500px"
                 >
-                  <svg
-                    data-css-fu31os=""
-                    height="500px"
-                    version="1.1"
-                    viewBox="0 0 500 500"
-                    width="500px"
+                  <g
+                    fill="none"
+                    fill-rule="evenodd"
+                    stroke="none"
+                    stroke-width="1"
                   >
-                    <g
-                      fill="none"
-                      fill-rule="evenodd"
-                      stroke="none"
-                      stroke-width="1"
-                    >
-                      <path
-                        d="M389.959839,442.284569 C383.432096,442.271612 376.963574,441.048453 370.883534,438.677355 L257.429719,394.98998 C252.590851,393.086238 247.208346,393.086238 242.369478,394.98998 L129.016064,438.677355 C106.320107,447.603374 80.4584687,439.55605 66.8674699,419.338677 C57.0515074,405.211352 54.9782782,387.116356 61.3453815,371.142285 L105.120482,258.016032 C107.028046,253.186861 107.028046,247.815143 105.120482,242.985972 L61.3453815,129.95992 C54.9782782,113.985849 57.0515074,95.8908522 66.8674699,81.7635271 C80.4584687,61.5461545 106.320107,53.4988304 129.016064,62.4248497 L242.269076,106.112224 C247.107944,108.015966 252.490449,108.015966 257.329317,106.112224 L370.783133,62.4248497 C393.47909,53.4988304 419.340728,61.5461545 432.931727,81.7635271 C442.747689,95.8908522 444.820919,113.985849 438.453815,129.95992 L394.678715,243.086172 C392.77115,247.915343 392.77115,253.287062 394.678715,258.116232 L438.453815,371.342685 C444.820919,387.316757 442.747689,405.411753 432.931727,419.539078 C423.237855,433.723837 407.164043,442.231882 389.959839,442.284569 M249.899598,362.224449 C256.353168,362.233978 262.750462,363.422577 268.7751,365.731463 L382.228916,409.418838 C384.691595,410.389201 387.312266,410.898698 389.959839,410.921844 C396.866782,410.810028 403.280763,407.328714 407.128514,401.603206 C411.093101,395.97649 411.889064,388.713698 409.236948,382.364729 L365.461847,269.138277 C360.743378,257.021258 360.743378,243.579944 365.461847,231.462926 L409.236948,118.336673 C411.813252,111.977018 411.021397,104.751703 407.128514,99.0981964 C401.695283,90.9837231 391.338118,87.7327557 382.228916,91.2825651 L268.7751,134.96994 C256.614316,139.574339 243.184881,139.574339 231.024096,134.96994 L117.771084,91.2825651 C108.661882,87.7327557 98.3047167,90.9837231 92.8714859,99.0981964 C88.9068988,104.724913 88.1109359,111.987705 90.7630522,118.336673 L134.538153,231.362725 C139.256622,243.479744 139.256622,256.921058 134.538153,269.038076 L90.7630522,382.164329 C87.7347473,389.869273 89.5592305,398.632331 95.4124457,404.495531 C101.265661,410.358732 110.039485,412.212063 117.771084,409.218437 L231.124498,365.531062 C237.149529,363.373645 243.498568,362.255472 249.899598,362.224449"
-                        fill="#D6D7D9"
-                      />
-                      <path
-                        d="M209.226908,407.765531 L179.959839,419.048096 L202.108434,468.937876 C210.52076,487.825367 229.289165,499.997401 250,499.997401 C270.710835,499.997401 289.47924,487.825367 297.891566,468.937876 L319.97992,419.088176 L290.753012,407.815631 L269.176707,456.412826 C265.803034,463.96969 258.289598,468.837793 250,468.837793 C241.710402,468.837793 234.196966,463.96969 230.823293,456.412826 L209.226908,407.765531 M378.905622,303.837675 L345.180723,318.737475 C333.273614,324.007833 323.754837,333.507534 318.473896,345.390782 L303.504016,379.108216 L332.771084,390.380762 L347.188755,357.915832 C349.28122,353.172217 353.078185,349.382861 357.831325,347.294589 L390.150602,333.006012 L378.875502,303.837675 M121.074297,303.837675 L109.789157,332.995992 L142.168675,347.294589 C146.901437,349.412477 150.689105,353.192554 152.811245,357.915832 L167.138554,390.190381 L196.405622,378.907816 L181.526104,345.390782 C176.245163,333.507534 166.726386,324.007833 154.819277,318.737475 L121.074297,303.817635 M80.9136546,180.571142 L31.124498,202.60521 C12.1990801,211.000678 0.00260459933,229.731472 0.00260459933,250.400802 C0.00260459933,271.070132 12.1990801,289.800925 31.124498,298.196393 L81.0341365,320.240481 L92.3192771,291.082164 L43.7751004,269.639279 C36.2030617,266.272366 31.3251832,258.773988 31.3251832,250.501002 C31.3251832,242.228016 36.2030617,234.729638 43.7751004,231.362725 L92.3092369,209.91984 L80.9538153,180.591182 M418.885542,180.521042 L407.540161,209.849699 L456.2249,231.362725 C463.796938,234.729638 468.674817,242.228016 468.674817,250.501002 C468.674817,258.773988 463.796938,266.272366 456.2249,269.639279 L407.46988,291.192385 L418.74498,320.360721 L468.875502,298.196393 C487.80092,289.800925 499.997395,271.070132 499.997395,250.400802 C499.997395,229.731472 487.80092,211.000678 468.875502,202.60521 L418.885542,180.561122 M167.329317,110.420842 L152.911647,142.885772 C150.819182,147.629387 147.022217,151.418742 142.269076,153.507014 L109.919679,167.795591 L121.2751,197.124248 L154.919679,182.264529 C166.826788,176.994171 176.345565,167.49447 181.626506,155.611222 L196.686747,121.723447 L167.349398,110.400802 M332.670683,110.400802 L303.323293,121.703407 L318.383534,155.641283 C323.664475,167.52453 333.183252,177.024231 345.090361,182.294589 L378.75502,197.164329 L390.100402,167.835671 L357.730924,153.507014 C352.977783,151.418742 349.180818,147.629387 347.088353,142.885772 L332.650602,110.370741 M250,1.00200401 C229.237589,0.829550704 210.38235,13.058923 202.108434,32.0641283 L179.909639,82.0541082 L209.246988,93.3767535 L230.823293,44.7895792 C234.196966,37.2327148 241.710402,32.3646117 250,32.3646117 C258.289598,32.3646117 265.803034,37.2327148 269.176707,44.7895792 L290.692771,93.2665331 L320.040161,81.9639279 L297.891566,32.0641283 C289.61765,13.058923 270.762411,0.829550704 250,1.00200401"
-                        fill="#844e9f"
-                      />
-                      <path
-                        d="M303.504016,379.108216 L290.753012,407.815631 L320.02008,419.088176 L332.771084,390.370741 L303.504016,379.098196 M196.405622,378.907816 L167.138554,390.190381 L179.949799,419.048096 L209.216867,407.765531 L196.405622,378.907816 M407.459839,291.192385 L378.865462,303.837675 L390.140562,333.006012 L418.73494,320.360721 L407.459839,291.192385 M92.3092369,291.102204 L81.0240964,320.260521 L109.789157,332.975952 L121.074297,303.817635 L92.3192771,291.102204 M390.090361,167.805611 L378.74498,197.134269 L407.540161,209.849699 L418.885542,180.521042 L390.090361,167.805611 M109.909639,167.805611 L80.9538153,180.591182 L92.3192771,209.91984 L121.285141,197.124248 L109.929719,167.795591 M179.929719,82.0541082 L167.349398,110.400802 L196.686747,121.723447 L209.267068,93.3767535 L179.929719,82.0541082 M320.060241,81.9539078 L290.692771,93.2665331 L303.303213,121.673347 L332.650602,110.370741 L320.040161,81.9639279"
-                        fill="#7a4b91"
-                      />
-                    </g>
-                  </svg>
-                  Caseflow
-                </a>
-                <a
-                  href="/dispatch/establish-claim/"
+                    <path
+                      d="M389.959839,442.284569 C383.432096,442.271612 376.963574,441.048453 370.883534,438.677355 L257.429719,394.98998 C252.590851,393.086238 247.208346,393.086238 242.369478,394.98998 L129.016064,438.677355 C106.320107,447.603374 80.4584687,439.55605 66.8674699,419.338677 C57.0515074,405.211352 54.9782782,387.116356 61.3453815,371.142285 L105.120482,258.016032 C107.028046,253.186861 107.028046,247.815143 105.120482,242.985972 L61.3453815,129.95992 C54.9782782,113.985849 57.0515074,95.8908522 66.8674699,81.7635271 C80.4584687,61.5461545 106.320107,53.4988304 129.016064,62.4248497 L242.269076,106.112224 C247.107944,108.015966 252.490449,108.015966 257.329317,106.112224 L370.783133,62.4248497 C393.47909,53.4988304 419.340728,61.5461545 432.931727,81.7635271 C442.747689,95.8908522 444.820919,113.985849 438.453815,129.95992 L394.678715,243.086172 C392.77115,247.915343 392.77115,253.287062 394.678715,258.116232 L438.453815,371.342685 C444.820919,387.316757 442.747689,405.411753 432.931727,419.539078 C423.237855,433.723837 407.164043,442.231882 389.959839,442.284569 M249.899598,362.224449 C256.353168,362.233978 262.750462,363.422577 268.7751,365.731463 L382.228916,409.418838 C384.691595,410.389201 387.312266,410.898698 389.959839,410.921844 C396.866782,410.810028 403.280763,407.328714 407.128514,401.603206 C411.093101,395.97649 411.889064,388.713698 409.236948,382.364729 L365.461847,269.138277 C360.743378,257.021258 360.743378,243.579944 365.461847,231.462926 L409.236948,118.336673 C411.813252,111.977018 411.021397,104.751703 407.128514,99.0981964 C401.695283,90.9837231 391.338118,87.7327557 382.228916,91.2825651 L268.7751,134.96994 C256.614316,139.574339 243.184881,139.574339 231.024096,134.96994 L117.771084,91.2825651 C108.661882,87.7327557 98.3047167,90.9837231 92.8714859,99.0981964 C88.9068988,104.724913 88.1109359,111.987705 90.7630522,118.336673 L134.538153,231.362725 C139.256622,243.479744 139.256622,256.921058 134.538153,269.038076 L90.7630522,382.164329 C87.7347473,389.869273 89.5592305,398.632331 95.4124457,404.495531 C101.265661,410.358732 110.039485,412.212063 117.771084,409.218437 L231.124498,365.531062 C237.149529,363.373645 243.498568,362.255472 249.899598,362.224449"
+                      fill="#D6D7D9"
+                    />
+                    <path
+                      d="M209.226908,407.765531 L179.959839,419.048096 L202.108434,468.937876 C210.52076,487.825367 229.289165,499.997401 250,499.997401 C270.710835,499.997401 289.47924,487.825367 297.891566,468.937876 L319.97992,419.088176 L290.753012,407.815631 L269.176707,456.412826 C265.803034,463.96969 258.289598,468.837793 250,468.837793 C241.710402,468.837793 234.196966,463.96969 230.823293,456.412826 L209.226908,407.765531 M378.905622,303.837675 L345.180723,318.737475 C333.273614,324.007833 323.754837,333.507534 318.473896,345.390782 L303.504016,379.108216 L332.771084,390.380762 L347.188755,357.915832 C349.28122,353.172217 353.078185,349.382861 357.831325,347.294589 L390.150602,333.006012 L378.875502,303.837675 M121.074297,303.837675 L109.789157,332.995992 L142.168675,347.294589 C146.901437,349.412477 150.689105,353.192554 152.811245,357.915832 L167.138554,390.190381 L196.405622,378.907816 L181.526104,345.390782 C176.245163,333.507534 166.726386,324.007833 154.819277,318.737475 L121.074297,303.817635 M80.9136546,180.571142 L31.124498,202.60521 C12.1990801,211.000678 0.00260459933,229.731472 0.00260459933,250.400802 C0.00260459933,271.070132 12.1990801,289.800925 31.124498,298.196393 L81.0341365,320.240481 L92.3192771,291.082164 L43.7751004,269.639279 C36.2030617,266.272366 31.3251832,258.773988 31.3251832,250.501002 C31.3251832,242.228016 36.2030617,234.729638 43.7751004,231.362725 L92.3092369,209.91984 L80.9538153,180.591182 M418.885542,180.521042 L407.540161,209.849699 L456.2249,231.362725 C463.796938,234.729638 468.674817,242.228016 468.674817,250.501002 C468.674817,258.773988 463.796938,266.272366 456.2249,269.639279 L407.46988,291.192385 L418.74498,320.360721 L468.875502,298.196393 C487.80092,289.800925 499.997395,271.070132 499.997395,250.400802 C499.997395,229.731472 487.80092,211.000678 468.875502,202.60521 L418.885542,180.561122 M167.329317,110.420842 L152.911647,142.885772 C150.819182,147.629387 147.022217,151.418742 142.269076,153.507014 L109.919679,167.795591 L121.2751,197.124248 L154.919679,182.264529 C166.826788,176.994171 176.345565,167.49447 181.626506,155.611222 L196.686747,121.723447 L167.349398,110.400802 M332.670683,110.400802 L303.323293,121.703407 L318.383534,155.641283 C323.664475,167.52453 333.183252,177.024231 345.090361,182.294589 L378.75502,197.164329 L390.100402,167.835671 L357.730924,153.507014 C352.977783,151.418742 349.180818,147.629387 347.088353,142.885772 L332.650602,110.370741 M250,1.00200401 C229.237589,0.829550704 210.38235,13.058923 202.108434,32.0641283 L179.909639,82.0541082 L209.246988,93.3767535 L230.823293,44.7895792 C234.196966,37.2327148 241.710402,32.3646117 250,32.3646117 C258.289598,32.3646117 265.803034,37.2327148 269.176707,44.7895792 L290.692771,93.2665331 L320.040161,81.9639279 L297.891566,32.0641283 C289.61765,13.058923 270.762411,0.829550704 250,1.00200401"
+                      fill="#844e9f"
+                    />
+                    <path
+                      d="M303.504016,379.108216 L290.753012,407.815631 L320.02008,419.088176 L332.771084,390.370741 L303.504016,379.098196 M196.405622,378.907816 L167.138554,390.190381 L179.949799,419.048096 L209.216867,407.765531 L196.405622,378.907816 M407.459839,291.192385 L378.865462,303.837675 L390.140562,333.006012 L418.73494,320.360721 L407.459839,291.192385 M92.3092369,291.102204 L81.0240964,320.260521 L109.789157,332.975952 L121.074297,303.817635 L92.3192771,291.102204 M390.090361,167.805611 L378.74498,197.134269 L407.540161,209.849699 L418.885542,180.521042 L390.090361,167.805611 M109.909639,167.805611 L80.9538153,180.591182 L92.3192771,209.91984 L121.285141,197.124248 L109.929719,167.795591 M179.929719,82.0541082 L167.349398,110.400802 L196.686747,121.723447 L209.267068,93.3767535 L179.929719,82.0541082 M320.060241,81.9539078 L290.692771,93.2665331 L303.303213,121.673347 L332.650602,110.370741 L320.040161,81.9639279"
+                      fill="#7a4b91"
+                    />
+                  </g>
+                </svg>
+                Caseflow
+              </a>
+              <a
+                href="/dispatch/establish-claim/"
+              >
+                <span
+                  class="cf-application-title"
+                  data-css-1mdtwij=""
+                  id="page-title"
                 >
-                  <span
-                    class="cf-application-title"
-                    data-css-1mdtwij=""
-                    id="page-title"
-                    tabindex="-1"
-                  >
-                    Dispatch
-                  </span>
-                </a>
-              </p>
-            </a>
+                  Dispatch
+                </span>
+              </a>
+            </p>
             <div
               data-css-1mdtwij=""
             />
diff --git a/client/test/app/queue/__snapshots__/QueueTable.test.js.snap b/client/test/app/queue/__snapshots__/QueueTable.test.js.snap
index 45f7a57a4b8..81d6335e160 100644
--- a/client/test/app/queue/__snapshots__/QueueTable.test.js.snap
+++ b/client/test/app/queue/__snapshots__/QueueTable.test.js.snap
@@ -400,6 +400,8 @@ exports[`QueueTable HeaderRow Can filter when using task pages API and column ha
           filterOptionsFromApi={Array []}
           header="Third"
           isReceiptDateFilter={false}
+          isTaskCompletedDateFilter={false}
+
           tableData={
             Array [
               Object {
diff --git a/spec/feature/queue/correspondence/correspondence_cases_spec.rb b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
index ceb2a1e56cf..2c91c9b92a2 100644
--- a/spec/feature/queue/correspondence/correspondence_cases_spec.rb
+++ b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
@@ -46,7 +46,7 @@
       20.times do
         correspondence = create(:correspondence)
         parent_task = create_correspondence_intake(correspondence, current_user)
-        create_efolderupload_task(correspondence, parent_task)
+        create_efolderupload_task(correspondence, parent_task, user:current_user)
       end
       # Used to mock a single task to compare task sorting
       EfolderUploadFailedTask.first.update!(type: "ReviewPackageTask")
@@ -195,13 +195,157 @@
     end
   end
 
-  context "correspondence cases action required tab" do
+  context "correspondence tasks completed tab" do
     let(:current_user) { create(:user) }
     before :each do
       MailTeamSupervisor.singleton.add_user(current_user)
       User.authenticate!(user: current_user)
     end
 
+    before do
+      20.times do
+        correspondence = create(:correspondence)
+        correspondence.root_task.update!(status: Constants.TASK_STATUSES.completed,
+                                         closed_at: rand(6 * 24 * 60).minutes.ago)
+      end
+    end
+
+    before :each do
+      FeatureToggle.enable!(:correspondence_queue)
+      FeatureToggle.enable!(:user_queue_pagination)
+    end
+
+    it "displays all completed correspondence tasks" do
+      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=completedDateColumn&order=asc"
+      expect(page).to have_content("Completed correspondence:")
+      expect(page).to have_content("Viewing 1-15 of 20 total")
+      expect(page).to have_button("Next")
+      expect(page).not_to have_button("Previous")
+
+      click_button("Next", match: :first)
+      expect(page).to have_content("Viewing 16-20 of 20 total")
+      expect(page).to have_button("Previous")
+      expect(page).not_to have_button("Next")
+
+      click_button("Previous", match: :first)
+      expect(page).to have_content("Viewing 1-15 of 20 total")
+    end
+
+    it "displays all correspondence tasks sorted by date completed" do
+      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=completedDateColumn&order=asc"
+      find("[aria-label='Sort by Date Completed']").click
+
+      dates = all("tbody > tr > td:nth-child(3)").map(&:text)
+      expect(dates).to eq(dates.sort.reverse)
+
+      find("[aria-label='Sort by Date Completed']").click
+      dates = all("tbody > tr > td:nth-child(3)").map(&:text)
+      expect(dates).to eq(dates.sort)
+    end
+
+    it "filters date column with 'between' the dates" do
+      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=completedDateColumn&order=asc"
+
+      find("[aria-label='Filter by date completed']").click
+      expect(page).to have_content("Date filter parameters")
+      expect(page).to have_button("Apply filter", disabled: true)
+
+      find("#reactSelectContainer").click
+      find("#react-select-2-option-0").click
+      current_date = Time.zone.today
+      start_date = current_date.strftime("%m/%d/%Y")
+      end_date = (current_date + 1).strftime("%m/%d/%Y")
+
+      all("div.input-container > input")[0].fill_in(with: start_date)
+      all("div.input-container > input")[1].fill_in(with: end_date)
+
+      expect(page).to have_button("Apply filter", disabled: false)
+      find(".cf-submit").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(3)").length).to eq(1)
+    end
+
+    it "filters date column with 'before' this date" do
+      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=completedDateColumn&order=asc"
+
+      find("[aria-label='Filter by date completed']").click
+      expect(page).to have_content("Date filter parameters")
+      expect(page).to have_button("Apply filter", disabled: true)
+
+      find("#reactSelectContainer").click
+      find("#react-select-2-option-1").click
+      current_date = Time.zone.today
+      start_date = (current_date - 1).strftime("%m/%d/%Y")
+
+      all("div.input-container > input")[0].fill_in(with: start_date)
+      expect(page).to have_button("Apply filter", disabled: false)
+      find(".cf-submit").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(3)").length).to eq(1)
+    end
+
+    it "filters date column with 'after' this date" do
+      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=completedDateColumn&order=asc"
+
+      find("[aria-label='Filter by date completed']").click
+      expect(page).to have_content("Date filter parameters")
+      expect(page).to have_button("Apply filter", disabled: true)
+
+      find("#reactSelectContainer").click
+      find("#react-select-2-option-2").click
+      current_date = Time.zone.yesterday
+      after_date = (current_date + 1).strftime("%m/%d/%Y")
+      all("div.input-container > input")[0].fill_in(with: after_date)
+      expect(page).to have_button("Apply filter", disabled: false)
+      find(".cf-submit").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(3)").length).to eq(1)
+    end
+
+    it "filters date column with 'on' this date" do
+      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=completedDateColumn&order=asc"
+
+      find("[aria-label='Filter by date completed']").click
+      expect(page).to have_content("Date filter parameters")
+      expect(page).to have_button("Apply filter", disabled: true)
+
+      find("#reactSelectContainer").click
+      find("#react-select-2-option-3").click
+      current_date = Time.zone.today
+      on_this_date = current_date.strftime("%m/%d/%Y")
+      all("div.input-container > input")[0].fill_in(with: on_this_date)
+      find(".cf-submit").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(3)").length).to eq(1)
+    end
+
+    it "sorts by Veteran Details column" do
+      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=veteranDetailsColumn&order=asc"
+      find("[aria-label='Sort by Veteran Details']").click
+
+      veterans = all("#task-link").map(&:text)
+      expect(veterans).to eq(veterans.sort.reverse)
+
+      find("[aria-label='Sort by Veteran Details']").click
+      veterans = all("#task-link").map(&:text)
+      expect(veterans).to eq(veterans.sort)
+    end
+
+    it "sorts by Notes column" do
+      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=notes&order=asc"
+      find("[aria-label='Sort by Notes']").click
+
+      notes = all("tbody > tr > td:nth-child(4)").map(&:text)
+      expect(notes).to eq(notes.sort.reverse)
+
+      find("[aria-label='Sort by Notes']").click
+      notes = all("tbody > tr > td:nth-child(4)").map(&:text)
+      expect(notes).to eq(notes.sort)
+    end
+  end
+
+  context "correspondence cases action required tab" do
+    let(:current_user) { create(:user) }
+    before :each do
+      MailTeamSupervisor.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+    end
     before do
       Timecop.freeze(Time.zone.local(2020, 5, 15))
       5.times do
diff --git a/spec/feature/queue/correspondence/correspondence_queue_task_link_spec.rb b/spec/feature/queue/correspondence/correspondence_queue_task_link_spec.rb
index 12cb7f6fad3..22e18098462 100644
--- a/spec/feature/queue/correspondence/correspondence_queue_task_link_spec.rb
+++ b/spec/feature/queue/correspondence/correspondence_queue_task_link_spec.rb
@@ -42,7 +42,7 @@
           assign_review_package_task(correspondence, current_user)
           process_correspondence(correspondence, current_user)
           parent_task = ReviewPackageTask.find_by(appeal_id: correspondence.id)
-          create_efolderupload_failed_task(correspondence, parent_task)
+          create_efolderupload_failed_task(correspondence, parent_task, user: current_user)
           visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
           find_all("#task-link").last.click
           using_wait_time(10) do
@@ -55,7 +55,7 @@
         it "routes to the Correspondence Intake page" do
           correspondence = create(:correspondence)
           parent_task = create_correspondence_intake(correspondence, current_user)
-          create_efolderupload_failed_task(correspondence, parent_task)
+          create_efolderupload_failed_task(correspondence, parent_task, user: current_user)
           visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
           find_all("#task-link").last.click
           using_wait_time(10) do
diff --git a/spec/support/correspondence_task_helpers.rb b/spec/support/correspondence_task_helpers.rb
index 150c1161e30..ccb0bc01e69 100644
--- a/spec/support/correspondence_task_helpers.rb
+++ b/spec/support/correspondence_task_helpers.rb
@@ -12,14 +12,19 @@ def assign_review_package_task(correspondence, user)
     review_package_task.update!(assigned_to: user, status: Constants.TASK_STATUSES.assigned)
   end
 
-  def create_efolderupload_failed_task(correspondence, parent)
+  def create_efolderupload_failed_task(correspondence, parent, user:)
+    correspondence.update!(
+      va_date_of_receipt: rand(1.month.ago..1.day.ago),
+      notes: "ABCDEFG".split("").shuffle.join,
+      updated_by_id: user.id
+    )
     EfolderUploadFailedTask.create!(
       parent_id: parent.id,
       appeal_id: correspondence.id,
       appeal_type: "Correspondence",
       assigned_to: parent.assigned_to,
       status: Constants.TASK_STATUSES.in_progress
-    )
+    ).update!(assigned_at: rand(1.month.ago..1.day.ago))
   end
 
   def process_correspondence(correspondence, user)

From 40bf4486b123a2f93663a18b6ef2f69aec38804d Mon Sep 17 00:00:00 2001
From: piedram <110848569+piedram@users.noreply.github.com>
Date: Thu, 22 Feb 2024 16:05:06 -0500
Subject: [PATCH 111/237] Piedram/appeals 40814 b (#20917)

* merge into feature

* refactoring the code

* Fix style issue

* Add space in _table.css file
---
 .../correspondence_intake_processor.rb        |   5 +-
 .../AddCorrespondence/AddLetter.jsx           | 406 +-----------------
 .../AddCorrespondence/NewLetter.jsx           | 404 +++++++++++++++++
 client/app/styles/_table.scss                 |   1 +
 .../queue/correspondence/intake_form_spec.rb  |   4 +-
 5 files changed, 412 insertions(+), 408 deletions(-)
 create mode 100644 client/app/queue/correspondence/intake/components/AddCorrespondence/NewLetter.jsx

diff --git a/app/services/correspondence_intake_processor.rb b/app/services/correspondence_intake_processor.rb
index 99420bbadba..523cb0e61f7 100644
--- a/app/services/correspondence_intake_processor.rb
+++ b/app/services/correspondence_intake_processor.rb
@@ -56,11 +56,11 @@ def create_response_letter(intake_params, correspondence_id)
 
     intake_params[:response_letters]&.map do |data|
       current_value = nil
-      if (data[:responseWindows] == 'Custom')
+      if data[:responseWindows] == "Custom"
         current_value = data[:customValue]
       end
 
-      if (data[:responseWindows] == '65 days')
+      if data[:responseWindows] == "65 days"
         current_value = 65
       end
 
@@ -77,7 +77,6 @@ def create_response_letter(intake_params, correspondence_id)
     end
   end
 
-
   def link_appeals_to_correspondence(intake_params, correspondence_id)
     intake_params[:related_appeal_ids]&.map do |appeal_id|
       CorrespondencesAppeal.find_or_create_by(correspondence_id: correspondence_id, appeal_id: appeal_id)
diff --git a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx
index 1b7f2903b7a..d99255399df 100644
--- a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx
+++ b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx
@@ -1,18 +1,8 @@
 import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
-import TextField from '../../../../../components/TextField';
 import Button from '../../../../../components/Button';
-import { css } from 'glamor';
-import SearchableDropdown from 'app/components/SearchableDropdown';
-import DateSelector from 'app/components/DateSelector';
-import RadioField from '../../../../../components/RadioField';
-import { ADD_CORRESPONDENCE_LETTER_SELECTIONS } from '../../../../constants';
-import moment from 'moment';
-import { connect, useDispatch, useSelector } from 'react-redux';
-import { bindActionCreators } from 'redux';
-import {
-  setResponseLetters, removeResponseLetters
-} from '../../../correspondenceReducer/correspondenceActions';
+import NewLetter from './NewLetter';
+import { useSelector } from 'react-redux';
 
 export const AddLetter = (props) => {
   const onContinueStatusChange = props.onContinueStatusChange;
@@ -93,8 +83,7 @@ export const AddLetter = (props) => {
 
   return (
     <>
-    
-      <div className="myletters" style={{width: '100%', display: 'inline-block' }}>
+      <div className="myletters" style={{ width: '100%', display: 'inline-block' }}>
         { letters.map((letter) => (
           <div id={letter} style={{ width: '50%', float: 'left', height: '840px' }} key={letter}>
             <NewLetter
@@ -134,392 +123,3 @@ AddLetter.propTypes = {
   setUnrelatedTasksCanContinue: PropTypes.func,
   onContinueStatusChange: PropTypes.func,
 };
-
-const currentDate = moment(new Date()).format('YYYY-MM-DD');
-const NewLetter = (props) => {
-  const index = props.index;
-  const currentLetter = props.currentLetter;
-  const letterHash = {};
-  const setUnrelatedTasksCanContinue = props.setUnrelatedTasksCanContinue;
-  const displayLetter = (typeof currentLetter !== 'undefined');
-  const [letterCard, setLetterCard] = useState({
-    id: index,
-    date: displayLetter ? currentLetter.date : currentDate,
-    type: displayLetter ? currentLetter.type : '',
-    title: displayLetter ? currentLetter.title : '',
-    subType: displayLetter ? currentLetter.subType : '',
-    reason: displayLetter ? currentLetter.reason : '',
-    responseWindows: displayLetter ? currentLetter.responseWindows : '',
-    customValue: displayLetter ? currentLetter.customValue : ''
-  });
-  const [letterTitleSelector, setLetterTitleSelector] = useState('');
-  const [letterSubSelector, setLetterSubSelector] = useState('');
-  const [letterSubReason, setLetterSubReason] = useState('');
-  const customResponseVal = Boolean(displayLetter && currentLetter?.customValue > 0);
-  const [customResponseWindowState, setCustomResponseWindowState] = useState(customResponseVal);
-
-  const [stateOptions, setStateOptions] = useState(true);
-
-  const [responseWindows, setResponseWindows] = useState(displayLetter ? currentLetter.responseWindows : '');
-  const naValue = 'N/A';
-  const dispatch = useDispatch();
-
-  const radioOptions = [
-    { displayText: '65 days',
-      value: '65 days',
-      disabled: stateOptions },
-    { displayText: 'No response window',
-      value: 'No response window',
-      disabled: stateOptions },
-    { displayText: 'Custom',
-      value: 'Custom',
-      disabled: stateOptions }
-  ];
-
-  const [valueOptions, setValueOptions] = useState(radioOptions);
-
-  const handleDays = (value) => {
-    const currentNumber = parseInt(value.trim(), 10);
-
-    if ((currentNumber >= 1) && (currentNumber <= 64)) {
-      setLetterCard({ ...letterCard,
-        customValue: currentNumber });
-    } else {
-      setLetterCard({ ...letterCard,
-        customValue: null });
-    }
-  };
-
-  const handleCustomWindowState = (currentOpt) => {
-    if (currentOpt === radioOptions[2].value) {
-      setResponseWindows(radioOptions[2].value);
-      setCustomResponseWindowState(true);
-    } else {
-      setResponseWindows(currentOpt);
-      setCustomResponseWindowState(false);
-      setLetterCard({ ...letterCard,
-        customValue: null });
-    }
-  };
-
-  const letterTypesData = ADD_CORRESPONDENCE_LETTER_SELECTIONS.map((option) => ({ label: (option.letter_type),
-    value: option.letter_type }));
-
-  const selectResponseWindows = (option, aux) => {
-    if (displayLetter) {
-      const responseWindowsValue = currentLetter.responseWindows;
-
-      setLetterCard({ ...letterCard,
-        responseWindows: responseWindowsValue });
-      setResponseWindows(responseWindowsValue);
-    } else if (option.response_window_option_default) {
-      const responseWindowsValue = option.response_window_option_default;
-
-      setLetterCard({ ...letterCard,
-        responseWindows: responseWindowsValue });
-      setResponseWindows(responseWindowsValue);
-    } else if (option.letter_titles[aux].letter_title === letterCard.title) {
-      setLetterCard({ ...letterCard,
-        responseWindows: option.letter_titles[aux].response_window_option_default });
-      setResponseWindows(option.letter_titles[aux].response_window_option_default);
-    }
-  };
-
-  const canContinue = () => {
-    const output = [];
-    const opts = ['65 days', 'No response window'];
-
-    for (const [, value] of Object.entries(letterCard)) {
-      if ((value !== null) && (value !== '')) {
-        output.push(value);
-      }
-    }
-
-    if ((output.length === 7) && (opts.includes(output[6]))) {
-      return true;
-    } else if (output.length === 8) {
-      return true;
-    }
-
-    return false;
-  };
-
-  const findSub = (option, aux) => {
-    const subCate = [];
-    const listReason = [];
-
-    selectResponseWindows(option, aux);
-
-    for (let aux1 = 0; aux1 < option.letter_titles[aux].letter_subcategories.length; aux1++) {
-      subCate.push({ label: option.letter_titles[aux].letter_subcategories[aux1].subcategory,
-        value: option.letter_titles[aux].letter_subcategories[aux1].subcategory });
-    }
-
-    if (subCate.length === 0) {
-      setLetterSubSelector([{ label: naValue, value: naValue }]);
-    } else {
-      setLetterSubSelector(subCate);
-    }
-
-    for (let aux1 = 0; aux1 < option.letter_titles[aux].letter_subcategories.length; aux1++) {
-      if (letterCard.subType === option.letter_titles[aux].letter_subcategories[aux1].subcategory) {
-        option.letter_titles[aux].letter_subcategories[aux1].reasons.map((currentReason) =>
-          listReason.push({ label: currentReason, value: currentReason }));
-      }
-    }
-
-    if (listReason.length === 0) {
-      setLetterSubReason([{ label: naValue, value: naValue }]);
-    } else {
-      setLetterSubReason(listReason);
-    }
-  };
-
-  const findSubCategoryReason = (option) => {
-    for (let aux = 0; aux < option.letter_titles.length; aux++) {
-      if (option.letter_titles[aux].letter_title === letterCard.title) {
-        findSub(option, aux);
-      } else {
-        selectResponseWindows(option, aux);
-      }
-    }
-  };
-
-  const activateWindowsOption = () => {
-    if (responseWindows.trim().length > 0) {
-      for (let i = 0; i < valueOptions.length; i++) {
-        const option = valueOptions[i];
-
-        setStateOptions(false);
-        option.disabled = false;
-      }
-      setValueOptions(valueOptions);
-    } else {
-      for (let i = 0; i < valueOptions.length; i++) {
-        const option = valueOptions[i];
-
-        setStateOptions(true);
-        option.disabled = true;
-      }
-      setValueOptions(valueOptions);
-    }
-  };
-
-  const letterTitlesData = () => {
-    for (let i = 0; i < ADD_CORRESPONDENCE_LETTER_SELECTIONS.length; i++) {
-      const option = ADD_CORRESPONDENCE_LETTER_SELECTIONS[i];
-
-      if (option.letter_type === letterCard.type) {
-        setLetterTitleSelector(option.letter_titles.map((current) => ({
-          label: current.letter_title, value: current.letter_title
-        })));
-
-        if (letterCard.type.length > 0) {
-          findSubCategoryReason(option);
-        }
-      }
-    }
-  };
-
-  useEffect(() => {
-    if (canContinue()) {
-      letterHash[index] = letterCard;
-      dispatch(setResponseLetters(letterHash));
-      setUnrelatedTasksCanContinue(true);
-      props.taskUpdatedCallback(letterCard);
-    } else {
-      setUnrelatedTasksCanContinue(false);
-    }
-  }, [letterCard]);
-
-  useEffect(() => {
-    activateWindowsOption();
-    setLetterCard({ ...letterCard,
-      responseWindows });
-  }, [responseWindows]);
-
-  useEffect(() => {
-    if (letterCard.type.length > 0) {
-      letterTitlesData();
-    }
-  }, [letterCard.type]);
-
-  useEffect(() => {
-    if (letterCard.subType.length > 0) {
-      letterTitlesData();
-    }
-  }, [letterCard.subType]);
-
-  const changeLetterType = (val) => {
-    setLetterCard({ ...letterCard,
-      type: val,
-      title: '',
-      subType: '',
-      reason: '',
-      responseWindows: ''
-    });
-  };
-
-  useEffect(() => {
-    if (letterCard.title.length > 0) {
-      letterTitlesData();
-      if (responseWindows.length > 0) {
-        activateWindowsOption();
-      }
-    }
-  }, [letterCard.title]);
-
-  const changeLetterTitle = (val) => {
-    setLetterCard({ ...letterCard,
-      title: val
-    });
-  };
-
-  const changeLetterSubTitle = (val) => {
-    setLetterCard({ ...letterCard,
-      subType: val
-    });
-  };
-
-  const changeSubReason = (val) => {
-    setLetterCard({ ...letterCard,
-      reason: val
-    });
-  };
-
-  const changeDate = (val) => {
-    setLetterCard({ ...letterCard,
-      date: val
-    });
-  };
-
-  const removeLetter = () => {
-    dispatch(removeResponseLetters(index));
-    props.removeLetter(index);
-  };
-
-  const letterSelectorStyling = css({
-    '& .cf-select__control': {
-      maxWidth: '60rem !important',
-    },
-  });
-
-  const letterDateStyling = css({
-    '.cf-form-textinput': {
-      maxWidth: '60rem !important',
-    },
-  });
-
-  return (
-    <div className="gray-border" style={
-      { display: 'inline-block', padding: '2rem 2rem', marginBottom: '3rem', width: '95%' }
-    }>
-      <div className="response_letter_date">
-        <DateSelector
-          name="date-set"
-          label="Date sent"
-          value= {letterCard.date}
-          onChange={(val) => changeDate(val)}
-          type="date"
-          inputStyling={letterDateStyling}
-        />
-      </div>
-      <br />
-      <SearchableDropdown
-        name="response-letter-type"
-        label="Letter type"
-        placeholder="Select..."
-        styling={letterSelectorStyling}
-        options={letterTypesData}
-        value={letterCard.type}
-        onChange={(val) => changeLetterType(val.value)}
-      />
-      <br />
-      <SearchableDropdown
-        name="response-letter-title"
-        label="Letter title"
-        placeholder="Select..."
-        styling={letterSelectorStyling}
-        readOnly = {letterCard.type.length === 0}
-        options={letterTitleSelector}
-        value={letterCard.title}
-        onChange={(val) => changeLetterTitle(val.value)}
-      />
-      <br />
-      <SearchableDropdown
-        name="response-letter-subcategory"
-        label="Letter subcategory"
-        placeholder="Select..."
-        styling={letterSelectorStyling}
-        readOnly = {letterCard.title.length === 0}
-        options={letterSubSelector}
-        value={letterCard.subType}
-        onChange={(val) => changeLetterSubTitle(val.value)}
-      />
-      <br />
-      <SearchableDropdown
-        name="response-letter-subcategory-reason"
-        label="Letter subcategory reason"
-        placeholder="Select..."
-        styling={letterSelectorStyling}
-        readOnly = {letterCard.subType.length === 0}
-        options={letterSubReason}
-        value={letterCard.reason}
-        onChange={(val) => changeSubReason(val.value)}
-      />
-      <br />
-      <RadioField
-        label="How long should the response window be for this response letter?"
-        name={`How long should the response window be for this response letter?-${index}`}
-        options={valueOptions}
-        value = {responseWindows}
-        onChange={(val) => handleCustomWindowState(val)}
-      />
-      { customResponseWindowState &&
-        <TextField
-          label="Number of days (Value must be between 1 and 64)"
-          name="content"
-          useAriaLabel
-          inputStyling={letterDateStyling}
-          onChange={handleDays}
-          value={letterCard.customValue}
-        />
-      }
-      <br />
-      <Button
-        name="Remove"
-        styling={{ style: { paddingLeft: '0rem', paddingRight: '0rem' } }}
-        onClick={() => removeLetter()}
-        classNames={['cf-btn-link', 'cf-right-side']}
-      >
-        <i className="fa fa-trash-o" aria-hidden="true"></i>&nbsp;Remove letter
-      </Button>
-    </div>
-  );
-};
-
-NewLetter.propTypes = {
-  removeLetter: PropTypes.func.isRequired,
-  index: PropTypes.number.isRequired,
-  setLetterType: PropTypes.func,
-  letterType: PropTypes.string,
-  letterTitle: PropTypes.string,
-  setLetterTitle: PropTypes.func,
-  setResponseLetters: PropTypes.func,
-  removeResponseLetters: PropTypes.func,
-  setUnrelatedTasksCanContinue: PropTypes.func,
-  currentLetter: PropTypes.func,
-  taskUpdatedCallback: PropTypes.func,
-  onContinueStatusChange: PropTypes.func
-};
-
-const mapDispatchToProps = (dispatch) => (
-  bindActionCreators({
-    setResponseLetters
-  }, dispatch)
-);
-
-export default connect(
-  mapDispatchToProps
-)(NewLetter);
-
diff --git a/client/app/queue/correspondence/intake/components/AddCorrespondence/NewLetter.jsx b/client/app/queue/correspondence/intake/components/AddCorrespondence/NewLetter.jsx
new file mode 100644
index 00000000000..338ee426298
--- /dev/null
+++ b/client/app/queue/correspondence/intake/components/AddCorrespondence/NewLetter.jsx
@@ -0,0 +1,404 @@
+import React, { useState, useEffect } from 'react';
+import PropTypes from 'prop-types';
+import TextField from '../../../../../components/TextField';
+import Button from '../../../../../components/Button';
+import { css } from 'glamor';
+import SearchableDropdown from 'app/components/SearchableDropdown';
+import DateSelector from 'app/components/DateSelector';
+import RadioField from '../../../../../components/RadioField';
+import { ADD_CORRESPONDENCE_LETTER_SELECTIONS } from '../../../../constants';
+import moment from 'moment';
+import { connect, useDispatch } from 'react-redux';
+import { bindActionCreators } from 'redux';
+import {
+  setResponseLetters, removeResponseLetters
+} from '../../../correspondenceReducer/correspondenceActions';
+
+export const NewLetter = (props) => {
+  const index = props.index;
+  const currentDate = moment(new Date()).format('YYYY-MM-DD');
+  const currentLetter = props.currentLetter;
+  const letterHash = {};
+  const setUnrelatedTasksCanContinue = props.setUnrelatedTasksCanContinue;
+  const displayLetter = (typeof currentLetter !== 'undefined');
+  const [letterCard, setLetterCard] = useState({
+    id: index,
+    date: displayLetter ? currentLetter.date : currentDate,
+    type: displayLetter ? currentLetter.type : '',
+    title: displayLetter ? currentLetter.title : '',
+    subType: displayLetter ? currentLetter.subType : '',
+    reason: displayLetter ? currentLetter.reason : '',
+    responseWindows: displayLetter ? currentLetter.responseWindows : '',
+    customValue: displayLetter ? currentLetter.customValue : ''
+  });
+  const [letterTitleSelector, setLetterTitleSelector] = useState('');
+  const [letterSubSelector, setLetterSubSelector] = useState('');
+  const [letterSubReason, setLetterSubReason] = useState('');
+  const customResponseVal = Boolean(displayLetter && currentLetter?.customValue > 0);
+  const [customResponseWindowState, setCustomResponseWindowState] = useState(customResponseVal);
+
+  const [stateOptions, setStateOptions] = useState(true);
+
+  const [responseWindows, setResponseWindows] = useState(displayLetter ? currentLetter.responseWindows : '');
+  const naValue = 'N/A';
+  const dispatch = useDispatch();
+
+  const radioOptions = [
+    { displayText: '65 days',
+      value: '65 days',
+      disabled: stateOptions },
+    { displayText: 'No response window',
+      value: 'No response window',
+      disabled: stateOptions },
+    { displayText: 'Custom',
+      value: 'Custom',
+      disabled: stateOptions }
+  ];
+
+  const [valueOptions, setValueOptions] = useState(radioOptions);
+
+  const handleDays = (value) => {
+    const currentNumber = parseInt(value.trim(), 10);
+
+    if ((currentNumber >= 1) && (currentNumber <= 64)) {
+      setLetterCard({ ...letterCard,
+        customValue: currentNumber });
+    } else {
+      setLetterCard({ ...letterCard,
+        customValue: null });
+    }
+  };
+
+  const handleCustomWindowState = (currentOpt) => {
+    if (currentOpt === radioOptions[2].value) {
+      setResponseWindows(radioOptions[2].value);
+      setCustomResponseWindowState(true);
+    } else {
+      setResponseWindows(currentOpt);
+      setCustomResponseWindowState(false);
+      setLetterCard({ ...letterCard,
+        customValue: null });
+    }
+  };
+
+  const letterTypesData = ADD_CORRESPONDENCE_LETTER_SELECTIONS.map((option) => ({ label: (option.letter_type),
+    value: option.letter_type }));
+
+  const selectResponseWindows = (option, aux) => {
+    if (displayLetter) {
+      const responseWindowsValue = currentLetter.responseWindows;
+
+      setLetterCard({ ...letterCard,
+        responseWindows: responseWindowsValue });
+      setResponseWindows(responseWindowsValue);
+    } else if (option.response_window_option_default) {
+      const responseWindowsValue = option.response_window_option_default;
+
+      setLetterCard({ ...letterCard,
+        responseWindows: responseWindowsValue });
+      setResponseWindows(responseWindowsValue);
+    } else if (option.letter_titles[aux].letter_title === letterCard.title) {
+      setLetterCard({ ...letterCard,
+        responseWindows: option.letter_titles[aux].response_window_option_default });
+      setResponseWindows(option.letter_titles[aux].response_window_option_default);
+    }
+  };
+
+  const canContinue = () => {
+    const output = [];
+    const opts = ['65 days', 'No response window'];
+
+    for (const [, value] of Object.entries(letterCard)) {
+      if ((value !== null) && (value !== '')) {
+        output.push(value);
+      }
+    }
+
+    if ((output.length === 7) && (opts.includes(output[6]))) {
+      return true;
+    } else if (output.length === 8) {
+      return true;
+    }
+
+    return false;
+  };
+
+  const findSub = (option, aux) => {
+    const subCate = [];
+    const listReason = [];
+
+    selectResponseWindows(option, aux);
+
+    for (let aux1 = 0; aux1 < option.letter_titles[aux].letter_subcategories.length; aux1++) {
+      subCate.push({ label: option.letter_titles[aux].letter_subcategories[aux1].subcategory,
+        value: option.letter_titles[aux].letter_subcategories[aux1].subcategory });
+    }
+
+    if (subCate.length === 0) {
+      setLetterSubSelector([{ label: naValue, value: naValue }]);
+    } else {
+      setLetterSubSelector(subCate);
+    }
+
+    for (let aux1 = 0; aux1 < option.letter_titles[aux].letter_subcategories.length; aux1++) {
+      if (letterCard.subType === option.letter_titles[aux].letter_subcategories[aux1].subcategory) {
+        option.letter_titles[aux].letter_subcategories[aux1].reasons.map((currentReason) =>
+          listReason.push({ label: currentReason, value: currentReason }));
+      }
+    }
+
+    if (listReason.length === 0) {
+      setLetterSubReason([{ label: naValue, value: naValue }]);
+    } else {
+      setLetterSubReason(listReason);
+    }
+  };
+
+  const findSubCategoryReason = (option) => {
+    for (let aux = 0; aux < option.letter_titles.length; aux++) {
+      if (option.letter_titles[aux].letter_title === letterCard.title) {
+        findSub(option, aux);
+      } else {
+        selectResponseWindows(option, aux);
+      }
+    }
+  };
+
+  const activateWindowsOption = () => {
+    if (responseWindows.trim().length > 0) {
+      for (let i = 0; i < valueOptions.length; i++) {
+        const option = valueOptions[i];
+
+        setStateOptions(false);
+        option.disabled = false;
+      }
+      setValueOptions(valueOptions);
+    } else {
+      for (let i = 0; i < valueOptions.length; i++) {
+        const option = valueOptions[i];
+
+        setStateOptions(true);
+        option.disabled = true;
+      }
+      setValueOptions(valueOptions);
+    }
+  };
+
+  const letterTitlesData = () => {
+    for (let i = 0; i < ADD_CORRESPONDENCE_LETTER_SELECTIONS.length; i++) {
+      const option = ADD_CORRESPONDENCE_LETTER_SELECTIONS[i];
+
+      if (option.letter_type === letterCard.type) {
+        setLetterTitleSelector(option.letter_titles.map((current) => ({
+          label: current.letter_title, value: current.letter_title
+        })));
+
+        if (letterCard.type.length > 0) {
+          findSubCategoryReason(option);
+        }
+      }
+    }
+  };
+
+  useEffect(() => {
+    if (canContinue()) {
+      letterHash[index] = letterCard;
+      dispatch(setResponseLetters(letterHash));
+      setUnrelatedTasksCanContinue(true);
+      props.taskUpdatedCallback(letterCard);
+    } else {
+      setUnrelatedTasksCanContinue(false);
+    }
+  }, [letterCard]);
+
+  useEffect(() => {
+    activateWindowsOption();
+    setLetterCard({ ...letterCard,
+      responseWindows });
+  }, [responseWindows]);
+
+  useEffect(() => {
+    if (letterCard.type.length > 0) {
+      letterTitlesData();
+    }
+  }, [letterCard.type]);
+
+  useEffect(() => {
+    if (letterCard.subType.length > 0) {
+      letterTitlesData();
+    }
+  }, [letterCard.subType]);
+
+  const changeLetterType = (val) => {
+    setLetterCard({ ...letterCard,
+      type: val,
+      title: '',
+      subType: '',
+      reason: '',
+      responseWindows: ''
+    });
+  };
+
+  useEffect(() => {
+    if (letterCard.title.length > 0) {
+      letterTitlesData();
+      if (responseWindows.length > 0) {
+        activateWindowsOption();
+      }
+    }
+  }, [letterCard.title]);
+
+  const changeLetterTitle = (val) => {
+    setLetterCard({ ...letterCard,
+      title: val
+    });
+  };
+
+  const changeLetterSubTitle = (val) => {
+    setLetterCard({ ...letterCard,
+      subType: val
+    });
+  };
+
+  const changeSubReason = (val) => {
+    setLetterCard({ ...letterCard,
+      reason: val
+    });
+  };
+
+  const changeDate = (val) => {
+    setLetterCard({ ...letterCard,
+      date: val
+    });
+  };
+
+  const removeLetter = () => {
+    dispatch(removeResponseLetters(index));
+    props.removeLetter(index);
+  };
+
+  const letterSelectorStyling = css({
+    '& .cf-select__control': {
+      maxWidth: '60rem !important',
+    },
+  });
+
+  const letterDateStyling = css({
+    '.cf-form-textinput': {
+      maxWidth: '60rem !important',
+    },
+  });
+
+  return (
+    <div className="gray-border" style={
+      { display: 'inline-block', padding: '2rem 2rem', marginBottom: '3rem', width: '95%' }
+    }>
+      <div className="response_letter_date">
+        <DateSelector
+          name="date-set"
+          label="Date sent"
+          value= {letterCard.date}
+          onChange={(val) => changeDate(val)}
+          type="date"
+          inputStyling={letterDateStyling}
+        />
+      </div>
+      <br />
+      <SearchableDropdown
+        name="response-letter-type"
+        label="Letter type"
+        placeholder="Select..."
+        styling={letterSelectorStyling}
+        options={letterTypesData}
+        value={letterCard.type}
+        onChange={(val) => changeLetterType(val.value)}
+      />
+      <br />
+      <SearchableDropdown
+        name="response-letter-title"
+        label="Letter title"
+        placeholder="Select..."
+        styling={letterSelectorStyling}
+        readOnly = {letterCard.type.length === 0}
+        options={letterTitleSelector}
+        value={letterCard.title}
+        onChange={(val) => changeLetterTitle(val.value)}
+      />
+      <br />
+      <SearchableDropdown
+        name="response-letter-subcategory"
+        label="Letter subcategory"
+        placeholder="Select..."
+        styling={letterSelectorStyling}
+        readOnly = {letterCard.title.length === 0}
+        options={letterSubSelector}
+        value={letterCard.subType}
+        onChange={(val) => changeLetterSubTitle(val.value)}
+      />
+      <br />
+      <SearchableDropdown
+        name="response-letter-subcategory-reason"
+        label="Letter subcategory reason"
+        placeholder="Select..."
+        styling={letterSelectorStyling}
+        readOnly = {letterCard.subType.length === 0}
+        options={letterSubReason}
+        value={letterCard.reason}
+        onChange={(val) => changeSubReason(val.value)}
+      />
+      <br />
+      <RadioField
+        label="How long should the response window be for this response letter?"
+        name={`How long should the response window be for this response letter?-${index}`}
+        options={valueOptions}
+        value = {responseWindows}
+        onChange={(val) => handleCustomWindowState(val)}
+      />
+      { customResponseWindowState &&
+        <TextField
+          label="Number of days (Value must be between 1 and 64)"
+          name="content"
+          useAriaLabel
+          inputStyling={letterDateStyling}
+          onChange={handleDays}
+          value={letterCard.customValue}
+        />
+      }
+      <br />
+      <Button
+        name="Remove"
+        styling={{ style: { paddingLeft: '0rem', paddingRight: '0rem' } }}
+        onClick={() => removeLetter()}
+        classNames={['cf-btn-link', 'cf-right-side']}
+      >
+        <i className="fa fa-trash-o" aria-hidden="true"></i>&nbsp;Remove letter
+      </Button>
+    </div>
+  );
+};
+
+NewLetter.propTypes = {
+  removeLetter: PropTypes.func.isRequired,
+  index: PropTypes.number.isRequired,
+  setLetterType: PropTypes.func,
+  letterType: PropTypes.string,
+  letterTitle: PropTypes.string,
+  setLetterTitle: PropTypes.func,
+  setResponseLetters: PropTypes.func,
+  removeResponseLetters: PropTypes.func,
+  setUnrelatedTasksCanContinue: PropTypes.func,
+  currentLetter: PropTypes.func,
+  taskUpdatedCallback: PropTypes.func,
+  onContinueStatusChange: PropTypes.func
+};
+
+const mapDispatchToProps = (dispatch) => (
+  bindActionCreators({
+    setResponseLetters
+  }, dispatch)
+);
+
+export default connect(
+  mapDispatchToProps
+)(NewLetter);
+
diff --git a/client/app/styles/_table.scss b/client/app/styles/_table.scss
index 9e7279e05f9..82403deb637 100644
--- a/client/app/styles/_table.scss
+++ b/client/app/styles/_table.scss
@@ -64,6 +64,7 @@ $letter-table-bg-color: #f9f9f9;
 
 .correspondence-response-letters-table {
   width: 100%;
+
   table {
     width: 100%;
   }
diff --git a/spec/feature/queue/correspondence/intake_form_spec.rb b/spec/feature/queue/correspondence/intake_form_spec.rb
index fa6c4223dfa..7d0f970a74b 100644
--- a/spec/feature/queue/correspondence/intake_form_spec.rb
+++ b/spec/feature/queue/correspondence/intake_form_spec.rb
@@ -97,7 +97,7 @@
 
       radio_choices = page.all(".cf-form-radio-option> label.disabled", visible: true)
       radio_choices.each do |opt|
-        opt.text != "No response window"
+        opt.text.not_eq("No response window")
       end
 
       dropdowns[2].click
@@ -129,7 +129,7 @@
       radio_choices = page.all(".cf-form-radio-option> label.disabled", visible: true)
 
       radio_choices.each do |opt|
-        opt.text == "No response window"
+        opt.text.to_eq("No response window")
       end
 
       dropdowns[2].click

From 05a9673328912448d391658ae51d224ad0414b3a Mon Sep 17 00:00:00 2001
From: Kamala Madamanchi <110078646+kamala-07@users.noreply.github.com>
Date: Thu, 22 Feb 2024 15:07:30 -0600
Subject: [PATCH 112/237] Kamalam7/appeals 40815 (#20915)

* basic edit letters canges

* edit section

* refactoring and lint fixes

* resolving conflicts

* bug fix for date and custom value

* fixing remove letter bug

* fixing lint

* fies for lint error

* lint fix

* adding response letters

* fix for continue button after Edit section and space issue

---------

Co-authored-by: vinner57 <128258952+vinner57@users.noreply.github.com>
Co-authored-by: cacevesva <109166981+cacevesva@users.noreply.github.com>
---
 .../components/AddCorrespondence/AddCorrespondenceView.jsx    | 2 +-
 .../intake/components/AddCorrespondence/AddLetter.jsx         | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx
index d021c6cca08..56fec8f769c 100644
--- a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx
+++ b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx
@@ -197,7 +197,7 @@ class AddCorrespondenceView extends React.Component {
       <div className="gray-border" style={{ marginBottom: '2rem', padding: '3rem 4rem' }}>
         <h1 style={{ marginBottom: '20px' }}>Add Related Correspondence</h1>
         <p style={{ marginTop: '0px' }}>Add any related correspondence to the mail package that is in progress.</p>
-        <h2 style={{ margin: '30px auto 20px auto' }}>Response Letter</h2>
+        <h2 style={{ margin: '0px', padding: '0px' }}>Response Letter</h2>
         {/* add letter here */}
         <AddLetter
           onContinueStatusChange={this.props.onContinueStatusChange}
diff --git a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx
index d99255399df..ab415fee9da 100644
--- a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx
+++ b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddLetter.jsx
@@ -39,9 +39,7 @@ export const AddLetter = (props) => {
   };
 
   const taskUpdatedCallback = (updatedTask) => {
-    const filtered = dataLetter.filter((cdl) => cdl.id !== updatedTask.id);
-
-    setDataLetter([...filtered, updatedTask]);
+    setDataLetter((prevDataLetter) => [...prevDataLetter.filter((cdl) => cdl.id !== updatedTask.id), updatedTask]);
   };
 
   const removeLetter = (index) => {

From 677e0fe8e584f2c445015908791e5f52639c79f0 Mon Sep 17 00:00:00 2001
From: Ki Mau <ki.mau@va.gov>
Date: Thu, 22 Feb 2024 16:42:36 -0500
Subject: [PATCH 113/237] Ki/APPEALS-35482 - Correspondence Cases - Unassigned
 Tab (#20911)

* update seed file to create package action tasks with assigned_by value

* Update tasks call for action required tab

* Update columns in QUEUE_COLUMN constants file

* Add sorting to columns

* refactor query to use scope

* always use task pages api for this workflow

* ensure assigned by is a user

* merge with ryan/APPEALS-35479-check

* add cancel link to package action modals

* add tests for action required tab

* remove pry

* refactor tasks method

* refactor correspondence task filter

* include appeal_type when creating

* APPEALS-35482 - CSS Fix

* APPEALS-35482 - Linting and RSpecs

* APPEALS-35482 - Rspecs, Filtering, Snapshots

* Update QueueDropdownFilter.jsx

---------

Co-authored-by: William Medders <medders_william@bah.com>
---
 ...ion_correspondence_unassigned_tasks_tab.rb |   2 +-
 .../CorrespondenceTableBuilder.jsx            |  38 ++-
 .../correspondence_cases_spec.rb              | 301 ++++++++++++++++++
 3 files changed, 336 insertions(+), 5 deletions(-)

diff --git a/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb
index d567bd78c1c..8bee5ae78be 100644
--- a/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb
+++ b/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb
@@ -16,7 +16,7 @@ def description
   end
 
   def tasks
-    CorrespondenceTask.where(assigned_to: assignee, status: "unassigned")
+    CorrespondenceTask.includes(*task_includes).where(assigned_to: assignee, status: "unassigned")
   end
 
   def column_names
diff --git a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
index 1b42a5f1532..3514f766d55 100644
--- a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
+++ b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
@@ -5,7 +5,8 @@ import { sprintf } from 'sprintf-js';
 import { connect } from 'react-redux';
 import querystring from 'querystring';
 
-import BulkAssignButton from '../components/BulkAssignButton';
+import Button from '../../components/Button';
+import SearchableDropdown from '../../components/SearchableDropdown';
 import QueueTable from '../QueueTable';
 import TabWindow from '../../components/TabWindow';
 import Link from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/Link';
@@ -138,12 +139,41 @@ const CorrespondenceTableBuilder = (props) => {
       label: sprintf(tabConfig.label, totalTaskCount),
       page: (
         <>
+          {(tabConfig.name === 'correspondence_unassigned' || tabConfig.name === 'correspondence_team_assigned') &&
+            <>
+              <p className="cf-margin-bottom-0rem">Assign to mail team user</p>
+              <div style={{ display: 'flex', flexDirection: 'row' }}>
+                <SearchableDropdown
+                  className="cf-dropdown"
+                  name="Assign to mail team user"
+                  hideLabel
+                  styling={{ width: '200px', marginRight: '2rem' }}
+                  dropdownStyling={{ width: '200px' }}
+                />
+                {tabConfig.name === 'correspondence_unassigned' &&
+              <>
+                <Button
+                  name="Assign"
+                />
+                <span style={{ marginLeft: 'auto' }}>
+                  <Button
+                    name="Auto assign correspondence"
+                  />
+                </span>
+              </>
+                }
+                {tabConfig.name === 'correspondence_team_assigned' &&
+            <Button
+              name="Reassign"
+            />
+                }
+              </div>
+              <hr></hr>
+            </>
+          }
           <p className="cf-margin-top-0">
             {noCasesMessage || tabConfig.description}
           </p>
-          {props.userCanBulkAssign && tabConfig.allow_bulk_assign && (
-            <BulkAssignButton />
-          )}
           <QueueTable
             key={tabConfig.name}
             columns={columnsFromConfig(config, tabConfig, tasks)}
diff --git a/spec/feature/queue/correspondence/correspondence_cases_spec.rb b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
index 2c91c9b92a2..e059f95d77c 100644
--- a/spec/feature/queue/correspondence/correspondence_cases_spec.rb
+++ b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
@@ -501,4 +501,305 @@
       expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
     end
   end
+
+  context "correspondence cases unassigned tab" do
+    let(:current_user) { create(:user) }
+    before :each do
+      MailTeamSupervisor.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+    end
+
+    before do
+      Timecop.freeze(Time.zone.local(2020, 5, 15))
+      5.times do
+        corres_array = (1..4).map { create(:correspondence) }
+        task_array = [ReassignPackageTask, RemovePackageTask, SplitPackageTask, MergePackageTask]
+
+        corres_array.each_with_index do |corres, index|
+          rpt = ReviewPackageTask.find_by(appeal_id: corres.id)
+          task_array[index].create!(
+            parent_id: rpt.id,
+            appeal_id: corres.id,
+            appeal_type: "Correspondence",
+            assigned_to: MailTeamSupervisor.singleton,
+            assigned_by_id: rpt.assigned_to_id
+          )
+        end
+      end
+
+      # Used to mock a single task to compare task sorting
+      ReassignPackageTask.first.correspondence.update!(
+        va_date_of_receipt: Date.new(2000, 10, 10),
+        updated_by_id: current_user.id
+      )
+      ReassignPackageTask.last.correspondence.update!(
+        va_date_of_receipt: Date.new(2050, 10, 10),
+        updated_by_id: current_user.id
+      )
+      FeatureToggle.enable!(:correspondence_queue)
+    end
+
+    it "successfully loads the unassigned tab" do
+      visit "/queue/correspondence/team?tab=correspondence_unassigned"
+      expect(page).to have_content("Correspondence owned by the Mail team are unassigned to an individual:")
+      expect(page).to have_content("Assign to mail team user")
+      expect(page).to have_button("Assign")
+      expect(page).to have_button("Auto assign correspondence")
+    end
+
+    it "uses veteran details sort correctly." do
+      visit "/queue/correspondence/team?tab=correspondence_unassigned"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by Veteran Details']").click
+      first_vet_info = page.all("#task-link")[0].text
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by Veteran Details']").click
+      last_vet_info = page.all("#task-link")[0].text
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by Veteran Details']").click
+      expect(page.all("#task-link")[0].text == first_vet_info)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by Veteran Details']").click
+      expect(page.all("#task-link")[0].text == last_vet_info)
+    end
+
+    it "uses VA DOR sort correctly." do
+      visit "/queue/correspondence/team?tab=correspondence_unassigned"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by VA DOR']").click
+      first_date = find("tbody > tr:nth-child(1) > td:nth-child(2)")
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by VA DOR']").click
+      last_date = find("tbody > tr:nth-child(1) > td:nth-child(2)")
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by VA DOR']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == first_date)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by VA DOR']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == last_date)
+    end
+
+    it "uses days waiting sort correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_unassigned"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by Days Waiting']").click
+      first_day_amount = find("tbody > tr:nth-child(1) > td:nth-child(4)").text
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by Days Waiting']").click
+      second_day_amount = find("tbody > tr:nth-child(1) > td:nth-child(4)").text
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by Days Waiting']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(4)").text == first_day_amount)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by Days Waiting']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(4)").text == second_day_amount)
+    end
+
+    it "uses notes sort correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_unassigned"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by Notes']").click
+      first_note = find("tbody > tr:nth-child(1) > td:nth-child(5)").text
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by Notes']").click
+      second_note = find("tbody > tr:nth-child(1) > td:nth-child(5)").text
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by Notes']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(5)").text == first_note)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by Notes']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(5)").text == second_note)
+    end
+
+    it "uses receipt date between filter correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_unassigned"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-3-option-0").click
+      all("div.input-container > input")[0].fill_in(with: "10/09/2000")
+      all("div.input-container > input")[1].fill_in(with: "10/11/2000")
+      click_button("Apply Filter")
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+
+    it "uses receipt date before filter correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_unassigned"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-3-option-1").click
+      all("div.input-container > input")[0].fill_in(with: "10/01/2001")
+      click_button("Apply Filter")
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+
+    it "uses receipt date after filter correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_unassigned"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-3-option-2").click
+      all("div.input-container > input")[0].fill_in(with: "10/01/2024")
+      click_button("Apply Filter")
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+
+    it "uses receipt date on filter correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_unassigned"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-3-option-3").click
+      all("div.input-container > input")[0].fill_in(with: "10/10/2000")
+      click_button("Apply Filter")
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+  end
+
+  context "correspondence cases assigned tab" do
+    let(:current_user) { create(:user) }
+    before :each do
+      MailTeamSupervisor.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+    end
+
+    before do
+      Timecop.freeze(Time.zone.local(2020, 5, 15))
+      5.times do
+        corres_array = (1..4).map { create(:correspondence) }
+        task_array = [ReassignPackageTask, RemovePackageTask, SplitPackageTask, MergePackageTask]
+
+        corres_array.each_with_index do |corres, index|
+          rpt = ReviewPackageTask.find_by(appeal_id: corres.id)
+          task_array[index].create!(
+            parent_id: rpt.id,
+            appeal_id: corres.id,
+            appeal_type: "Correspondence",
+            assigned_to: MailTeamSupervisor.singleton,
+            assigned_by_id: rpt.assigned_to_id
+          )
+        end
+      end
+
+      # Used to mock a single task to compare task sorting
+      ReassignPackageTask.first.correspondence.update!(
+        va_date_of_receipt: Date.new(2000, 10, 10),
+        updated_by_id: current_user.id
+      )
+      ReassignPackageTask.last.correspondence.update!(
+        va_date_of_receipt: Date.new(2050, 10, 10),
+        updated_by_id: current_user.id
+      )
+      FeatureToggle.enable!(:correspondence_queue)
+    end
+
+    it "successfully loads the assigned tab" do
+      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
+      expect(page).to have_content("Correspondence that is currently assigned to mail team users:")
+      expect(page).to have_content("Assign to mail team user")
+      expect(page).to have_button("Reassign")
+    end
+
+    it "uses veteran details sort correctly." do
+      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by Veteran Details']").click
+      first_vet_info = page.all("#task-link")[0].text
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by Veteran Details']").click
+      last_vet_info = page.all("#task-link")[0].text
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by Veteran Details']").click
+      expect(page.all("#task-link")[0].text == first_vet_info)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by Veteran Details']").click
+      expect(page.all("#task-link")[0].text == last_vet_info)
+    end
+
+    it "uses VA DOR sort correctly." do
+      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by VA DOR']").click
+      first_date = find("tbody > tr:nth-child(1) > td:nth-child(2)")
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by VA DOR']").click
+      last_date = find("tbody > tr:nth-child(1) > td:nth-child(2)")
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by VA DOR']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == first_date)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by VA DOR']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == last_date)
+    end
+
+    it "uses days waiting sort correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by Days Waiting']").click
+      first_day_amount = find("tbody > tr:nth-child(1) > td:nth-child(4)").text
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by Days Waiting']").click
+      second_day_amount = find("tbody > tr:nth-child(1) > td:nth-child(4)").text
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by Days Waiting']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(4)").text == first_day_amount)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by Days Waiting']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(4)").text == second_day_amount)
+    end
+
+    it "uses notes sort correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by Notes']").click
+      first_note = find("tbody > tr:nth-child(1) > td:nth-child(5)").text
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by Notes']").click
+      second_note = find("tbody > tr:nth-child(1) > td:nth-child(5)").text
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by Notes']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(5)").text == first_note)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by Notes']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(5)").text == second_note)
+    end
+
+    it "uses receipt date between filter correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-3-option-0").click
+      all("div.input-container > input")[0].fill_in(with: "10/09/2000")
+      all("div.input-container > input")[1].fill_in(with: "10/11/2000")
+      click_button("Apply Filter")
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+
+    it "uses receipt date before filter correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-3-option-1").click
+      all("div.input-container > input")[0].fill_in(with: "10/01/2001")
+      click_button("Apply Filter")
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+
+    it "uses receipt date after filter correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-3-option-2").click
+      all("div.input-container > input")[0].fill_in(with: "10/01/2024")
+      click_button("Apply Filter")
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+
+    it "uses receipt date on filter correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-3-option-3").click
+      all("div.input-container > input")[0].fill_in(with: "10/10/2000")
+      click_button("Apply Filter")
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+  end
 end

From 0037fc72a0b0301bda073ac0aad28905a7757ede Mon Sep 17 00:00:00 2001
From: IsaiahBar <107133331+IsaiahBar@users.noreply.github.com>
Date: Thu, 22 Feb 2024 17:10:13 -0500
Subject: [PATCH 114/237] Isaiah bar/appeals 35478 (#20918)

* update seed file to create package action tasks with assigned_by value

* Update tasks call for action required tab

* Update columns in QUEUE_COLUMN constants file

* Add sorting to columns

* refactor query to use scope

* always use task pages api for this workflow

* ensure assigned by is a user

* merge with ryan/APPEALS-35479-check

* add cancel link to package action modals

* add tests for action required tab

* remove pry

* refactor tasks method

* refactor correspondence task filter

* include appeal_type when creating

* APPEALS-35482 - CSS Fix

* APPEALS-35482 - Linting and RSpecs

* APPEALS-35482 - Rspecs, Filtering, Snapshots

* Update QueueDropdownFilter.jsx

* updated task for Assigned tab

---------

Co-authored-by: William Medders <medders_william@bah.com>
Co-authored-by: KiMauVA <Ki.Mau@va.gov>
Co-authored-by: Jim Foley <james.foley4@va.gov>
---
 .../organization_correspondence_assigned_tasks_tab.rb     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/models/queue_tabs/organization_correspondence_assigned_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_assigned_tasks_tab.rb
index 867beb1a9c6..b312606f07e 100644
--- a/app/models/queue_tabs/organization_correspondence_assigned_tasks_tab.rb
+++ b/app/models/queue_tabs/organization_correspondence_assigned_tasks_tab.rb
@@ -16,7 +16,13 @@ def description
   end
 
   def tasks
-    CorrespondenceTask.includes(*task_includes).where(assigned_to: assignee).assigned
+    tasks = CorrespondenceTask.includes(*task_includes).package_action_tasks
+
+    tasks = if RequestStore[:current_user].mail_supervisor?
+      tasks.where(assigned_to: assignee).active
+    else
+      tasks.where.not(type: RemovePackageTask.name).where(assigned_to: assignee).active
+    end
   end
 
   def column_names

From fff2379d24c1eb0310718a434923844a4c8a5a26 Mon Sep 17 00:00:00 2001
From: Will Medders <93014155+wmedders21@users.noreply.github.com>
Date: Thu, 22 Feb 2024 17:04:22 -0600
Subject: [PATCH 115/237] Update seeds to assign to superuser and have varied
 days waiting values (#20920)

Co-authored-by: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
---
 db/seeds/helpers/queue_helpers.rb | 14 ++++++-
 db/seeds/queue_correspondences.rb | 64 +++++++++++++++++++++++--------
 2 files changed, 61 insertions(+), 17 deletions(-)

diff --git a/db/seeds/helpers/queue_helpers.rb b/db/seeds/helpers/queue_helpers.rb
index 6afafd64952..1c88427aed4 100644
--- a/db/seeds/helpers/queue_helpers.rb
+++ b/db/seeds/helpers/queue_helpers.rb
@@ -49,12 +49,18 @@ def create_correspondence_document(correspondence, veteran)
 
   def create_correspondence_intake(correspondence, user)
     parent = correspondence&.root_task
-    CorrespondenceIntakeTask.create_from_params(parent, user)
+    cit = CorrespondenceIntakeTask.create_from_params(parent, user)
+    randomize_days_waiting_value(cit)
+    cit
   end
 
   def assign_review_package_task(correspondence, user)
     review_package_task = ReviewPackageTask.find_by(appeal_id: correspondence.id)
-    review_package_task.update!(assigned_to: user, status: Constants.TASK_STATUSES.assigned)
+    review_package_task.update!(
+      assigned_to: user,
+      status: Constants.TASK_STATUSES.assigned,
+      assigned_at: rand(1.month.ago..1.day.ago)
+    )
   end
 
   def create_efolderupload_failed_task(correspondence, parent)
@@ -123,5 +129,9 @@ def process_correspondence(correspondence, user)
     cit = CorrespondenceIntakeTask.create_from_params(correspondence&.root_task, user)
     cit.update!(status: Constants.TASK_STATUSES.completed, completed_by_id: user.id)
   end
+
+  def randomize_days_waiting_value(task)
+    task.update(assigned_at: rand(1.month.ago..1.day.ago))
+  end
 end
 # rubocop:enable Metrics/ModuleLength
diff --git a/db/seeds/queue_correspondences.rb b/db/seeds/queue_correspondences.rb
index 3f89e770a29..69746ea9c09 100644
--- a/db/seeds/queue_correspondences.rb
+++ b/db/seeds/queue_correspondences.rb
@@ -17,6 +17,10 @@ def mail_team_user
       @mail_team_user ||= User.find_by_css_id("JOLLY_POSTMAN")
     end
 
+    def mail_team_superuser
+      @mail_team_superuser ||= User.find_by_css_id("AMBRISVACO")
+    end
+
     def seed!
       create_queue_correspondences
     end
@@ -39,17 +43,20 @@ def initial_id_values
     def create_queue_correspondences
       # 20 Correspondences with eFolderFailedUploadTask with a parent CorrespondenceIntakeTask
       20.times do
-        create_correspondence_with_intake_and_failed_upload_task
+        create_correspondence_with_intake_and_failed_upload_task(mail_team_user)
+        create_correspondence_with_intake_and_failed_upload_task(mail_team_superuser)
       end
 
       # 20 Correspondences with CorrespondenceIntakeTask with a status of in_progress
       20.times do
-        create_correspondence_with_intake_task
+        create_correspondence_with_intake_task(mail_team_user)
+        create_correspondence_with_intake_task(mail_team_superuser)
       end
 
       # 20 Correspondences with eFolderFailedUploadTask with a parent ReviewPackageTask
       20.times do
-        create_correspondence_with_review_package_and_failed_upload_task
+        create_correspondence_with_review_package_and_failed_upload_task(mail_team_user)
+        create_correspondence_with_review_package_and_failed_upload_task(mail_team_superuser)
       end
 
       # 20 Correspondences with the CorrespondenceRootTask with the status of completed
@@ -59,7 +66,8 @@ def create_queue_correspondences
 
       # 20 Correspondences with ReviewPackageTask in progress
       20.times do
-        create_correspondence_with_review_package_task
+        create_correspondence_with_review_package_task(mail_team_user)
+        create_correspondence_with_review_package_task(mail_team_superuser)
       end
 
       # 20 Correspondences with the tasks for Action Required tab and an on_hold ReviewPackageTask as their parent
@@ -70,7 +78,8 @@ def create_queue_correspondences
 
       # 10 Correspondences with in-progress CorrespondenceRootTask and completed Mail Task
       10.times do
-        create_correspondence_with_completed_mail_task
+        create_correspondence_with_completed_mail_task(mail_team_user)
+        create_correspondence_with_completed_mail_task(mail_team_superuser)
       end
 
       # 5 Correspondences with the CorrespondenceRootTask with the status of canceled
@@ -81,33 +90,58 @@ def create_queue_correspondences
       # 20 Correspondences with the tasks for CAVC and Congress Interest
       20.times do
         create_cavc_mailtask(create_correspondence, mail_team_user)
+        create_cavc_mailtask(create_correspondence, mail_team_superuser)
       end
 
       20.times do
         create_congress_interest_mailtask(create_correspondence, mail_team_user)
+        create_congress_interest_mailtask(create_correspondence, mail_team_superuser)
+      end
+
+      10.times do
+        create_correspondence_with_in_progress_review_package_task(mail_team_user)
+        create_correspondence_with_in_progress_review_package_task(mail_team_superuser)
+      end
+
+      10.times do
+        create_correspondence_with_in_progress_intake_task(mail_team_user)
+        create_correspondence_with_in_progress_intake_task(mail_team_superuser)
       end
     end
     # rubocop:enable Metrics/MethodLength
 
-    def create_correspondence_with_intake_and_failed_upload_task
+    def create_correspondence_with_intake_and_failed_upload_task(user)
       corres = create_correspondence
-      parent_task = create_correspondence_intake(corres, mail_team_user)
+      parent_task = create_correspondence_intake(corres, user)
       create_efolderupload_failed_task(corres, parent_task)
     end
 
-    def create_correspondence_with_intake_task
+    def create_correspondence_with_intake_task(user)
+      corres = create_correspondence
+      create_correspondence_intake(corres, user)
+    end
+
+    def create_correspondence_with_in_progress_intake_task(user)
+      corres = create_correspondence
+      cit = create_correspondence_intake(corres, user)
+      cit.update!(status: Constants.TASK_STATUSES.in_progress)
+    end
+
+    def create_correspondence_with_review_package_task(user)
       corres = create_correspondence
-      create_correspondence_intake(corres, mail_team_user)
+      assign_review_package_task(corres, user)
     end
 
-    def create_correspondence_with_review_package_task
+    def create_correspondence_with_in_progress_review_package_task(user)
       corres = create_correspondence
-      assign_review_package_task(corres, mail_team_user)
+      assign_review_package_task(corres, user)
+      rpt = ReviewPackageTask.find_by(appeal_id: corres.id)
+      rpt.update!(status: Constants.TASK_STATUSES.in_progress)
     end
 
-    def create_correspondence_with_review_package_and_failed_upload_task
+    def create_correspondence_with_review_package_and_failed_upload_task(user)
       corres = create_correspondence
-      assign_review_package_task(corres, mail_team_user)
+      assign_review_package_task(corres, user)
       parent_task = ReviewPackageTask.find_by(appeal_id: corres.id, type: ReviewPackageTask.name)
       create_efolderupload_failed_task(corres, parent_task)
     end
@@ -133,9 +167,9 @@ def create_correspondence_with_action_required_tasks
       end
     end
 
-    def create_correspondence_with_completed_mail_task
+    def create_correspondence_with_completed_mail_task(user)
       correspondence = create_correspondence
-      create_and_complete_mail_task(correspondence, mail_team_user)
+      create_and_complete_mail_task(correspondence, user)
     end
 
     def create_correspondence_with_canceled_root_task

From 67e4d58a951907994e281e663f92541cf4513e23 Mon Sep 17 00:00:00 2001
From: HunJerBAH <Jeremy.Hunton@va.gov>
Date: Fri, 23 Feb 2024 09:15:37 -0500
Subject: [PATCH 116/237] left out comma in merge commit from master

---
 client/COPY.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/COPY.json b/client/COPY.json
index 66442706727..bbb055e7376 100644
--- a/client/COPY.json
+++ b/client/COPY.json
@@ -1435,7 +1435,7 @@
   "CORRESPONDENCE_READONLY_BANNER_MESSAGE": "Any further actions cannot be made on this package until a supervisor or superuser reviews the request.",
   "ASSOCIATED_WITH_CLAIMS_FOLDER_MAIL_TASK_LABEL": "Associated with claims folder",
   "VACOLS_UPDATED_MAIL_TASK_LABEL": "VACOLS updated",
-  "SENT_TO_ROJ_MAIL_TASK_LABEL": "Sent to ROJ"
+  "SENT_TO_ROJ_MAIL_TASK_LABEL": "Sent to ROJ",
   "CASE_DISTRIBUTION_TITLE": "Case Distribution Algorithm Values",
   "CASE_DISTRIBUTION_ALGORITHM_DESCRIPTION": "The Case Distribution Algorithm determines how cases are assigned to VLJs and their teams.  Current algorithm is \"Docket Date.\"",
   "CASE_DISTRIBUTION_ACTIVE_LEVERS_TITLE": "Active Data Elements",

From 39ed838b8add6198476c4774df75c8ea62e598c1 Mon Sep 17 00:00:00 2001
From: vinner57 <128258952+vinner57@users.noreply.github.com>
Date: Fri, 23 Feb 2024 11:44:25 -0500
Subject: [PATCH 117/237] fixing date error (#20924)

---
 .../ConfirmCorrespondence/ConfirmCorrespondenceView.jsx     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmCorrespondenceView.jsx b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmCorrespondenceView.jsx
index 2b8f4d146a6..a5b6592c4cc 100644
--- a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmCorrespondenceView.jsx
+++ b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmCorrespondenceView.jsx
@@ -9,6 +9,7 @@ import ConfirmTasksNotRelatedToAnAppeal from './ConfirmTasksNotRelatedToAnAppeal
 import Table from '../../../../../components/Table';
 import ConfirmTasksRelatedToAnAppeal from './ConfirmTasksRelatedToAnAppeal';
 import { COLORS } from '../../../../../constants/AppConstants';
+import { formatDateStr } from 'app/util/DateUtil';
 
 const bodyStyling = css({
   '& > tr > td': {
@@ -196,13 +197,12 @@ export const ConfirmCorrespondenceView = (props) => {
               </tbody>
               { Object.keys(responseLetters)?.map((indexValue) => {
                 const responseLetter = responseLetters[indexValue];
-                const responseDate = new Date(responseLetter?.date);
+                const responseDate = new Date(responseLetter?.date).toISOString();
 
                 return (
                   <tbody key={indexValue}>
                     <tr>
-                      <td> {responseDate?.toLocaleDateString('en-US', {
-                        month: '2-digit', day: '2-digit', year: 'numeric' })} </td>
+                      <td> {formatDateStr(responseDate)} </td>
                       <td> {responseLetter?.type} </td>
                       <td> {responseLetter?.title} </td>
                       <td> {responseLetter?.subType} </td>

From 24ab6bc2a2d0bee5284c4bb929fb0381a86551a4 Mon Sep 17 00:00:00 2001
From: Kevma50287 <104021955+Kevma50287@users.noreply.github.com>
Date: Fri, 23 Feb 2024 15:29:05 -0500
Subject: [PATCH 118/237] Bugfix for standard error logging (#20937)

---
 app/services/correspondence_auto_assigner.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/correspondence_auto_assigner.rb b/app/services/correspondence_auto_assigner.rb
index 3fc0348fbe4..9888590fba2 100644
--- a/app/services/correspondence_auto_assigner.rb
+++ b/app/services/correspondence_auto_assigner.rb
@@ -32,7 +32,7 @@ def perform
   rescue StandardError => error
     error_uuid = SecureRandom.uuid
     Raven.capture_exception(error, extra: { error_uuid: error_uuid })
-    logger.error(msg: COPY::BAAA_ERROR_MESSAGE + " (Error code:#{error_uuid})", extras: { error_uuid: error_uuid })
+    logger.error(msg: COPY::BAAA_ERROR_MESSAGE + " (Error code:#{error_uuid})")
   end
 
   private

From 090b135ff2f13166dd3560832b5886e00b88cca2 Mon Sep 17 00:00:00 2001
From: Will Medders <93014155+wmedders21@users.noreply.github.com>
Date: Tue, 27 Feb 2024 11:33:00 -0600
Subject: [PATCH 119/237] Wmedders21/appeals 40978 (#20947)

* Change correspondence_task to abstract class

* Refactor correspondence root task to not have a parent task

* do not expect abstract correspondence_task to appear in task tree

* Update test to not look for a now abstract class instance -CorrespondenceTask

* Fix for appeals not loading on step 2 of intake form

* add evidence submission window attribute to re-serializer

* Remove package document type column to fix flaky test

* Refresh to fix flaky test
---
 app/models/tasks/correspondence_task.rb       |  3 ++-
 .../correspondence_root_task_factory.rb       | 21 +++++--------------
 .../correspondence/CorrespondenceTable.jsx    |  9 --------
 .../TasksAppeals/AddAppealRelatedTaskView.jsx |  4 ++--
 client/app/queue/utils.js                     |  4 +++-
 spec/controllers/explain_controller_spec.rb   |  1 -
 .../correspondence/submit_intake_form_spec.rb |  3 ++-
 spec/models/correspondence_spec.rb            |  7 -------
 8 files changed, 14 insertions(+), 38 deletions(-)

diff --git a/app/models/tasks/correspondence_task.rb b/app/models/tasks/correspondence_task.rb
index 607b856f111..d807a2a76af 100644
--- a/app/models/tasks/correspondence_task.rb
+++ b/app/models/tasks/correspondence_task.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class CorrespondenceTask < Task
+  self.abstract_class = true
+
   before_create :verify_org_task_unique
   validate :status_is_valid_on_create, on: :create
   validate :assignee_status_is_valid_on_create, on: :create
@@ -24,7 +26,6 @@ def remove_package
       appeal_id: @correspondence.id,
       assigned_to: MailTeamSupervisor.singleton,
       appeal_type: "Correspondence",
-      parent_id: @correspondence_task.id,
       type: "CorrespondenceRootTask"
     )
     root_task.cancel_task_and_child_subtasks
diff --git a/app/workflows/correspondence_root_task_factory.rb b/app/workflows/correspondence_root_task_factory.rb
index 668e15be1b8..82b6a5ed0e6 100644
--- a/app/workflows/correspondence_root_task_factory.rb
+++ b/app/workflows/correspondence_root_task_factory.rb
@@ -17,33 +17,22 @@ def create_root_and_sub_tasks!
   private
 
   def create_root!
-    @correspondence_task = CorrespondenceTask.find_or_create_by!(
+      @root_task = CorrespondenceRootTask.find_or_create_by!(
       appeal_id: @correspondence.id,
       assigned_to: MailTeamSupervisor.singleton,
-      appeal_type: "Correspondence",
-      type: "CorrespondenceTask"
+      appeal_type: Correspondence.name
     )
 
-    @correspondence_task.update(status: "on_hold")
-
-    @root_task = CorrespondenceRootTask.find_or_create_by!(
-      appeal_id: @correspondence.id,
-      assigned_to: MailTeamSupervisor.singleton,
-      appeal_type: "Correspondence",
-      parent_id: @correspondence_task.id,
-      type: "CorrespondenceRootTask"
-    )
-
-    @root_task.update(status: "on_hold")
+    @root_task.update(status: Constants.TASK_STATUSES.on_hold)
   end
 
   def create_subtasks!
     @review_package_task = ReviewPackageTask.find_or_create_by!(
       appeal_id: @correspondence.id,
       assigned_to: MailTeamSupervisor.singleton,
-      appeal_type: "Correspondence",
+      appeal_type: Correspondence.name,
       parent_id: @root_task.id,
-      type: "ReviewPackageTask"
+      type: ReviewPackageTask.name
     )
   end
 end
diff --git a/client/app/queue/correspondence/CorrespondenceTable.jsx b/client/app/queue/correspondence/CorrespondenceTable.jsx
index 7f828b94e1b..a872c351678 100644
--- a/client/app/queue/correspondence/CorrespondenceTable.jsx
+++ b/client/app/queue/correspondence/CorrespondenceTable.jsx
@@ -21,15 +21,6 @@ class CorrespondenceTable extends React.Component {
           </Link>
         )
       },
-      {
-        name: 'packageDocumentType',
-        header: 'Package Document Type ',
-        align: 'left',
-        valueName: 'packageDocumentType',
-        enableFilter: true,
-        getSortValue: (row) => row.packageDocumentType,
-        backendCanSort: true
-      },
       {
         name: 'cmPacketNumber',
         header: 'CM Packet Number ',
diff --git a/client/app/queue/correspondence/intake/components/TasksAppeals/AddAppealRelatedTaskView.jsx b/client/app/queue/correspondence/intake/components/TasksAppeals/AddAppealRelatedTaskView.jsx
index 67bfbb36497..16ab359128b 100644
--- a/client/app/queue/correspondence/intake/components/TasksAppeals/AddAppealRelatedTaskView.jsx
+++ b/client/app/queue/correspondence/intake/components/TasksAppeals/AddAppealRelatedTaskView.jsx
@@ -3,7 +3,7 @@ import { useSelector, useDispatch } from 'react-redux';
 import PropTypes from 'prop-types';
 import CaseListTable from '../../../../CaseListTable';
 import ApiUtil from '../../../../../util/ApiUtil';
-import { prepareAppealForStore } from '../../../../utils';
+import { prepareAppealForSearchStore } from '../../../../utils';
 import LoadingContainer from '../../../../../components/LoadingContainer';
 import { COLORS, LOGO_COLORS } from '../../../../../constants/AppConstants';
 import RadioField from '../../../../../components/RadioField';
@@ -122,7 +122,7 @@ export const AddAppealRelatedTaskView = (props) => {
 
       ApiUtil.get('/appeals', { headers: { 'case-search': veteranFileNumber } }).
         then((appealResponse) => {
-          const appealsForStore = prepareAppealForStore(appealResponse.body.appeals);
+          const appealsForStore = prepareAppealForSearchStore(appealResponse.body.appeals);
 
           const appealArr = Object.values(appealsForStore.appeals).sort((first, second) => first.id - second.id);
 
diff --git a/client/app/queue/utils.js b/client/app/queue/utils.js
index 83179a430ef..698d527ded3 100644
--- a/client/app/queue/utils.js
+++ b/client/app/queue/utils.js
@@ -561,7 +561,9 @@ export const prepareAppealForSearchStore = (appeals) => {
         appeal.attributes.readable_hearing_request_type,
       readableOriginalHearingRequestType:
         appeal.attributes.readable_original_hearing_request_type,
-      vacateType: appeal.attributes.vacate_type
+      vacateType: appeal.attributes.vacate_type,
+      evidenceSubmissionTask: appeal.attributes.evidence_submission_task,
+      hasEvidenceSubmissionTask: appeal.attributes.evidence_submission_task !== null,
     };
 
     return accumulator;
diff --git a/spec/controllers/explain_controller_spec.rb b/spec/controllers/explain_controller_spec.rb
index d220d6a4d03..c9c1263471a 100644
--- a/spec/controllers/explain_controller_spec.rb
+++ b/spec/controllers/explain_controller_spec.rb
@@ -199,7 +199,6 @@
         # task tree
         expect(response.body).to include "Correspondence #{correspondence.id}"
         expect(response.body).to include "CorrespondenceRootTask"
-        expect(response.body).to include "CorrespondenceTask"
         expect(response.body).to include "ReviewPackageTask"
       end
     end
diff --git a/spec/feature/queue/correspondence/submit_intake_form_spec.rb b/spec/feature/queue/correspondence/submit_intake_form_spec.rb
index 146b5f8cf0d..89906ef7e18 100644
--- a/spec/feature/queue/correspondence/submit_intake_form_spec.rb
+++ b/spec/feature/queue/correspondence/submit_intake_form_spec.rb
@@ -157,8 +157,9 @@
         find_by_id("waiveReason").fill_in with: "test waive note"
         click_button("Continue")
         find(".cf-pdf-external-link-icon").click
+        page.switch_to_window(page.windows.last)
         using_wait_time(wait_time) do
-          page.switch_to_window(page.windows.last)
+          refresh
           expect(page).to have_content("Evidence Submission Window Task")
         end
         page.switch_to_window(page.windows.first)
diff --git a/spec/models/correspondence_spec.rb b/spec/models/correspondence_spec.rb
index d1be1c309cd..5d27276dee1 100644
--- a/spec/models/correspondence_spec.rb
+++ b/spec/models/correspondence_spec.rb
@@ -32,17 +32,10 @@
     it "Create Root Task and Review Package task for correspondence" do
       correspondence = create(:correspondence)
 
-      ct = CorrespondenceTask.find_by(appeal_id: correspondence.id, type: "CorrespondenceTask")
-      expect(ct.appeal_id).to eq(correspondence.id)
-      expect(ct.status).to eq("on_hold")
-      expect(ct.type).to eq("CorrespondenceTask")
-      expect(ct.assigned_to).to eq(MailTeamSupervisor.singleton)
-
       crt = CorrespondenceRootTask.find_by(appeal_id: correspondence.id)
       expect(crt.appeal_id).to eq(correspondence.id)
       expect(crt.status).to eq("on_hold")
       expect(crt.type).to eq("CorrespondenceRootTask")
-      expect(crt.parent_id).to eq(ct.id)
       expect(crt.assigned_to).to eq(MailTeamSupervisor.singleton)
 
       rpt = ReviewPackageTask.find_by(appeal_id: correspondence.id)

From 43b9ce6ae300341e2da6e486ee8ecdb744ac3870 Mon Sep 17 00:00:00 2001
From: Will Medders <93014155+wmedders21@users.noreply.github.com>
Date: Tue, 27 Feb 2024 14:20:34 -0600
Subject: [PATCH 120/237] Package action task refactor for create verification
 and inheritance (#20960)

* Package action task refactor for create verification and inheritance

* fix typo
---
 .../correspondence/reassign_package_task.rb   |  3 ++-
 app/models/tasks/correspondence_task.rb       | 23 +++++++++++++++++++
 app/models/tasks/merge_package_task.rb        |  3 ++-
 app/models/tasks/remove_package_task.rb       |  3 ++-
 app/models/tasks/split_package_task.rb        |  3 ++-
 5 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/app/models/tasks/correspondence/reassign_package_task.rb b/app/models/tasks/correspondence/reassign_package_task.rb
index 0feb2e7bcf9..335e3133df9 100644
--- a/app/models/tasks/correspondence/reassign_package_task.rb
+++ b/app/models/tasks/correspondence/reassign_package_task.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 
-class ReassignPackageTask < ReviewPackageTask
+class ReassignPackageTask < CorrespondenceTask
+  before_create :verify_no_other_open_package_action_task_on_correspondence
 end
diff --git a/app/models/tasks/correspondence_task.rb b/app/models/tasks/correspondence_task.rb
index d807a2a76af..0a3bf143d76 100644
--- a/app/models/tasks/correspondence_task.rb
+++ b/app/models/tasks/correspondence_task.rb
@@ -7,6 +7,17 @@ class CorrespondenceTask < Task
   validate :status_is_valid_on_create, on: :create
   validate :assignee_status_is_valid_on_create, on: :create
 
+  scope :package_action_tasks, -> { where(type: package_action_task_names) }
+
+  def self.package_action_task_names
+    [
+      ReassignPackageTask.name,
+      RemovePackageTask.name,
+      SplitPackageTask.name,
+      MergePackageTask.name
+    ]
+  end
+
   def verify_org_task_unique
     if Task.where(
       appeal_id: appeal_id,
@@ -21,6 +32,14 @@ def verify_org_task_unique
     end
   end
 
+  def verify_no_other_open_package_action_task_on_correspondence
+    return true unless package_action_task?
+
+    if CorrespondenceTask.package_action_tasks.open.where(appeal_id: appeal_id).any?
+      fail Caseflow::Error::MultipleOpenTasksOfSameTypeError, task_type: "package action task"
+    end
+  end
+
   def remove_package
     root_task = CorrespondenceRootTask.find_by!(
       appeal_id: @correspondence.id,
@@ -62,4 +81,8 @@ def assignee_status_is_valid_on_create
 
     true
   end
+
+  def package_action_task?
+    self.class.package_action_task_names.include?(self.class.name)
+  end
 end
diff --git a/app/models/tasks/merge_package_task.rb b/app/models/tasks/merge_package_task.rb
index fcc94564c1f..664f922a387 100644
--- a/app/models/tasks/merge_package_task.rb
+++ b/app/models/tasks/merge_package_task.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 
-class MergePackageTask < ReviewPackageTask
+class MergePackageTask < CorrespondenceTask
+  before_create :verify_no_other_open_package_action_task_on_correspondence
 end
diff --git a/app/models/tasks/remove_package_task.rb b/app/models/tasks/remove_package_task.rb
index 63af99adfbb..aa6d4db778e 100644
--- a/app/models/tasks/remove_package_task.rb
+++ b/app/models/tasks/remove_package_task.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 
-class RemovePackageTask < ReviewPackageTask
+class RemovePackageTask < CorrespondenceTask
+  before_create :verify_no_other_open_package_action_task_on_correspondence
 end
diff --git a/app/models/tasks/split_package_task.rb b/app/models/tasks/split_package_task.rb
index d12f057fbf0..bbedcb47cf6 100644
--- a/app/models/tasks/split_package_task.rb
+++ b/app/models/tasks/split_package_task.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 
-class SplitPackageTask < ReviewPackageTask
+class SplitPackageTask < CorrespondenceTask
+  before_create :verify_no_other_open_package_action_task_on_correspondence
 end

From 1a7e714f78d73d7b5a423e158ff39f3085a36290 Mon Sep 17 00:00:00 2001
From: Christopher Aceves <christopher.aceves@va.gov>
Date: Tue, 27 Feb 2024 16:00:50 -0800
Subject: [PATCH 121/237] Fix failing spec

---
 spec/models/correspondence_spec.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spec/models/correspondence_spec.rb b/spec/models/correspondence_spec.rb
index 1c73493aa6f..581673a87d0 100644
--- a/spec/models/correspondence_spec.rb
+++ b/spec/models/correspondence_spec.rb
@@ -36,7 +36,6 @@
       expect(crt.appeal_id).to eq(correspondence.id)
       expect(crt.status).to eq("on_hold")
       expect(crt.type).to eq("CorrespondenceRootTask")
-      expect(crt.parent_id).to eq(ct.id)
       expect(crt.assigned_to).to eq(InboundOpsTeam.singleton)
 
       rpt = ReviewPackageTask.find_by(appeal_id: correspondence.id)

From 49682889c8befb19658b267093d2b6217e0f6583 Mon Sep 17 00:00:00 2001
From: Kevma50287 <104021955+Kevma50287@users.noreply.github.com>
Date: Wed, 28 Feb 2024 14:07:40 -0500
Subject: [PATCH 122/237] Bugifx for banner color (#20977)

* Bugifx for banner color

* Fixed constants typo
---
 .../queue/correspondence/component/AutoAssignAlertBanner.jsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/app/queue/correspondence/component/AutoAssignAlertBanner.jsx b/client/app/queue/correspondence/component/AutoAssignAlertBanner.jsx
index 17516acedc9..800a611c49c 100644
--- a/client/app/queue/correspondence/component/AutoAssignAlertBanner.jsx
+++ b/client/app/queue/correspondence/component/AutoAssignAlertBanner.jsx
@@ -32,7 +32,7 @@ const AutoAssignAlertBanner = (props) => {
         message: response.error_message.message,
       };
 
-      if (response.error_message.error_uuid) {
+      if (response.error_message.message.includes(COPY.BAAA_ERROR_MESSAGE)) {
         bannerPayload.type = 'error';
       } else {
         bannerPayload.type = 'info';

From cd705cbfbbe4ad9e4db7893d67470b0f77cf9c0e Mon Sep 17 00:00:00 2001
From: Will Medders <93014155+wmedders21@users.noreply.github.com>
Date: Wed, 28 Feb 2024 15:13:10 -0600
Subject: [PATCH 123/237] Wmedders21/appeals 41354 (#20978)

* randomize closed at for correspondence root task seeds

* update seeds to have varying values to be able to test sorting columns
---
 db/seeds/helpers/queue_helpers.rb |  8 +++++++-
 db/seeds/queue_correspondences.rb | 17 ++++++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/db/seeds/helpers/queue_helpers.rb b/db/seeds/helpers/queue_helpers.rb
index 1c88427aed4..8a336fed186 100644
--- a/db/seeds/helpers/queue_helpers.rb
+++ b/db/seeds/helpers/queue_helpers.rb
@@ -49,6 +49,7 @@ def create_correspondence_document(correspondence, veteran)
 
   def create_correspondence_intake(correspondence, user)
     parent = correspondence&.root_task
+    complete_task(ReviewPackageTask.find_by(appeal_id: correspondence.id), user.id)
     cit = CorrespondenceIntakeTask.create_from_params(parent, user)
     randomize_days_waiting_value(cit)
     cit
@@ -64,13 +65,14 @@ def assign_review_package_task(correspondence, user)
   end
 
   def create_efolderupload_failed_task(correspondence, parent)
-    EfolderUploadFailedTask.create!(
+    euft = EfolderUploadFailedTask.create!(
       parent_id: parent.id,
       appeal_id: correspondence.id,
       appeal_type: "Correspondence",
       assigned_to: parent.assigned_to,
       status: Constants.TASK_STATUSES.in_progress
     )
+    randomize_days_waiting_value(euft)
   end
 
   def create_action_required_tasks(correspondence, status:, parent_task:, task_type:)
@@ -122,6 +124,10 @@ def create_congress_interest_mailtask(correspondence, user)
     )
   end
 
+  def complete_task(task, user_id)
+    task.update!(status: Constants.TASK_STATUSES.completed, completed_by_id: user_id)
+  end
+
   def process_correspondence(correspondence, user)
     rpt = ReviewPackageTask.find_by(appeal_id: correspondence.id)
     rpt.update!(status: Constants.TASK_STATUSES.completed, completed_by_id: user.id)
diff --git a/db/seeds/queue_correspondences.rb b/db/seeds/queue_correspondences.rb
index 69746ea9c09..e56705cf5d9 100644
--- a/db/seeds/queue_correspondences.rb
+++ b/db/seeds/queue_correspondences.rb
@@ -41,6 +41,11 @@ def initial_id_values
 
     # rubocop:disable Metrics/MethodLength
     def create_queue_correspondences
+      # 20 Correspondences with unassigned ReviewPackageTask
+      20.times do
+        create_correspondence_with_unassigned_review_package_task
+      end
+
       # 20 Correspondences with eFolderFailedUploadTask with a parent CorrespondenceIntakeTask
       20.times do
         create_correspondence_with_intake_and_failed_upload_task(mail_team_user)
@@ -127,6 +132,13 @@ def create_correspondence_with_in_progress_intake_task(user)
       cit.update!(status: Constants.TASK_STATUSES.in_progress)
     end
 
+    def create_correspondence_with_unassigned_review_package_task
+      corres = create_correspondence
+      # vary days waiting to be able to test column sorting
+      rpt = ReviewPackageTask.find_by(appeal_id: corres.id)
+      rpt.update(assigned_at: corres.va_date_of_receipt)
+    end
+
     def create_correspondence_with_review_package_task(user)
       corres = create_correspondence
       assign_review_package_task(corres, user)
@@ -149,6 +161,7 @@ def create_correspondence_with_review_package_and_failed_upload_task(user)
     def create_correspondence_with_completed_root_task
       corres = create_correspondence
       corres.root_task.update!(status: Constants.TASK_STATUSES.completed)
+      corres.root_task.update!(closed_at: rand(1.month.ago..1.day.ago))
     end
 
     def create_correspondence_with_action_required_tasks
@@ -157,13 +170,15 @@ def create_correspondence_with_action_required_tasks
 
       corres_array.each_with_index do |corres, index|
         rpt = ReviewPackageTask.find_by(appeal_id: corres.id)
-        task_array[index].create!(
+        rpt.update(assigned_to_id: mail_team_superuser.id) if index.even?
+        pat = task_array[index].create!(
           parent_id: rpt.id,
           appeal_id: corres.id,
           appeal_type: "Correspondence",
           assigned_to: MailTeamSupervisor.singleton,
           assigned_by_id: rpt.assigned_to_id
         )
+        pat.update(assigned_at: corres.va_date_of_receipt)
       end
     end
 

From 5e34d2584b00a4773c095b7eb017ad46b6c2bfda Mon Sep 17 00:00:00 2001
From: IsaiahBar <107133331+IsaiahBar@users.noreply.github.com>
Date: Wed, 28 Feb 2024 16:20:01 -0500
Subject: [PATCH 124/237] Isaiah bar/appeals 35478 (#20964)

* update seed file to create package action tasks with assigned_by value

* Update tasks call for action required tab

* Update columns in QUEUE_COLUMN constants file

* Add sorting to columns

* refactor query to use scope

* always use task pages api for this workflow

* ensure assigned by is a user

* merge with ryan/APPEALS-35479-check

* add cancel link to package action modals

* add tests for action required tab

* remove pry

* refactor tasks method

* refactor correspondence task filter

* include appeal_type when creating

* APPEALS-35482 - CSS Fix

* APPEALS-35482 - Linting and RSpecs

* APPEALS-35482 - Rspecs, Filtering, Snapshots

* Update QueueDropdownFilter.jsx

* updated task for Assigned tab

* fix test

* modified expect

* fix tasks filter

* test for tasks filter

* fixed tasks

* updating Tasks filter

* update query for tasks

---------

Co-authored-by: William Medders <medders_william@bah.com>
Co-authored-by: KiMauVA <Ki.Mau@va.gov>
Co-authored-by: Jim Foley <james.foley4@va.gov>
Co-authored-by: Ryan Marshall <rnmarshall1993@gmail.com>
Co-authored-by: HunJerBAH <Jeremy.Hunton@va.gov>
---
 .../organization_correspondence_assigned_tasks_tab.rb    | 8 +-------
 app/models/tasks/correspondence_task_filter.rb           | 4 ++--
 .../queue/correspondence/correspondence_cases_spec.rb    | 9 ++++++++-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/models/queue_tabs/organization_correspondence_assigned_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_assigned_tasks_tab.rb
index b312606f07e..613f32c6046 100644
--- a/app/models/queue_tabs/organization_correspondence_assigned_tasks_tab.rb
+++ b/app/models/queue_tabs/organization_correspondence_assigned_tasks_tab.rb
@@ -16,13 +16,7 @@ def description
   end
 
   def tasks
-    tasks = CorrespondenceTask.includes(*task_includes).package_action_tasks
-
-    tasks = if RequestStore[:current_user].mail_supervisor?
-      tasks.where(assigned_to: assignee).active
-    else
-      tasks.where.not(type: RemovePackageTask.name).where(assigned_to: assignee).active
-    end
+    CorrespondenceTask.includes(*task_includes).active.where.not(assigned_to_type: "Organization")
   end
 
   def column_names
diff --git a/app/models/tasks/correspondence_task_filter.rb b/app/models/tasks/correspondence_task_filter.rb
index feb51b079b3..e7f3cea421e 100644
--- a/app/models/tasks/correspondence_task_filter.rb
+++ b/app/models/tasks/correspondence_task_filter.rb
@@ -37,7 +37,7 @@ def filter_by_task(task_type)
 
   def filtered_tasks
     va_dor_params = filter_params.select { |param| param.include?("col=vaDor") }
-    task_column_params = filter_params.select { |param| param.include?("col=completedDateColumn") }
+    task_column_params = filter_params.select { |param| param.include?("col=taskColumn") }
     result = tasks.all # Assuming Task is the name of your ActiveRecord model
     va_dor_params.each do |param|
       value_hash = Rack::Utils.parse_nested_query(param).deep_symbolize_keys
@@ -46,7 +46,7 @@ def filtered_tasks
 
     task_column_params.each do |param|
       value_hash = Rack::Utils.parse_nested_query(param).deep_symbolize_keys
-      result = result.merge(filter_by_date(value_hash[:val]))
+      result = result.merge(filter_by_task(value_hash[:val]))
     end
 
     result
diff --git a/spec/feature/queue/correspondence/correspondence_cases_spec.rb b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
index e059f95d77c..94ed74fbed0 100644
--- a/spec/feature/queue/correspondence/correspondence_cases_spec.rb
+++ b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
@@ -22,7 +22,7 @@
     it "routes to correspondence cases if feature toggle is enabled" do
       FeatureToggle.enable!(:correspondence_queue)
       visit "/queue/correspondence"
-      expect(page).to have_current_path("/queue/correspondence")
+      expect(page).to have_current_path(%r{/queue/correspondence})
     end
   end
 
@@ -729,6 +729,13 @@
       expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == last_date)
     end
 
+    it "use tasks filter correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
+      find("[aria-label='Filter by task']").click
+      find("label", text: "Merge Package Task (5)").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+
     it "uses days waiting sort correctly" do
       visit "/queue/correspondence/team?tab=correspondence_team_assigned"
       # put page in the sorted A-Z state

From b2657336f52a38cccf6d3a770b8144672b801631 Mon Sep 17 00:00:00 2001
From: HunJerBAH <Jeremy.Hunton@va.gov>
Date: Wed, 28 Feb 2024 17:31:17 -0500
Subject: [PATCH 125/237] updated assigned tab tests to match business logic.

---
 .../correspondence_cases_spec.rb              | 39 +++++++++++--------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/spec/feature/queue/correspondence/correspondence_cases_spec.rb b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
index 94ed74fbed0..9ecf6575c91 100644
--- a/spec/feature/queue/correspondence/correspondence_cases_spec.rb
+++ b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
@@ -662,28 +662,33 @@
 
     before do
       Timecop.freeze(Time.zone.local(2020, 5, 15))
-      5.times do
-        corres_array = (1..4).map { create(:correspondence) }
-        task_array = [ReassignPackageTask, RemovePackageTask, SplitPackageTask, MergePackageTask]
-
-        corres_array.each_with_index do |corres, index|
-          rpt = ReviewPackageTask.find_by(appeal_id: corres.id)
-          task_array[index].create!(
-            parent_id: rpt.id,
-            appeal_id: corres.id,
-            appeal_type: "Correspondence",
-            assigned_to: MailTeamSupervisor.singleton,
-            assigned_by_id: rpt.assigned_to_id
-          )
-        end
+      (1..10).map { create(:correspondence, :with_correspondence_intake_task) }
+      10.times do
+        review_correspondence = create(:correspondence)
+        rpt = ReviewPackageTask.find_by(appeal_id: review_correspondence.id)
+        rpt.update!(assigned_to: current_user, status: "assigned")
+        rpt.save!
+      end
+      10.times do
+        corr = create(:correspondence)
+
+        rpt = ReviewPackageTask.find_by(appeal_id: corr.id)
+
+        EfolderUploadFailedTask.create!(
+          parent_id: rpt.id,
+          appeal_id: corr.id,
+          appeal_type: "Correspondence",
+          assigned_to: current_user,
+          assigned_by_id: rpt.assigned_to_id
+        )
       end
 
       # Used to mock a single task to compare task sorting
-      ReassignPackageTask.first.correspondence.update!(
+      EfolderUploadFailedTask.first.correspondence.update!(
         va_date_of_receipt: Date.new(2000, 10, 10),
         updated_by_id: current_user.id
       )
-      ReassignPackageTask.last.correspondence.update!(
+      EfolderUploadFailedTask.last.correspondence.update!(
         va_date_of_receipt: Date.new(2050, 10, 10),
         updated_by_id: current_user.id
       )
@@ -732,7 +737,7 @@
     it "use tasks filter correctly" do
       visit "/queue/correspondence/team?tab=correspondence_team_assigned"
       find("[aria-label='Filter by task']").click
-      find("label", text: "Merge Package Task (5)").click
+      find("label", text: "Correspondence Intake Task (10)").click
       expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
     end
 

From 5e335d7c76e88f43d26ffcc56aa1c147bbfb0602 Mon Sep 17 00:00:00 2001
From: Alex Smith <alex.smith.99@thunderyard.com>
Date: Thu, 29 Feb 2024 14:09:52 -0700
Subject: [PATCH 126/237] Add Checks to Ensure Correspondence Auto Assignment
 Job Uniqueness (#20968)

* Add Checks to Ensure Correspondence Auto Assignment Job Uniqueness

- Update the CorrespondenceAutoAssigner to do validations before
running to ensure we don't end up with parallel auto assign jobs.

- Add and update specs as needed.

* Update Incorrect Time Field Checks

---------

Co-authored-by: cacevesva <109166981+cacevesva@users.noreply.github.com>
---
 app/controllers/correspondence_controller.rb  |  38 ++----
 app/jobs/auto_assign_correspondence_job.rb    |  13 +-
 .../correspondence_auto_assign_logger.rb      |  30 +++--
 ...correspondence_auto_assign_run_verifier.rb |  69 ++++++++++
 app/services/correspondence_auto_assigner.rb  |  69 +++++-----
 .../CORRESPONDENCE_AUTO_ASSIGNMENT.json       |   4 +
 .../correspondence_controller_spec.rb         |  14 +-
 .../batch_auto_assignment_attempt.rb          |   3 +-
 .../individual_auto_assignment_attempt.rb     |  17 +++
 .../auto_assign_correspondence_job_spec.rb    |  18 +++
 .../correspondence_auto_assign_logger_spec.rb |   2 +-
 ...spondence_auto_assign_run_verifier_spec.rb | 122 ++++++++++++++++++
 .../correspondence_auto_assigner_spec.rb      |  95 +++++++++++---
 13 files changed, 382 insertions(+), 112 deletions(-)
 create mode 100644 app/services/correspondence_auto_assign_run_verifier.rb
 create mode 100644 spec/factories/individual_auto_assignment_attempt.rb
 create mode 100644 spec/jobs/auto_assign_correspondence_job_spec.rb
 create mode 100644 spec/services/correspondence_auto_assign_run_verifier_spec.rb

diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index e5c2564f5e4..7a7d29cd9f3 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -175,26 +175,19 @@ def process_intake
   end
 
   def auto_assign_correspondences
-    batch = existing_batch_auto_assignment_attempt
+    batch = BatchAutoAssignmentAttempt.create!(
+      user: current_user,
+      status: Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.started
+    )
 
-    if batch.nil?
-      batch = BatchAutoAssignmentAttempt.create!(
-        user: current_user,
-        status: Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.started
-      )
-      job_args = {
-        current_user_id: current_user.id,
-        batch_auto_assignment_attempt_id: batch.id
-      }
-
-      begin
-        perform_later_or_now(AutoAssignCorrespondenceJob, job_args)
-      ensure
-        render json: { batch_auto_assignment_attempt_id: batch.id }, status: :ok
-      end
-    else
-      render json: { batch_auto_assignment_attempt_id: batch.id }, status: :ok
-    end
+    job_args = {
+      current_user_id: current_user.id,
+      batch_auto_assignment_attempt_id: batch.id
+    }
+
+    perform_later_or_now(AutoAssignCorrespondenceJob, job_args)
+  ensure
+    render json: { batch_auto_assignment_attempt_id: batch&.id }, status: :ok
   end
 
   def auto_assign_status
@@ -339,11 +332,4 @@ def upload_documents_to_claim_evidence
     rpt = ReviewPackageTask.find_by(appeal_id: correspondence.id, type: ReviewPackageTask.name)
     correspondence_documents_efolder_uploader.upload_documents_to_claim_evidence(correspondence, current_user, rpt)
   end
-
-  def existing_batch_auto_assignment_attempt
-    @existing_batch_auto_assignment_attempt ||= BatchAutoAssignmentAttempt.find_by(
-      user: current_user,
-      status: Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.started
-    )
-  end
 end
diff --git a/app/jobs/auto_assign_correspondence_job.rb b/app/jobs/auto_assign_correspondence_job.rb
index eacceaea25f..e586351f75c 100644
--- a/app/jobs/auto_assign_correspondence_job.rb
+++ b/app/jobs/auto_assign_correspondence_job.rb
@@ -4,12 +4,15 @@ class AutoAssignCorrespondenceJob < CaseflowJob
   queue_with_priority :low_priority
 
   def perform(current_user_id:, batch_auto_assignment_attempt_id:)
-    CorrespondenceAutoAssigner.new(
+    correspondence_auto_assigner.perform(
       current_user_id: current_user_id,
       batch_auto_assignment_attempt_id: batch_auto_assignment_attempt_id
-    ).perform
-  rescue StandardError => error
-    error_uuid = SecureRandom.uuid
-    log_error(error, extra: { error_uuid: error_uuid })
+    )
+  end
+
+  private
+
+  def correspondence_auto_assigner
+    @correspondence_auto_assigner ||= CorrespondenceAutoAssigner.new
   end
 end
diff --git a/app/services/correspondence_auto_assign_logger.rb b/app/services/correspondence_auto_assign_logger.rb
index 7f2ca775705..7f0bb2f21e9 100644
--- a/app/services/correspondence_auto_assign_logger.rb
+++ b/app/services/correspondence_auto_assign_logger.rb
@@ -3,12 +3,12 @@
 # :reek:FeatureEnvy
 class CorrespondenceAutoAssignLogger
   def initialize(current_user, batch)
-    @current_user = current_user
-    @batch = batch
+    self.current_user = current_user
+    self.batch = batch
   end
 
   def begin
-    @batch.update!(
+    batch.update!(
       started_at: Time.current,
       status: Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.started,
       num_nod_packages_assigned: 0,
@@ -19,7 +19,7 @@ def begin
   end
 
   def end
-    @batch.assign_attributes(
+    batch.assign_attributes(
       status: Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.completed,
       completed_at: Time.current
     )
@@ -28,7 +28,7 @@ def end
   end
 
   def error(msg:)
-    @batch.assign_attributes(
+    batch.assign_attributes(
       status: Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.error,
       error_info: { message: msg },
       errored_at: Time.current
@@ -50,9 +50,9 @@ def assigned(task:, started_at:, assigned_to:)
     )
 
     if correspondence.nod?
-      @batch.num_nod_packages_assigned += 1
+      batch.num_nod_packages_assigned += 1
     else
-      @batch.num_packages_assigned += 1
+      batch.num_packages_assigned += 1
     end
 
     save_attempt_statistics(
@@ -75,9 +75,9 @@ def no_eligible_assignees(task:, started_at:)
     )
 
     if correspondence.nod?
-      @batch.num_nod_packages_unassigned += 1
+      batch.num_nod_packages_unassigned += 1
     else
-      @batch.num_packages_unassigned += 1
+      batch.num_packages_unassigned += 1
     end
 
     save_attempt_statistics(
@@ -89,20 +89,22 @@ def no_eligible_assignees(task:, started_at:)
 
   private
 
+  attr_accessor :batch, :current_user
+
   def individual_auto_assignment_attempt
     IndividualAutoAssignmentAttempt.new(
-      batch_auto_assignment_attempt: @batch,
-      user: @current_user
+      batch_auto_assignment_attempt: batch,
+      user: current_user
     )
   end
 
   def save_run_statistics
     stats = {
-      seconds_elapsed: seconds_elapsed(record: @batch, status: @batch.status)
+      seconds_elapsed: seconds_elapsed(record: batch, status: batch.status)
     }
 
-    @batch.statistics = stats
-    @batch.save!
+    batch.statistics = stats
+    batch.save!
   end
 
   def save_attempt_statistics(attempt:, task:, result:)
diff --git a/app/services/correspondence_auto_assign_run_verifier.rb b/app/services/correspondence_auto_assign_run_verifier.rb
new file mode 100644
index 00000000000..11841ed5090
--- /dev/null
+++ b/app/services/correspondence_auto_assign_run_verifier.rb
@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+class CorrespondenceAutoAssignRunVerifier
+  attr_accessor :verified_batch, :verified_user, :err_msg
+
+  def can_run_auto_assign?(current_user_id:, batch_auto_assignment_attempt_id:)
+    verify_feature_toggles &&
+      verify_id_params(current_user_id, batch_auto_assignment_attempt_id) &&
+      verify_no_other_jobs_running
+  end
+
+  def min_minutes_elapsed_batch_attempt
+    Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.timing.min_minutes_elapsed_batch_attempt
+  end
+
+  def min_minutes_elapsed_individual_attempt
+    Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.timing.min_minutes_elapsed_individual_attempt
+  end
+
+  private
+
+  def verify_feature_toggles
+    if !Rails.env.production? && FeatureToggle.enabled?(:auto_assign_banner_failure)
+      self.err_msg = "Failing due to feature toggle"
+      return false
+    end
+
+    true
+  end
+
+  def verify_id_params(current_user_id, batch_auto_assignment_attempt_id)
+    self.verified_user = User.find_by(id: current_user_id)
+    if verified_user.blank?
+      self.err_msg = "User does not exist"
+      return false
+    end
+
+    self.verified_batch = BatchAutoAssignmentAttempt.find_by(user: verified_user, id: batch_auto_assignment_attempt_id)
+    if verified_batch.blank?
+      self.err_msg = "BatchAutoAssignmentAttempt does not exist"
+      return false
+    end
+
+    true
+  end
+
+  def verify_no_other_jobs_running
+    if assignment_already_running?
+      self.err_msg = "Auto assignment already in progress"
+      return false
+    end
+
+    true
+  end
+
+  def assignment_already_running?
+    last_assignment = IndividualAutoAssignmentAttempt.last
+
+    # Safe to move forward if we haven't seen any assignment attempts for the past X minutes
+    return true if last_assignment&.created_at.present? &&
+                   ((Time.current - last_assignment.created_at)/60) < min_minutes_elapsed_individual_attempt
+
+    # Safe to move forward if the last batch was started more than Y minutes ago
+    BatchAutoAssignmentAttempt
+      .where.not(id: verified_batch.id)
+      .where(status: Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.started)
+      .exists?(["started_at < ?", min_minutes_elapsed_batch_attempt.minutes.ago])
+  end
+end
diff --git a/app/services/correspondence_auto_assigner.rb b/app/services/correspondence_auto_assigner.rb
index 9888590fba2..bf57deab666 100644
--- a/app/services/correspondence_auto_assigner.rb
+++ b/app/services/correspondence_auto_assigner.rb
@@ -1,20 +1,13 @@
 # frozen_string_literal: true
 
-# :reek:InstanceVariableAssumption
 class CorrespondenceAutoAssigner
-  def initialize(current_user_id:, batch_auto_assignment_attempt_id:)
-    @current_user = User.find(current_user_id)
-    @batch = BatchAutoAssignmentAttempt.find_by(user: @current_user, id: batch_auto_assignment_attempt_id)
-  end
+  def perform(current_user_id:, batch_auto_assignment_attempt_id:)
+    # Don't catch these exceptions here so that if we're being called by a job
+    # the job will auto-retry with exponential back-off
+    validate_run!(current_user_id, batch_auto_assignment_attempt_id)
 
-  def perform
     logger.begin
 
-    # Manual error trigger for testing purposes
-    if FeatureToggle.enabled?(:auto_assign_banner_failure) && !Rails.env.production?
-      fail StandardError
-    end
-
     if !unassigned_review_package_tasks.count.positive?
       logger.error(msg: COPY::BAAA_NO_UNASSIGNED_CORRESPONDENCE)
       return
@@ -25,18 +18,23 @@ def perform
       return
     end
 
-    unassigned_review_package_tasks.each do |task|
-      assign(task)
+    begin
+      unassigned_review_package_tasks.each do |task|
+        assign(task)
+      end
+
+      logger.end
+    rescue StandardError => error
+      error_uuid = SecureRandom.uuid
+      Raven.capture_exception(error, extra: { error_uuid: error_uuid })
+      logger.error(msg: "#{COPY::BAAA_ERROR_MESSAGE} (Error code: #{error_uuid})")
     end
-    logger.end
-  rescue StandardError => error
-    error_uuid = SecureRandom.uuid
-    Raven.capture_exception(error, extra: { error_uuid: error_uuid })
-    logger.error(msg: COPY::BAAA_ERROR_MESSAGE + " (Error code:#{error_uuid})")
   end
 
   private
 
+  attr_accessor :batch, :current_user
+
   def assign(task)
     started_at = Time.current
 
@@ -56,38 +54,43 @@ def assign_task_to_user(task, user)
     task.update!(
       assigned_to: user,
       assigned_at: Time.current,
-      assigned_by: @current_user,
+      assigned_by: current_user,
       assigned_to_type: User.name,
       status: Constants.TASK_STATUSES.assigned
     )
   end
 
   def unassigned_review_package_tasks
-    return @unassigned_review_package_tasks if @unassigned_review_package_tasks.present?
+    return [] if !Rails.env.production? && FeatureToggle.enabled?(:auto_assign_banner_no_rpt)
 
-    tasks = ReviewPackageTask
-      .where(status: "unassigned")
+    ReviewPackageTask
+      .where(status: Constants.TASK_STATUSES.unassigned)
       .includes(:correspondence)
       .references(:correspondence)
       .merge(Correspondence.order(va_date_of_receipt: :desc))
+  end
 
-    # Jobs run synchronously in testing and development environments - limit to 10 to prevent timeouts
-    tasks = if !Rails.env.production?
-              if FeatureToggle.enabled?(:auto_assign_banner_no_rpt)
-                []
-              else
-                tasks.limit(10)
-              end
-            end
-
-    @unassigned_review_package_tasks = tasks
+  def validate_run!(current_user_id, batch_auto_assignment_attempt_id)
+    if run_verifier.can_run_auto_assign?(
+      current_user_id: current_user_id,
+      batch_auto_assignment_attempt_id: batch_auto_assignment_attempt_id
+    )
+      self.batch = run_verifier.verified_batch
+      self.current_user = run_verifier.verified_user
+    else
+      fail run_verifier.err_msg
+    end
   end
 
   def logger
-    @logger ||= CorrespondenceAutoAssignLogger.new(@current_user, @batch)
+    @logger ||= CorrespondenceAutoAssignLogger.new(current_user, batch)
   end
 
   def assignable_user_finder
     @assignable_user_finder ||= AutoAssignableUserFinder.new
   end
+
+  def run_verifier
+    @run_verifier ||= CorrespondenceAutoAssignRunVerifier.new
+  end
 end
diff --git a/client/constants/CORRESPONDENCE_AUTO_ASSIGNMENT.json b/client/constants/CORRESPONDENCE_AUTO_ASSIGNMENT.json
index 0c3ec1695da..05810a83469 100644
--- a/client/constants/CORRESPONDENCE_AUTO_ASSIGNMENT.json
+++ b/client/constants/CORRESPONDENCE_AUTO_ASSIGNMENT.json
@@ -4,5 +4,9 @@
     "started": "started",
     "completed": "completed",
     "error": "error"
+  },
+  "timing": {
+    "min_minutes_elapsed_batch_attempt": 5,
+    "min_minutes_elapsed_individual_attempt": 2
   }
 }
diff --git a/spec/controllers/correspondence_controller_spec.rb b/spec/controllers/correspondence_controller_spec.rb
index 4366bf90a49..4da9c19f39f 100644
--- a/spec/controllers/correspondence_controller_spec.rb
+++ b/spec/controllers/correspondence_controller_spec.rb
@@ -222,23 +222,11 @@
         expect(JSON.parse(response.body)["batch_auto_assignment_attempt_id"]).to eq(BatchAutoAssignmentAttempt.last.id)
       end
     end
-
-    context "when there is an existing batch assignment attempt" do
-      it "does not create batch auto assignment attempt and returns the id" do
-        BatchAutoAssignmentAttempt.create!(
-          user: current_user,
-          status: Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.started
-        )
-        expect { get :auto_assign_correspondences }.to_not change(BatchAutoAssignmentAttempt, :count)
-        expect(response).to have_http_status(:ok)
-        expect(JSON.parse(response.body)["batch_auto_assignment_attempt_id"]).to eq(BatchAutoAssignmentAttempt.last.id)
-      end
-    end
   end
 
   describe "POST #auto_assign_status" do
     let(:error_baaa) do
-      create(:batch_auto_assignment_attempt, :max_capacity_error, :packages_assigned, user_id: current_user.id)
+      create(:batch_auto_assignment_attempt, :max_capacity_error, :packages_assigned, user: current_user)
     end
 
     before do
diff --git a/spec/factories/batch_auto_assignment_attempt.rb b/spec/factories/batch_auto_assignment_attempt.rb
index 3adc99c664e..05ed797953b 100644
--- a/spec/factories/batch_auto_assignment_attempt.rb
+++ b/spec/factories/batch_auto_assignment_attempt.rb
@@ -6,7 +6,8 @@
     started_at { 12.hours.ago }
     updated_at { 12.hours.ago }
     status { Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.started }
-    user_id { User.first.id || create(:user).id }
+
+    association :user, factory: :user
 
     trait :packages_assigned do
       num_nod_packages_assigned { 5 }
diff --git a/spec/factories/individual_auto_assignment_attempt.rb b/spec/factories/individual_auto_assignment_attempt.rb
new file mode 100644
index 00000000000..1d22f2923c9
--- /dev/null
+++ b/spec/factories/individual_auto_assignment_attempt.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :individual_auto_assignment_attempt do
+    status { Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.started }
+    nod { false }
+    statistics { nil }
+
+    started_at { nil }
+    completed_at { nil }
+    errored_at { nil }
+
+    association :batch_auto_assignment_attempt, factory: :batch_auto_assignment_attempt
+    association :correspondence, factory: :correspondence
+    association :user, factory: :user
+  end
+end
diff --git a/spec/jobs/auto_assign_correspondence_job_spec.rb b/spec/jobs/auto_assign_correspondence_job_spec.rb
new file mode 100644
index 00000000000..bf7ad7c49b7
--- /dev/null
+++ b/spec/jobs/auto_assign_correspondence_job_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+describe AutoAssignCorrespondenceJob, :postgres do
+  before do
+    ActiveJob::Base.queue_adapter = :test
+  end
+
+  describe "#perform_later" do
+    it "enqueues a job" do
+      expect do
+        described_class.perform_later(
+          current_user_id: 1,
+          batch_auto_assignment_attempt_id: 1
+        )
+      end.to have_enqueued_job
+    end
+  end
+end
diff --git a/spec/services/correspondence_auto_assign_logger_spec.rb b/spec/services/correspondence_auto_assign_logger_spec.rb
index 4c8346d95b4..e1d7c80685d 100644
--- a/spec/services/correspondence_auto_assign_logger_spec.rb
+++ b/spec/services/correspondence_auto_assign_logger_spec.rb
@@ -3,9 +3,9 @@
 describe CorrespondenceAutoAssignLogger do
   subject(:described) { described_class.new(current_user, batch_auto_assignment_attempt) }
 
-  let(:batch_auto_assignment_attempt) { create(:batch_auto_assignment_attempt, user_id: current_user.id) }
   let(:current_user) { create(:user) }
   let(:assignee) { create(:user) }
+  let(:batch_auto_assignment_attempt) { create(:batch_auto_assignment_attempt, user: current_user) }
 
   let!(:correspondence) { create(:correspondence) }
   let(:task) { correspondence.review_package_task }
diff --git a/spec/services/correspondence_auto_assign_run_verifier_spec.rb b/spec/services/correspondence_auto_assign_run_verifier_spec.rb
new file mode 100644
index 00000000000..a160edb8a70
--- /dev/null
+++ b/spec/services/correspondence_auto_assign_run_verifier_spec.rb
@@ -0,0 +1,122 @@
+# frozen_string_literal: true
+
+describe CorrespondenceAutoAssignRunVerifier do
+  subject(:described) { described_class.new }
+
+  let(:current_user) { create(:user) }
+
+  describe "#can_run_auto_assign?" do
+    let!(:valid_batch) do
+      create(
+        :batch_auto_assignment_attempt,
+        user: current_user,
+        started_at: (described.min_minutes_elapsed_batch_attempt + 1).minutes.ago
+      )
+    end
+
+    let!(:valid_batch_recent) do
+      create(
+        :batch_auto_assignment_attempt,
+        user: current_user,
+        status: Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.completed,
+        started_at: (described.min_minutes_elapsed_batch_attempt - 1).minutes.ago
+      )
+    end
+
+    context "when true" do
+      context "with completed IndividualAutoAssignmentAttempt" do
+        let!(:individual) do
+          create(
+            :individual_auto_assignment_attempt,
+            batch_auto_assignment_attempt: valid_batch,
+            created_at: (described.min_minutes_elapsed_individual_attempt + 1).minutes.ago
+          )
+        end
+
+        it "returns true" do
+          expect(
+            described.can_run_auto_assign?(current_user_id: current_user.id, batch_auto_assignment_attempt_id: valid_batch.id)
+          ).to eq(true)
+        end
+      end
+
+      context "with completed BatchAutoAssignmentAttempt" do
+        it "returns true" do
+          expect(
+            described.can_run_auto_assign?(current_user_id: current_user.id, batch_auto_assignment_attempt_id: valid_batch.id)
+          ).to eq(true)
+        end
+      end
+    end
+
+    context "when false" do
+      context "with feature toggles enabled" do
+        before do
+          FeatureToggle.enable!(:auto_assign_banner_failure)
+        end
+
+        it "returns false" do
+          expect(
+            described.can_run_auto_assign?(current_user_id: current_user.id, batch_auto_assignment_attempt_id: valid_batch.id)
+          ).to eq(false)
+        end
+      end
+
+      context "with invalid current_user_id" do
+        it "returns false" do
+          expect(
+            described.can_run_auto_assign?(current_user_id: 0, batch_auto_assignment_attempt_id: valid_batch.id)
+          ).to eq(false)
+        end
+      end
+
+      context "with invalid batch_auto_assignment_attempt_id" do
+        it "returns false" do
+          expect(
+            described.can_run_auto_assign?(current_user_id: current_user.id, batch_auto_assignment_attempt_id: 0)
+          ).to eq(false)
+        end
+      end
+
+      context "when checking for concurrent runs" do
+        context "when the latest IndividualAutoAssignmentAttempt occurred too recently" do
+          let!(:invalid_individual) do
+            create(
+              :individual_auto_assignment_attempt,
+              batch_auto_assignment_attempt: valid_batch,
+              created_at: 1.minutes.ago
+            )
+          end
+
+          before do
+            batch_stubbed = class_double(BatchAutoAssignmentAttempt).as_stubbed_const(:transfer_nested_constants => true)
+            expect(batch_stubbed).to receive(:find_by).with(user: current_user, id: valid_batch.id).and_return(valid_batch)
+            expect(batch_stubbed).not_to receive(:where)
+          end
+
+          it "returns false" do
+            expect(
+              described.can_run_auto_assign?(current_user_id: current_user.id, batch_auto_assignment_attempt_id: valid_batch.id)
+            ).to eq(false)
+          end
+        end
+
+        context "when the latest BatchAutoAssignmentAttempt occurred too recently" do
+          let!(:recent_batch) do
+            create(
+              :batch_auto_assignment_attempt,
+              user: current_user,
+              started_at: (described.min_minutes_elapsed_batch_attempt - 1).minutes.ago
+            )
+          end
+
+          it "returns false" do
+            expect(
+              described.can_run_auto_assign?(current_user_id: current_user.id, batch_auto_assignment_attempt_id: recent_batch.id)
+            ).to eq(false)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/services/correspondence_auto_assigner_spec.rb b/spec/services/correspondence_auto_assigner_spec.rb
index 946bae25d75..7a50e56b2ce 100644
--- a/spec/services/correspondence_auto_assigner_spec.rb
+++ b/spec/services/correspondence_auto_assigner_spec.rb
@@ -1,41 +1,98 @@
 # frozen_string_literal: true
 
 describe CorrespondenceAutoAssigner do
-  subject(:described) do
-    described_class.new(
-      current_user_id: current_user.id,
-      batch_auto_assignment_attempt_id: batch_auto_assignment_attempt.id
-    )
-  end
+  subject(:described) { described_class.new }
 
-  let(:batch_auto_assignment_attempt) { create(:batch_auto_assignment_attempt, user_id: current_user.id) }
   let(:veteran) { create(:veteran) }
   let(:current_user) { create(:user) }
 
-  let!(:correspondence) { create(:correspondence, veteran_id: veteran.id) }
+  let!(:batch) { create(:batch_auto_assignment_attempt, user: current_user) }
 
   let(:mock_assignable_user_finder) { instance_double(AutoAssignableUserFinder) }
+  let(:mock_run_verifier) { instance_double(CorrespondenceAutoAssignRunVerifier) }
 
   before do
     allow(AutoAssignableUserFinder).to receive(:new).and_return(mock_assignable_user_finder)
+    allow(CorrespondenceAutoAssignRunVerifier).to receive(:new).and_return(mock_run_verifier)
   end
 
   describe "#perform" do
-    context "when assignable users exist" do
-      let(:intake_user) { create(:intake_user) }
-      let!(:org_user) { create(:organizations_user, organization: InboundOpsTeam.singleton, user: intake_user) }
-
+    context "when a run is permitted" do
       before do
-        expect(mock_assignable_user_finder).to receive(:assignable_users_exist?).and_return(true)
-        expect(mock_assignable_user_finder).to receive(:get_first_assignable_user).and_return(intake_user)
+        expect(mock_run_verifier).to receive(:can_run_auto_assign?).and_return(true)
+        expect(mock_run_verifier).to receive(:verified_batch).and_return(batch)
+        expect(mock_run_verifier).to receive(:verified_user).and_return(current_user)
       end
 
-      it "assigns review package tasks to assignable users" do
-        described.perform
+      context "with unassigned ReviewPackageTasks" do
+        let!(:correspondence) { create(:correspondence, veteran_id: veteran.id) }
+
+        context "when assignable users exist" do
+          let(:intake_user) { create(:intake_user) }
+          let!(:org_user) { create(:organizations_user, organization: InboundOpsTeam.singleton, user: intake_user) }
+
+          before do
+            expect(mock_assignable_user_finder).to receive(:assignable_users_exist?).and_return(true)
+            expect(mock_assignable_user_finder).to receive(:get_first_assignable_user).and_return(intake_user)
+          end
+
+          it "assigns review package tasks to assignable users" do
+            described.perform(
+              current_user_id: current_user.id,
+              batch_auto_assignment_attempt_id: batch.id
+            )
+
+            task = ReviewPackageTask.last
+            expect(task.assigned_to).to eq(intake_user)
+            expect(task.status).to eq("assigned")
+          end
+        end
+
+        context "when assignable users do NOT exist" do
+          before do
+            expect(mock_assignable_user_finder).to receive(:assignable_users_exist?).and_return(false)
+          end
+
+          it "updates the BatchAutoAssignmentAttempt with a capacity error message" do
+            described.perform(
+              current_user_id: current_user.id,
+              batch_auto_assignment_attempt_id: batch.id
+            )
+
+            reloaded = batch.reload
+            expect(reloaded.status).to eq("error")
+            expect(reloaded.error_info["message"]).to match(/maximum capacity/)
+          end
+        end
+      end
+
+      context "when unassigned ReviewPackageTasks do NOT exist" do
+        it "updates the BatchAutoAssignmentAttempt with a no correspondences error message" do
+          described.perform(
+            current_user_id: current_user.id,
+            batch_auto_assignment_attempt_id: batch.id
+          )
+
+          reloaded = batch.reload
+          expect(reloaded.status).to eq("error")
+          expect(reloaded.error_info["message"]).to match(/no correspondences/)
+        end
+      end
+    end
+
+    context "when a run is NOT permitted" do
+      before do
+        expect(mock_run_verifier).to receive(:can_run_auto_assign?).and_return(false)
+        expect(mock_run_verifier).to receive(:err_msg).and_return("Test error")
+      end
 
-        task = ReviewPackageTask.last
-        expect(task.assigned_to).to eq(intake_user)
-        expect(task.status).to eq("assigned")
+      it "raises an error" do
+        expect do
+          described.perform(
+            current_user_id: current_user.id,
+            batch_auto_assignment_attempt_id: batch.id
+          )
+        end.to raise_error(RuntimeError, "Test error")
       end
     end
   end

From 6754a56a36513b1a0cced1799d5670b3c0794655 Mon Sep 17 00:00:00 2001
From: Ki Mau <ki.mau@va.gov>
Date: Mon, 4 Mar 2024 09:41:37 -0500
Subject: [PATCH 127/237] Ki/APPEALS-35482-hotfix - Supervisor Assign
 limitation (#20989)

* APPEALS-35482 - Conditional assign button for mail team super

* APPEALS-35482 - QueueTable pagination update

* APPEALS-35482 - Undo currentPage Issue

* Delete client/test/app/queue/__snapshots__/QueueTable.test.js.snap

* Update snapshot
---
 .../CorrespondenceTableBuilder.jsx            | 57 ++++++++++---------
 .../__snapshots__/QueueTable.test.js.snap     |  1 -
 2 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
index 3514f766d55..08647bcb818 100644
--- a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
+++ b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
@@ -48,6 +48,8 @@ const CorrespondenceTableBuilder = (props) => {
     querystring.parse(window.location.search.slice(1))
   );
 
+  const isMailTeamSupervisor = props.organizations.find((org) => org.name === 'Mail Team Supervisor');
+
   // Causes one additional rerender of the QueueTables/tabs but prevents saved pagination behavior
   // e.g. clearing filter in a tab, then swapping tabs, then swapping back and the filter will still be applied
   useEffect(() => {
@@ -139,37 +141,38 @@ const CorrespondenceTableBuilder = (props) => {
       label: sprintf(tabConfig.label, totalTaskCount),
       page: (
         <>
-          {(tabConfig.name === 'correspondence_unassigned' || tabConfig.name === 'correspondence_team_assigned') &&
-            <>
-              <p className="cf-margin-bottom-0rem">Assign to mail team user</p>
-              <div style={{ display: 'flex', flexDirection: 'row' }}>
-                <SearchableDropdown
-                  className="cf-dropdown"
-                  name="Assign to mail team user"
-                  hideLabel
-                  styling={{ width: '200px', marginRight: '2rem' }}
-                  dropdownStyling={{ width: '200px' }}
-                />
-                {tabConfig.name === 'correspondence_unassigned' &&
+          {isMailTeamSupervisor &&
+            (tabConfig.name === 'correspondence_unassigned' || tabConfig.name === 'correspondence_team_assigned') &&
               <>
-                <Button
-                  name="Assign"
-                />
-                <span style={{ marginLeft: 'auto' }}>
+                <p className="cf-margin-bottom-0rem">Assign to mail team user</p>
+                <div style={{ display: 'flex', flexDirection: 'row' }}>
+                  <SearchableDropdown
+                    className="cf-dropdown"
+                    name="Assign to mail team user"
+                    hideLabel
+                    styling={{ width: '200px', marginRight: '2rem' }}
+                    dropdownStyling={{ width: '200px' }}
+                  />
+                  {tabConfig.name === 'correspondence_unassigned' &&
+                <>
                   <Button
-                    name="Auto assign correspondence"
+                    name="Assign"
                   />
-                </span>
+                  <span style={{ marginLeft: 'auto' }}>
+                    <Button
+                      name="Auto assign correspondence"
+                    />
+                  </span>
+                </>
+                  }
+                  {tabConfig.name === 'correspondence_team_assigned' &&
+              <Button
+                name="Reassign"
+              />
+                  }
+                </div>
+                <hr></hr>
               </>
-                }
-                {tabConfig.name === 'correspondence_team_assigned' &&
-            <Button
-              name="Reassign"
-            />
-                }
-              </div>
-              <hr></hr>
-            </>
           }
           <p className="cf-margin-top-0">
             {noCasesMessage || tabConfig.description}
diff --git a/client/test/app/queue/__snapshots__/QueueTable.test.js.snap b/client/test/app/queue/__snapshots__/QueueTable.test.js.snap
index 81d6335e160..5674c3e4876 100644
--- a/client/test/app/queue/__snapshots__/QueueTable.test.js.snap
+++ b/client/test/app/queue/__snapshots__/QueueTable.test.js.snap
@@ -401,7 +401,6 @@ exports[`QueueTable HeaderRow Can filter when using task pages API and column ha
           header="Third"
           isReceiptDateFilter={false}
           isTaskCompletedDateFilter={false}
-
           tableData={
             Array [
               Object {

From 6f23d56b7b861cfcb899e1b8571bca9130d5640d Mon Sep 17 00:00:00 2001
From: Dev-KRedd <134650238+Dev-KRedd@users.noreply.github.com>
Date: Mon, 4 Mar 2024 09:42:12 -0500
Subject: [PATCH 128/237] Khalin/appeals 40265 (#20841)

* Rubocop stying errors fixed

* Duplication Issues

* Duplication issues

* Duplication fix

* Complexity Reek Errors WIP

* De-couple CorrespondenceConfig from QueueConfig
Co-authored-by: Jeremy Croteau <jcroteau@users.noreply.github.com>

* Replace conditional with  Polymorphism

* Reek Attribute comment

* Removal of dead code

* frozen_string_literal addition

* Removal of dead code & addition of DataClump comment

* Styling fixes

* styling

* Adding process_correspondence method back

* Revert "Replace conditional with  Polymorphism"

This reverts commit 4fa20e9f66d47b1f2d0feaca0d47852418c1e853.

* Revert "De-couple CorrespondenceConfig from QueueConfig"

This reverts commit 7b8e450da0861b1de6068f6a5141df28b06106c6.

* Revert "Removal of dead code"

This reverts commit b9ac6fc2913f5d45defe831b53a5aa3fe82e71b1.

* Revert "Removal of dead code & addition of DataClump comment"

This reverts commit bb7ffe8d6eb90704e5bec826c7fe65c6629fe5dc.

* Adding back from merge conflict

* Wmedders21/appeals 40978 on my local(Will revert before PR)

* Fixing tests

* Syling Fixes

* Rubocop Styling fixes

* Complexity fixes

* Duplication fix

* Styling fix

* Styling fix

---------

Co-authored-by: Jim Foley <james.foley4@va.gov>
Co-authored-by: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
---
 app/models/correspondence_config.rb           |  3 +++
 app/models/correspondence_queue_tab.rb        |  1 +
 .../correspondence_assigned_tasks_tab.rb      |  3 +++
 .../correspondence_completed_tasks_tab.rb     |  3 +++
 .../correspondence_in_progress_tasks_tab.rb   |  3 +++
 .../organization_completed_tasks_tab.rb       |  3 +++
 ...orrespondence_action_required_tasks_tab.rb | 11 ++++++----
 ...ation_correspondence_assigned_tasks_tab.rb |  3 +++
 ...tion_correspondence_completed_tasks_tab.rb |  3 +++
 ...zation_correspondence_pending_tasks_tab.rb |  4 ++++
 ...ion_correspondence_unassigned_tasks_tab.rb |  3 +++
 .../work_queue/task_column_serializer.rb      |  2 +-
 .../correspondence/reassign_package_task.rb   |  1 +
 app/models/tasks/remove_package_task.rb       |  1 +
 app/models/vacols/case_docket.rb              |  1 -
 .../correspondence_root_task_factory.rb       |  2 +-
 .../CorrespondenceTableBuilder.jsx            |  4 ++--
 client/app/queue/utils.js                     |  2 +-
 db/seeds/helpers/queue_helpers.rb             | 14 +++++++++++--
 .../correspondence_cases_spec.rb              | 12 +++++------
 spec/models/correspondence_config_spec.rb     | 20 +++++++++----------
 .../correspondence_controller_spec.rb         |  4 ++--
 ...ondence_documents_efolder_uploader_spec.rb |  2 ++
 23 files changed, 75 insertions(+), 30 deletions(-)

diff --git a/app/models/correspondence_config.rb b/app/models/correspondence_config.rb
index 7df7e52782b..6712a25caba 100644
--- a/app/models/correspondence_config.rb
+++ b/app/models/correspondence_config.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# :reek:RepeatedConditional
+
 class CorrespondenceConfig < QueueConfig
   def to_hash
     {
@@ -13,6 +15,7 @@ def to_hash
 
   private
 
+  # :reek:FeatureEnvy
   def attach_tasks_to_tab(tab)
     task_pager = CorrespondenceTaskPager.new(
       assignee: assignee,
diff --git a/app/models/correspondence_queue_tab.rb b/app/models/correspondence_queue_tab.rb
index b02036426de..fee50b3bd03 100644
--- a/app/models/correspondence_queue_tab.rb
+++ b/app/models/correspondence_queue_tab.rb
@@ -15,6 +15,7 @@ def task_includes
     ]
   end
 
+  # :reek:UtilityFunction
   def default_sorting_column
     CorrespondenceQueueColumn.from_name(Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name)
   end
diff --git a/app/models/queue_tabs/correspondence_assigned_tasks_tab.rb b/app/models/queue_tabs/correspondence_assigned_tasks_tab.rb
index 7734843fa28..a1074835cfd 100644
--- a/app/models/queue_tabs/correspondence_assigned_tasks_tab.rb
+++ b/app/models/queue_tabs/correspondence_assigned_tasks_tab.rb
@@ -3,6 +3,7 @@
 class CorrespondenceAssignedTasksTab < CorrespondenceQueueTab
   validate :assignee_is_user
 
+  # :reek:UtilityFunction
   def label
     Constants.QUEUE_CONFIG.CORRESPONDENCE_ASSIGNED_TASKS_LABEL
   end
@@ -11,6 +12,7 @@ def self.tab_name
     Constants.QUEUE_CONFIG.CORRESPONDENCE_ASSIGNED_TASKS_TAB_NAME
   end
 
+  # :reek:UtilityFunction
   def description
     Constants.QUEUE_CONFIG.CORRESPONDENCE_ASSIGNED_TASKS_DESCRIPTION
   end
@@ -19,6 +21,7 @@ def tasks
     CorrespondenceTask.where(assigned_to_id: assignee.id)
   end
 
+  # :reek:UtilityFunction
   def column_names
     [
       Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
diff --git a/app/models/queue_tabs/correspondence_completed_tasks_tab.rb b/app/models/queue_tabs/correspondence_completed_tasks_tab.rb
index baa305f3ad5..356a4f34ff9 100644
--- a/app/models/queue_tabs/correspondence_completed_tasks_tab.rb
+++ b/app/models/queue_tabs/correspondence_completed_tasks_tab.rb
@@ -3,6 +3,7 @@
 class CorrespondenceCompletedTasksTab < CorrespondenceQueueTab
   validate :assignee_is_user
 
+  # :reek:UtilityFunction
   def label
     Constants.QUEUE_CONFIG.CORRESPONDENCE_COMPLETED_TASKS_LABEL
   end
@@ -11,6 +12,7 @@ def self.tab_name
     Constants.QUEUE_CONFIG.CORRESPONDENCE_COMPLETED_TASKS_TAB_NAME
   end
 
+  # :reek:UtilityFunction
   def description
     Constants.QUEUE_CONFIG.CORRESPONDENCE_COMPLETED_TASKS_DESCRIPTION
   end
@@ -32,6 +34,7 @@ def tasks
       .where(id: completed_root_tasks + tasks_with_completed_children).recently_completed
   end
 
+  # :reek:UtilityFunction
   def column_names
     [
       Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
diff --git a/app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb b/app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb
index af6f553c644..c381b656b31 100644
--- a/app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb
+++ b/app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb
@@ -3,6 +3,7 @@
 class CorrespondenceInProgressTasksTab < CorrespondenceQueueTab
   validate :assignee_is_user
 
+  # :reek:UtilityFunction
   def label
     Constants.QUEUE_CONFIG.CORRESPONDENCE_IN_PROGRESS_TASKS_LABEL
   end
@@ -11,6 +12,7 @@ def self.tab_name
     Constants.QUEUE_CONFIG.CORRESPONDENCE_IN_PROGRESS_TASKS_TAB_NAME
   end
 
+  # :reek:UtilityFunction
   def description
     Constants.QUEUE_CONFIG.CORRESPONDENCE_IN_PROGRESS_TASKS_DESCRIPTION
   end
@@ -19,6 +21,7 @@ def tasks
     CorrespondenceTask.where(assigned_to: assignee).in_progress
   end
 
+  # :reek:UtilityFunction
   def column_names
     [
       Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
diff --git a/app/models/queue_tabs/organization_completed_tasks_tab.rb b/app/models/queue_tabs/organization_completed_tasks_tab.rb
index f189af5cada..385a3961f1c 100644
--- a/app/models/queue_tabs/organization_completed_tasks_tab.rb
+++ b/app/models/queue_tabs/organization_completed_tasks_tab.rb
@@ -3,6 +3,7 @@
 class OrganizationCompletedTasksTab < QueueTab
   validate :assignee_is_organization
 
+  # :reek:UtilityFunction
   def label
     COPY::QUEUE_PAGE_COMPLETE_TAB_TITLE
   end
@@ -11,6 +12,7 @@ def self.tab_name
     Constants.QUEUE_CONFIG.COMPLETED_TASKS_TAB_NAME
   end
 
+  # :reek:UtilityFunction
   def description
     COPY::QUEUE_PAGE_COMPLETE_LAST_SEVEN_DAYS_TASKS_DESCRIPTION
   end
@@ -19,6 +21,7 @@ def tasks
     recently_completed_tasks
   end
 
+  # :reek:UtilityFunction
   # rubocop:disable Metrics/AbcSize
   def column_names
     [
diff --git a/app/models/queue_tabs/organization_correspondence_action_required_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_action_required_tasks_tab.rb
index a2fcf3de06b..d4481cd2507 100644
--- a/app/models/queue_tabs/organization_correspondence_action_required_tasks_tab.rb
+++ b/app/models/queue_tabs/organization_correspondence_action_required_tasks_tab.rb
@@ -3,6 +3,7 @@
 class OrganizationCorrespondenceActionRequiredTasksTab < CorrespondenceQueueTab
   validate :assignee_is_organization
 
+  # :reek:UtilityFunction
   def label
     Constants.QUEUE_CONFIG.CORRESPONDENCE_ACTION_REQUIRED_TASKS_LABEL
   end
@@ -11,6 +12,7 @@ def self.tab_name
     Constants.QUEUE_CONFIG.CORRESPONDENCE_ACTION_REQUIRED_TASKS_TAB_NAME
   end
 
+  # :reek:UtilityFunction
   def description
     Constants.QUEUE_CONFIG.CORRESPONDENCE_ACTION_REQUIRED_TASKS_DESCRIPTION
   end
@@ -19,12 +21,13 @@ def tasks
     tasks = CorrespondenceTask.includes(*task_includes).package_action_tasks
 
     tasks = if RequestStore[:current_user].mail_supervisor?
-      tasks.where(assigned_to: assignee).active
-    else
-      tasks.where.not(type: RemovePackageTask.name).where(assigned_to: assignee).active
-    end
+              tasks.where(assigned_to: assignee).active
+            else
+              tasks.where.not(type: RemovePackageTask.name).where(assigned_to: assignee).active
+            end
   end
 
+  # :reek:UtilityFunction
   def column_names
     [
       Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
diff --git a/app/models/queue_tabs/organization_correspondence_assigned_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_assigned_tasks_tab.rb
index 613f32c6046..355335fe744 100644
--- a/app/models/queue_tabs/organization_correspondence_assigned_tasks_tab.rb
+++ b/app/models/queue_tabs/organization_correspondence_assigned_tasks_tab.rb
@@ -3,6 +3,7 @@
 class OrganizationCorrespondenceAssignedTasksTab < CorrespondenceQueueTab
   validate :assignee_is_organization
 
+  # :reek:UtilityFunction
   def label
     Constants.QUEUE_CONFIG.CORRESPONDENCE_TEAM_ASSIGNED_TASKS_LABEL
   end
@@ -11,6 +12,7 @@ def self.tab_name
     Constants.QUEUE_CONFIG.CORRESPONDENCE_TEAM_ASSIGNED_TASKS_TAB_NAME
   end
 
+  # :reek:UtilityFunction
   def description
     Constants.QUEUE_CONFIG.CORRESPONDENCE_TEAM_ASSIGNED_TASKS_DESCRIPTION
   end
@@ -19,6 +21,7 @@ def tasks
     CorrespondenceTask.includes(*task_includes).active.where.not(assigned_to_type: "Organization")
   end
 
+  # :reek:UtilityFunction
   def column_names
     [
       Constants.QUEUE_CONFIG.COLUMNS.CHECKBOX_COLUMN.name,
diff --git a/app/models/queue_tabs/organization_correspondence_completed_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_completed_tasks_tab.rb
index 1fe773a1b27..f45f434eebe 100644
--- a/app/models/queue_tabs/organization_correspondence_completed_tasks_tab.rb
+++ b/app/models/queue_tabs/organization_correspondence_completed_tasks_tab.rb
@@ -3,6 +3,7 @@
 class OrganizationCorrespondenceCompletedTasksTab < CorrespondenceQueueTab
   validate :assignee_is_organization
 
+  # :reek:UtilityFunction
   def label
     Constants.QUEUE_CONFIG.CORRESPONDENCE_TEAM_COMPLETED_TASKS_LABEL
   end
@@ -11,6 +12,7 @@ def self.tab_name
     Constants.QUEUE_CONFIG.CORRESPONDENCE_TEAM_COMPLETED_TASKS_TAB_NAME
   end
 
+  # :reek:UtilityFunction
   def description
     Constants.QUEUE_CONFIG.CORRESPONDENCE_TEAM_COMPLETED_TASKS_DESCRIPTION
   end
@@ -31,6 +33,7 @@ def tasks
       .where(id: completed_root_tasks + tasks_with_completed_children).recently_completed
   end
 
+  # :reek:UtilityFunction
   def column_names
     [
       Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
diff --git a/app/models/queue_tabs/organization_correspondence_pending_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_pending_tasks_tab.rb
index f87699301a2..085e0fc01cb 100644
--- a/app/models/queue_tabs/organization_correspondence_pending_tasks_tab.rb
+++ b/app/models/queue_tabs/organization_correspondence_pending_tasks_tab.rb
@@ -3,6 +3,7 @@
 class OrganizationCorrespondencePendingTasksTab < CorrespondenceQueueTab
   validate :assignee_is_organization
 
+  # :reek:UtilityFunction
   def label
     Constants.QUEUE_CONFIG.CORRESPONDENCE_PENDING_TASKS_LABEL
   end
@@ -11,10 +12,12 @@ def self.tab_name
     Constants.QUEUE_CONFIG.CORRESPONDENCE_PENDING_TASKS_TAB_NAME
   end
 
+  # :reek:UtilityFunction
   def description
     Constants.QUEUE_CONFIG.CORRESPONDENCE_PENDING_TASKS_DESCRIPTION
   end
 
+  # :reek:UtilityFunction
   def tasks
     Task.none
     # CorrespondenceTask
@@ -24,6 +27,7 @@ def tasks
     # )
   end
 
+  # :reek:UtilityFunction
   def column_names
     [
       Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
diff --git a/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb
index 8bee5ae78be..60e84ba378c 100644
--- a/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb
+++ b/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb
@@ -3,6 +3,7 @@
 class OrganizationCorrespondenceUnassignedTasksTab < CorrespondenceQueueTab
   validate :assignee_is_organization
 
+  # :reek:UtilityFunction
   def label
     Constants.QUEUE_CONFIG.CORRESPONDENCE_UNASSIGNED_TASKS_LABEL
   end
@@ -11,6 +12,7 @@ def self.tab_name
     Constants.QUEUE_CONFIG.CORRESPONDENCE_UNASSIGNED_TASKS_TAB_NAME
   end
 
+  # :reek:UtilityFunction
   def description
     Constants.QUEUE_CONFIG.CORRESPONDENCE_UNASSIGNED_TASKS_DESCRIPTION
   end
@@ -19,6 +21,7 @@ def tasks
     CorrespondenceTask.includes(*task_includes).where(assigned_to: assignee, status: "unassigned")
   end
 
+  # :reek:UtilityFunction
   def column_names
     [
       Constants.QUEUE_CONFIG.COLUMNS.CHECKBOX_COLUMN.name,
diff --git a/app/models/serializers/work_queue/task_column_serializer.rb b/app/models/serializers/work_queue/task_column_serializer.rb
index f2ed1f5655a..e0ab6df9e1d 100644
--- a/app/models/serializers/work_queue/task_column_serializer.rb
+++ b/app/models/serializers/work_queue/task_column_serializer.rb
@@ -177,8 +177,8 @@ def self.serialize_attribute?(params, columns)
     if serialize_attribute?(params, columns)
       {
         css_id: assignee.try(:css_id),
-        is_organization: assignee.is_a?(Organization),
         name: assignee.is_a?(Organization) ? assignee.name : assignee.css_id,
+        is_organization: assignee.is_a?(Organization),
         type: assignee.class.name,
         id: assignee.id
       }
diff --git a/app/models/tasks/correspondence/reassign_package_task.rb b/app/models/tasks/correspondence/reassign_package_task.rb
index 30acc3243db..8fb51fa32a6 100644
--- a/app/models/tasks/correspondence/reassign_package_task.rb
+++ b/app/models/tasks/correspondence/reassign_package_task.rb
@@ -3,6 +3,7 @@
 class ReassignPackageTask < CorrespondenceTask
   before_create :verify_no_other_open_package_action_task_on_correspondence
 
+  # :reek:UtilityFunction
   def task_url
     Constants.CORRESPONDENCE_TASK_URL.REASSIGN_PACKAGE_TASK_MODAL_URL
   end
diff --git a/app/models/tasks/remove_package_task.rb b/app/models/tasks/remove_package_task.rb
index 759ca363dc0..7e4ab28fb8e 100644
--- a/app/models/tasks/remove_package_task.rb
+++ b/app/models/tasks/remove_package_task.rb
@@ -3,6 +3,7 @@
 class RemovePackageTask < CorrespondenceTask
   before_create :verify_no_other_open_package_action_task_on_correspondence
 
+  # :reek:UtilityFunction
   def task_url
     Constants.CORRESPONDENCE_TASK_URL.REMOVE_PACKAGE_TASK_MODAL_URL
   end
diff --git a/app/models/vacols/case_docket.rb b/app/models/vacols/case_docket.rb
index 41440a2b5b0..f4b57b92509 100644
--- a/app/models/vacols/case_docket.rb
+++ b/app/models/vacols/case_docket.rb
@@ -469,7 +469,6 @@ def self.distribute_nonpriority_appeals(judge, genpop, range, limit, bust_backlo
     distribute_appeals(fmtd_query, judge, dry_run)
   end
 
-  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/ParameterLists, Metrics/MethodLength
   def self.distribute_priority_appeals(judge, genpop, limit, dry_run = false)
     query = if use_by_docket_date?
               <<-SQL
diff --git a/app/workflows/correspondence_root_task_factory.rb b/app/workflows/correspondence_root_task_factory.rb
index f1ee0dd1353..91903d9a544 100644
--- a/app/workflows/correspondence_root_task_factory.rb
+++ b/app/workflows/correspondence_root_task_factory.rb
@@ -17,7 +17,7 @@ def create_root_and_sub_tasks!
   private
 
   def create_root!
-      @root_task = CorrespondenceRootTask.find_or_create_by!(
+    @root_task = CorrespondenceRootTask.find_or_create_by!(
       appeal_id: @correspondence.id,
       assigned_to: MailTeamSupervisor.singleton,
       appeal_type: Correspondence.name
diff --git a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
index 08647bcb818..e30349d8f9f 100644
--- a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
+++ b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
@@ -56,7 +56,7 @@ const CorrespondenceTableBuilder = (props) => {
     setStoredPaginationOptions({});
   }, []);
 
-  const calculateActiveTabIndex = (config) => {
+  const calcActiveTabIndex = (config) => {
     const tabNames = config.tabs.map((tab) => {
       return tab.name;
     });
@@ -70,7 +70,7 @@ const CorrespondenceTableBuilder = (props) => {
   const queueConfig = () => {
     const { config } = props;
 
-    config.active_tab_index = calculateActiveTabIndex(config);
+    config.active_tab_index = calcActiveTabIndex(config);
 
     return config;
   };
diff --git a/client/app/queue/utils.js b/client/app/queue/utils.js
index f5ae64364df..625bb96b172 100644
--- a/client/app/queue/utils.js
+++ b/client/app/queue/utils.js
@@ -280,8 +280,8 @@ export const prepareLegacyTasksForStore = (tasks) => {
       assigneeName: task.attributes.assignee_name,
       assignedTo: {
         cssId: task.attributes.assigned_to.css_id,
-        isOrganization: task.attributes.assigned_to.is_organization,
         id: task.attributes.assigned_to.id,
+        isOrganization: task.attributes.assigned_to.is_organization,
         type: task.attributes.assigned_to.type,
         name: task.attributes.assigned_to.name,
       },
diff --git a/db/seeds/helpers/queue_helpers.rb b/db/seeds/helpers/queue_helpers.rb
index 8a336fed186..01ccbd68fa0 100644
--- a/db/seeds/helpers/queue_helpers.rb
+++ b/db/seeds/helpers/queue_helpers.rb
@@ -36,6 +36,7 @@ def create_correspondence
     ).tap { @cmp_packet_number += 1 }
   end
 
+  # :reek:UtilityFunction
   def create_correspondence_document(correspondence, veteran)
     CorrespondenceDocument.find_or_create_by!(
       document_file_number: veteran.file_number,
@@ -47,6 +48,7 @@ def create_correspondence_document(correspondence, veteran)
     )
   end
 
+  # :reek:UtilityFunction
   def create_correspondence_intake(correspondence, user)
     parent = correspondence&.root_task
     complete_task(ReviewPackageTask.find_by(appeal_id: correspondence.id), user.id)
@@ -55,6 +57,7 @@ def create_correspondence_intake(correspondence, user)
     cit
   end
 
+  # :reek:UtilityFunction
   def assign_review_package_task(correspondence, user)
     review_package_task = ReviewPackageTask.find_by(appeal_id: correspondence.id)
     review_package_task.update!(
@@ -64,6 +67,8 @@ def assign_review_package_task(correspondence, user)
     )
   end
 
+  # :reek:UtilityFunction
+  # :reek:FeatureEnvy
   def create_efolderupload_failed_task(correspondence, parent)
     euft = EfolderUploadFailedTask.create!(
       parent_id: parent.id,
@@ -75,6 +80,8 @@ def create_efolderupload_failed_task(correspondence, parent)
     randomize_days_waiting_value(euft)
   end
 
+  # :reek:UtilityFunction
+  # :reek:LongParameterList
   def create_action_required_tasks(correspondence, status:, parent_task:, task_type:)
     task_type.create!(
       parent_id: parent_task.id,
@@ -85,6 +92,7 @@ def create_action_required_tasks(correspondence, status:, parent_task:, task_typ
     )
   end
 
+  # :reek:FeatureEnvy
   def create_and_complete_mail_task(correspondence, user)
     process_correspondence(correspondence, user)
     assigned_by = CorrespondenceIntakeTask.find_by(appeal_id: correspondence.id).completed_by
@@ -99,6 +107,7 @@ def create_and_complete_mail_task(correspondence, user)
     cavct
   end
 
+  # :reek:FeatureEnvy
   def create_cavc_mailtask(correspondence, user)
     process_correspondence(correspondence, user)
     assigned_by = CorrespondenceIntakeTask.find_by(appeal_id: correspondence.id).completed_by
@@ -110,7 +119,7 @@ def create_cavc_mailtask(correspondence, user)
       status: Constants.TASK_STATUSES.assigned
     )
   end
-
+  # :reek:FeatureEnvy
   def create_congress_interest_mailtask(correspondence, user)
     process_correspondence(correspondence, user)
     assigned_by = CorrespondenceIntakeTask.find_by(appeal_id: correspondence.id).completed_by
@@ -124,10 +133,12 @@ def create_congress_interest_mailtask(correspondence, user)
     )
   end
 
+  # :reek:UtilityFunction
   def complete_task(task, user_id)
     task.update!(status: Constants.TASK_STATUSES.completed, completed_by_id: user_id)
   end
 
+  # :reek:UtilityFunction
   def process_correspondence(correspondence, user)
     rpt = ReviewPackageTask.find_by(appeal_id: correspondence.id)
     rpt.update!(status: Constants.TASK_STATUSES.completed, completed_by_id: user.id)
@@ -140,4 +151,3 @@ def randomize_days_waiting_value(task)
     task.update(assigned_at: rand(1.month.ago..1.day.ago))
   end
 end
-# rubocop:enable Metrics/ModuleLength
diff --git a/spec/feature/queue/correspondence/correspondence_cases_spec.rb b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
index 9ecf6575c91..a8d7407700c 100644
--- a/spec/feature/queue/correspondence/correspondence_cases_spec.rb
+++ b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
@@ -46,7 +46,7 @@
       20.times do
         correspondence = create(:correspondence)
         parent_task = create_correspondence_intake(correspondence, current_user)
-        create_efolderupload_task(correspondence, parent_task, user:current_user)
+        create_efolderupload_task(correspondence, parent_task, user: current_user)
       end
       # Used to mock a single task to compare task sorting
       EfolderUploadFailedTask.first.update!(type: "ReviewPackageTask")
@@ -356,19 +356,19 @@
           rpt = ReviewPackageTask.find_by(appeal_id: corres.id)
           task_array[index].create!(
             parent_id: rpt.id,
-            appeal_id: corres.id,
             appeal_type: "Correspondence",
+            appeal_id: corres.id,
             assigned_to: MailTeamSupervisor.singleton,
             assigned_by_id: rpt.assigned_to_id
           )
         end
       end
-       # Used to mock a single task to compare task sorting
-       ReassignPackageTask.first.correspondence.update!(
+      # Used to mock a single task to compare task sorting
+      ReassignPackageTask.first.correspondence.update!(
         va_date_of_receipt: Date.new(2000, 10, 10),
         updated_by_id: current_user.id
       )
-       ReassignPackageTask.last.correspondence.update!(
+      ReassignPackageTask.last.correspondence.update!(
         va_date_of_receipt: Date.new(2050, 10, 10),
         updated_by_id: current_user.id
       )
@@ -519,9 +519,9 @@
           rpt = ReviewPackageTask.find_by(appeal_id: corres.id)
           task_array[index].create!(
             parent_id: rpt.id,
-            appeal_id: corres.id,
             appeal_type: "Correspondence",
             assigned_to: MailTeamSupervisor.singleton,
+            appeal_id: corres.id,
             assigned_by_id: rpt.assigned_to_id
           )
         end
diff --git a/spec/models/correspondence_config_spec.rb b/spec/models/correspondence_config_spec.rb
index d44c7c96b30..0a3bbd9a16c 100644
--- a/spec/models/correspondence_config_spec.rb
+++ b/spec/models/correspondence_config_spec.rb
@@ -52,29 +52,29 @@
         it "has the correct tabs" do
           expect(subject[:tabs].map do |tab|
             tab[:label]
-          end).to eq(%w(Unassigned Action\ Required Pending Assigned Completed))
+          end).to eq(%w[Unassigned Action\ Required Pending Assigned Completed])
         end
 
         it "tabs have the correct columns" do
           expect(subject[:tabs].find { |tab| tab[:label] == "Unassigned" }[:columns]
           .map { |column| column[:name] })
-          .to eq(%w(checkboxColumn veteranDetails vaDor daysWaitingCorrespondence notes))
+            .to eq(%w[checkboxColumn veteranDetails vaDor daysWaitingCorrespondence notes])
 
           expect(subject[:tabs].find { |tab| tab[:label] == "Action Required" }[:columns]
           .map { |column| column[:name] })
-          .to eq(%w(veteranDetails vaDor daysWaitingCorrespondence assignedByColumn actionType notes))
+            .to eq(%w[veteranDetails vaDor daysWaitingCorrespondence assignedByColumn actionType notes])
 
           expect(subject[:tabs].find { |tab| tab[:label] == "Pending" }[:columns]
           .map { |column| column[:name] })
-          .to eq(%w(veteranDetails vaDor daysWaitingCorrespondence taskColumn assignedToColumn))
+            .to eq(%w[veteranDetails vaDor daysWaitingCorrespondence taskColumn assignedToColumn])
 
           expect(subject[:tabs].find { |tab| tab[:label] == "Assigned" }[:columns]
           .map { |column| column[:name] })
-          .to eq(%w(checkboxColumn veteranDetails vaDor daysWaitingCorrespondence taskColumn assignedToColumn notes))
+            .to eq(%w[checkboxColumn veteranDetails vaDor daysWaitingCorrespondence taskColumn assignedToColumn notes])
 
           expect(subject[:tabs].find { |tab| tab[:label] == "Completed" }[:columns]
           .map { |column| column[:name] })
-          .to eq(%w(veteranDetails vaDor completedDateColumn notes))
+            .to eq(%w[veteranDetails vaDor completedDateColumn notes])
         end
       end
 
@@ -84,21 +84,21 @@
         it "has the correct tabs" do
           expect(subject[:tabs].map do |tab|
             tab[:label]
-          end).to eq(%w(Assigned In\ Progress Completed))
+          end).to eq(%w[Assigned In\ Progress Completed])
         end
 
         it "tabs have the correct columns" do
           expect(subject[:tabs].find { |tab| tab[:label] == "Assigned" }[:columns]
           .map { |column| column[:name] })
-          .to eq(%w(veteranDetails vaDor daysWaitingCorrespondence notes))
+            .to eq(%w[veteranDetails vaDor daysWaitingCorrespondence notes])
 
           expect(subject[:tabs].find { |tab| tab[:label] == "In Progress" }[:columns]
           .map { |column| column[:name] })
-          .to eq(%w(veteranDetails vaDor taskColumn daysWaitingCorrespondence notes))
+            .to eq(%w[veteranDetails vaDor taskColumn daysWaitingCorrespondence notes])
 
           expect(subject[:tabs].find { |tab| tab[:label] == "Completed" }[:columns]
           .map { |column| column[:name] })
-          .to eq(%w(veteranDetails vaDor completedDateColumn notes))
+            .to eq(%w[veteranDetails vaDor completedDateColumn notes])
         end
       end
     end
diff --git a/spec/requests/correspondence_controller_spec.rb b/spec/requests/correspondence_controller_spec.rb
index a881a5fd0d5..be7736478af 100644
--- a/spec/requests/correspondence_controller_spec.rb
+++ b/spec/requests/correspondence_controller_spec.rb
@@ -71,7 +71,7 @@
       expect(response).to have_http_status(:ok)
     end
 
-    it "returns json in the expected shape" do
+    it "returns json in the expected shape for correspondence_cases" do
       data = JSON.parse(response.body, symbolize_names: true)
       expect(data[:correspondence_config][:table_title]).to be_a(String)
       expect(data[:correspondence_config]).to be_a(Hash)
@@ -115,7 +115,7 @@
       expect(response).to have_http_status(:ok)
     end
 
-    it "returns json in the expected shape" do
+    it "returns json in the expected shape correspondence_team" do
       data = JSON.parse(response.body, symbolize_names: true)
       expect(data[:correspondence_config][:table_title]).to be_a(String)
       expect(data[:correspondence_config]).to be_a(Hash)
diff --git a/spec/services/correspondence_documents_efolder_uploader_spec.rb b/spec/services/correspondence_documents_efolder_uploader_spec.rb
index 41f42750b01..2c38a8a2a72 100644
--- a/spec/services/correspondence_documents_efolder_uploader_spec.rb
+++ b/spec/services/correspondence_documents_efolder_uploader_spec.rb
@@ -52,7 +52,9 @@
       end
 
       context "with existing EfolderUploadFailedTask" do
+        # rubocop:disable Layout/LineLength
         let!(:existing_failed_task) { create(:efolder_upload_failed_task, appeal: correspondence, appeal_type: "Correspondence") }
+        # rubocop:enable Layout/LineLength
         it "does not create a new EfolderUploadFailedTask if one already exists" do
           expect do
             described.upload_documents_to_claim_evidence(correspondence, current_user, parent_task)

From 9ed8fb8ecde80eff364acf7aaf155cfe2841c3ff Mon Sep 17 00:00:00 2001
From: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
Date: Mon, 4 Mar 2024 09:54:29 -0500
Subject: [PATCH 129/237] created :destroy dependencies relationships in
 correspondence model (#21003)

---
 app/models/correspondence.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/correspondence.rb b/app/models/correspondence.rb
index aa28c9a6b76..b1ae74d045e 100644
--- a/app/models/correspondence.rb
+++ b/app/models/correspondence.rb
@@ -11,11 +11,11 @@ class Correspondence < CaseflowRecord
   include PrintsTaskTree
   include AppealableCorrespondence
 
-  has_many :correspondence_documents
-  has_many :correspondence_intakes
-  has_many :correspondences_appeals
+  has_many :correspondence_documents, dependent: :destroy
+  has_many :correspondence_intakes, dependent: :destroy
+  has_many :correspondences_appeals, dependent: :destroy
   has_many :appeals, through: :correspondences_appeals
-  has_many :correspondence_relations
+  has_many :correspondence_relations, dependent: :destroy
   has_many :related_correspondences, through: :correspondence_relations, dependent: :destroy
   belongs_to :correspondence_type
   belongs_to :package_document_type

From 57e0573654863ccd7a77ce732c503cb1dbd7379f Mon Sep 17 00:00:00 2001
From: divyadasari-va <135847343+divyadasari-va@users.noreply.github.com>
Date: Mon, 4 Mar 2024 08:03:23 -0700
Subject: [PATCH 130/237] Div/appeals 35484 (#20939)

* To get mail team users in the dropdown

* made mail team users populate as a prop.

* Added checkboxes that are functional, retain state after tab / index changes.

* Backend update for mailteam users with selected tasks

* Updated the flash message with the required banner status

* Updated the flash message with the required banner status

* Status update with assigned

* prototype page reload

* Banner success message

* Syntax error fix

* added tasks filter test for mail team admin

* Banner message work updated

* Commit for Assign button disable and enable

* Modified dropdown fix for Assign button

* code cleanup checkpoint

* refactored correspondence_controller to handle different banner results

* Feature test spec for batch assignment for unassigned tab

* feature test cases for cob user

* fixed COB issue and added feature flag.

* added failure case for tasks

* Removed the banner stuff for Nod

* fixed logic on set_banner_params

* swapped banner type to info

* Clean up the code and lint issues

* Changes to Reassigned work

* Feature tests for Assigned tab for batch assignment

* Spec issues fixes

* Modified the suggested changes

---------

Co-authored-by: Ryan Marshall <rnmarshall1993@gmail.com>
---
 app/controllers/correspondence_controller.rb  |  85 ++++++++-
 app/models/user.rb                            |   2 +
 .../correspondence_team.html.erb              |   4 +
 .../app/queue/components/TaskTableColumns.jsx |  47 ++++-
 .../correspondence/CorrespondenceCases.jsx    |  20 ++-
 .../CorrespondenceTableBuilder.jsx            | 102 +++++++----
 .../correspondenceActions.js                  |   8 +
 .../correspondenceConstants.js                |   2 +
 .../correspondenceReducer.js                  |  16 ++
 config/routes.rb                              |   1 +
 .../correspondence_cases_batch_assignment.rb  | 163 ++++++++++++++++++
 .../correspondence_cases_spec.rb              |   2 +-
 12 files changed, 409 insertions(+), 43 deletions(-)
 create mode 100644 spec/feature/queue/correspondence/correspondence_cases_batch_assignment.rb

diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index e1b07eb4f67..b4edf5c953b 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -7,6 +7,7 @@ class CorrespondenceController < ApplicationController
   before_action :correspondence
   before_action :auto_texts
   before_action :veteran_information
+  MAX_QUEUED_ITEMS = 60
 
   def intake
     respond_to do |format|
@@ -54,14 +55,18 @@ def correspondence_cases
     end
   end
 
+  def mail_team_users
+    mail_team_users = User.mail_team_users
+    respond_to do |format|
+      format.json do
+        render json: { mail_team_users: mail_team_users }
+      end
+    end
+  end
+
   def correspondence_team
     if current_user.mail_superuser? || current_user.mail_supervisor?
-      respond_to do |format|
-        format.html { "correspondence_team" }
-        format.json do
-          render json: { correspondence_config: CorrespondenceConfig.new(assignee: MailTeamSupervisor.singleton) }
-        end
-      end
+      handle_mail_superuser_or_supervisor
     elsif current_user.mail_team_user?
       redirect_to "/queue/correspondence"
     else
@@ -195,6 +200,74 @@ def process_intake
 
   private
 
+  def handle_mail_superuser_or_supervisor
+    @mail_team_users = User.mail_team_users.pluck(:css_id)
+    mail_team_user = User.find_by(css_id: params[:user]) if params[:user].present?
+    task_ids = params[:taskIds]&.split(",") if params[:taskIds].present?
+    tab = params[:tab] if params[:tab].present?
+
+    respond_to do |format|
+      format.html { handle_html_response(mail_team_user, task_ids, tab) }
+      format.json { handle_json_response(mail_team_user, task_ids, tab) }
+    end
+  end
+
+  def handle_html_response(mail_team_user, task_ids, tab)
+    if mail_team_user && task_ids.present?
+      set_banner_params(mail_team_user, task_ids.count, tab)
+      update_tasks(mail_team_user, task_ids)
+    end
+    render "correspondence_team"
+  end
+
+  def handle_json_response(mail_team_user, task_ids, tab)
+    if mail_team_user && task_ids.present?
+      set_banner_params(mail_team_user, task_ids&.count, tab)
+    else
+      render json: { correspondence_config: CorrespondenceConfig.new(assignee: MailTeamSupervisor.singleton) }
+    end
+  end
+
+  def update_tasks(mail_team_user, task_ids)
+    return unless @response_type == "success"
+
+    tasks = Task.where(id: task_ids)
+    tasks.update_all(assigned_to_id: mail_team_user.id, assigned_to_type: "User", status: "assigned")
+  end
+
+  def set_banner_params(user, task_count, tab)
+    template = message_template(user, task_count, tab)
+    response_type(user)
+    @response_header = template[:header]
+    @response_message = template[:message]
+  end
+
+  def message_template(user, task_count, tab)
+    success_header_unassigned = "You have successfully assigned #{task_count} Correspondence to #{user.css_id}."
+    success_header_assigned = "You have successfully reassigned #{task_count} Correspondence to #{user.css_id}."
+    success_message = "Please go to your individual queue to see any self-assigned correspondence."
+    failure_header_unassigned = "Correspondence assignment to #{user.css_id} has failed"
+    failure_header_assigned = "Correspondence reassignment to #{user.css_id} has failed"
+    failure_message = "Queue volume has reached maximum capacity for this user."
+
+    case tab
+    when "correspondence_unassigned"
+      {
+        header: (user.tasks.length < MAX_QUEUED_ITEMS) ? success_header_unassigned : failure_header_unassigned,
+        message: (user.tasks.length < MAX_QUEUED_ITEMS) ? success_message : failure_message
+      }
+    when "correspondence_team_assigned"
+      {
+        header: (user.tasks.length < MAX_QUEUED_ITEMS) ? success_header_assigned : failure_header_assigned,
+        message: (user.tasks.length < MAX_QUEUED_ITEMS) ? success_message : failure_message
+      }
+    end
+  end
+
+  def response_type(user)
+    @response_type = (user.tasks.length < MAX_QUEUED_ITEMS) ? "success" : "info"
+  end
+
   # :reek:FeatureEnvy
   def vbms_document_types
     begin
diff --git a/app/models/user.rb b/app/models/user.rb
index af018035cf9..b41caef8f28 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -21,6 +21,8 @@ class User < CaseflowRecord # rubocop:disable Metrics/ClassLength
 
   # Alternative: where("roles @> ARRAY[?]::varchar[]", role)
   scope :with_role, ->(role) { where("? = ANY(roles)", role) }
+  scope :mail_team_users, -> { joins(:organizations).where(organizations: { type: MailTeam.name }) }
+
 
   BOARD_STATION_ID = "101"
   LAST_LOGIN_PRECISION = 5.minutes
diff --git a/app/views/correspondence/correspondence_team.html.erb b/app/views/correspondence/correspondence_team.html.erb
index bb358254427..a1eaf8a2983 100644
--- a/app/views/correspondence/correspondence_team.html.erb
+++ b/app/views/correspondence/correspondence_team.html.erb
@@ -11,6 +11,10 @@
     feedbackUrl: feedback_url,
     configUrl: '/queue/correspondence/team?json',
     flash: flash,
+    mailTeamUsers: @mail_team_users,
+    responseType: @response_type,
+    responseHeader: @response_header,
+    responseMessage: @response_message,
     featureToggles: {
       correspondence_queue: FeatureToggle.enabled?(:correspondence_queue, user: current_user)
     }
diff --git a/client/app/queue/components/TaskTableColumns.jsx b/client/app/queue/components/TaskTableColumns.jsx
index 7ad6137f93b..4e4b9c61cbb 100644
--- a/client/app/queue/components/TaskTableColumns.jsx
+++ b/client/app/queue/components/TaskTableColumns.jsx
@@ -14,10 +14,11 @@ import OnHoldLabel, { numDaysOnHold } from './OnHoldLabel';
 import IhpDaysWaitingTooltip from './IhpDaysWaitingTooltip';
 import TranscriptionTaskTooltip from './TranscriptionTaskTooltip';
 import Checkbox from '../../components/Checkbox';
-import { useDispatch } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 import {
   setShowReassignPackageModal,
-  setShowRemovePackageModal
+  setShowRemovePackageModal,
+  setSelectedTasks
 } from 'app/queue/correspondence/correspondenceReducer/correspondenceActions';
 
 import { taskHasCompletedHold, hasDASRecord, collapseColumn, regionalOfficeCity, renderAppealType } from '../utils';
@@ -302,11 +303,49 @@ export const notes = () => {
     getSortValue: (task) => task.notes
   };
 };
-export const checkboxColumn = () => {
+export const checkboxColumn = (handleCheckboxChange) => {
+  const dispatch = useDispatch();
+
+  const currentlySelectedTasks = useSelector((state) => state.intakeCorrespondence.selectedTasks);
+
+  const toggleChange = (value) => {
+    const indexOfTask = currentlySelectedTasks.indexOf(value);
+
+    const newSelectedTasks = currentlySelectedTasks;
+
+    if (indexOfTask === -1) {
+      newSelectedTasks.push(value);
+    } else {
+      newSelectedTasks.splice(indexOfTask, 1);
+    }
+
+    dispatch(setSelectedTasks(newSelectedTasks));
+
+    handleCheckboxChange(newSelectedTasks.length > 0);
+
+  };
+
   return {
     header: 'Select',
+    checked: true,
     name: QUEUE_CONFIG.COLUMNS.CHECKBOX_COLUMN,
-    valueFunction: (task) => task ? <Checkbox id={task.uniqueId} ariaLabel={task.uniqueId} /> : ''
+    valueFunction: (task) => {
+
+      if (task) {
+        return <Checkbox
+          id={task.uniqueId}
+          value={Boolean(currentlySelectedTasks.includes(task.uniqueId))}
+          name={task.uniqueId}
+          hideLabel
+          onChange={() => toggleChange(task.uniqueId)}
+        />;
+      }
+
+      return null;
+      // or any other valid JSX element
+
+    }
+
   };
 };
 
diff --git a/client/app/queue/correspondence/CorrespondenceCases.jsx b/client/app/queue/correspondence/CorrespondenceCases.jsx
index 2494520333f..f8b2aee08d6 100644
--- a/client/app/queue/correspondence/CorrespondenceCases.jsx
+++ b/client/app/queue/correspondence/CorrespondenceCases.jsx
@@ -6,7 +6,7 @@ import {
   setShowRemovePackageModal
 } from './correspondenceReducer/correspondenceActions';
 import AppSegment from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/AppSegment';
-import PropTypes from 'prop-types';
+import PropTypes, { string } from 'prop-types';
 import COPY from '../../../COPY';
 import { sprintf } from 'sprintf-js';
 import CorrespondenceTableBuilder from './CorrespondenceTableBuilder';
@@ -51,6 +51,14 @@ const CorrespondenceCases = (props) => {
 
   return (
     <>
+      {props.responseType && (
+        <Alert
+          type={props.responseType}
+          title={props.responseHeader}
+          message={props.responseMessage}
+          scrollOnAlert={false}
+        />
+      )}
       <AppSegment filledBackground>
         {(veteranInformation?.veteranName?.firstName && veteranInformation?.veteranName?.lastName) &&
           currentAction.action_type === 'DeleteReviewPackage' && (
@@ -62,7 +70,7 @@ const CorrespondenceCases = (props) => {
           />
         )}
         {config &&
-        <CorrespondenceTableBuilder />}
+        <CorrespondenceTableBuilder mailTeamUsers={props.mailTeamUsers} />}
         {showReassignPackageModal &&
         <Modal
           title={COPY.CORRESPONDENCE_CASES_REASSIGN_PACKAGE_MODAL_TITLE}
@@ -86,7 +94,13 @@ CorrespondenceCases.propTypes = {
   correspondenceConfig: PropTypes.object,
   currentAction: PropTypes.object,
   veteranInformation: PropTypes.object,
-  configUrl: PropTypes.string
+  configUrl: PropTypes.string,
+  mailTeamUsers: PropTypes.arrayOf(string),
+  responseType: PropTypes.string,
+  responseHeader: PropTypes.string,
+  responseMessage: PropTypes.string,
+  taskIds: PropTypes.array
+
 };
 
 export default CorrespondenceCases;
diff --git a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
index e30349d8f9f..f48e3768c3d 100644
--- a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
+++ b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
@@ -1,10 +1,9 @@
 import React, { useState, useEffect } from 'react';
+import { useSelector, connect } from 'react-redux';
 import _ from 'lodash';
 import PropTypes from 'prop-types';
 import { sprintf } from 'sprintf-js';
-import { connect } from 'react-redux';
 import querystring from 'querystring';
-
 import Button from '../../components/Button';
 import SearchableDropdown from '../../components/SearchableDropdown';
 import QueueTable from '../QueueTable';
@@ -23,6 +22,7 @@ import {
   vaDor,
   veteranDetails
 } from '../components/TaskTableColumns';
+
 import { tasksWithCorrespondenceFromRawTasks } from '../utils';
 
 import COPY from '../../../COPY';
@@ -42,7 +42,21 @@ const rootStyles = css({
  * - @assignedTasks {array[object]} array of task objects to appear in the assigned tab
  **/
 
+const buildMailUserData = (data) => {
+  return data.map((user) => {
+    return {
+      value: user,
+      label: user
+    };
+  });
+};
+
 const CorrespondenceTableBuilder = (props) => {
+  const [selectedMailTeamUser, setSelectedMailTeamUser] = useState(null);
+  const [isAnyCheckboxSelected, setIsAnyCheckboxSelected] = useState(false);
+  const [isDropdownItemSelected, setIsDropdownItemSelected] = useState(false);
+  const selectedTasks = useSelector((state) => state.intakeCorrespondence.selectedTasks);
+
   const paginationOptions = () => querystring.parse(window.location.search.slice(1));
   const [storedPaginationOptions, setStoredPaginationOptions] = useState(
     querystring.parse(window.location.search.slice(1))
@@ -56,6 +70,28 @@ const CorrespondenceTableBuilder = (props) => {
     setStoredPaginationOptions({});
   }, []);
 
+  const handleMailTeamUserChange = (selectedUser) => {
+    setSelectedMailTeamUser(selectedUser);
+    setIsDropdownItemSelected(Boolean(selectedUser));
+  };
+
+  const handleCheckboxChange = (isChecked) => {
+    setIsAnyCheckboxSelected(isChecked);
+  };
+
+  const handleAssignButtonClick = () => {
+    // Logic to handle assigning tasks to the selected mail team user
+    if (selectedMailTeamUser && isDropdownItemSelected && isAnyCheckboxSelected) {
+      const mailTeamUser = selectedMailTeamUser.value;
+      const taskIds = selectedTasks.map((task) => task);
+      let newUrl = window.location.href;
+
+      newUrl += newUrl.includes('?') ? `&user=${mailTeamUser}&taskIds=${taskIds}` :
+        `?user=${mailTeamUser}&taskIds=${taskIds}`;
+      window.location.href = newUrl;
+    }
+  };
+
   const calcActiveTabIndex = (config) => {
     const tabNames = config.tabs.map((tab) => {
       return tab.name;
@@ -93,7 +129,7 @@ const CorrespondenceTableBuilder = (props) => {
       [QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name]: veteranDetails(),
       [QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name]: vaDor(tasks, filterOptions),
       [QUEUE_CONFIG.COLUMNS.NOTES.name]: notes(),
-      [QUEUE_CONFIG.COLUMNS.CHECKBOX_COLUMN.name]: checkboxColumn(),
+      [QUEUE_CONFIG.COLUMNS.CHECKBOX_COLUMN.name]: checkboxColumn(handleCheckboxChange),
       [QUEUE_CONFIG.COLUMNS.ACTION_TYPE.name]: actionType(),
     };
 
@@ -143,36 +179,42 @@ const CorrespondenceTableBuilder = (props) => {
         <>
           {isMailTeamSupervisor &&
             (tabConfig.name === 'correspondence_unassigned' || tabConfig.name === 'correspondence_team_assigned') &&
+            <>
+              <p className="cf-margin-bottom-0rem">Assign to mail team user</p>
+              <div style={{ display: 'flex', flexDirection: 'row' }}>
+                <SearchableDropdown
+                  className="cf-dropdown"
+                  name="Assign to mail team user"
+                  hideLabel
+                  styling={{ width: '200px', marginRight: '2rem' }}
+                  dropdownStyling={{ width: '200px' }}
+                  options={buildMailUserData(props.mailTeamUsers)}
+                  onChange={handleMailTeamUserChange}
+                />
+                {tabConfig.name === 'correspondence_unassigned' &&
               <>
-                <p className="cf-margin-bottom-0rem">Assign to mail team user</p>
-                <div style={{ display: 'flex', flexDirection: 'row' }}>
-                  <SearchableDropdown
-                    className="cf-dropdown"
-                    name="Assign to mail team user"
-                    hideLabel
-                    styling={{ width: '200px', marginRight: '2rem' }}
-                    dropdownStyling={{ width: '200px' }}
-                  />
-                  {tabConfig.name === 'correspondence_unassigned' &&
-                <>
+                <Button
+                  name="Assign"
+                  onClick={handleAssignButtonClick}
+                  disabled={!isDropdownItemSelected || !isAnyCheckboxSelected}
+                />
+                <span style={{ marginLeft: 'auto' }}>
                   <Button
-                    name="Assign"
-                  />
-                  <span style={{ marginLeft: 'auto' }}>
-                    <Button
-                      name="Auto assign correspondence"
+                    name="Auto assign correspondence"
                     />
                   </span>
                 </>
-                  }
-                  {tabConfig.name === 'correspondence_team_assigned' &&
-              <Button
-                name="Reassign"
-              />
-                  }
-                </div>
-                <hr></hr>
-              </>
+                }
+                {tabConfig.name === 'correspondence_team_assigned' &&
+            <Button
+              name="Reassign"
+              onClick={handleAssignButtonClick}
+              disabled={!isDropdownItemSelected || !isAnyCheckboxSelected}
+            />
+                }
+              </div>
+              <hr></hr>
+            </>
           }
           <p className="cf-margin-top-0">
             {noCasesMessage || tabConfig.description}
@@ -239,7 +281,9 @@ CorrespondenceTableBuilder.propTypes = {
   }),
   userCanBulkAssign: PropTypes.bool,
   isVhaOrg: PropTypes.bool,
-  featureToggles: PropTypes.object
+  featureToggles: PropTypes.object,
+  mailTeamUsers: PropTypes.array,
+  selectedTasks: PropTypes.array,
 };
 
 export default connect(mapStateToProps)(CorrespondenceTableBuilder);
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
index ed873ed7340..e66ac30e4da 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
@@ -88,6 +88,14 @@ export const clearCheckboxState = () =>
     });
   };
 
+export const setSelectedTasks = (values) =>
+  (dispatch) => {
+    dispatch({
+      type: ACTIONS.SET_SELECTED_TASKS,
+      payload: { values }
+    });
+  };
+
 export const setTaskRelatedAppealIds = (appealIds) =>
   (dispatch) => {
     dispatch({
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
index 7b3244ec928..bbfee2df05b 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
@@ -4,6 +4,7 @@ export const ACTIONS = {
   LOAD_VETERAN_INFORMATION: 'LOAD_VETERAN_INFORMATION',
   LOAD_VET_CORRESPONDENCE: 'LOAD_VET_CORRESPONDENCE',
   LOAD_CORRESPONDENCE_CONFIG: 'LOAD_CORRESPONDENCE_CONFIG',
+  LOAD_MAIL_TEAM_USERS: 'LOAD_MAIL_TEAM_USERS',
   UPDATE_RADIO_VALUE: 'UPDATE_RADIO_VALUE',
   SAVE_CHECKBOX_STATE: 'SAVE_CHECKBOX_STATE',
   CLEAR_CHECKBOX_STATE: 'CLEAR_CHECKBOX_STATE',
@@ -15,4 +16,5 @@ export const ACTIONS = {
   SET_WAIVED_EVIDENCE_TASKS: 'SET_WAIVED_EVIDENCE_TASKS',
   SET_SHOW_REASSIGN_PACKAGE_MODAL: 'SET_SHOW_REASSIGN_PACKAGE_MODAL',
   SET_SHOW_REMOVE_PACKAGE_MODAL: 'SET_SHOW_REMOVE_PACKAGE_MODAL',
+  SET_SELECTED_TASKS: 'SET_SELECTED_TASKS'
 };
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
index 6e41fcd9df4..e5f851abafb 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
@@ -8,6 +8,7 @@ export const initialState = {
   correspondences: [],
   radioValue: '0',
   relatedCorrespondences: [],
+  selectedTasks: [],
   mailTasks: [],
   unrelatedTasks: [],
   currentCorrespondence: [],
@@ -54,6 +55,13 @@ export const intakeCorrespondenceReducer = (state = initialState, action = {}) =
       }
     });
 
+  case ACTIONS.LOAD_MAIL_TEAM_USERS:
+    return update(state, {
+      mailTeamUsers: {
+        $set: action.payload.mailTeamUsers
+      }
+    });
+
   case ACTIONS.UPDATE_RADIO_VALUE:
     return update(state, {
       radioValue: {
@@ -83,6 +91,14 @@ export const intakeCorrespondenceReducer = (state = initialState, action = {}) =
       }
     });
 
+    // fix this to use the actual value for set
+  case ACTIONS.SET_SELECTED_TASKS:
+    return update(state, {
+      selectedTasks: {
+        $set: [...action.payload.values]
+      }
+    });
+
   case ACTIONS.SET_UNRELATED_TASKS:
     return update(state, {
       unrelatedTasks: {
diff --git a/config/routes.rb b/config/routes.rb
index 4df966a718b..81f24cc4ad2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -313,6 +313,7 @@
   scope path: '/queue' do
     get '/', to: 'queue#index'
     get '/correspondence', to: 'correspondence#correspondence_cases'
+    get '/correspondence/mail_team_users', to: 'correspondence#mail_team_users'
     get '/correspondence/:correspondence_uuid/intake', to: 'correspondence#intake', as: :queue_correspondence_intake
     post '/correspondence/:correspondence_uuid/current_step', to: 'correspondence#current_step', as: :queue_correspondence_intake_current_step
     post '/correspondence/:correspondence_uuid/correspondence_intake_task', to: 'correspondence_tasks#create_correspondence_intake_task'
diff --git a/spec/feature/queue/correspondence/correspondence_cases_batch_assignment.rb b/spec/feature/queue/correspondence/correspondence_cases_batch_assignment.rb
new file mode 100644
index 00000000000..9fc5033abe0
--- /dev/null
+++ b/spec/feature/queue/correspondence/correspondence_cases_batch_assignment.rb
@@ -0,0 +1,163 @@
+# frozen_string_literal: true
+
+RSpec.feature("The Correspondence Cases page") do
+  include CorrespondenceTaskHelpers
+  # alias this to avoid the method name collision
+  alias_method :create_efolderupload_task, :create_efolderupload_failed_task
+  context "correspondence batch assignment cases for assigned and unassigned tabs" do
+    let(:current_user) { create(:user) }
+    before :each do
+      MailTeamSupervisor.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+    end
+    let(:organization) { MailTeam.singleton }
+    let(:mail_user) { User.authenticate!(roles: ["Mail Team"]) }
+    let(:target_user) { create(:user, css_id: "TARGET_USER") }
+
+    let(:wait_time) { 30 }
+
+    before do
+      organization.add_user(mail_user)
+      mail_user.reload
+    end
+
+    before do
+      organization.add_user(target_user)
+      target_user.reload
+    end
+
+    before do
+      Timecop.freeze(Time.zone.local(2020, 5, 15))
+      5.times do
+        corres_array = (1..4).map { create(:correspondence) }
+        task_array = [ReassignPackageTask, RemovePackageTask, SplitPackageTask, MergePackageTask]
+
+        corres_array.each_with_index do |corres, index|
+          rpt = ReviewPackageTask.find_by(appeal_id: corres.id)
+          task_array[index].create!(
+            parent_id: rpt.id,
+            appeal_id: corres.id,
+            appeal_type: "Correspondence",
+            assigned_to: MailTeamSupervisor.singleton,
+            assigned_by_id: rpt.assigned_to_id
+          )
+        end
+      end
+
+      # Used to mock a single task to compare task sorting
+      ReassignPackageTask.first.correspondence.update!(
+        va_date_of_receipt: Date.new(2000, 10, 10),
+        updated_by_id: current_user.id
+      )
+      ReassignPackageTask.last.correspondence.update!(
+        va_date_of_receipt: Date.new(2050, 10, 10),
+        updated_by_id: current_user.id
+      )
+      FeatureToggle.enable!(:correspondence_queue)
+    end
+
+    before do
+      Timecop.freeze(Time.zone.local(2020, 5, 15))
+      40.times do
+        correspondence = create(:correspondence)
+        parent_task = create_correspondence_intake(correspondence, target_user)
+        create_efolderupload_task(correspondence, parent_task, user: target_user)
+      end
+    end
+
+    it "successfully loads the unassigned tab" do
+      visit "/queue/correspondence/team?tab=correspondence_unassigned"
+      expect(page).to have_content("Correspondence owned by the Mail team are unassigned to an individual:")
+      expect(page).to have_content("Assign to mail team user")
+      expect(page).to have_button("Assign", disabled: true)
+      expect(page).to have_button("Auto assign correspondence")
+    end
+
+    it "Verify the mail team user batch assignment with Assign button" do
+      visit "/queue/correspondence/team?tab=correspondence_unassigned"
+      expect(page).to have_content("Assign to mail team user")
+      expect(page).to have_button("Assign", disabled: true)
+      expect(page).to have_selector(".cf-select__input")
+      all(".cf-select__input").first.click
+      find_by_id("react-select-2-option-0").click
+      page.execute_script('
+        document.querySelectorAll(".cf-form-checkbox input[type=\'checkbox\']").forEach((checkbox, index) => {
+          if (index < 3) {
+            checkbox.click();
+          }
+        });
+      ')
+      expect(page).to have_button("Assign", disabled: false)
+      find_by_id("button-Assign").click
+      expect(page).to have_content("You have successfully assigned 3 Correspondence to #{mail_user.css_id}.")
+      expect(page).to have_content("Please go to your individual queue to see any self-assigned correspondence.")
+    end
+
+    it "Verify the mail team user batch assignment with assign button with queue limit" do
+      visit "/queue/correspondence/team?tab=correspondence_unassigned"
+      expect(page).to have_content("Assign to mail team user")
+      expect(page).to have_button("Assign", disabled: true)
+      expect(page).to have_selector(".cf-select__input")
+      all(".cf-select__input").first.click
+      find_by_id("react-select-2-option-1").click
+      page.execute_script('
+        document.querySelectorAll(".cf-form-checkbox input[type=\'checkbox\']").forEach((checkbox, index) => {
+          if (index < 3) {
+            checkbox.click();
+          }
+        });
+      ')
+      expect(page).to have_button("Assign", disabled: false)
+      find_by_id("button-Assign").click
+      expect(page).to have_content("Correspondence assignment to #{target_user.css_id} has failed")
+      expect(page).to have_content("Queue volume has reached maximum capacity for this user.")
+    end
+
+    it "successfully loads the assigned tab" do
+      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
+      expect(page).to have_content("Correspondence that is currently assigned to mail team users:")
+      expect(page).to have_content("Assign to mail team user")
+      expect(page).to have_button("Reassign", disabled: true)
+    end
+
+    it "Verify the mail team user batch reassignment with Reassign button" do
+      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
+      expect(page).to have_content("Assign to mail team user")
+      expect(page).to have_button("Reassign", disabled: true)
+      expect(page).to have_selector(".cf-select__input")
+      all(".cf-select__input").first.click
+      find_by_id("react-select-2-option-0").click
+      page.execute_script('
+        document.querySelectorAll(".cf-form-checkbox input[type=\'checkbox\']").forEach((checkbox, index) => {
+          if (index < 3) {
+            checkbox.click();
+          }
+        });
+      ')
+      expect(page).to have_button("Reassign", disabled: false)
+      find_by_id("button-Reassign").click
+      expect(page).to have_content("You have successfully reassigned 3 Correspondence to #{mail_user.css_id}.")
+      expect(page).to have_content("Please go to your individual queue to see any self-assigned correspondence.")
+    end
+
+    it "Verify the mail team user batch reassignment with reassign button with queue limit" do
+      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
+      expect(page).to have_content("Assign to mail team user")
+      expect(page).to have_button("Reassign", disabled: true)
+      expect(page).to have_selector(".cf-select__input")
+      all(".cf-select__input").first.click
+      find_by_id("react-select-2-option-1").click
+      page.execute_script('
+        document.querySelectorAll(".cf-form-checkbox input[type=\'checkbox\']").forEach((checkbox, index) => {
+          if (index < 3) {
+            checkbox.click();
+          }
+        });
+      ')
+      expect(page).to have_button("Reassign", disabled: false)
+      find_by_id("button-Reassign").click
+      expect(page).to have_content("Correspondence reassignment to #{target_user.css_id} has failed")
+      expect(page).to have_content("Queue volume has reached maximum capacity for this user.")
+    end
+  end
+end
diff --git a/spec/feature/queue/correspondence/correspondence_cases_spec.rb b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
index a8d7407700c..febc2dbbe05 100644
--- a/spec/feature/queue/correspondence/correspondence_cases_spec.rb
+++ b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
@@ -699,7 +699,7 @@
       visit "/queue/correspondence/team?tab=correspondence_team_assigned"
       expect(page).to have_content("Correspondence that is currently assigned to mail team users:")
       expect(page).to have_content("Assign to mail team user")
-      expect(page).to have_button("Reassign")
+      expect(page).to have_button("Reassign", disabled: true)
     end
 
     it "uses veteran details sort correctly." do

From 8693606c489ae25592bd04d5bcbb397c4ac6effc Mon Sep 17 00:00:00 2001
From: HunJerBAH <Jeremy.Hunton@va.gov>
Date: Mon, 4 Mar 2024 10:24:49 -0500
Subject: [PATCH 131/237] updated info banner to warning banner per UI/UX
 updates

---
 app/controllers/correspondence_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index b4edf5c953b..d18dd555414 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -265,7 +265,7 @@ def message_template(user, task_count, tab)
   end
 
   def response_type(user)
-    @response_type = (user.tasks.length < MAX_QUEUED_ITEMS) ? "success" : "info"
+    @response_type = (user.tasks.length < MAX_QUEUED_ITEMS) ? "success" : "warning"
   end
 
   # :reek:FeatureEnvy

From e29e2faa81d722bd0ca66e4103c4f7c2ec161a7d Mon Sep 17 00:00:00 2001
From: HunJerBAH <Jeremy.Hunton@va.gov>
Date: Mon, 4 Mar 2024 10:29:05 -0500
Subject: [PATCH 132/237] updated efolder failed task inheritance to come from
 correspondence_task

---
 app/models/tasks/efolder_upload_failed_task.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/tasks/efolder_upload_failed_task.rb b/app/models/tasks/efolder_upload_failed_task.rb
index 3bafaf1c87f..3cfae9fd4ae 100644
--- a/app/models/tasks/efolder_upload_failed_task.rb
+++ b/app/models/tasks/efolder_upload_failed_task.rb
@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
-class EfolderUploadFailedTask < ReviewPackageTask
+class EfolderUploadFailedTask < CorrespondenceTask
 end

From 0c93ca07e80a7217eee8c87689c59f5c67b168df Mon Sep 17 00:00:00 2001
From: Rnmarshall93 <110805785+Rnmarshall93@users.noreply.github.com>
Date: Mon, 4 Mar 2024 10:51:04 -0800
Subject: [PATCH 133/237] Your Correspondence - In Progress Tab (Bug fixes)
 (#21010)

* merge issue on activrecord

* Fixed tasks filter with multiple options

* refactored to be cleaner

* refactored CorrespondenceTaskFilter to be OOP best practices and added clarification comments.

* Made suggested changes and fixed efolder upload failed task link on the backend.

---------

Co-authored-by: Jim Foley <james.foley4@va.gov>
---
 .../tasks/correspondence_task_filter.rb       | 68 +++++++++++--------
 .../tasks/efolder_upload_failed_task.rb       |  6 +-
 2 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/app/models/tasks/correspondence_task_filter.rb b/app/models/tasks/correspondence_task_filter.rb
index e7f3cea421e..306ce4fba4d 100644
--- a/app/models/tasks/correspondence_task_filter.rb
+++ b/app/models/tasks/correspondence_task_filter.rb
@@ -1,21 +1,31 @@
 # frozen_string_literal: true
 
 class CorrespondenceTaskFilter < TaskFilter
-  def filter_by_va_dor(date_info)
-    date_type, first_date, second_date = date_info.split(",")
+  def filtered_tasks
+    va_dor_params = filter_params.select { |param| param.include?("col=vaDor") }
+    task_column_params = filter_params.select { |param| param.include?("col=taskColumn") }
 
-    case date_type
-    when "0"
-      filter_between_dates(first_date, second_date)
-    when "1"
-      filter_before_date(first_date)
-    when "2"
-      filter_after_date(first_date)
-    when "3"
-      filter_on_date(first_date)
+    # task_column_params comes in as a single string, delimited by |. Updates task_column_params
+    # to be an array of the incoming values.
+    unless task_column_params == []
+      task_column_params[0].slice!("col=taskColumn&val=")[0]
+      task_column_params = task_column_params[0].split("|")
+    end
+
+    result = tasks.all
+    va_dor_params.each do |param|
+      value_hash = Rack::Utils.parse_nested_query(param).deep_symbolize_keys
+      result = result.merge(filter_by_va_dor(value_hash[:val]))
+    end
+
+    unless task_column_params.empty?
+      result = result.merge(filter_by_task(task_column_params))
     end
+    result
   end
 
+  private
+
   def filter_by_date(date_info)
     date_type, first_date, second_date = date_info.split(",")
 
@@ -31,29 +41,31 @@ def filter_by_date(date_info)
     end
   end
 
-  def filter_by_task(task_type)
-    tasks.where("type = (?)", task_type)
-  end
+  def filter_by_va_dor(date_info)
+    date_type, first_date, second_date = date_info.split(",")
 
-  def filtered_tasks
-    va_dor_params = filter_params.select { |param| param.include?("col=vaDor") }
-    task_column_params = filter_params.select { |param| param.include?("col=taskColumn") }
-    result = tasks.all # Assuming Task is the name of your ActiveRecord model
-    va_dor_params.each do |param|
-      value_hash = Rack::Utils.parse_nested_query(param).deep_symbolize_keys
-      result = result.merge(filter_by_va_dor(value_hash[:val]))
+    case date_type
+    when "0"
+      filter_between_dates(first_date, second_date)
+    when "1"
+      filter_before_date(first_date)
+    when "2"
+      filter_after_date(first_date)
+    when "3"
+      filter_on_date(first_date)
     end
+  end
 
-    task_column_params.each do |param|
-      value_hash = Rack::Utils.parse_nested_query(param).deep_symbolize_keys
-      result = result.merge(filter_by_task(value_hash[:val]))
+  def filter_by_task(task_types)
+    # Initialize collection to an empty scope
+    collection = Task.none
+    task_types.each do |task_type|
+      t = tasks.where(type: task_type)
+      collection = collection.or(t)
     end
-
-    result
+    collection
   end
 
-  private
-
   def filter_between_dates(start_date, end_date)
     tasks.joins(:appeal)
       .where("correspondences.va_date_of_receipt > ? AND correspondences.va_date_of_receipt < ?",
diff --git a/app/models/tasks/efolder_upload_failed_task.rb b/app/models/tasks/efolder_upload_failed_task.rb
index 7eca744c2a6..28759b6ba47 100644
--- a/app/models/tasks/efolder_upload_failed_task.rb
+++ b/app/models/tasks/efolder_upload_failed_task.rb
@@ -2,10 +2,6 @@
 
 class EfolderUploadFailedTask < ReviewPackageTask
   def task_url
-    if parent.is_a?(ReviewPackageTask)
-      Constants.CORRESPONDENCE_TASK_URL.REVIEW_PACKAGE_TASK_URL.sub("uuid", correspondence.uuid)
-    elsif parent.is_a?(CorrespondenceIntakeTask)
-      Constants.CORRESPONDENCE_TASK_URL.INTAKE_TASK_URL.sub("uuid", correspondence.uuid)
-    end
+    Constants.CORRESPONDENCE_TASK_URL.REVIEW_PACKAGE_TASK_URL.sub("uuid", correspondence.uuid)
   end
 end

From 4405469267d1b07fda80cd7dceae28063ac4a32a Mon Sep 17 00:00:00 2001
From: IsaiahBar <107133331+IsaiahBar@users.noreply.github.com>
Date: Mon, 4 Mar 2024 18:28:55 -0500
Subject: [PATCH 134/237] Your Correspondence - Assigned Tab (#21014)

* fix feature test

* Revert "fix feature test"

This reverts commit 948d6374e1f9b548277da1fe5e0851942a5825d8.

* pushing up tests for ryan to run

* feature tests

---------

Co-authored-by: Jim Foley <james.foley4@va.gov>
---
 .../correspondence_cases_spec.rb              | 81 ++++++++++++++++++-
 1 file changed, 80 insertions(+), 1 deletion(-)

diff --git a/spec/feature/queue/correspondence/correspondence_cases_spec.rb b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
index febc2dbbe05..6f771587ef4 100644
--- a/spec/feature/queue/correspondence/correspondence_cases_spec.rb
+++ b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
@@ -22,7 +22,7 @@
     it "routes to correspondence cases if feature toggle is enabled" do
       FeatureToggle.enable!(:correspondence_queue)
       visit "/queue/correspondence"
-      expect(page).to have_current_path(%r{/queue/correspondence})
+      expect(page).to have_current_path("/queue/correspondence")
     end
   end
 
@@ -814,4 +814,83 @@
       expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
     end
   end
+
+  context "Your Correspondence assigned tab" do
+    let(:current_user) { create(:user) }
+    before :each do
+      MailTeamSupervisor.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+    end
+
+    before do
+      Timecop.freeze(Time.zone.local(2020, 5, 15))
+      (1..10).map { create(:correspondence, :with_correspondence_intake_task) }
+      10.times do
+        review_correspondence = create(:correspondence)
+        rpt = ReviewPackageTask.find_by(appeal_id: review_correspondence.id)
+        rpt.update!(assigned_to: current_user, status: "assigned")
+        rpt.save!
+      end
+      10.times do
+        corr = create(:correspondence)
+
+        rpt = ReviewPackageTask.find_by(appeal_id: corr.id)
+
+        EfolderUploadFailedTask.create!(
+          parent_id: rpt.id,
+          appeal_id: corr.id,
+          appeal_type: "Correspondence",
+          assigned_to: current_user,
+          assigned_by_id: rpt.assigned_to_id
+        )
+      end
+
+      # Used to mock a single task to compare task sorting
+      EfolderUploadFailedTask.first.correspondence.update!(
+        va_date_of_receipt: Date.new(2000, 10, 10),
+        updated_by_id: current_user.id
+      )
+      EfolderUploadFailedTask.last.correspondence.update!(
+        va_date_of_receipt: Date.new(2050, 10, 10),
+        updated_by_id: current_user.id
+      )
+      FeatureToggle.enable!(:correspondence_queue)
+    end
+
+    it "successfully loads the assigned tab" do
+      visit "/queue/correspondence?tab=correspondence_assigned&page=1&sort_by=vaDor&order=asc"
+    end
+
+    it "uses VA DOR sort correctly." do
+      visit "/queue/correspondence?tab=correspondence_assigned&page=1&sort_by=vaDor&order=asc"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by VA DOR']").click
+      first_date = find("tbody > tr:nth-child(1) > td:nth-child(2)")
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by VA DOR']").click
+      last_date = find("tbody > tr:nth-child(1) > td:nth-child(2)")
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by VA DOR']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == first_date)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by VA DOR']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == last_date)
+    end
+
+    it "uses notes sort correctly" do
+      visit "/queue/correspondence?tab=correspondence_assigned&page=1&sort_by=vaDor&order=asc"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by Notes']").click
+      first_note = find("tbody > tr:nth-child(1) > td:nth-child(5)").text
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by Notes']").click
+      second_note = find("tbody > tr:nth-child(1) > td:nth-child(5)").text
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by Notes']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(5)").text == first_note)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by Notes']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(5)").text == second_note)
+    end
+  end
 end

From 867cf747a99ec4018573d051056195a21ee12e6d Mon Sep 17 00:00:00 2001
From: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
Date: Tue, 5 Mar 2024 12:22:56 -0500
Subject: [PATCH 135/237] replaced MailTeamSupervisor with InboundOpsTeam
 (#21015)

---
 app/controllers/correspondence_controller.rb           |  4 ++--
 app/controllers/correspondence_tasks_controller.rb     |  6 +++---
 app/controllers/team_management_controller.rb          |  2 +-
 .../{mail_team_supervisor.rb => inbound_ops_team.rb}   |  6 +++---
 app/models/tasks/correspondence_task.rb                |  2 +-
 app/workflows/correspondence_root_task_factory.rb      |  6 +++---
 .../app/queue/components/QueueOrganizationDropdown.jsx |  2 +-
 .../review_package/CorrespondenceReviewPackage.jsx     |  4 ++--
 db/seeds/users.rb                                      | 10 +++++-----
 spec/controllers/correspondence_controller_spec.rb     |  4 ++--
 .../queue/correspondence/correspondence_cases_spec.rb  |  2 +-
 .../queue/correspondence/edit_cmp_information_spec.rb  |  4 ++--
 .../queue/correspondence/review_package_spec.rb        |  6 +++---
 spec/models/correspondence_spec.rb                     |  4 ++--
 14 files changed, 31 insertions(+), 31 deletions(-)
 rename app/models/organizations/{mail_team_supervisor.rb => inbound_ops_team.rb} (56%)

diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index ac35b37d55c..1d36aacae74 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -94,7 +94,7 @@ def show
       correspondence: correspondence,
       package_document_type: correspondence&.package_document_type,
       general_information: general_information,
-      user_can_edit_vador: MailTeamSupervisor.singleton.user_has_access?(current_user),
+      user_can_edit_vador: InboundOpsTeam.singleton.user_has_access?(current_user),
       correspondence_documents: corres_docs.map do |doc|
         WorkQueue::CorrespondenceDocumentSerializer.new(doc).serializable_hash[:data][:attributes]
       end,
@@ -200,7 +200,7 @@ def set_flash_intake_success_message
   end
 
   def verify_correspondence_access
-    return true if MailTeamSupervisor.singleton.user_has_access?(current_user) ||
+    return true if InboundOpsTeam.singleton.user_has_access?(current_user) ||
                    MailTeam.singleton.user_has_access?(current_user)
 
     redirect_to "/unauthorized"
diff --git a/app/controllers/correspondence_tasks_controller.rb b/app/controllers/correspondence_tasks_controller.rb
index 1822faf07a0..35a771cac09 100644
--- a/app/controllers/correspondence_tasks_controller.rb
+++ b/app/controllers/correspondence_tasks_controller.rb
@@ -19,7 +19,7 @@ def create_package_action_task
       task_params = {
         parent_id: review_package_task.id,
         instructions: params[:instructions],
-        assigned_to: MailTeamSupervisor.singleton,
+        assigned_to: InboundOpsTeam.singleton,
         appeal_id: params[:correspondence_id],
         appeal_type: "Correspondence",
         status: Constants.TASK_STATUSES.assigned,
@@ -27,7 +27,7 @@ def create_package_action_task
       }
 
       ReviewPackageTask.create_from_params(task_params, current_user)
-      review_package_task.update!(assigned_to: MailTeamSupervisor.singleton, status: :on_hold)
+      review_package_task.update!(assigned_to: InboundOpsTeam.singleton, status: :on_hold)
       render json: { status: :ok }
     end
   end
@@ -59,7 +59,7 @@ def create_correspondence_intake_task
   def remove_package
     root_task = CorrespondenceRootTask.find_by!(
       appeal_id: params[:id],
-      assigned_to: MailTeamSupervisor.singleton,
+      assigned_to: InboundOpsTeam.singleton,
       appeal_type: "Correspondence",
       type: "CorrespondenceRootTask"
     )
diff --git a/app/controllers/team_management_controller.rb b/app/controllers/team_management_controller.rb
index bc5b51f4503..98e8c51eb8f 100644
--- a/app/controllers/team_management_controller.rb
+++ b/app/controllers/team_management_controller.rb
@@ -120,7 +120,7 @@ def other_orgs
       VhaProgramOffice,
       VhaRegionalOffice,
       EducationRpo,
-      MailTeamSupervisor
+      InboundOpsTeam
     ]
     Organization.order(:name).reject do |org|
       rejected_orgs.any? { |excluded_org| org.is_a?(excluded_org) }
diff --git a/app/models/organizations/mail_team_supervisor.rb b/app/models/organizations/inbound_ops_team.rb
similarity index 56%
rename from app/models/organizations/mail_team_supervisor.rb
rename to app/models/organizations/inbound_ops_team.rb
index 3f3b7ada7f9..e0c3a99290d 100644
--- a/app/models/organizations/mail_team_supervisor.rb
+++ b/app/models/organizations/inbound_ops_team.rb
@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-class MailTeamSupervisor < Organization
+class InboundOpsTeam < Organization
   def self.singleton
-    MailTeamSupervisor.first ||
-      MailTeamSupervisor.create(name: "Mail Team Supervisor", url: "mail-team-supervisor")
+    InboundOpsTeam.first ||
+      InboundOpsTeam.create(name: "Inbound Ops Team", url: "inbound-ops-team")
   end
 
   # :reek:UtilityFunction
diff --git a/app/models/tasks/correspondence_task.rb b/app/models/tasks/correspondence_task.rb
index 0a3bf143d76..2d99f91fa2c 100644
--- a/app/models/tasks/correspondence_task.rb
+++ b/app/models/tasks/correspondence_task.rb
@@ -43,7 +43,7 @@ def verify_no_other_open_package_action_task_on_correspondence
   def remove_package
     root_task = CorrespondenceRootTask.find_by!(
       appeal_id: @correspondence.id,
-      assigned_to: MailTeamSupervisor.singleton,
+      assigned_to: InboundOpsTeam.singleton,
       appeal_type: "Correspondence",
       type: "CorrespondenceRootTask"
     )
diff --git a/app/workflows/correspondence_root_task_factory.rb b/app/workflows/correspondence_root_task_factory.rb
index 82b6a5ed0e6..9594abc9b29 100644
--- a/app/workflows/correspondence_root_task_factory.rb
+++ b/app/workflows/correspondence_root_task_factory.rb
@@ -17,9 +17,9 @@ def create_root_and_sub_tasks!
   private
 
   def create_root!
-      @root_task = CorrespondenceRootTask.find_or_create_by!(
+    @root_task = CorrespondenceRootTask.find_or_create_by!(
       appeal_id: @correspondence.id,
-      assigned_to: MailTeamSupervisor.singleton,
+      assigned_to: InboundOpsTeam.singleton,
       appeal_type: Correspondence.name
     )
 
@@ -29,7 +29,7 @@ def create_root!
   def create_subtasks!
     @review_package_task = ReviewPackageTask.find_or_create_by!(
       appeal_id: @correspondence.id,
-      assigned_to: MailTeamSupervisor.singleton,
+      assigned_to: InboundOpsTeam.singleton,
       appeal_type: Correspondence.name,
       parent_id: @root_task.id,
       type: ReviewPackageTask.name
diff --git a/client/app/queue/components/QueueOrganizationDropdown.jsx b/client/app/queue/components/QueueOrganizationDropdown.jsx
index 13b89541774..2b7140f765c 100644
--- a/client/app/queue/components/QueueOrganizationDropdown.jsx
+++ b/client/app/queue/components/QueueOrganizationDropdown.jsx
@@ -36,7 +36,7 @@ export default class QueueOrganizationDropdown extends React.Component {
 
     let items = [queueItem, ...organizationItems];
 
-    if (organizations[0].name === 'Mail' || organizations[0].name === 'Mail Team Supervisor') {
+    if (organizations[0].name === 'Mail' || organizations[0].name === 'Inbound Ops Team') {
       const orgHref = '/queue/correspondence';
 
       correspondenceItems = {
diff --git a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
index 3aa321a7ba4..d4d141da5ef 100644
--- a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
+++ b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
@@ -49,10 +49,10 @@ export const CorrespondenceReviewPackage = (props) => {
     // When a remove package task is active and pending review, the page is read-only
     const isPageReadOnly = (tasks) => {
       const assignedRemoveTask = tasks.find((task) => task.status === 'assigned' && task.type === 'RemovePackageTask');
-      const isMailTeamSupervisor = correspondence.organizations.find((org) => org.name === 'Mail Team Supervisor');
+      const isInboundOpsTeam = correspondence.organizations.find((org) => org.name === 'Inbound Ops Team');
 
       // Return true if a removePackageTask that is currently assigned is found, else false
-      return (typeof assignedRemoveTask !== 'undefined') && isMailTeamSupervisor;
+      return (typeof assignedRemoveTask !== 'undefined') && isInboundOpsTeam;
     };
 
     try {
diff --git a/db/seeds/users.rb b/db/seeds/users.rb
index 6cfaa98cf97..3a778c0655f 100644
--- a/db/seeds/users.rb
+++ b/db/seeds/users.rb
@@ -88,7 +88,7 @@ def create_users
       create_lit_support_user
       create_oai_team_user
       create_occ_team_user
-      create_mail_team_supervisor_user
+      create_inbound_ops_team_user
       create_cavc_lit_support_user
       create_pulac_cerullo_user
       create_mail_team_user
@@ -377,13 +377,13 @@ def create_occ_team_user
       OaiTeam.singleton.add_user(u)
     end
 
-    def create_mail_team_supervisor_user
+    def create_inbound_ops_team_user
       u = User.create!(station_id: 101, css_id: "MAIL_TEAM_SUPERVISOR_ADMIN_USER", full_name: "Jon MailTeam Snow Admin")
-      MailTeamSupervisor.singleton.add_user(u)
-      OrganizationsUser.make_user_admin(u, MailTeamSupervisor.singleton)
+      InboundOpsTeam.singleton.add_user(u)
+      OrganizationsUser.make_user_admin(u, InboundOpsTeam.singleton)
       u = User.create!(station_id: 101, css_id: "MAIL_TEAM_SUPERVISOR_MAIL_INTAKE_USER",
                        full_name: "Jon MailTeam Snow Mail Intake", roles: ["Mail Intake"])
-      MailTeamSupervisor.singleton.add_user(u)
+      InboundOpsTeam.singleton.add_user(u)
     end
 
     def create_cavc_lit_support_user
diff --git a/spec/controllers/correspondence_controller_spec.rb b/spec/controllers/correspondence_controller_spec.rb
index 5a87342c9e5..a3b0cf07a33 100644
--- a/spec/controllers/correspondence_controller_spec.rb
+++ b/spec/controllers/correspondence_controller_spec.rb
@@ -64,8 +64,8 @@
       expect(response.body).to match(/unauthorized/)
     end
 
-    it "returns a success response when current user is part of MailTeamSupervisor" do
-      MailTeamSupervisor.singleton.add_user(current_user)
+    it "returns a success response when current user is part of InboundOpsTeam" do
+      InboundOpsTeam.singleton.add_user(current_user)
       User.authenticate!(user: current_user)
       get :show, params: { correspondence_uuid: correspondence.uuid }
       expect(response).to have_http_status(:ok)
diff --git a/spec/feature/queue/correspondence/correspondence_cases_spec.rb b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
index 0feb438d9ac..371e6b7ff4d 100644
--- a/spec/feature/queue/correspondence/correspondence_cases_spec.rb
+++ b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
@@ -4,7 +4,7 @@
   context "correspondece cases feature toggle" do
     let(:current_user) { create(:user) }
     before :each do
-      MailTeamSupervisor.singleton.add_user(current_user)
+      InboundOpsTeam.singleton.add_user(current_user)
       User.authenticate!(user: current_user)
       @correspondence_uuid = "123456789"
     end
diff --git a/spec/feature/queue/correspondence/edit_cmp_information_spec.rb b/spec/feature/queue/correspondence/edit_cmp_information_spec.rb
index a5c27f28f30..e86b1b68909 100644
--- a/spec/feature/queue/correspondence/edit_cmp_information_spec.rb
+++ b/spec/feature/queue/correspondence/edit_cmp_information_spec.rb
@@ -38,7 +38,7 @@
   context "Review package form shell" do
     before :each do
       FeatureToggle.enable!(:correspondence_queue)
-      MailTeamSupervisor.singleton.add_user(current_user)
+      InboundOpsTeam.singleton.add_user(current_user)
       User.authenticate!(user: current_user)
       visit "/queue/correspondence/#{correspondence.uuid}/review_package"
     end
@@ -136,7 +136,7 @@
   context "Checking VADOR field is enable for Mail Supervisor" do
     before do
       FeatureToggle.enable!(:correspondence_queue)
-      MailTeamSupervisor.singleton.add_user(current_user)
+      InboundOpsTeam.singleton.add_user(current_user)
       User.authenticate!(user: current_user)
       visit "/queue/correspondence/#{correspondence.uuid}/review_package"
     end
diff --git a/spec/feature/queue/correspondence/review_package_spec.rb b/spec/feature/queue/correspondence/review_package_spec.rb
index 63958c7ced3..129077f3ea9 100644
--- a/spec/feature/queue/correspondence/review_package_spec.rb
+++ b/spec/feature/queue/correspondence/review_package_spec.rb
@@ -6,7 +6,7 @@
   let(:package_document_type) { PackageDocumentType.create(id: 15, active: true, created_at: Time.zone.now, name: "10182", updated_at: Time.zone.now) }
   let(:correspondence) { create(:correspondence, :with_single_doc, veteran_id: veteran.id, package_document_type_id: package_document_type.id) }
   let(:mail_team_supervisor_user) { create(:user, roles: ["Mail Intake"]) }
-  let(:mail_team_supervisor_org) { MailTeamSupervisor.singleton }
+  let(:mail_team_supervisor_org) { InboundOpsTeam.singleton }
   let(:mail_team_user) { create(:user) }
   let(:mail_team_org) { MailTeam.singleton }
 
@@ -65,14 +65,14 @@
         task_params = {
           parent_id: review_package_task.id,
           instructions: ["test remove", "test"],
-          assigned_to: MailTeamSupervisor.singleton,
+          assigned_to: InboundOpsTeam.singleton,
           appeal_id: correspondence.id,
           appeal_type: "Correspondence",
           status: Constants.TASK_STATUSES.assigned,
           type: "RemovePackageTask"
         }
         ReviewPackageTask.create_from_params(task_params, mail_team_supervisor_user)
-        review_package_task.update!(assigned_to: MailTeamSupervisor.singleton, status: :on_hold)
+        review_package_task.update!(assigned_to: InboundOpsTeam.singleton, status: :on_hold)
         visit "/queue/correspondence/#{correspondence.uuid}/review_package"
       end
 
diff --git a/spec/models/correspondence_spec.rb b/spec/models/correspondence_spec.rb
index 5d27276dee1..581673a87d0 100644
--- a/spec/models/correspondence_spec.rb
+++ b/spec/models/correspondence_spec.rb
@@ -36,14 +36,14 @@
       expect(crt.appeal_id).to eq(correspondence.id)
       expect(crt.status).to eq("on_hold")
       expect(crt.type).to eq("CorrespondenceRootTask")
-      expect(crt.assigned_to).to eq(MailTeamSupervisor.singleton)
+      expect(crt.assigned_to).to eq(InboundOpsTeam.singleton)
 
       rpt = ReviewPackageTask.find_by(appeal_id: correspondence.id)
       expect(rpt.appeal_id).to eq(correspondence.id)
       expect(rpt.status).to eq("unassigned")
       expect(rpt.type).to eq("ReviewPackageTask")
       expect(rpt.parent_id).to eq(crt.id)
-      expect(rpt.assigned_to).to eq(MailTeamSupervisor.singleton)
+      expect(rpt.assigned_to).to eq(InboundOpsTeam.singleton)
     end
   end
 end

From cbc1a6e27c22c06afcb404ed8f0ec065c428a818 Mon Sep 17 00:00:00 2001
From: HunJerBAH <Jeremy.Hunton@va.gov>
Date: Tue, 5 Mar 2024 13:06:32 -0500
Subject: [PATCH 136/237] updated MailTeamSupervisor with InboundOpsTeam
 namespace

---
 app/controllers/correspondence_controller.rb  |  2 +-
 app/models/user.rb                            |  2 +-
 .../CorrespondenceTableBuilder.jsx            |  4 ++--
 db/seeds/helpers/queue_helpers.rb             |  4 ++--
 db/seeds/queue_correspondences.rb             |  2 +-
 .../correspondence_cases_batch_assignment.rb  |  4 ++--
 .../correspondence_queue_task_link_spec.rb    |  8 ++++----
 spec/models/task_spec.rb                      | 20 +++++++++----------
 .../correspondence_controller_spec.rb         |  2 +-
 9 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index 2cabc753f8e..b56feeafb49 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -224,7 +224,7 @@ def handle_json_response(mail_team_user, task_ids, tab)
     if mail_team_user && task_ids.present?
       set_banner_params(mail_team_user, task_ids&.count, tab)
     else
-      render json: { correspondence_config: CorrespondenceConfig.new(assignee: MailTeamSupervisor.singleton) }
+      render json: { correspondence_config: CorrespondenceConfig.new(assignee: InboundOpsTeam.singleton) }
     end
   end
 
diff --git a/app/models/user.rb b/app/models/user.rb
index b41caef8f28..e2a64407587 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -102,7 +102,7 @@ def mail_team_user?
   end
 
   def mail_supervisor?
-    organizations.include?(MailTeamSupervisor.singleton)
+    organizations.include?(InboundOpsTeam.singleton)
   end
 
   def mail_superuser?
diff --git a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
index f48e3768c3d..225a60314b4 100644
--- a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
+++ b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
@@ -62,7 +62,7 @@ const CorrespondenceTableBuilder = (props) => {
     querystring.parse(window.location.search.slice(1))
   );
 
-  const isMailTeamSupervisor = props.organizations.find((org) => org.name === 'Mail Team Supervisor');
+  const isInboundOpsTeam = props.organizations.find((org) => org.name === 'Inbound Ops Team');
 
   // Causes one additional rerender of the QueueTables/tabs but prevents saved pagination behavior
   // e.g. clearing filter in a tab, then swapping tabs, then swapping back and the filter will still be applied
@@ -177,7 +177,7 @@ const CorrespondenceTableBuilder = (props) => {
       label: sprintf(tabConfig.label, totalTaskCount),
       page: (
         <>
-          {isMailTeamSupervisor &&
+          {isInboundOpsTeam &&
             (tabConfig.name === 'correspondence_unassigned' || tabConfig.name === 'correspondence_team_assigned') &&
             <>
               <p className="cf-margin-bottom-0rem">Assign to mail team user</p>
diff --git a/db/seeds/helpers/queue_helpers.rb b/db/seeds/helpers/queue_helpers.rb
index 01ccbd68fa0..98ef609a66c 100644
--- a/db/seeds/helpers/queue_helpers.rb
+++ b/db/seeds/helpers/queue_helpers.rb
@@ -88,7 +88,7 @@ def create_action_required_tasks(correspondence, status:, parent_task:, task_typ
       appeal_id: correspondence.id,
       appeal_type: "Correspondence",
       status: status,
-      assigned_to: MailTeamSupervisor.singleton
+      assigned_to: InboundOpsTeam.singleton
     )
   end
 
@@ -101,7 +101,7 @@ def create_and_complete_mail_task(correspondence, user)
       appeal_id: correspondence.id,
       appeal_type: "Correspondence",
       assigned_by: assigned_by,
-      assigned_to: MailTeamSupervisor.singleton
+      assigned_to: InboundOpsTeam.singleton
     )
     cavct.update!(status: Constants.TASK_STATUSES.completed)
     cavct
diff --git a/db/seeds/queue_correspondences.rb b/db/seeds/queue_correspondences.rb
index e56705cf5d9..09cf711eeba 100644
--- a/db/seeds/queue_correspondences.rb
+++ b/db/seeds/queue_correspondences.rb
@@ -175,7 +175,7 @@ def create_correspondence_with_action_required_tasks
           parent_id: rpt.id,
           appeal_id: corres.id,
           appeal_type: "Correspondence",
-          assigned_to: MailTeamSupervisor.singleton,
+          assigned_to: InboundOpsTeam.singleton,
           assigned_by_id: rpt.assigned_to_id
         )
         pat.update(assigned_at: corres.va_date_of_receipt)
diff --git a/spec/feature/queue/correspondence/correspondence_cases_batch_assignment.rb b/spec/feature/queue/correspondence/correspondence_cases_batch_assignment.rb
index 9fc5033abe0..f11fc5d0f76 100644
--- a/spec/feature/queue/correspondence/correspondence_cases_batch_assignment.rb
+++ b/spec/feature/queue/correspondence/correspondence_cases_batch_assignment.rb
@@ -7,7 +7,7 @@
   context "correspondence batch assignment cases for assigned and unassigned tabs" do
     let(:current_user) { create(:user) }
     before :each do
-      MailTeamSupervisor.singleton.add_user(current_user)
+      InboundOpsTeam.singleton.add_user(current_user)
       User.authenticate!(user: current_user)
     end
     let(:organization) { MailTeam.singleton }
@@ -38,7 +38,7 @@
             parent_id: rpt.id,
             appeal_id: corres.id,
             appeal_type: "Correspondence",
-            assigned_to: MailTeamSupervisor.singleton,
+            assigned_to: InboundOpsTeam.singleton,
             assigned_by_id: rpt.assigned_to_id
           )
         end
diff --git a/spec/feature/queue/correspondence/correspondence_queue_task_link_spec.rb b/spec/feature/queue/correspondence/correspondence_queue_task_link_spec.rb
index 22e18098462..73111655cd3 100644
--- a/spec/feature/queue/correspondence/correspondence_queue_task_link_spec.rb
+++ b/spec/feature/queue/correspondence/correspondence_queue_task_link_spec.rb
@@ -74,9 +74,9 @@
             parent_id: parent_task&.id,
             appeal_id: correspondence&.id,
             appeal_type: "Correspondence",
-            assigned_to: MailTeamSupervisor.singleton
+            assigned_to: InboundOpsTeam.singleton
           )
-          MailTeamSupervisor.singleton.add_user(current_user)
+          InboundOpsTeam.singleton.add_user(current_user)
           visit "/queue/correspondence/team?tab=correspondence_action_required&page=1&sort_by=vaDor&order=asc"
           find_all("#task-link").last.click
         end
@@ -98,9 +98,9 @@
             parent_id: parent_task&.id,
             appeal_id: correspondence&.id,
             appeal_type: "Correspondence",
-            assigned_to: MailTeamSupervisor.singleton
+            assigned_to: InboundOpsTeam.singleton
           )
-          MailTeamSupervisor.singleton.add_user(current_user)
+          InboundOpsTeam.singleton.add_user(current_user)
           visit "/queue/correspondence/team?tab=correspondence_action_required&page=1&sort_by=vaDor&order=asc"
           find_all("#task-link").last.click
         end
diff --git a/spec/models/task_spec.rb b/spec/models/task_spec.rb
index 9331b60e05b..4e5df7227ce 100644
--- a/spec/models/task_spec.rb
+++ b/spec/models/task_spec.rb
@@ -2017,7 +2017,7 @@ def next_assignee(_options = {})
         correspondence = create(:correspondence)
         rpt = ReviewPackageTask.find_or_create_by(
           appeal_id: correspondence.id,
-          assigned_to: MailTeamSupervisor.singleton,
+          assigned_to: InboundOpsTeam.singleton,
           appeal_type: Correspondence.name
         )
 
@@ -2030,13 +2030,13 @@ def next_assignee(_options = {})
         correspondence = create(:correspondence)
         rpt = ReviewPackageTask.find_or_create_by(
           appeal_id: correspondence.id,
-          assigned_to: MailTeamSupervisor.singleton,
+          assigned_to: InboundOpsTeam.singleton,
           appeal_type: Correspondence.name
         )
 
         uft = EfolderUploadFailedTask.create(
           appeal_id: correspondence.id,
-          assigned_to: MailTeamSupervisor.singleton,
+          assigned_to: InboundOpsTeam.singleton,
           appeal_type: Correspondence.name,
           parent_id: rpt.id
         )
@@ -2048,13 +2048,13 @@ def next_assignee(_options = {})
         correspondence = create(:correspondence)
         cit = CorrespondenceIntakeTask.find_or_create_by(
           appeal_id: correspondence.id,
-          assigned_to: MailTeamSupervisor.singleton,
+          assigned_to: InboundOpsTeam.singleton,
           appeal_type: Correspondence.name
         )
 
         uft = EfolderUploadFailedTask.create(
           appeal_id: correspondence.id,
-          assigned_to: MailTeamSupervisor.singleton,
+          assigned_to: InboundOpsTeam.singleton,
           appeal_type: Correspondence.name,
           parent_id: cit.id
         )
@@ -2071,7 +2071,7 @@ def next_assignee(_options = {})
           parent_id: parent_task&.id,
           appeal_id: correspondence&.id,
           appeal_type: Correspondence.name,
-          assigned_to: MailTeamSupervisor.singleton
+          assigned_to: InboundOpsTeam.singleton
         )
 
         # creation ok with no pre-existing package action task
@@ -2083,7 +2083,7 @@ def next_assignee(_options = {})
             parent_id: parent_task&.id,
             appeal_id: correspondence&.id,
             appeal_type: Correspondence.name,
-            assigned_to: MailTeamSupervisor.singleton
+            assigned_to: InboundOpsTeam.singleton
           )
         end.to raise_error(Caseflow::Error::MultipleOpenTasksOfSameTypeError)
 
@@ -2093,7 +2093,7 @@ def next_assignee(_options = {})
             parent_id: parent_task&.id,
             appeal_id: correspondence&.id,
             appeal_type: Correspondence.name,
-            assigned_to: MailTeamSupervisor.singleton
+            assigned_to: InboundOpsTeam.singleton
           )
         end.to raise_error(Caseflow::Error::MultipleOpenTasksOfSameTypeError)
 
@@ -2103,7 +2103,7 @@ def next_assignee(_options = {})
             parent_id: parent_task&.id,
             appeal_id: correspondence&.id,
             appeal_type: Correspondence.name,
-            assigned_to: MailTeamSupervisor.singleton
+            assigned_to: InboundOpsTeam.singleton
           )
         end.to raise_error(Caseflow::Error::MultipleOpenTasksOfSameTypeError)
 
@@ -2114,7 +2114,7 @@ def next_assignee(_options = {})
                  parent_id: parent_task&.id,
                  appeal_id: correspondence&.id,
                  appeal_type: Correspondence.name,
-                 assigned_to: MailTeamSupervisor.singleton
+                 assigned_to: InboundOpsTeam.singleton
                )).to be_a(RemovePackageTask)
       end
     end
diff --git a/spec/requests/correspondence_controller_spec.rb b/spec/requests/correspondence_controller_spec.rb
index be7736478af..55dd09979cf 100644
--- a/spec/requests/correspondence_controller_spec.rb
+++ b/spec/requests/correspondence_controller_spec.rb
@@ -107,7 +107,7 @@
 
   describe "correspondence_team" do
     before do
-      MailTeamSupervisor.singleton.add_user(current_user)
+      InboundOpsTeam.singleton.add_user(current_user)
       get correspondence_team_path, as: :json
     end
 

From 5a646e2d3fd5349e162811076120189793f83bfc Mon Sep 17 00:00:00 2001
From: HunJerBAH <Jeremy.Hunton@va.gov>
Date: Tue, 5 Mar 2024 13:06:51 -0500
Subject: [PATCH 137/237] updated failing seed test

---
 spec/seeds/users_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/seeds/users_spec.rb b/spec/seeds/users_spec.rb
index 187471971f4..cbafd58f7b3 100644
--- a/spec/seeds/users_spec.rb
+++ b/spec/seeds/users_spec.rb
@@ -6,7 +6,7 @@
 
     it "creates all kinds of users and organizations" do
       expect { subject }.to_not raise_error
-      expect(User.count).to eq(132)
+      expect(User.count).to eq(134)
       expect(Organization.count).to eq(39)
     end
   end

From b3475350d5918bc352c828371f9651339bf0f848 Mon Sep 17 00:00:00 2001
From: HunJerBAH <Jeremy.Hunton@va.gov>
Date: Tue, 5 Mar 2024 13:15:17 -0500
Subject: [PATCH 138/237] updated failing test

---
 spec/seeds/users_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/seeds/users_spec.rb b/spec/seeds/users_spec.rb
index 187471971f4..9a09c31f59b 100644
--- a/spec/seeds/users_spec.rb
+++ b/spec/seeds/users_spec.rb
@@ -6,8 +6,8 @@
 
     it "creates all kinds of users and organizations" do
       expect { subject }.to_not raise_error
-      expect(User.count).to eq(132)
-      expect(Organization.count).to eq(39)
+      expect(User.count).to eq(134)
+      expect(Organization.count).to eq(40)
     end
   end
 end

From 2b8056abaf0f5e8a4500eef876887741f4568a82 Mon Sep 17 00:00:00 2001
From: Rnmarshall93 <110805785+Rnmarshall93@users.noreply.github.com>
Date: Tue, 5 Mar 2024 18:07:29 -0800
Subject: [PATCH 139/237] Update in_progress_tab query to prevent
 EfolderUploadFailedTasks from populating. (#21035)

* updates query to prevent efolderuploadfailed tasks

* updated query to look better

* Fixed task sorting.

---------

Co-authored-by: Jim Foley <james.foley4@va.gov>
---
 app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb | 4 +++-
 app/models/task_sorter.rb                                     | 2 ++
 client/app/queue/components/TaskTableColumns.jsx              | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb b/app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb
index c381b656b31..1cf5e82b6b9 100644
--- a/app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb
+++ b/app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb
@@ -18,7 +18,9 @@ def description
   end
 
   def tasks
-    CorrespondenceTask.where(assigned_to: assignee).in_progress
+    CorrespondenceTask.where(assigned_to: assignee)
+      .where.not(type: "EfolderUploadFailedTask")
+      .where(status: ["in_progress", "on_hold"]).in_progress
   end
 
   # :reek:UtilityFunction
diff --git a/app/models/task_sorter.rb b/app/models/task_sorter.rb
index a1d3ddbb498..7b45cf6d11f 100644
--- a/app/models/task_sorter.rb
+++ b/app/models/task_sorter.rb
@@ -34,6 +34,8 @@ def sorted_tasks
       tasks.joins(:appeal).order(notes: sort_order.to_sym)
     when Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name
       tasks.joins(:appeal).order(va_date_of_receipt: sort_order.to_sym)
+    when Constants.QUEUE_CONFIG.COLUMNS.DAYS_WAITING.name
+      tasks.joins(:appeal).order(assigned_at: sort_order.to_sym)
     else
       tasks.with_assignees.with_assigners.with_cached_appeals.order(order_clause)
     end
diff --git a/client/app/queue/components/TaskTableColumns.jsx b/client/app/queue/components/TaskTableColumns.jsx
index 4e4b9c61cbb..ef381858f36 100644
--- a/client/app/queue/components/TaskTableColumns.jsx
+++ b/client/app/queue/components/TaskTableColumns.jsx
@@ -362,7 +362,8 @@ export const actionType = () => {
 export const daysWaitingCorrespondence = () => {
   return {
     header: 'Days Waiting',
-    name: QUEUE_CONFIG.COLUMNS.DAYS_WAITING_CORRESPONDENCE.name,
+    name: QUEUE_CONFIG.COLUMNS.DAYS_WAITING.name,
+    enableFilter: true,
     backendCanSort: true,
     getSortValue: (task) => task.daysWaiting,
     valueFunction: (task) => task.daysWaiting

From 2726e64afc846459000ee23ead220500c9912532 Mon Sep 17 00:00:00 2001
From: Will Medders <93014155+wmedders21@users.noreply.github.com>
Date: Wed, 6 Mar 2024 11:19:48 -0600
Subject: [PATCH 140/237] Wmedders21/appeals 35479 2 (#21018)

* Add new correspondence tasks not related to appeal

* Fix error when submitting correspondence intake

* Add scope tasks_not_related_to_appeal

* Change intake processor to create new correspondence tasks

* Refactor to have new Correspondence task class names

* Refactor to simplify and be less flaky

* Refactor with the updated class names

* add veteran full name

* create abstract base class for tasks not related to an appeal

* remove task not related to appeal scope

* move correspondence mail tasks to folder

* correspondence mail tasks inherit from CorrespondenceMailTask

* remove hard coded true return for task creation verification

* abstract class and create child class override

* replace deleted verification bypass

* revert task creation refactor
---
 app/models/correspondence.rb                   |  4 ++++
 .../cavc_correspondence_correspondence_task.rb |  4 ++++
 ...ngressional_interest_correspondence_task.rb |  4 ++++
 .../correspondence_mail_task.rb                | 18 ++++++++++++++++++
 .../death_certificate_correspondence_task.rb   |  4 ++++
 .../foia_request_correspondence_task.rb        |  4 ++++
 .../other_motion_correspondence_task.rb        |  4 ++++
 ..._of_attorney_related_correspondence_task.rb |  4 ++++
 .../privacy_act_request_correspondence_task.rb |  4 ++++
 .../privacy_complaint_correspondence_task.rb   |  4 ++++
 .../status_inquiry_correspondence_task.rb      |  4 ++++
 .../correspondence_intake_processor.rb         | 11 ++++++++++-
 .../QUEUE_INTAKE_FORM_TASK_TYPES.json          | 18 +++++++++---------
 .../correspondence/submit_intake_form_spec.rb  | 17 ++++-------------
 .../requests/correspondence_controller_spec.rb | 18 +++++++++---------
 15 files changed, 90 insertions(+), 32 deletions(-)
 create mode 100644 app/models/tasks/mail_tasks_not_related_to_appeal/cavc_correspondence_correspondence_task.rb
 create mode 100644 app/models/tasks/mail_tasks_not_related_to_appeal/congressional_interest_correspondence_task.rb
 create mode 100644 app/models/tasks/mail_tasks_not_related_to_appeal/correspondence_mail_task.rb
 create mode 100644 app/models/tasks/mail_tasks_not_related_to_appeal/death_certificate_correspondence_task.rb
 create mode 100644 app/models/tasks/mail_tasks_not_related_to_appeal/foia_request_correspondence_task.rb
 create mode 100644 app/models/tasks/mail_tasks_not_related_to_appeal/other_motion_correspondence_task.rb
 create mode 100644 app/models/tasks/mail_tasks_not_related_to_appeal/power_of_attorney_related_correspondence_task.rb
 create mode 100644 app/models/tasks/mail_tasks_not_related_to_appeal/privacy_act_request_correspondence_task.rb
 create mode 100644 app/models/tasks/mail_tasks_not_related_to_appeal/privacy_complaint_correspondence_task.rb
 create mode 100644 app/models/tasks/mail_tasks_not_related_to_appeal/status_inquiry_correspondence_task.rb

diff --git a/app/models/correspondence.rb b/app/models/correspondence.rb
index b1ae74d045e..dabc983b82c 100644
--- a/app/models/correspondence.rb
+++ b/app/models/correspondence.rb
@@ -52,4 +52,8 @@ def docket_number
   def docket_name
     package_document_type.name
   end
+
+  def veteran_full_name
+    veteran.name
+  end
 end
diff --git a/app/models/tasks/mail_tasks_not_related_to_appeal/cavc_correspondence_correspondence_task.rb b/app/models/tasks/mail_tasks_not_related_to_appeal/cavc_correspondence_correspondence_task.rb
new file mode 100644
index 00000000000..a9241aceb4d
--- /dev/null
+++ b/app/models/tasks/mail_tasks_not_related_to_appeal/cavc_correspondence_correspondence_task.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class CavcCorrespondenceCorrespondenceTask < CorrespondenceMailTask
+end
diff --git a/app/models/tasks/mail_tasks_not_related_to_appeal/congressional_interest_correspondence_task.rb b/app/models/tasks/mail_tasks_not_related_to_appeal/congressional_interest_correspondence_task.rb
new file mode 100644
index 00000000000..c84d1da2c79
--- /dev/null
+++ b/app/models/tasks/mail_tasks_not_related_to_appeal/congressional_interest_correspondence_task.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class CongressionalInterestCorrespondenceTask < CorrespondenceMailTask
+end
diff --git a/app/models/tasks/mail_tasks_not_related_to_appeal/correspondence_mail_task.rb b/app/models/tasks/mail_tasks_not_related_to_appeal/correspondence_mail_task.rb
new file mode 100644
index 00000000000..0877065914e
--- /dev/null
+++ b/app/models/tasks/mail_tasks_not_related_to_appeal/correspondence_mail_task.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+# Abstract base class for "tasks not related to an appeal" added to a correspondence during Correspondence Intake.
+class CorrespondenceMailTask < CorrespondenceTask
+  self.abstract_class = true
+
+  def self.create_child_task(parent, current_user, params)
+    Task.create!(
+      type: name,
+      appeal: parent.appeal,
+      appeal_type: Correspondence.name,
+      assigned_by_id: child_assigned_by_id(parent, current_user),
+      parent_id: parent.id,
+      assigned_to: params[:assigned_to] || child_task_assignee(parent, params),
+      instructions: params[:instructions]
+    )
+  end
+end
diff --git a/app/models/tasks/mail_tasks_not_related_to_appeal/death_certificate_correspondence_task.rb b/app/models/tasks/mail_tasks_not_related_to_appeal/death_certificate_correspondence_task.rb
new file mode 100644
index 00000000000..3154e4d7db9
--- /dev/null
+++ b/app/models/tasks/mail_tasks_not_related_to_appeal/death_certificate_correspondence_task.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class DeathCertificateCorrespondenceTask < CorrespondenceMailTask
+end
diff --git a/app/models/tasks/mail_tasks_not_related_to_appeal/foia_request_correspondence_task.rb b/app/models/tasks/mail_tasks_not_related_to_appeal/foia_request_correspondence_task.rb
new file mode 100644
index 00000000000..52a3cee4a42
--- /dev/null
+++ b/app/models/tasks/mail_tasks_not_related_to_appeal/foia_request_correspondence_task.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class FoiaRequestCorrespondenceTask < CorrespondenceMailTask
+end
diff --git a/app/models/tasks/mail_tasks_not_related_to_appeal/other_motion_correspondence_task.rb b/app/models/tasks/mail_tasks_not_related_to_appeal/other_motion_correspondence_task.rb
new file mode 100644
index 00000000000..688dbeb0764
--- /dev/null
+++ b/app/models/tasks/mail_tasks_not_related_to_appeal/other_motion_correspondence_task.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class OtherMotionCorrespondenceTask < CorrespondenceMailTask
+end
diff --git a/app/models/tasks/mail_tasks_not_related_to_appeal/power_of_attorney_related_correspondence_task.rb b/app/models/tasks/mail_tasks_not_related_to_appeal/power_of_attorney_related_correspondence_task.rb
new file mode 100644
index 00000000000..02b067a50ef
--- /dev/null
+++ b/app/models/tasks/mail_tasks_not_related_to_appeal/power_of_attorney_related_correspondence_task.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class PowerOfAttorneyRelatedCorrespondenceTask < CorrespondenceMailTask
+end
diff --git a/app/models/tasks/mail_tasks_not_related_to_appeal/privacy_act_request_correspondence_task.rb b/app/models/tasks/mail_tasks_not_related_to_appeal/privacy_act_request_correspondence_task.rb
new file mode 100644
index 00000000000..ded1fc20b19
--- /dev/null
+++ b/app/models/tasks/mail_tasks_not_related_to_appeal/privacy_act_request_correspondence_task.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class PrivacyActRequestCorrespondenceTask < CorrespondenceMailTask
+end
diff --git a/app/models/tasks/mail_tasks_not_related_to_appeal/privacy_complaint_correspondence_task.rb b/app/models/tasks/mail_tasks_not_related_to_appeal/privacy_complaint_correspondence_task.rb
new file mode 100644
index 00000000000..99baaaab30d
--- /dev/null
+++ b/app/models/tasks/mail_tasks_not_related_to_appeal/privacy_complaint_correspondence_task.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class PrivacyComplaintCorrespondenceTask < CorrespondenceMailTask
+end
diff --git a/app/models/tasks/mail_tasks_not_related_to_appeal/status_inquiry_correspondence_task.rb b/app/models/tasks/mail_tasks_not_related_to_appeal/status_inquiry_correspondence_task.rb
new file mode 100644
index 00000000000..020710f70cd
--- /dev/null
+++ b/app/models/tasks/mail_tasks_not_related_to_appeal/status_inquiry_correspondence_task.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class StatusInquiryCorrespondenceTask < CorrespondenceMailTask
+end
diff --git a/app/services/correspondence_intake_processor.rb b/app/services/correspondence_intake_processor.rb
index 059e89fe163..b7615ebf37b 100644
--- a/app/services/correspondence_intake_processor.rb
+++ b/app/services/correspondence_intake_processor.rb
@@ -159,7 +159,16 @@ def task_class_for_type(task_type)
       "PrivacyComplaintMailTask": PrivacyComplaintMailTask.name,
       "ReconsiderationMotionMailTask": ReconsiderationMotionMailTask.name,
       "ReturnedUndeliverableCorrespondenceMailTask": ReturnedUndeliverableCorrespondenceMailTask.name,
-      "StatusInquiryMailTask": StatusInquiryMailTask.name
+      "StatusInquiryMailTask": StatusInquiryMailTask.name,
+      "DeathCertificateCorrespondenceTask": DeathCertificateCorrespondenceTask.name,
+      "FoiaRequestCorrespondenceTask": FoiaRequestCorrespondenceTask.name,
+      "StatusInquiryCorrespondenceTask": StatusInquiryCorrespondenceTask.name,
+      "OtherMotionCorrespondenceTask": OtherMotionCorrespondenceTask.name,
+      "PrivacyComplaintCorrespondenceTask": PrivacyComplaintCorrespondenceTask.name,
+      "PowerOfAttorneyRelatedCorrespondenceTask": PowerOfAttorneyRelatedCorrespondenceTask.name,
+      "CavcCorrespondenceCorrespondenceTask": CavcCorrespondenceCorrespondenceTask.name,
+      "CongressionalInterestCorrespondenceTask": CongressionalInterestCorrespondenceTask.name,
+      "PrivacyActRequestCorrespondenceTask": PrivacyActRequestCorrespondenceTask.name
     }.with_indifferent_access
 
     task_types[task_type]&.constantize
diff --git a/client/constants/QUEUE_INTAKE_FORM_TASK_TYPES.json b/client/constants/QUEUE_INTAKE_FORM_TASK_TYPES.json
index 377d3de90fd..4835346f245 100644
--- a/client/constants/QUEUE_INTAKE_FORM_TASK_TYPES.json
+++ b/client/constants/QUEUE_INTAKE_FORM_TASK_TYPES.json
@@ -2,55 +2,55 @@
   "unrelatedToAppeal": [
     {
       "value": {
-        "klass": "CavcCorrespondenceMailTask",
+        "klass": "CavcCorrespondenceCorrespondenceTask",
         "assigned_to": "CavcLitigationSupport"
         },
       "label": "CAVC Correspondence"
     }, {
       "value": {
-        "klass": "CongressionalInterestMailTask",
+        "klass": "CongressionalInterestCorrespondenceTask",
         "assigned_to": "LitigationSupport"
         },
       "label": "Congressional Interest"
     }, {
       "value": {
-        "klass": "DeathCertificateMailTask",
+        "klass": "DeathCertificateCorrespondenceTask",
         "assigned_to": "Colocated"
         },
       "label": "Death Certificate"
     }, {
       "value": {
-        "klass": "FoiaRequestMailTask",
+        "klass": "FoiaRequestCorrespondenceTask",
         "assigned_to": "PrivacyTeam"
         },
       "label": "FOIA Request"
     }, {
       "value": {
-        "klass": "OtherMotionMailTask",
+        "klass": "OtherMotionCorrespondenceTask",
         "assigned_to": "LitigationSupport"
         },
       "label": "Other Motion"
     }, {
       "value": {
-        "klass": "PowerOfAttorneyRelatedMailTask",
+        "klass": "PowerOfAttorneyRelatedCorrespondenceTask",
         "assigned_to": "HearingAdmin"
         },
       "label": "Power Of Attorney-Related"
     }, {
       "value": {
-        "klass": "PrivacyActRequestMailTask",
+        "klass": "PrivacyActRequestCorrespondenceTask",
         "assigned_to": "PrivacyTeam"
         },
       "label": "Privacy Act Request"
     }, {
       "value": {
-        "klass": "PrivacyComplaintMailTask",
+        "klass": "PrivacyComplaintCorrespondenceTask",
         "assigned_to": "PrivacyTeam"
         },
       "label": "Privacy Complaint"
     }, {
       "value": {
-        "klass": "StatusInquiryMailTask",
+        "klass": "StatusInquiryCorrespondenceTask",
         "assigned_to": "LitigationSupport"
         },
       "label": "Status Inquiry"
diff --git a/spec/feature/queue/correspondence/submit_intake_form_spec.rb b/spec/feature/queue/correspondence/submit_intake_form_spec.rb
index 89906ef7e18..15f82f2c83f 100644
--- a/spec/feature/queue/correspondence/submit_intake_form_spec.rb
+++ b/spec/feature/queue/correspondence/submit_intake_form_spec.rb
@@ -156,24 +156,15 @@
         find("label", text: "Waive Evidence Window").click
         find_by_id("waiveReason").fill_in with: "test waive note"
         click_button("Continue")
-        find(".cf-pdf-external-link-icon").click
-        page.switch_to_window(page.windows.last)
-        using_wait_time(wait_time) do
-          refresh
-          expect(page).to have_content("Evidence Submission Window Task")
-        end
-        page.switch_to_window(page.windows.first)
+
         click_button("Submit")
         click_button("Confirm")
         using_wait_time(wait_time) do
           expect(page).to have_content("You have successfully submitted a correspondence record")
         end
-        page.switch_to_window(page.windows.last)
-        refresh
-        using_wait_time(wait_time) do
-          page.switch_to_window(page.windows.last)
-          expect(page).to have_no_content("Evidence Submission Window Task")
-        end
+
+        eswt = EvidenceSubmissionWindowTask.find_by(appeal_id: CorrespondencesAppeal.first.appeal_id)
+        expect(eswt.status).to eq("completed")
       end
     end
   end
diff --git a/spec/requests/correspondence_controller_spec.rb b/spec/requests/correspondence_controller_spec.rb
index cf020450989..be7746c1639 100644
--- a/spec/requests/correspondence_controller_spec.rb
+++ b/spec/requests/correspondence_controller_spec.rb
@@ -94,15 +94,15 @@
       end
 
       unrelated_task_types = {
-        "CavcCorrespondenceMailTask": "CavcLitigationSupport",
-        "CongressionalInterestMailTask": "LitigationSupport",
-        "DeathCertificateMailTask": "Colocated",
-        "FoiaRequestMailTask": "PrivacyTeam",
-        "OtherMotionMailTask": "LitigationSupport",
-        "PowerOfAttorneyRelatedMailTask": "HearingAdmin",
-        "PrivacyActRequestMailTask": "PrivacyTeam",
-        "PrivacyComplaintMailTask": "PrivacyTeam",
-        "StatusInquiryMailTask": "LitigationSupport"
+        "CavcCorrespondenceCorrespondenceTask": "CavcLitigationSupport",
+        "CongressionalInterestCorrespondenceTask": "LitigationSupport",
+        "DeathCertificateCorrespondenceTask": "Colocated",
+        "FoiaRequestCorrespondenceTask": "PrivacyTeam",
+        "OtherMotionCorrespondenceTask": "LitigationSupport",
+        "PowerOfAttorneyRelatedCorrespondenceTask": "HearingAdmin",
+        "PrivacyActRequestCorrespondenceTask": "PrivacyTeam",
+        "PrivacyComplaintCorrespondenceTask": "PrivacyTeam",
+        "StatusInquiryCorrespondenceTask": "LitigationSupport"
       }
 
       unrelated_task_types.each do |klass_name, assignee|

From d8f3d2f7fda52263ba019330650bcc9bdc6a0e48 Mon Sep 17 00:00:00 2001
From: piedram <110848569+piedram@users.noreply.github.com>
Date: Wed, 6 Mar 2024 13:03:48 -0500
Subject: [PATCH 141/237] Piedram/appeals 40988 (#20992)

* add nod column in correspondences

* update seed data with the nod value

* fix Reek Violation

* Fix schema file

* fix error about nod

* Fix NOD Correspondence Spec Failure

---------

Co-authored-by: Kamala Madamanchi <kamala.madamanchi@va.gov>
Co-authored-by: Alexander Smith <alex.smith.99@thunderyard.com>
---
 app/models/correspondence.rb                  |  4 -
 app/services/auto_assignable_user_finder.rb   |  2 +-
 .../correspondence_auto_assign_logger.rb      |  8 +-
 ...229165212_nod_column_in_correspondences.rb |  7 ++
 db/schema.rb                                  |  3 +-
 db/seeds/correspondence.rb                    | 81 +++++++++++++++++++
 spec/factories/correspondence.rb              |  3 +-
 .../auto_assignable_user_finder_spec.rb       |  4 +-
 8 files changed, 99 insertions(+), 13 deletions(-)
 create mode 100644 db/migrate/20240229165212_nod_column_in_correspondences.rb

diff --git a/app/models/correspondence.rb b/app/models/correspondence.rb
index 54d3426c80f..eb8aadc0141 100644
--- a/app/models/correspondence.rb
+++ b/app/models/correspondence.rb
@@ -45,10 +45,6 @@ def root_task
     Task.find_by(appeal_id: id, appeal_type: type, type: CorrespondenceRootTask.name)
   end
 
-  def nod?
-    PackageDocumentType.nod == package_document_type
-  end
-
   # Methods below are included to allow Correspondences to render in explain page
 
   # Alias for cmp_packet_number
diff --git a/app/services/auto_assignable_user_finder.rb b/app/services/auto_assignable_user_finder.rb
index 7f734b3c35c..e40d7f7b67c 100644
--- a/app/services/auto_assignable_user_finder.rb
+++ b/app/services/auto_assignable_user_finder.rb
@@ -19,7 +19,7 @@ def get_first_assignable_user(correspondence:)
   private
 
   def run_auto_assign_algorithm(correspondence, vbms_id)
-    return auto_assign_nod(vbms_id) if correspondence.nod?
+    return auto_assign_nod(vbms_id) if correspondence.nod
 
     assignable_users.each do |user|
       if sensitivity_checker.user_can_access?(vbms_id: vbms_id, user_to_check: user.user_obj)
diff --git a/app/services/correspondence_auto_assign_logger.rb b/app/services/correspondence_auto_assign_logger.rb
index 7f0bb2f21e9..45298b7279e 100644
--- a/app/services/correspondence_auto_assign_logger.rb
+++ b/app/services/correspondence_auto_assign_logger.rb
@@ -44,12 +44,12 @@ def assigned(task:, started_at:, assigned_to:)
     attempt.assign_attributes(
       correspondence: correspondence,
       completed_at: Time.current,
-      nod: correspondence.nod?,
+      nod: correspondence.nod,
       status: Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.completed,
       started_at: started_at
     )
 
-    if correspondence.nod?
+    if correspondence.nod
       batch.num_nod_packages_assigned += 1
     else
       batch.num_packages_assigned += 1
@@ -69,12 +69,12 @@ def no_eligible_assignees(task:, started_at:)
     attempt.assign_attributes(
       correspondence: correspondence,
       errored_at: Time.current,
-      nod: correspondence.nod?,
+      nod: correspondence.nod,
       status: Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.error,
       started_at: started_at
     )
 
-    if correspondence.nod?
+    if correspondence.nod
       batch.num_nod_packages_unassigned += 1
     else
       batch.num_packages_unassigned += 1
diff --git a/db/migrate/20240229165212_nod_column_in_correspondences.rb b/db/migrate/20240229165212_nod_column_in_correspondences.rb
new file mode 100644
index 00000000000..d57f0101e61
--- /dev/null
+++ b/db/migrate/20240229165212_nod_column_in_correspondences.rb
@@ -0,0 +1,7 @@
+class NodColumnInCorrespondences < Caseflow::Migration
+  def change
+    safety_assured do
+      add_column :correspondences, :nod, :boolean, null: false, default: false, comment: 'NOD (Notice of Disagreement)'
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 509a36599c1..ec68f3b5867 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2024_02_12_195552) do
+ActiveRecord::Schema.define(version: 2024_02_29_165212) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -695,6 +695,7 @@
     t.integer "cmp_queue_id", comment: "Foreign key to CMP queues table"
     t.integer "correspondence_type_id", comment: "Foreign key for correspondence_types table"
     t.datetime "created_at", null: false, comment: "Standard created_at/updated_at timestamps"
+    t.boolean "nod", default: false, null: false, comment: "NOD (Notice of Disagreement)"
     t.text "notes", comment: "Comes from CMP; can be updated by user"
     t.integer "package_document_type_id", comment: "Represents entire CMP package document type"
     t.datetime "portal_entry_date", comment: "Time when correspondence is created in Caseflow"
diff --git a/db/seeds/correspondence.rb b/db/seeds/correspondence.rb
index 5bea65f1dd8..7f16cf44290 100644
--- a/db/seeds/correspondence.rb
+++ b/db/seeds/correspondence.rb
@@ -10,6 +10,7 @@ def initialize
 
     def seed!
       create_correspondences
+      create_correspondences_nod
     end
 
     private
@@ -146,6 +147,86 @@ def create_correspondences
       end
     end
 
+    def create_correspondences_nod
+      # correspondences with multiple documents
+      10.times do
+        veteran = create_veteran
+        corres = ::Correspondence.create!(
+          uuid: SecureRandom.uuid,
+          portal_entry_date: Time.zone.now,
+          source_type: "Mail",
+          package_document_type_id: 15,
+          correspondence_type_id: 8,
+          cmp_queue_id: 1,
+          nod: true,
+          cmp_packet_number: @cmp_packet_number,
+          va_date_of_receipt: Faker::Date.between(from: 90.days.ago, to: Time.zone.yesterday),
+          notes: "This is a note from CMP.",
+          assigned_by_id: 81,
+          updated_by_id: 81,
+          veteran_id: veteran.id
+        )
+        create_multiple_docs(corres, veteran)
+        @cmp_packet_number += 1
+      end
+
+      (1..24).each do |corres_type_id|
+        veteran = create_veteran
+        corres = ::Correspondence.create!(
+          uuid: SecureRandom.uuid,
+          portal_entry_date: Time.zone.now,
+          source_type: "Mail",
+          package_document_type_id: 15,
+          correspondence_type_id: corres_type_id,
+          cmp_queue_id: 1,
+          nod: true,
+          cmp_packet_number: @cmp_packet_number,
+          va_date_of_receipt: Faker::Date.between(from: 90.days.ago, to: Time.zone.yesterday),
+          notes: "This is a note from CMP.",
+          assigned_by_id: 81,
+          updated_by_id: 81,
+          veteran_id: veteran.id,
+        )
+        CorrespondenceDocument.find_or_create_by(
+          document_file_number: veteran.file_number,
+          uuid: SecureRandom.uuid,
+          vbms_document_type_id: 1250,
+          document_type: 1250,
+          pages: 30,
+          correspondence_id: corres.id
+        )
+        @cmp_packet_number += 1
+      end
+
+      (1..17).each do |cmp_queue_id|
+        veteran = create_veteran
+        corres = ::Correspondence.create!(
+          uuid: SecureRandom.uuid,
+          portal_entry_date: Time.zone.now,
+          source_type: "Mail",
+          package_document_type_id: 15,
+          correspondence_type_id: 8,
+          cmp_queue_id: cmp_queue_id,
+          nod: true,
+          cmp_packet_number: @cmp_packet_number,
+          va_date_of_receipt: Faker::Date.between(from: 90.days.ago, to: Time.zone.yesterday),
+          notes: "This is a note from CMP.",
+          assigned_by_id: 81,
+          updated_by_id: 81,
+          veteran_id: veteran.id,
+        )
+        CorrespondenceDocument.find_or_create_by(
+          document_file_number: veteran.file_number,
+          uuid: SecureRandom.uuid,
+          vbms_document_type_id: 1250,
+          document_type: 1250,
+          pages: 30,
+          correspondence_id: corres.id
+        )
+        @cmp_packet_number += 1
+      end
+    end
+
     def create_multiple_docs(corres, veteran)
       CorrespondenceDocument.find_or_create_by(
         document_file_number: veteran.file_number,
diff --git a/spec/factories/correspondence.rb b/spec/factories/correspondence.rb
index d04e649d56e..7d240ab6971 100644
--- a/spec/factories/correspondence.rb
+++ b/spec/factories/correspondence.rb
@@ -9,6 +9,7 @@
     cmp_packet_number { rand(1_000_000_000..9_999_999_999) }
     va_date_of_receipt { Faker::Date.between(from: 90.days.ago, to: Time.zone.yesterday) }
     notes { "This is a note from CMP." }
+    nod { false }
     assigned_by factory: :user
 
     correspondence_type
@@ -16,7 +17,7 @@
     package_document_type
 
     trait :nod do
-      package_document_type { create(:package_document_type, :nod) }
+      nod { true }
     end
 
     trait :with_single_doc do
diff --git a/spec/services/auto_assignable_user_finder_spec.rb b/spec/services/auto_assignable_user_finder_spec.rb
index 2f91bc023d6..73e8045ec22 100644
--- a/spec/services/auto_assignable_user_finder_spec.rb
+++ b/spec/services/auto_assignable_user_finder_spec.rb
@@ -78,7 +78,7 @@ def generate_assigned_review_package_tasks(amount:, user:)
 
       context "with NOD correspondence" do
         let!(:correspondence_nod) do
-          create(:correspondence, package_document_type: create(:package_document_type, :nod), veteran_id: veteran.id)
+          create(:correspondence, :nod, veteran_id: veteran.id)
         end
         let!(:user_1) { create(:correspondence_auto_assignable_user) }
         let!(:user_2) { create(:correspondence_auto_assignable_user) }
@@ -124,7 +124,7 @@ def generate_assigned_review_package_tasks(amount:, user:)
       context "with NOD correspondence" do
         let!(:nod_user) { create(:correspondence_auto_assignable_user, :nod_enabled) }
         let!(:correspondence_nod) do
-          create(:correspondence, package_document_type: create(:package_document_type, :nod), veteran_id: veteran.id)
+          create(:correspondence, :nod, veteran_id: veteran.id)
         end
 
         before do

From 7e5e98b884ff2188992feb5edc2324954ba7c380 Mon Sep 17 00:00:00 2001
From: Jim Foley <james.foley4@va.gov>
Date: Wed, 6 Mar 2024 11:40:03 -0700
Subject: [PATCH 142/237] Wmedders21/appeals 35479 2 (#21018) (#21048)

* Add new correspondence tasks not related to appeal

* Fix error when submitting correspondence intake

* Add scope tasks_not_related_to_appeal

* Change intake processor to create new correspondence tasks

* Refactor to have new Correspondence task class names

* Refactor to simplify and be less flaky

* Refactor with the updated class names

* add veteran full name

* create abstract base class for tasks not related to an appeal

* remove task not related to appeal scope

* move correspondence mail tasks to folder

* correspondence mail tasks inherit from CorrespondenceMailTask

* remove hard coded true return for task creation verification

* abstract class and create child class override

* replace deleted verification bypass

* revert task creation refactor

Co-authored-by: Will Medders <93014155+wmedders21@users.noreply.github.com>
---
 app/models/correspondence.rb                   |  4 ++++
 .../cavc_correspondence_correspondence_task.rb |  4 ++++
 ...ngressional_interest_correspondence_task.rb |  4 ++++
 .../correspondence_mail_task.rb                | 18 ++++++++++++++++++
 .../death_certificate_correspondence_task.rb   |  4 ++++
 .../foia_request_correspondence_task.rb        |  4 ++++
 .../other_motion_correspondence_task.rb        |  4 ++++
 ..._of_attorney_related_correspondence_task.rb |  4 ++++
 .../privacy_act_request_correspondence_task.rb |  4 ++++
 .../privacy_complaint_correspondence_task.rb   |  4 ++++
 .../status_inquiry_correspondence_task.rb      |  4 ++++
 .../correspondence_intake_processor.rb         | 11 ++++++++++-
 .../QUEUE_INTAKE_FORM_TASK_TYPES.json          | 18 +++++++++---------
 .../correspondence/submit_intake_form_spec.rb  | 17 ++++-------------
 .../requests/correspondence_controller_spec.rb | 18 +++++++++---------
 15 files changed, 90 insertions(+), 32 deletions(-)
 create mode 100644 app/models/tasks/mail_tasks_not_related_to_appeal/cavc_correspondence_correspondence_task.rb
 create mode 100644 app/models/tasks/mail_tasks_not_related_to_appeal/congressional_interest_correspondence_task.rb
 create mode 100644 app/models/tasks/mail_tasks_not_related_to_appeal/correspondence_mail_task.rb
 create mode 100644 app/models/tasks/mail_tasks_not_related_to_appeal/death_certificate_correspondence_task.rb
 create mode 100644 app/models/tasks/mail_tasks_not_related_to_appeal/foia_request_correspondence_task.rb
 create mode 100644 app/models/tasks/mail_tasks_not_related_to_appeal/other_motion_correspondence_task.rb
 create mode 100644 app/models/tasks/mail_tasks_not_related_to_appeal/power_of_attorney_related_correspondence_task.rb
 create mode 100644 app/models/tasks/mail_tasks_not_related_to_appeal/privacy_act_request_correspondence_task.rb
 create mode 100644 app/models/tasks/mail_tasks_not_related_to_appeal/privacy_complaint_correspondence_task.rb
 create mode 100644 app/models/tasks/mail_tasks_not_related_to_appeal/status_inquiry_correspondence_task.rb

diff --git a/app/models/correspondence.rb b/app/models/correspondence.rb
index b1ae74d045e..dabc983b82c 100644
--- a/app/models/correspondence.rb
+++ b/app/models/correspondence.rb
@@ -52,4 +52,8 @@ def docket_number
   def docket_name
     package_document_type.name
   end
+
+  def veteran_full_name
+    veteran.name
+  end
 end
diff --git a/app/models/tasks/mail_tasks_not_related_to_appeal/cavc_correspondence_correspondence_task.rb b/app/models/tasks/mail_tasks_not_related_to_appeal/cavc_correspondence_correspondence_task.rb
new file mode 100644
index 00000000000..a9241aceb4d
--- /dev/null
+++ b/app/models/tasks/mail_tasks_not_related_to_appeal/cavc_correspondence_correspondence_task.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class CavcCorrespondenceCorrespondenceTask < CorrespondenceMailTask
+end
diff --git a/app/models/tasks/mail_tasks_not_related_to_appeal/congressional_interest_correspondence_task.rb b/app/models/tasks/mail_tasks_not_related_to_appeal/congressional_interest_correspondence_task.rb
new file mode 100644
index 00000000000..c84d1da2c79
--- /dev/null
+++ b/app/models/tasks/mail_tasks_not_related_to_appeal/congressional_interest_correspondence_task.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class CongressionalInterestCorrespondenceTask < CorrespondenceMailTask
+end
diff --git a/app/models/tasks/mail_tasks_not_related_to_appeal/correspondence_mail_task.rb b/app/models/tasks/mail_tasks_not_related_to_appeal/correspondence_mail_task.rb
new file mode 100644
index 00000000000..0877065914e
--- /dev/null
+++ b/app/models/tasks/mail_tasks_not_related_to_appeal/correspondence_mail_task.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+# Abstract base class for "tasks not related to an appeal" added to a correspondence during Correspondence Intake.
+class CorrespondenceMailTask < CorrespondenceTask
+  self.abstract_class = true
+
+  def self.create_child_task(parent, current_user, params)
+    Task.create!(
+      type: name,
+      appeal: parent.appeal,
+      appeal_type: Correspondence.name,
+      assigned_by_id: child_assigned_by_id(parent, current_user),
+      parent_id: parent.id,
+      assigned_to: params[:assigned_to] || child_task_assignee(parent, params),
+      instructions: params[:instructions]
+    )
+  end
+end
diff --git a/app/models/tasks/mail_tasks_not_related_to_appeal/death_certificate_correspondence_task.rb b/app/models/tasks/mail_tasks_not_related_to_appeal/death_certificate_correspondence_task.rb
new file mode 100644
index 00000000000..3154e4d7db9
--- /dev/null
+++ b/app/models/tasks/mail_tasks_not_related_to_appeal/death_certificate_correspondence_task.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class DeathCertificateCorrespondenceTask < CorrespondenceMailTask
+end
diff --git a/app/models/tasks/mail_tasks_not_related_to_appeal/foia_request_correspondence_task.rb b/app/models/tasks/mail_tasks_not_related_to_appeal/foia_request_correspondence_task.rb
new file mode 100644
index 00000000000..52a3cee4a42
--- /dev/null
+++ b/app/models/tasks/mail_tasks_not_related_to_appeal/foia_request_correspondence_task.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class FoiaRequestCorrespondenceTask < CorrespondenceMailTask
+end
diff --git a/app/models/tasks/mail_tasks_not_related_to_appeal/other_motion_correspondence_task.rb b/app/models/tasks/mail_tasks_not_related_to_appeal/other_motion_correspondence_task.rb
new file mode 100644
index 00000000000..688dbeb0764
--- /dev/null
+++ b/app/models/tasks/mail_tasks_not_related_to_appeal/other_motion_correspondence_task.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class OtherMotionCorrespondenceTask < CorrespondenceMailTask
+end
diff --git a/app/models/tasks/mail_tasks_not_related_to_appeal/power_of_attorney_related_correspondence_task.rb b/app/models/tasks/mail_tasks_not_related_to_appeal/power_of_attorney_related_correspondence_task.rb
new file mode 100644
index 00000000000..02b067a50ef
--- /dev/null
+++ b/app/models/tasks/mail_tasks_not_related_to_appeal/power_of_attorney_related_correspondence_task.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class PowerOfAttorneyRelatedCorrespondenceTask < CorrespondenceMailTask
+end
diff --git a/app/models/tasks/mail_tasks_not_related_to_appeal/privacy_act_request_correspondence_task.rb b/app/models/tasks/mail_tasks_not_related_to_appeal/privacy_act_request_correspondence_task.rb
new file mode 100644
index 00000000000..ded1fc20b19
--- /dev/null
+++ b/app/models/tasks/mail_tasks_not_related_to_appeal/privacy_act_request_correspondence_task.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class PrivacyActRequestCorrespondenceTask < CorrespondenceMailTask
+end
diff --git a/app/models/tasks/mail_tasks_not_related_to_appeal/privacy_complaint_correspondence_task.rb b/app/models/tasks/mail_tasks_not_related_to_appeal/privacy_complaint_correspondence_task.rb
new file mode 100644
index 00000000000..99baaaab30d
--- /dev/null
+++ b/app/models/tasks/mail_tasks_not_related_to_appeal/privacy_complaint_correspondence_task.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class PrivacyComplaintCorrespondenceTask < CorrespondenceMailTask
+end
diff --git a/app/models/tasks/mail_tasks_not_related_to_appeal/status_inquiry_correspondence_task.rb b/app/models/tasks/mail_tasks_not_related_to_appeal/status_inquiry_correspondence_task.rb
new file mode 100644
index 00000000000..020710f70cd
--- /dev/null
+++ b/app/models/tasks/mail_tasks_not_related_to_appeal/status_inquiry_correspondence_task.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class StatusInquiryCorrespondenceTask < CorrespondenceMailTask
+end
diff --git a/app/services/correspondence_intake_processor.rb b/app/services/correspondence_intake_processor.rb
index 059e89fe163..b7615ebf37b 100644
--- a/app/services/correspondence_intake_processor.rb
+++ b/app/services/correspondence_intake_processor.rb
@@ -159,7 +159,16 @@ def task_class_for_type(task_type)
       "PrivacyComplaintMailTask": PrivacyComplaintMailTask.name,
       "ReconsiderationMotionMailTask": ReconsiderationMotionMailTask.name,
       "ReturnedUndeliverableCorrespondenceMailTask": ReturnedUndeliverableCorrespondenceMailTask.name,
-      "StatusInquiryMailTask": StatusInquiryMailTask.name
+      "StatusInquiryMailTask": StatusInquiryMailTask.name,
+      "DeathCertificateCorrespondenceTask": DeathCertificateCorrespondenceTask.name,
+      "FoiaRequestCorrespondenceTask": FoiaRequestCorrespondenceTask.name,
+      "StatusInquiryCorrespondenceTask": StatusInquiryCorrespondenceTask.name,
+      "OtherMotionCorrespondenceTask": OtherMotionCorrespondenceTask.name,
+      "PrivacyComplaintCorrespondenceTask": PrivacyComplaintCorrespondenceTask.name,
+      "PowerOfAttorneyRelatedCorrespondenceTask": PowerOfAttorneyRelatedCorrespondenceTask.name,
+      "CavcCorrespondenceCorrespondenceTask": CavcCorrespondenceCorrespondenceTask.name,
+      "CongressionalInterestCorrespondenceTask": CongressionalInterestCorrespondenceTask.name,
+      "PrivacyActRequestCorrespondenceTask": PrivacyActRequestCorrespondenceTask.name
     }.with_indifferent_access
 
     task_types[task_type]&.constantize
diff --git a/client/constants/QUEUE_INTAKE_FORM_TASK_TYPES.json b/client/constants/QUEUE_INTAKE_FORM_TASK_TYPES.json
index 377d3de90fd..4835346f245 100644
--- a/client/constants/QUEUE_INTAKE_FORM_TASK_TYPES.json
+++ b/client/constants/QUEUE_INTAKE_FORM_TASK_TYPES.json
@@ -2,55 +2,55 @@
   "unrelatedToAppeal": [
     {
       "value": {
-        "klass": "CavcCorrespondenceMailTask",
+        "klass": "CavcCorrespondenceCorrespondenceTask",
         "assigned_to": "CavcLitigationSupport"
         },
       "label": "CAVC Correspondence"
     }, {
       "value": {
-        "klass": "CongressionalInterestMailTask",
+        "klass": "CongressionalInterestCorrespondenceTask",
         "assigned_to": "LitigationSupport"
         },
       "label": "Congressional Interest"
     }, {
       "value": {
-        "klass": "DeathCertificateMailTask",
+        "klass": "DeathCertificateCorrespondenceTask",
         "assigned_to": "Colocated"
         },
       "label": "Death Certificate"
     }, {
       "value": {
-        "klass": "FoiaRequestMailTask",
+        "klass": "FoiaRequestCorrespondenceTask",
         "assigned_to": "PrivacyTeam"
         },
       "label": "FOIA Request"
     }, {
       "value": {
-        "klass": "OtherMotionMailTask",
+        "klass": "OtherMotionCorrespondenceTask",
         "assigned_to": "LitigationSupport"
         },
       "label": "Other Motion"
     }, {
       "value": {
-        "klass": "PowerOfAttorneyRelatedMailTask",
+        "klass": "PowerOfAttorneyRelatedCorrespondenceTask",
         "assigned_to": "HearingAdmin"
         },
       "label": "Power Of Attorney-Related"
     }, {
       "value": {
-        "klass": "PrivacyActRequestMailTask",
+        "klass": "PrivacyActRequestCorrespondenceTask",
         "assigned_to": "PrivacyTeam"
         },
       "label": "Privacy Act Request"
     }, {
       "value": {
-        "klass": "PrivacyComplaintMailTask",
+        "klass": "PrivacyComplaintCorrespondenceTask",
         "assigned_to": "PrivacyTeam"
         },
       "label": "Privacy Complaint"
     }, {
       "value": {
-        "klass": "StatusInquiryMailTask",
+        "klass": "StatusInquiryCorrespondenceTask",
         "assigned_to": "LitigationSupport"
         },
       "label": "Status Inquiry"
diff --git a/spec/feature/queue/correspondence/submit_intake_form_spec.rb b/spec/feature/queue/correspondence/submit_intake_form_spec.rb
index 89906ef7e18..15f82f2c83f 100644
--- a/spec/feature/queue/correspondence/submit_intake_form_spec.rb
+++ b/spec/feature/queue/correspondence/submit_intake_form_spec.rb
@@ -156,24 +156,15 @@
         find("label", text: "Waive Evidence Window").click
         find_by_id("waiveReason").fill_in with: "test waive note"
         click_button("Continue")
-        find(".cf-pdf-external-link-icon").click
-        page.switch_to_window(page.windows.last)
-        using_wait_time(wait_time) do
-          refresh
-          expect(page).to have_content("Evidence Submission Window Task")
-        end
-        page.switch_to_window(page.windows.first)
+
         click_button("Submit")
         click_button("Confirm")
         using_wait_time(wait_time) do
           expect(page).to have_content("You have successfully submitted a correspondence record")
         end
-        page.switch_to_window(page.windows.last)
-        refresh
-        using_wait_time(wait_time) do
-          page.switch_to_window(page.windows.last)
-          expect(page).to have_no_content("Evidence Submission Window Task")
-        end
+
+        eswt = EvidenceSubmissionWindowTask.find_by(appeal_id: CorrespondencesAppeal.first.appeal_id)
+        expect(eswt.status).to eq("completed")
       end
     end
   end
diff --git a/spec/requests/correspondence_controller_spec.rb b/spec/requests/correspondence_controller_spec.rb
index 55dd09979cf..91bf09b67f4 100644
--- a/spec/requests/correspondence_controller_spec.rb
+++ b/spec/requests/correspondence_controller_spec.rb
@@ -181,15 +181,15 @@
       end
 
       unrelated_task_types = {
-        "CavcCorrespondenceMailTask": "CavcLitigationSupport",
-        "CongressionalInterestMailTask": "LitigationSupport",
-        "DeathCertificateMailTask": "Colocated",
-        "FoiaRequestMailTask": "PrivacyTeam",
-        "OtherMotionMailTask": "LitigationSupport",
-        "PowerOfAttorneyRelatedMailTask": "HearingAdmin",
-        "PrivacyActRequestMailTask": "PrivacyTeam",
-        "PrivacyComplaintMailTask": "PrivacyTeam",
-        "StatusInquiryMailTask": "LitigationSupport"
+        "CavcCorrespondenceCorrespondenceTask": "CavcLitigationSupport",
+        "CongressionalInterestCorrespondenceTask": "LitigationSupport",
+        "DeathCertificateCorrespondenceTask": "Colocated",
+        "FoiaRequestCorrespondenceTask": "PrivacyTeam",
+        "OtherMotionCorrespondenceTask": "LitigationSupport",
+        "PowerOfAttorneyRelatedCorrespondenceTask": "HearingAdmin",
+        "PrivacyActRequestCorrespondenceTask": "PrivacyTeam",
+        "PrivacyComplaintCorrespondenceTask": "PrivacyTeam",
+        "StatusInquiryCorrespondenceTask": "LitigationSupport"
       }
 
       unrelated_task_types.each do |klass_name, assignee|

From 1599cfaca6a8328ca92d56c8f934dea5fc975ace Mon Sep 17 00:00:00 2001
From: HunJerBAH <Jeremy.Hunton@va.gov>
Date: Wed, 6 Mar 2024 13:41:23 -0500
Subject: [PATCH 143/237] Revert "Merge branch 'feature/APPEALS-32900' into
 feature/APPEALS-27311"

This reverts commit 66172aef439e3aeafbec10ca79e5af3fec1309e5, reversing
changes made to 2726e64afc846459000ee23ead220500c9912532.
---
 .../concerns/task_pagination_concern.rb       |  27 -
 app/controllers/correspondence_controller.rb  | 102 +--
 .../correspondence_task_pages_controller.rb   |  17 -
 app/jobs/no_available_modifiers_fix_job.rb    |   1 +
 app/models/correspondence_config.rb           |  68 --
 app/models/correspondence_queue_column.rb     |  45 -
 app/models/correspondence_queue_tab.rb        |  30 -
 app/models/correspondence_task_pager.rb       |  18 -
 app/models/organization.rb                    |  30 -
 app/models/queue_column.rb                    |  11 +-
 .../correspondence_assigned_tasks_tab.rb      |  33 -
 .../correspondence_completed_tasks_tab.rb     |  46 -
 .../correspondence_in_progress_tasks_tab.rb   |  36 -
 .../organization_completed_tasks_tab.rb       |   3 -
 ...orrespondence_action_required_tasks_tab.rb |  41 -
 ...ation_correspondence_assigned_tasks_tab.rb |  36 -
 ...tion_correspondence_completed_tasks_tab.rb |  45 -
 ...zation_correspondence_pending_tasks_tab.rb |  40 -
 ...ion_correspondence_unassigned_tasks_tab.rb |  34 -
 .../work_queue/appeal_search_serializer.rb    |   1 -
 .../correspondence_task_column_serializer.rb  |  60 --
 .../work_queue/task_column_serializer.rb      |   2 +-
 app/models/task_sorter.rb                     |  15 +-
 .../tasks/cavc_correspondence_mail_task.rb    |   8 -
 .../correspondence/reassign_package_task.rb   |   5 -
 .../tasks/correspondence_intake_task.rb       |   4 -
 app/models/tasks/correspondence_task.rb       |  25 +-
 .../tasks/correspondence_task_filter.rb       |  87 --
 .../tasks/efolder_upload_failed_task.rb       |   3 -
 app/models/tasks/remove_package_task.rb       |   5 -
 app/models/tasks/review_package_task.rb       |   8 -
 app/models/user.rb                            |  34 -
 app/models/vacols/case_docket.rb              |   1 +
 .../correspondence_cases.html.erb             |   1 -
 .../correspondence_team.html.erb              |  22 -
 app/views/queue/index.html.erb                |   3 -
 .../correspondence_root_task_factory.rb       |   2 -
 client/COPY.json                              |  10 +-
 client/app/components/FilterOption.jsx        |   1 +
 client/app/components/ReceiptDatePicker.jsx   | 100 --
 client/app/components/TableFilter.jsx         |   7 -
 .../components/TaskCompletedDatePicker.jsx    | 104 ---
 client/app/queue/QueueApp.jsx                 |  29 +-
 client/app/queue/QueueDropdownFilter.jsx      | 141 +--
 client/app/queue/QueueTable.jsx               |   9 +-
 client/app/queue/QueueTableBuilder.jsx        |  14 +-
 .../components/QueueOrganizationDropdown.jsx  |  36 +-
 .../app/queue/components/TaskTableColumns.jsx | 162 +---
 .../correspondence/CorrespondenceCases.jsx    | 166 ++--
 .../correspondence/CorrespondenceTable.jsx    |   6 +-
 .../CorrespondenceTableBuilder.jsx            | 289 ------
 .../correspondenceActions.js                  |  49 -
 .../correspondenceConstants.js                |   5 -
 .../correspondenceReducer.js                  |  39 -
 .../SubmitCorrespondenceModal.jsx             |   2 +-
 .../CorrespondenceReviewPackage.jsx           |   2 +
 client/app/queue/uiReducer/uiActions.js       |  15 -
 client/app/queue/uiReducer/uiConstants.js     |   3 -
 client/app/queue/uiReducer/uiReducer.js       |  21 -
 client/app/queue/utils.js                     |  36 +-
 client/constants/CORRESPONDENCE_TASK_URL.json |   6 -
 client/constants/QUEUE_CONFIG.json            |  57 --
 .../CaseWorkerIndex.test.js.snap              |  89 +-
 .../__snapshots__/QueueTable.test.js.snap     |   2 -
 config/routes.rb                              |   4 -
 db/seeds.rb                                   |   1 -
 db/seeds/helpers/queue_helpers.rb             | 153 ----
 db/seeds/queue_correspondences.rb             | 195 ----
 lib/tasks/correspondence.rake                 |   1 -
 spec/factories/correspondence.rb              |   7 +-
 spec/factories/task.rb                        |   2 -
 .../correspondence_cases_batch_assignment.rb  | 163 ----
 .../correspondence_cases_spec.rb              | 866 +-----------------
 .../correspondence_queue_task_link_spec.rb    | 118 ---
 .../correspondence/review_package_spec.rb     |   2 +-
 spec/models/correspondence_config_spec.rb     | 106 ---
 spec/models/task_spec.rb                      | 122 ---
 .../correspondence_controller_spec.rb         |  87 --
 ...ondence_documents_efolder_uploader_spec.rb |   5 +-
 spec/support/correspondence_task_helpers.rb   |  37 -
 80 files changed, 175 insertions(+), 4043 deletions(-)
 delete mode 100644 app/controllers/correspondence_task_pages_controller.rb
 delete mode 100644 app/models/correspondence_config.rb
 delete mode 100644 app/models/correspondence_queue_column.rb
 delete mode 100644 app/models/correspondence_queue_tab.rb
 delete mode 100644 app/models/correspondence_task_pager.rb
 delete mode 100644 app/models/queue_tabs/correspondence_assigned_tasks_tab.rb
 delete mode 100644 app/models/queue_tabs/correspondence_completed_tasks_tab.rb
 delete mode 100644 app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb
 delete mode 100644 app/models/queue_tabs/organization_correspondence_action_required_tasks_tab.rb
 delete mode 100644 app/models/queue_tabs/organization_correspondence_assigned_tasks_tab.rb
 delete mode 100644 app/models/queue_tabs/organization_correspondence_completed_tasks_tab.rb
 delete mode 100644 app/models/queue_tabs/organization_correspondence_pending_tasks_tab.rb
 delete mode 100644 app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb
 delete mode 100644 app/models/serializers/work_queue/correspondence_task_column_serializer.rb
 delete mode 100644 app/models/tasks/correspondence_task_filter.rb
 delete mode 100644 app/views/correspondence/correspondence_team.html.erb
 delete mode 100644 client/app/components/ReceiptDatePicker.jsx
 delete mode 100644 client/app/components/TaskCompletedDatePicker.jsx
 delete mode 100644 client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
 delete mode 100644 client/constants/CORRESPONDENCE_TASK_URL.json
 delete mode 100644 db/seeds/helpers/queue_helpers.rb
 delete mode 100644 db/seeds/queue_correspondences.rb
 delete mode 100644 spec/feature/queue/correspondence/correspondence_cases_batch_assignment.rb
 delete mode 100644 spec/feature/queue/correspondence/correspondence_queue_task_link_spec.rb
 delete mode 100644 spec/models/correspondence_config_spec.rb
 delete mode 100644 spec/support/correspondence_task_helpers.rb

diff --git a/app/controllers/concerns/task_pagination_concern.rb b/app/controllers/concerns/task_pagination_concern.rb
index b3c61cef704..eb2ce725391 100644
--- a/app/controllers/concerns/task_pagination_concern.rb
+++ b/app/controllers/concerns/task_pagination_concern.rb
@@ -17,28 +17,8 @@ def pagination_json
     }
   end
 
-  def correspondence_pagination_json
-    {
-      tasks: correspondence_json_tasks(correspondence_task_pager.paged_tasks),
-      task_page_count: correspondence_task_pager.task_page_count,
-      total_task_count: correspondence_task_pager.total_task_count,
-      tasks_per_page: CorrespondenceTaskPager::TASKS_PER_PAGE
-    }
-  end
-
   private
 
-  def correspondence_task_pager
-    @correspondence_task_pager ||= CorrespondenceTaskPager.new(
-      assignee: assignee,
-      tab_name: params[Constants.QUEUE_CONFIG.TAB_NAME_REQUEST_PARAM.to_sym],
-      page: params[Constants.QUEUE_CONFIG.PAGE_NUMBER_REQUEST_PARAM.to_sym],
-      sort_order: params[Constants.QUEUE_CONFIG.SORT_DIRECTION_REQUEST_PARAM.to_sym],
-      sort_by: params[Constants.QUEUE_CONFIG.SORT_COLUMN_REQUEST_PARAM.to_sym],
-      filters: params[Constants.QUEUE_CONFIG.FILTER_COLUMN_REQUEST_PARAM.to_sym]
-    )
-  end
-
   def task_pager
     @task_pager ||= TaskPager.new(
       assignee: assignee,
@@ -50,13 +30,6 @@ def task_pager
     )
   end
 
-  def correspondence_json_tasks(tasks)
-    { data: WorkQueue::CorrespondenceTaskColumnSerializer.new(
-      tasks,
-      is_collection: true
-    ).serializable_hash[:data] }
-  end
-
   def json_tasks(tasks)
     tasks = AppealRepository.eager_load_legacy_appeals_for_tasks(tasks)
     params = { user: current_user }
diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index b56feeafb49..1d36aacae74 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -7,7 +7,6 @@ class CorrespondenceController < ApplicationController
   before_action :correspondence
   before_action :auto_texts
   before_action :veteran_information
-  MAX_QUEUED_ITEMS = 60
 
   def intake
     respond_to do |format|
@@ -41,39 +40,14 @@ def current_step
   end
 
   def correspondence_cases
-    if current_user.mail_supervisor?
-      redirect_to "/queue/correspondence/team"
-    elsif current_user.mail_superuser? || current_user.mail_team_user?
-      respond_to do |format|
-        format.html { "your_correspondence" }
-        format.json do
-          render json: { correspondence_config: CorrespondenceConfig.new(assignee: current_user) }
-        end
-      end
-    else
-      redirect_to "/unauthorized"
-    end
-  end
-
-  def mail_team_users
-    mail_team_users = User.mail_team_users
     respond_to do |format|
+      format.html { "correspondence_cases" }
       format.json do
-        render json: { mail_team_users: mail_team_users }
+        render json: { vetCorrespondences: veterans_with_correspondences }
       end
     end
   end
 
-  def correspondence_team
-    if current_user.mail_superuser? || current_user.mail_supervisor?
-      handle_mail_superuser_or_supervisor
-    elsif current_user.mail_team_user?
-      redirect_to "/queue/correspondence"
-    else
-      redirect_to "/unauthorized"
-    end
-  end
-
   def review_package
     render "correspondence/review_package"
   end
@@ -200,74 +174,6 @@ def process_intake
 
   private
 
-  def handle_mail_superuser_or_supervisor
-    @mail_team_users = User.mail_team_users.pluck(:css_id)
-    mail_team_user = User.find_by(css_id: params[:user]) if params[:user].present?
-    task_ids = params[:taskIds]&.split(",") if params[:taskIds].present?
-    tab = params[:tab] if params[:tab].present?
-
-    respond_to do |format|
-      format.html { handle_html_response(mail_team_user, task_ids, tab) }
-      format.json { handle_json_response(mail_team_user, task_ids, tab) }
-    end
-  end
-
-  def handle_html_response(mail_team_user, task_ids, tab)
-    if mail_team_user && task_ids.present?
-      set_banner_params(mail_team_user, task_ids.count, tab)
-      update_tasks(mail_team_user, task_ids)
-    end
-    render "correspondence_team"
-  end
-
-  def handle_json_response(mail_team_user, task_ids, tab)
-    if mail_team_user && task_ids.present?
-      set_banner_params(mail_team_user, task_ids&.count, tab)
-    else
-      render json: { correspondence_config: CorrespondenceConfig.new(assignee: InboundOpsTeam.singleton) }
-    end
-  end
-
-  def update_tasks(mail_team_user, task_ids)
-    return unless @response_type == "success"
-
-    tasks = Task.where(id: task_ids)
-    tasks.update_all(assigned_to_id: mail_team_user.id, assigned_to_type: "User", status: "assigned")
-  end
-
-  def set_banner_params(user, task_count, tab)
-    template = message_template(user, task_count, tab)
-    response_type(user)
-    @response_header = template[:header]
-    @response_message = template[:message]
-  end
-
-  def message_template(user, task_count, tab)
-    success_header_unassigned = "You have successfully assigned #{task_count} Correspondence to #{user.css_id}."
-    success_header_assigned = "You have successfully reassigned #{task_count} Correspondence to #{user.css_id}."
-    success_message = "Please go to your individual queue to see any self-assigned correspondence."
-    failure_header_unassigned = "Correspondence assignment to #{user.css_id} has failed"
-    failure_header_assigned = "Correspondence reassignment to #{user.css_id} has failed"
-    failure_message = "Queue volume has reached maximum capacity for this user."
-
-    case tab
-    when "correspondence_unassigned"
-      {
-        header: (user.tasks.length < MAX_QUEUED_ITEMS) ? success_header_unassigned : failure_header_unassigned,
-        message: (user.tasks.length < MAX_QUEUED_ITEMS) ? success_message : failure_message
-      }
-    when "correspondence_team_assigned"
-      {
-        header: (user.tasks.length < MAX_QUEUED_ITEMS) ? success_header_assigned : failure_header_assigned,
-        message: (user.tasks.length < MAX_QUEUED_ITEMS) ? success_message : failure_message
-      }
-    end
-  end
-
-  def response_type(user)
-    @response_type = (user.tasks.length < MAX_QUEUED_ITEMS) ? "success" : "warning"
-  end
-
   # :reek:FeatureEnvy
   def vbms_document_types
     begin
@@ -295,9 +201,7 @@ def set_flash_intake_success_message
 
   def verify_correspondence_access
     return true if InboundOpsTeam.singleton.user_has_access?(current_user) ||
-                   MailTeam.singleton.user_has_access?(current_user) ||
-                   BvaIntake.singleton.user_is_admin?(current_user) ||
-                   MailTeam.singleton.user_is_admin?(current_user)
+                   MailTeam.singleton.user_has_access?(current_user)
 
     redirect_to "/unauthorized"
   end
diff --git a/app/controllers/correspondence_task_pages_controller.rb b/app/controllers/correspondence_task_pages_controller.rb
deleted file mode 100644
index 92686e06d66..00000000000
--- a/app/controllers/correspondence_task_pages_controller.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-class CorrespondenceTaskPagesController < ApplicationController
-  include TaskPaginationConcern
-
-  def index
-    render json: correspondence_pagination_json
-  end
-
-  def assignee
-    if params[:user_id]
-      User.find(params[:user_id])
-    elsif params[:organization_id]
-      Organization.find(params[:organization_id])
-    end
-  end
-end
diff --git a/app/jobs/no_available_modifiers_fix_job.rb b/app/jobs/no_available_modifiers_fix_job.rb
index cd2fe35bc32..6cbf4c65a50 100644
--- a/app/jobs/no_available_modifiers_fix_job.rb
+++ b/app/jobs/no_available_modifiers_fix_job.rb
@@ -50,6 +50,7 @@ def process_records(supp_claims, available_space)
     supp_claims.each do |sc|
       next if available_space <= 0
 
+      # binding.pry
       @stuck_job_report_service.append_single_record(sc.class.name, sc.id)
       ActiveRecord::Base.transaction do
         DecisionReviewProcessJob.perform_now(sc)
diff --git a/app/models/correspondence_config.rb b/app/models/correspondence_config.rb
deleted file mode 100644
index 6712a25caba..00000000000
--- a/app/models/correspondence_config.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-# frozen_string_literal: true
-
-# :reek:RepeatedConditional
-
-class CorrespondenceConfig < QueueConfig
-  def to_hash
-    {
-      table_title: table_title,
-      active_tab: default_active_tab,
-      tasks_per_page: 15,
-      use_task_pages_api: true,
-      tabs: assignee.correspondence_queue_tabs.map { |tab| attach_tasks_to_tab(tab) }
-    }
-  end
-
-  private
-
-  # :reek:FeatureEnvy
-  def attach_tasks_to_tab(tab)
-    task_pager = CorrespondenceTaskPager.new(
-      assignee: assignee,
-      tab_name: tab.name,
-      sort_by: tab.default_sorting_column.name,
-      sort_order: tab.default_sorting_direction
-    )
-    endpoint = "task_pages?#{Constants.QUEUE_CONFIG.TAB_NAME_REQUEST_PARAM}=#{tab.name}"
-    base_path = if assignee_is_org?
-                  "organizations/#{assignee.id}/#{endpoint}"
-                else
-                  "correspondence/users/#{assignee.id}/#{endpoint}"
-                end
-
-    tab.to_hash.merge(
-      tasks: serialized_tasks_for_columns(task_pager.paged_tasks, tab.column_names),
-      task_page_count: task_pager.task_page_count,
-      total_task_count: task_pager.total_task_count,
-      task_page_endpoint_base_path: base_path
-    )
-  end
-
-  def serialized_tasks_for_columns(tasks, columns)
-    WorkQueue::CorrespondenceTaskColumnSerializer.new(
-      tasks,
-      is_collection: true,
-      params: { columns: columns }
-    ).serializable_hash[:data]
-  end
-
-  def table_title
-    if assignee_is_org?
-      Constants.QUEUE_CONFIG.CORRESPONDENCE_ORG_TABLE_TITLE
-    else
-      Constants.QUEUE_CONFIG.CORRESPONDENCE_USER_TABLE_TITLE
-    end
-  end
-
-  def default_active_tab
-    if assignee_is_org?
-      Constants.QUEUE_CONFIG.CORRESPONDENCE_UNASSIGNED_TASKS_TAB_NAME
-    else
-      Constants.QUEUE_CONFIG.CORRESPONDENCE_ASSIGNED_TASKS_TAB_NAME
-    end
-  end
-
-  def default_sorting_column
-    Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name
-  end
-end
diff --git a/app/models/correspondence_queue_column.rb b/app/models/correspondence_queue_column.rb
deleted file mode 100644
index 80ffa3d347d..00000000000
--- a/app/models/correspondence_queue_column.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-class CorrespondenceQueueColumn < QueueColumn
-  include ActiveModel::Model
-
-  attr_accessor :filterable, :name
-
-  def initialize(args)
-    super
-    @filterable ||= false
-  end
-
-  def to_hash(tasks)
-    {
-      name: name,
-      filterable: filterable,
-      filter_options: filterable ? filter_options(tasks) : []
-    }
-  end
-
-  FILTER_OPTIONS = {
-    Constants.QUEUE_CONFIG.COLUMNS.TASK_TYPE.name => :task_type_options,
-    Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name => :va_dor_options,
-    Constants.QUEUE_CONFIG.COLUMNS.TASK_CLOSED_DATE.name => :date_completed_options,
-    Constants.QUEUE_CONFIG.COLUMNS.TASK_ASSIGNEE.name => :task_type_options
-  }.freeze
-
-  private
-
-  def task_type_options(tasks)
-    tasks.group(:type).count.each_pair.map do |option, count|
-      label = self.class.format_option_label(Object.const_get(option).label, count)
-      self.class.filter_option_hash(option, label)
-    end
-  end
-
-  # placeholder method because the function is required
-  def va_dor_options(dummy)
-    dummy
-  end
-
-  def date_completed_options(dummy)
-    dummy
-  end
-end
diff --git a/app/models/correspondence_queue_tab.rb b/app/models/correspondence_queue_tab.rb
deleted file mode 100644
index fee50b3bd03..00000000000
--- a/app/models/correspondence_queue_tab.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-class CorrespondenceQueueTab < QueueTab
-  def columns
-    column_names.map { |column_name| CorrespondenceQueueColumn.from_name(column_name) }
-  end
-
-  def task_includes
-    [
-      { appeal: [:package_document_type] },
-      :assigned_by,
-      :assigned_to,
-      :children,
-      :parent
-    ]
-  end
-
-  # :reek:UtilityFunction
-  def default_sorting_column
-    CorrespondenceQueueColumn.from_name(Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name)
-  end
-
-  # If you don't create your own tab name it will default to the tab defined in QueueTab
-  def self.from_name(tab_name)
-    tab = descendants.find { |subclass| subclass.tab_name == tab_name }
-    fail(Caseflow::Error::InvalidTaskTableTab, tab_name: tab_name) unless tab
-
-    tab
-  end
-end
diff --git a/app/models/correspondence_task_pager.rb b/app/models/correspondence_task_pager.rb
deleted file mode 100644
index 53a6eb494c6..00000000000
--- a/app/models/correspondence_task_pager.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-class CorrespondenceTaskPager < TaskPager
-  def filtered_tasks
-    CorrespondenceTaskFilter.new(filter_params: filters, tasks: tasks_for_tab).filtered_tasks
-  end
-
-  def queue_tab
-    @queue_tab ||= CorrespondenceQueueTab.from_name(tab_name).new(assignee: assignee)
-  end
-
-  def paged_tasks
-    @paged_tasks ||= begin
-      tasks = sorted_tasks(filtered_tasks)
-      pagination_enabled ? tasks.page(page).per(TASKS_PER_PAGE) : tasks
-    end
-  end
-end
diff --git a/app/models/organization.rb b/app/models/organization.rb
index 78d0fb32cae..9b05f6d3287 100644
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@@ -138,16 +138,6 @@ def queue_tabs
     ]
   end
 
-  def correspondence_queue_tabs
-    [
-      correspondence_unassigned_tasks_tab,
-      correspondence_action_required_tasks_tab,
-      correspondence_pending_tasks_tab,
-      correspondence_assigned_tasks_tab,
-      correspondence_completed_tasks_tab
-    ]
-  end
-
   def unassigned_tasks_tab
     ::OrganizationUnassignedTasksTab.new(
       assignee: self,
@@ -168,26 +158,6 @@ def completed_tasks_tab
     ::OrganizationCompletedTasksTab.new(assignee: self, show_regional_office_column: show_regional_office_in_queue?)
   end
 
-  def correspondence_unassigned_tasks_tab
-    ::OrganizationCorrespondenceUnassignedTasksTab.new(assignee: self)
-  end
-
-  def correspondence_action_required_tasks_tab
-    ::OrganizationCorrespondenceActionRequiredTasksTab.new(assignee: self)
-  end
-
-  def correspondence_assigned_tasks_tab
-    ::OrganizationCorrespondenceAssignedTasksTab.new(assignee: self)
-  end
-
-  def correspondence_pending_tasks_tab
-    ::OrganizationCorrespondencePendingTasksTab.new(assignee: self)
-  end
-
-  def correspondence_completed_tasks_tab
-    ::OrganizationCorrespondenceCompletedTasksTab.new(assignee: self)
-  end
-
   def serialize
     {
       accepts_priority_pushed_cases: accepts_priority_pushed_cases,
diff --git a/app/models/queue_column.rb b/app/models/queue_column.rb
index 162d0dae631..b848c345925 100644
--- a/app/models/queue_column.rb
+++ b/app/models/queue_column.rb
@@ -41,8 +41,7 @@ def to_hash(tasks)
   }.freeze
 
   def filter_options(tasks)
-    filter_option_func = self.class::FILTER_OPTIONS[name]
-
+    filter_option_func = FILTER_OPTIONS[name]
     if filter_option_func
       send(filter_option_func, tasks)
     else
@@ -69,14 +68,6 @@ def self.filter_option_hash(value, label)
 
   private
 
-  def va_dor_options
-    nil
-  end
-
-  def date_completed_options
-    nil
-  end
-
   def case_type_options(tasks)
     options = tasks.with_cached_appeals.group(:case_type).count.each_pair.map do |option, count|
       label = self.class.format_option_label(option, count)
diff --git a/app/models/queue_tabs/correspondence_assigned_tasks_tab.rb b/app/models/queue_tabs/correspondence_assigned_tasks_tab.rb
deleted file mode 100644
index a1074835cfd..00000000000
--- a/app/models/queue_tabs/correspondence_assigned_tasks_tab.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-class CorrespondenceAssignedTasksTab < CorrespondenceQueueTab
-  validate :assignee_is_user
-
-  # :reek:UtilityFunction
-  def label
-    Constants.QUEUE_CONFIG.CORRESPONDENCE_ASSIGNED_TASKS_LABEL
-  end
-
-  def self.tab_name
-    Constants.QUEUE_CONFIG.CORRESPONDENCE_ASSIGNED_TASKS_TAB_NAME
-  end
-
-  # :reek:UtilityFunction
-  def description
-    Constants.QUEUE_CONFIG.CORRESPONDENCE_ASSIGNED_TASKS_DESCRIPTION
-  end
-
-  def tasks
-    CorrespondenceTask.where(assigned_to_id: assignee.id)
-  end
-
-  # :reek:UtilityFunction
-  def column_names
-    [
-      Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
-      Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
-      Constants.QUEUE_CONFIG.COLUMNS.DAYS_WAITING_CORRESPONDENCE.name,
-      Constants.QUEUE_CONFIG.COLUMNS.NOTES.name
-    ]
-  end
-end
diff --git a/app/models/queue_tabs/correspondence_completed_tasks_tab.rb b/app/models/queue_tabs/correspondence_completed_tasks_tab.rb
deleted file mode 100644
index 356a4f34ff9..00000000000
--- a/app/models/queue_tabs/correspondence_completed_tasks_tab.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-class CorrespondenceCompletedTasksTab < CorrespondenceQueueTab
-  validate :assignee_is_user
-
-  # :reek:UtilityFunction
-  def label
-    Constants.QUEUE_CONFIG.CORRESPONDENCE_COMPLETED_TASKS_LABEL
-  end
-
-  def self.tab_name
-    Constants.QUEUE_CONFIG.CORRESPONDENCE_COMPLETED_TASKS_TAB_NAME
-  end
-
-  # :reek:UtilityFunction
-  def description
-    Constants.QUEUE_CONFIG.CORRESPONDENCE_COMPLETED_TASKS_DESCRIPTION
-  end
-
-  def tasks
-    completed_root_tasks = CorrespondenceRootTask.includes(:children).where(
-      status: Constants.TASK_STATUSES.completed,
-      assigned_to: assignee
-    ).pluck(:id)
-
-    tasks_with_completed_children = CorrespondenceRootTask.includes(:children)
-      .where.not(status: Constants.TASK_STATUSES.completed)
-      .filter do |task|
-        task.children.all?(&:completed?) && task.children.any? { |child| child.assigned_to == assignee }
-      end
-      .pluck(:id)
-
-    CorrespondenceTask.includes(*task_includes)
-      .where(id: completed_root_tasks + tasks_with_completed_children).recently_completed
-  end
-
-  # :reek:UtilityFunction
-  def column_names
-    [
-      Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
-      Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
-      Constants.QUEUE_CONFIG.COLUMNS.TASK_CLOSED_DATE.name,
-      Constants.QUEUE_CONFIG.COLUMNS.NOTES.name
-    ]
-  end
-end
diff --git a/app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb b/app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb
deleted file mode 100644
index 1cf5e82b6b9..00000000000
--- a/app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-class CorrespondenceInProgressTasksTab < CorrespondenceQueueTab
-  validate :assignee_is_user
-
-  # :reek:UtilityFunction
-  def label
-    Constants.QUEUE_CONFIG.CORRESPONDENCE_IN_PROGRESS_TASKS_LABEL
-  end
-
-  def self.tab_name
-    Constants.QUEUE_CONFIG.CORRESPONDENCE_IN_PROGRESS_TASKS_TAB_NAME
-  end
-
-  # :reek:UtilityFunction
-  def description
-    Constants.QUEUE_CONFIG.CORRESPONDENCE_IN_PROGRESS_TASKS_DESCRIPTION
-  end
-
-  def tasks
-    CorrespondenceTask.where(assigned_to: assignee)
-      .where.not(type: "EfolderUploadFailedTask")
-      .where(status: ["in_progress", "on_hold"]).in_progress
-  end
-
-  # :reek:UtilityFunction
-  def column_names
-    [
-      Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
-      Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
-      Constants.QUEUE_CONFIG.COLUMNS.TASK_TYPE.name,
-      Constants.QUEUE_CONFIG.COLUMNS.DAYS_WAITING_CORRESPONDENCE.name,
-      Constants.QUEUE_CONFIG.COLUMNS.NOTES.name
-    ]
-  end
-end
diff --git a/app/models/queue_tabs/organization_completed_tasks_tab.rb b/app/models/queue_tabs/organization_completed_tasks_tab.rb
index 385a3961f1c..f189af5cada 100644
--- a/app/models/queue_tabs/organization_completed_tasks_tab.rb
+++ b/app/models/queue_tabs/organization_completed_tasks_tab.rb
@@ -3,7 +3,6 @@
 class OrganizationCompletedTasksTab < QueueTab
   validate :assignee_is_organization
 
-  # :reek:UtilityFunction
   def label
     COPY::QUEUE_PAGE_COMPLETE_TAB_TITLE
   end
@@ -12,7 +11,6 @@ def self.tab_name
     Constants.QUEUE_CONFIG.COMPLETED_TASKS_TAB_NAME
   end
 
-  # :reek:UtilityFunction
   def description
     COPY::QUEUE_PAGE_COMPLETE_LAST_SEVEN_DAYS_TASKS_DESCRIPTION
   end
@@ -21,7 +19,6 @@ def tasks
     recently_completed_tasks
   end
 
-  # :reek:UtilityFunction
   # rubocop:disable Metrics/AbcSize
   def column_names
     [
diff --git a/app/models/queue_tabs/organization_correspondence_action_required_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_action_required_tasks_tab.rb
deleted file mode 100644
index d4481cd2507..00000000000
--- a/app/models/queue_tabs/organization_correspondence_action_required_tasks_tab.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-class OrganizationCorrespondenceActionRequiredTasksTab < CorrespondenceQueueTab
-  validate :assignee_is_organization
-
-  # :reek:UtilityFunction
-  def label
-    Constants.QUEUE_CONFIG.CORRESPONDENCE_ACTION_REQUIRED_TASKS_LABEL
-  end
-
-  def self.tab_name
-    Constants.QUEUE_CONFIG.CORRESPONDENCE_ACTION_REQUIRED_TASKS_TAB_NAME
-  end
-
-  # :reek:UtilityFunction
-  def description
-    Constants.QUEUE_CONFIG.CORRESPONDENCE_ACTION_REQUIRED_TASKS_DESCRIPTION
-  end
-
-  def tasks
-    tasks = CorrespondenceTask.includes(*task_includes).package_action_tasks
-
-    tasks = if RequestStore[:current_user].mail_supervisor?
-              tasks.where(assigned_to: assignee).active
-            else
-              tasks.where.not(type: RemovePackageTask.name).where(assigned_to: assignee).active
-            end
-  end
-
-  # :reek:UtilityFunction
-  def column_names
-    [
-      Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
-      Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
-      Constants.QUEUE_CONFIG.COLUMNS.DAYS_WAITING_CORRESPONDENCE.name,
-      Constants.QUEUE_CONFIG.COLUMNS.TASK_ASSIGNED_BY.name,
-      Constants.QUEUE_CONFIG.COLUMNS.ACTION_TYPE.name,
-      Constants.QUEUE_CONFIG.COLUMNS.NOTES.name
-    ]
-  end
-end
diff --git a/app/models/queue_tabs/organization_correspondence_assigned_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_assigned_tasks_tab.rb
deleted file mode 100644
index 355335fe744..00000000000
--- a/app/models/queue_tabs/organization_correspondence_assigned_tasks_tab.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-class OrganizationCorrespondenceAssignedTasksTab < CorrespondenceQueueTab
-  validate :assignee_is_organization
-
-  # :reek:UtilityFunction
-  def label
-    Constants.QUEUE_CONFIG.CORRESPONDENCE_TEAM_ASSIGNED_TASKS_LABEL
-  end
-
-  def self.tab_name
-    Constants.QUEUE_CONFIG.CORRESPONDENCE_TEAM_ASSIGNED_TASKS_TAB_NAME
-  end
-
-  # :reek:UtilityFunction
-  def description
-    Constants.QUEUE_CONFIG.CORRESPONDENCE_TEAM_ASSIGNED_TASKS_DESCRIPTION
-  end
-
-  def tasks
-    CorrespondenceTask.includes(*task_includes).active.where.not(assigned_to_type: "Organization")
-  end
-
-  # :reek:UtilityFunction
-  def column_names
-    [
-      Constants.QUEUE_CONFIG.COLUMNS.CHECKBOX_COLUMN.name,
-      Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
-      Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
-      Constants.QUEUE_CONFIG.COLUMNS.DAYS_WAITING_CORRESPONDENCE.name,
-      Constants.QUEUE_CONFIG.COLUMNS.TASK_TYPE.name,
-      Constants.QUEUE_CONFIG.COLUMNS.TASK_ASSIGNEE.name,
-      Constants.QUEUE_CONFIG.COLUMNS.NOTES.name
-    ]
-  end
-end
diff --git a/app/models/queue_tabs/organization_correspondence_completed_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_completed_tasks_tab.rb
deleted file mode 100644
index f45f434eebe..00000000000
--- a/app/models/queue_tabs/organization_correspondence_completed_tasks_tab.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-class OrganizationCorrespondenceCompletedTasksTab < CorrespondenceQueueTab
-  validate :assignee_is_organization
-
-  # :reek:UtilityFunction
-  def label
-    Constants.QUEUE_CONFIG.CORRESPONDENCE_TEAM_COMPLETED_TASKS_LABEL
-  end
-
-  def self.tab_name
-    Constants.QUEUE_CONFIG.CORRESPONDENCE_TEAM_COMPLETED_TASKS_TAB_NAME
-  end
-
-  # :reek:UtilityFunction
-  def description
-    Constants.QUEUE_CONFIG.CORRESPONDENCE_TEAM_COMPLETED_TASKS_DESCRIPTION
-  end
-
-  def tasks
-    completed_root_tasks = CorrespondenceRootTask.includes(:children).where(
-      status: Constants.TASK_STATUSES.completed,
-      assigned_to: assignee
-    ).pluck(:id)
-
-    tasks_with_completed_children = CorrespondenceRootTask.includes(:children).where.not(
-      status: Constants.TASK_STATUSES.completed
-    ).select do |task|
-      task.children.all?(&:completed?)
-    end.pluck(:id)
-
-    CorrespondenceTask.includes(*task_includes)
-      .where(id: completed_root_tasks + tasks_with_completed_children).recently_completed
-  end
-
-  # :reek:UtilityFunction
-  def column_names
-    [
-      Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
-      Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
-      Constants.QUEUE_CONFIG.COLUMNS.TASK_CLOSED_DATE.name,
-      Constants.QUEUE_CONFIG.COLUMNS.NOTES.name
-    ]
-  end
-end
diff --git a/app/models/queue_tabs/organization_correspondence_pending_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_pending_tasks_tab.rb
deleted file mode 100644
index 085e0fc01cb..00000000000
--- a/app/models/queue_tabs/organization_correspondence_pending_tasks_tab.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-class OrganizationCorrespondencePendingTasksTab < CorrespondenceQueueTab
-  validate :assignee_is_organization
-
-  # :reek:UtilityFunction
-  def label
-    Constants.QUEUE_CONFIG.CORRESPONDENCE_PENDING_TASKS_LABEL
-  end
-
-  def self.tab_name
-    Constants.QUEUE_CONFIG.CORRESPONDENCE_PENDING_TASKS_TAB_NAME
-  end
-
-  # :reek:UtilityFunction
-  def description
-    Constants.QUEUE_CONFIG.CORRESPONDENCE_PENDING_TASKS_DESCRIPTION
-  end
-
-  # :reek:UtilityFunction
-  def tasks
-    Task.none
-    # CorrespondenceTask
-    # .where(status: "on_hold")
-    # .find(
-    #   MailTask.active.where(appeal_type: "Correspondence").pluck(:parent_id)
-    # )
-  end
-
-  # :reek:UtilityFunction
-  def column_names
-    [
-      Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
-      Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
-      Constants.QUEUE_CONFIG.COLUMNS.DAYS_WAITING_CORRESPONDENCE.name,
-      Constants.QUEUE_CONFIG.COLUMNS.TASK_TYPE.name,
-      Constants.QUEUE_CONFIG.COLUMNS.TASK_ASSIGNEE.name
-    ]
-  end
-end
diff --git a/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb
deleted file mode 100644
index 60e84ba378c..00000000000
--- a/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-class OrganizationCorrespondenceUnassignedTasksTab < CorrespondenceQueueTab
-  validate :assignee_is_organization
-
-  # :reek:UtilityFunction
-  def label
-    Constants.QUEUE_CONFIG.CORRESPONDENCE_UNASSIGNED_TASKS_LABEL
-  end
-
-  def self.tab_name
-    Constants.QUEUE_CONFIG.CORRESPONDENCE_UNASSIGNED_TASKS_TAB_NAME
-  end
-
-  # :reek:UtilityFunction
-  def description
-    Constants.QUEUE_CONFIG.CORRESPONDENCE_UNASSIGNED_TASKS_DESCRIPTION
-  end
-
-  def tasks
-    CorrespondenceTask.includes(*task_includes).where(assigned_to: assignee, status: "unassigned")
-  end
-
-  # :reek:UtilityFunction
-  def column_names
-    [
-      Constants.QUEUE_CONFIG.COLUMNS.CHECKBOX_COLUMN.name,
-      Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
-      Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
-      Constants.QUEUE_CONFIG.COLUMNS.DAYS_WAITING_CORRESPONDENCE.name,
-      Constants.QUEUE_CONFIG.COLUMNS.NOTES.name
-    ]
-  end
-end
diff --git a/app/models/serializers/work_queue/appeal_search_serializer.rb b/app/models/serializers/work_queue/appeal_search_serializer.rb
index d3e7fee9ea8..27ca83b0929 100644
--- a/app/models/serializers/work_queue/appeal_search_serializer.rb
+++ b/app/models/serializers/work_queue/appeal_search_serializer.rb
@@ -138,7 +138,6 @@ class WorkQueue::AppealSearchSerializer
   attribute :evidence_submission_task do |object|
     object.tasks.find_by(type: "EvidenceSubmissionWindowTask", status: "assigned")
   end
-
   attribute :readable_hearing_request_type, &:readable_current_hearing_request_type
 
   attribute :readable_original_hearing_request_type, &:readable_original_hearing_request_type
diff --git a/app/models/serializers/work_queue/correspondence_task_column_serializer.rb b/app/models/serializers/work_queue/correspondence_task_column_serializer.rb
deleted file mode 100644
index 4e7f87f53be..00000000000
--- a/app/models/serializers/work_queue/correspondence_task_column_serializer.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-# frozen_string_literal: true
-
-class WorkQueue::CorrespondenceTaskColumnSerializer
-  include FastJsonapi::ObjectSerializer
-
-  attribute :unique_id do |object|
-    object.id.to_s
-  end
-
-  attribute :instructions
-
-  attribute :veteran_details do |object|
-    vet = Veteran.find(object.correspondence.veteran_id)
-    "#{vet.first_name} #{vet.last_name} (#{vet.file_number})"
-  end
-
-  attribute :notes do |object|
-    object.correspondence.notes
-  end
-
-  attribute :cmp_packet_number do |object|
-    object.correspondence.cmp_packet_number
-  end
-
-  attribute(:completion_date, &:closed_at)
-
-  attribute :days_waiting
-
-  attribute :va_date_of_receipt do |object|
-    object.correspondence.va_date_of_receipt
-  end
-
-  attribute :label
-
-  attribute :status
-
-  attribute :assigned_at
-
-  attribute :task_url
-
-  attribute :assigned_to do |object|
-    assignee = object.assigned_to
-    {
-      css_id: assignee.try(:css_id),
-      is_organization: assignee.is_a?(Organization),
-      name: assignee.is_a?(Organization) ? assignee.name : assignee.css_id,
-      type: assignee.class.name,
-      id: assignee.id
-    }
-  end
-
-  attribute :assigned_by do |object|
-    {
-      first_name: object.assigned_by_display_name.first,
-      last_name: object.assigned_by_display_name.last,
-      css_id: object.assigned_by.try(:css_id),
-      pg_id: object.assigned_by.try(:id)
-    }
-  end
-end
diff --git a/app/models/serializers/work_queue/task_column_serializer.rb b/app/models/serializers/work_queue/task_column_serializer.rb
index e0ab6df9e1d..f2ed1f5655a 100644
--- a/app/models/serializers/work_queue/task_column_serializer.rb
+++ b/app/models/serializers/work_queue/task_column_serializer.rb
@@ -177,8 +177,8 @@ def self.serialize_attribute?(params, columns)
     if serialize_attribute?(params, columns)
       {
         css_id: assignee.try(:css_id),
-        name: assignee.is_a?(Organization) ? assignee.name : assignee.css_id,
         is_organization: assignee.is_a?(Organization),
+        name: assignee.is_a?(Organization) ? assignee.name : assignee.css_id,
         type: assignee.class.name,
         id: assignee.id
       }
diff --git a/app/models/task_sorter.rb b/app/models/task_sorter.rb
index 7b45cf6d11f..13c364866cd 100644
--- a/app/models/task_sorter.rb
+++ b/app/models/task_sorter.rb
@@ -21,26 +21,13 @@ def initialize(args)
     fail(Caseflow::Error::MissingRequiredProperty, message: errors.full_messages.join(", ")) unless valid?
   end
 
-  # rubocop:disable Metrics/AbcSize
   def sorted_tasks
     return tasks unless tasks.any?
 
     # Always join to the CachedAppeal and users tables because we sometimes need it, joining does not slow down the
     # application, and conditional logic to only join sometimes adds unnecessary complexity.
-    case column.name
-    when Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name
-      tasks.joins(appeal: :veteran).order(last_name: sort_order.to_sym, first_name: sort_order.to_sym)
-    when Constants.QUEUE_CONFIG.COLUMNS.NOTES.name
-      tasks.joins(:appeal).order(notes: sort_order.to_sym)
-    when Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name
-      tasks.joins(:appeal).order(va_date_of_receipt: sort_order.to_sym)
-    when Constants.QUEUE_CONFIG.COLUMNS.DAYS_WAITING.name
-      tasks.joins(:appeal).order(assigned_at: sort_order.to_sym)
-    else
-      tasks.with_assignees.with_assigners.with_cached_appeals.order(order_clause)
-    end
+    tasks.with_assignees.with_assigners.with_cached_appeals.order(order_clause)
   end
-  # rubocop:enable Metrics/AbcSize
 
   private
 
diff --git a/app/models/tasks/cavc_correspondence_mail_task.rb b/app/models/tasks/cavc_correspondence_mail_task.rb
index cd56d7da7de..a5aff59b3d4 100644
--- a/app/models/tasks/cavc_correspondence_mail_task.rb
+++ b/app/models/tasks/cavc_correspondence_mail_task.rb
@@ -77,12 +77,4 @@ def user_task_assigned_to_cavc_lit_support
   def assigned_to_cavc_lit_team_member
     CavcLitigationSupport.singleton.users.include?(assigned_to)
   end
-
-  def status_is_valid_on_create
-    unless [Constants.TASK_STATUSES.assigned, Constants.TASK_STATUSES.completed].include?(status)
-      fail Caseflow::Error::InvalidStatusOnTaskCreate, task_type: type
-    end
-
-    true
-  end
 end
diff --git a/app/models/tasks/correspondence/reassign_package_task.rb b/app/models/tasks/correspondence/reassign_package_task.rb
index 8fb51fa32a6..335e3133df9 100644
--- a/app/models/tasks/correspondence/reassign_package_task.rb
+++ b/app/models/tasks/correspondence/reassign_package_task.rb
@@ -2,9 +2,4 @@
 
 class ReassignPackageTask < CorrespondenceTask
   before_create :verify_no_other_open_package_action_task_on_correspondence
-
-  # :reek:UtilityFunction
-  def task_url
-    Constants.CORRESPONDENCE_TASK_URL.REASSIGN_PACKAGE_TASK_MODAL_URL
-  end
 end
diff --git a/app/models/tasks/correspondence_intake_task.rb b/app/models/tasks/correspondence_intake_task.rb
index 952b88e3a04..7e63dba9fc7 100644
--- a/app/models/tasks/correspondence_intake_task.rb
+++ b/app/models/tasks/correspondence_intake_task.rb
@@ -27,8 +27,4 @@ def verify_current_user_can_create!(user)
       MailTeam.singleton.user_has_access?(user)
     end
   end
-
-  def task_url
-    closed? ? "/under_construction" : Constants.CORRESPONDENCE_TASK_URL.INTAKE_TASK_URL.sub("uuid", correspondence.uuid)
-  end
 end
diff --git a/app/models/tasks/correspondence_task.rb b/app/models/tasks/correspondence_task.rb
index c8082867d98..2d99f91fa2c 100644
--- a/app/models/tasks/correspondence_task.rb
+++ b/app/models/tasks/correspondence_task.rb
@@ -4,7 +4,6 @@ class CorrespondenceTask < Task
   self.abstract_class = true
 
   before_create :verify_org_task_unique
-  belongs_to :appeal, class_name: "Correspondence", foreign_key: :appeal_id
   validate :status_is_valid_on_create, on: :create
   validate :assignee_status_is_valid_on_create, on: :create
 
@@ -63,31 +62,17 @@ def self.create_child_task(parent_task, current_user, params)
     )
   end
 
-  def correspondence
-    appeal
-  end
-
-  def task_url
-    "/under_construction"
-  end
-
   private
 
-  # rubocop:disable Metrics/CyclomaticComplexity
   def status_is_valid_on_create
-    case type
-    when "ReviewPackageTask"
-      return Constants.TASK_STATUSES.on_hold if status != Constants.TASK_STATUSES.on_hold
-    when "CorrespondenceIntakeTask", "EfolderUploadFailedTask"
-      return Constants.TASK_STATUSES.in_progress if status != Constants.TASK_STATUSES.in_progress
-    when "CorrespondenceRootTask", "HearingPostponementRequestMailTask"
-      return Constants.TASK_STATUSES.completed if status != Constants.TASK_STATUSES.completed
-    else
-      fail Caseflow::Error::InvalidStatusOnTaskCreate, task_type: type unless status == Constants.TASK_STATUSES.assigned
+    if type == "ReviewPackageTask" && status != Constants.TASK_STATUSES.unassigned
+      update!(status: :unassigned)
+    elsif type != "ReviewPackageTask" && status != Constants.TASK_STATUSES.assigned
+      fail Caseflow::Error::InvalidStatusOnTaskCreate, task_type: type
     end
+
     true
   end
-  # rubocop:enable Metrics/CyclomaticComplexity
 
   def assignee_status_is_valid_on_create
     if parent&.child_must_have_active_assignee? && assigned_to.is_a?(User) && !assigned_to.active?
diff --git a/app/models/tasks/correspondence_task_filter.rb b/app/models/tasks/correspondence_task_filter.rb
deleted file mode 100644
index 306ce4fba4d..00000000000
--- a/app/models/tasks/correspondence_task_filter.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-# frozen_string_literal: true
-
-class CorrespondenceTaskFilter < TaskFilter
-  def filtered_tasks
-    va_dor_params = filter_params.select { |param| param.include?("col=vaDor") }
-    task_column_params = filter_params.select { |param| param.include?("col=taskColumn") }
-
-    # task_column_params comes in as a single string, delimited by |. Updates task_column_params
-    # to be an array of the incoming values.
-    unless task_column_params == []
-      task_column_params[0].slice!("col=taskColumn&val=")[0]
-      task_column_params = task_column_params[0].split("|")
-    end
-
-    result = tasks.all
-    va_dor_params.each do |param|
-      value_hash = Rack::Utils.parse_nested_query(param).deep_symbolize_keys
-      result = result.merge(filter_by_va_dor(value_hash[:val]))
-    end
-
-    unless task_column_params.empty?
-      result = result.merge(filter_by_task(task_column_params))
-    end
-    result
-  end
-
-  private
-
-  def filter_by_date(date_info)
-    date_type, first_date, second_date = date_info.split(",")
-
-    case date_type
-    when "0"
-      tasks.where("closed_at > ? AND closed_at < ?", Time.zone.parse(first_date), Time.zone.parse(second_date))
-    when "1"
-      tasks.where("closed_at < ?", Time.zone.parse(first_date))
-    when "2"
-      tasks.where("closed_at > ?", Time.zone.parse(first_date))
-    when "3"
-      tasks.where("DATE(closed_at) = (?)", Time.zone.parse(first_date))
-    end
-  end
-
-  def filter_by_va_dor(date_info)
-    date_type, first_date, second_date = date_info.split(",")
-
-    case date_type
-    when "0"
-      filter_between_dates(first_date, second_date)
-    when "1"
-      filter_before_date(first_date)
-    when "2"
-      filter_after_date(first_date)
-    when "3"
-      filter_on_date(first_date)
-    end
-  end
-
-  def filter_by_task(task_types)
-    # Initialize collection to an empty scope
-    collection = Task.none
-    task_types.each do |task_type|
-      t = tasks.where(type: task_type)
-      collection = collection.or(t)
-    end
-    collection
-  end
-
-  def filter_between_dates(start_date, end_date)
-    tasks.joins(:appeal)
-      .where("correspondences.va_date_of_receipt > ? AND correspondences.va_date_of_receipt < ?",
-             Time.zone.parse(start_date),
-             Time.zone.parse(end_date))
-  end
-
-  def filter_before_date(date)
-    tasks.joins(:appeal).where("correspondences.va_date_of_receipt < ?", Time.zone.parse(date))
-  end
-
-  def filter_after_date(date)
-    tasks.joins(:appeal).where("correspondences.va_date_of_receipt > ?", Time.zone.parse(date))
-  end
-
-  def filter_on_date(date)
-    tasks.joins(:appeal).where("DATE(correspondences.va_date_of_receipt) = (?)", Time.zone.parse(date))
-  end
-end
diff --git a/app/models/tasks/efolder_upload_failed_task.rb b/app/models/tasks/efolder_upload_failed_task.rb
index 8fccff6545e..3cfae9fd4ae 100644
--- a/app/models/tasks/efolder_upload_failed_task.rb
+++ b/app/models/tasks/efolder_upload_failed_task.rb
@@ -1,7 +1,4 @@
 # frozen_string_literal: true
 
 class EfolderUploadFailedTask < CorrespondenceTask
-  def task_url
-    Constants.CORRESPONDENCE_TASK_URL.REVIEW_PACKAGE_TASK_URL.sub("uuid", correspondence.uuid)
-  end
 end
diff --git a/app/models/tasks/remove_package_task.rb b/app/models/tasks/remove_package_task.rb
index 7e4ab28fb8e..aa6d4db778e 100644
--- a/app/models/tasks/remove_package_task.rb
+++ b/app/models/tasks/remove_package_task.rb
@@ -2,9 +2,4 @@
 
 class RemovePackageTask < CorrespondenceTask
   before_create :verify_no_other_open_package_action_task_on_correspondence
-
-  # :reek:UtilityFunction
-  def task_url
-    Constants.CORRESPONDENCE_TASK_URL.REMOVE_PACKAGE_TASK_MODAL_URL
-  end
 end
diff --git a/app/models/tasks/review_package_task.rb b/app/models/tasks/review_package_task.rb
index 4f204de93ed..85d6ac257c3 100644
--- a/app/models/tasks/review_package_task.rb
+++ b/app/models/tasks/review_package_task.rb
@@ -16,12 +16,4 @@ def create_from_params(params, user)
   def when_child_task_created(_child_task)
     true
   end
-
-  def task_url
-    if closed?
-      "/under_construction"
-    else
-      Constants.CORRESPONDENCE_TASK_URL.REVIEW_PACKAGE_TASK_URL.sub("uuid", correspondence.uuid)
-    end
-  end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index e2a64407587..e663375c066 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -21,8 +21,6 @@ class User < CaseflowRecord # rubocop:disable Metrics/ClassLength
 
   # Alternative: where("roles @> ARRAY[?]::varchar[]", role)
   scope :with_role, ->(role) { where("? = ANY(roles)", role) }
-  scope :mail_team_users, -> { joins(:organizations).where(organizations: { type: MailTeam.name }) }
-
 
   BOARD_STATION_ID = "101"
   LAST_LOGIN_PRECISION = 5.minutes
@@ -97,18 +95,6 @@ def hearings_user?
     can_any_of_these_roles?(["Build HearSched", "Edit HearSched", "RO ViewHearSched", "VSO", "Hearing Prep"])
   end
 
-  def mail_team_user?
-    organizations.include?(MailTeam.singleton)
-  end
-
-  def mail_supervisor?
-    organizations.include?(InboundOpsTeam.singleton)
-  end
-
-  def mail_superuser?
-    organizations_users.where(admin: true, organization_id: MailTeam.singleton.id || BvaIntake.singleton.id).any?
-  end
-
   def can_assign_hearing_schedule?
     can_any_of_these_roles?(["Edit HearSched", "Build HearSched"])
   end
@@ -438,14 +424,6 @@ def queue_tabs
     end
   end
 
-  def correspondence_queue_tabs
-    [
-      correspondence_assigned_tasks_tab,
-      correspondence_in_progress_tasks_tab,
-      correspondence_completed_tasks_tab
-    ]
-  end
-
   def self.default_active_tab
     Constants.QUEUE_CONFIG.INDIVIDUALLY_ASSIGNED_TASKS_TAB_NAME
   end
@@ -462,18 +440,6 @@ def completed_tasks_tab
     ::CompletedTasksTab.new(assignee: self, show_regional_office_column: show_regional_office_in_queue?)
   end
 
-  def correspondence_assigned_tasks_tab
-    ::CorrespondenceAssignedTasksTab.new(assignee: self)
-  end
-
-  def correspondence_in_progress_tasks_tab
-    ::CorrespondenceInProgressTasksTab.new(assignee: self)
-  end
-
-  def correspondence_completed_tasks_tab
-    ::CorrespondenceCompletedTasksTab.new(assignee: self)
-  end
-
   def can_edit_unrecognized_poa?
     allowed_orgs = [LitigationSupport, ClerkOfTheBoard, BoardProductOwners, BvaIntake].map(&:singleton)
     colocated_in_vacols? || allowed_orgs.any? { |org| org.user_has_access?(self) }
diff --git a/app/models/vacols/case_docket.rb b/app/models/vacols/case_docket.rb
index f4b57b92509..41440a2b5b0 100644
--- a/app/models/vacols/case_docket.rb
+++ b/app/models/vacols/case_docket.rb
@@ -469,6 +469,7 @@ def self.distribute_nonpriority_appeals(judge, genpop, range, limit, bust_backlo
     distribute_appeals(fmtd_query, judge, dry_run)
   end
 
+  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/ParameterLists, Metrics/MethodLength
   def self.distribute_priority_appeals(judge, genpop, limit, dry_run = false)
     query = if use_by_docket_date?
               <<-SQL
diff --git a/app/views/correspondence/correspondence_cases.html.erb b/app/views/correspondence/correspondence_cases.html.erb
index 6feaf79a547..74298a297bc 100644
--- a/app/views/correspondence/correspondence_cases.html.erb
+++ b/app/views/correspondence/correspondence_cases.html.erb
@@ -9,7 +9,6 @@
     dropdownUrls: dropdown_urls,
     applicationUrls: application_urls,
     feedbackUrl: feedback_url,
-    configUrl: '/queue/correspondence?json',
     flash: flash,
     featureToggles: {
       correspondence_queue: FeatureToggle.enabled?(:correspondence_queue, user: current_user)
diff --git a/app/views/correspondence/correspondence_team.html.erb b/app/views/correspondence/correspondence_team.html.erb
deleted file mode 100644
index a1eaf8a2983..00000000000
--- a/app/views/correspondence/correspondence_team.html.erb
+++ /dev/null
@@ -1,22 +0,0 @@
-<% content_for :full_page_content do %>
-  <%= react_component("Queue", props: {
-    userDisplayName: current_user.display_name,
-    userId: current_user.id,
-    userRole: (current_user.vacols_roles.first || "").capitalize,
-    userCssId: current_user.css_id,
-    organizations: current_user.selectable_organizations.map {|o| o.slice(:name, :url)},
-    caseSearchHomePage: case_search_home_page,
-    dropdownUrls: dropdown_urls,
-    applicationUrls: application_urls,
-    feedbackUrl: feedback_url,
-    configUrl: '/queue/correspondence/team?json',
-    flash: flash,
-    mailTeamUsers: @mail_team_users,
-    responseType: @response_type,
-    responseHeader: @response_header,
-    responseMessage: @response_message,
-    featureToggles: {
-      correspondence_queue: FeatureToggle.enabled?(:correspondence_queue, user: current_user)
-    }
-  }) %>
-<% end %>
diff --git a/app/views/queue/index.html.erb b/app/views/queue/index.html.erb
index f09fa482de4..5e2afcde681 100644
--- a/app/views/queue/index.html.erb
+++ b/app/views/queue/index.html.erb
@@ -20,9 +20,6 @@
     userCanViewHearingSchedule: current_user.can_view_hearing_schedule?,
     userCanViewOvertimeStatus: current_user.can_view_overtime_status?,
     userCanViewEditNodDate: current_user.can_view_edit_nod_date?,
-    isMailTeamUser: current_user.mail_team_user?,
-    isMailSupervisor: current_user.mail_supervisor?,
-    isMailSuperUser: current_user.mail_superuser?,
     canEditCavcRemands: current_user.can_edit_cavc_remands?,
     canEditCavcDashboards: current_user.can_edit_cavc_dashboards?,
     canViewCavcDashboards: current_user.can_view_cavc_dashboards?,
diff --git a/app/workflows/correspondence_root_task_factory.rb b/app/workflows/correspondence_root_task_factory.rb
index 00e150898d0..9594abc9b29 100644
--- a/app/workflows/correspondence_root_task_factory.rb
+++ b/app/workflows/correspondence_root_task_factory.rb
@@ -34,7 +34,5 @@ def create_subtasks!
       parent_id: @root_task.id,
       type: ReviewPackageTask.name
     )
-
-    @review_package_task.update!(status: Constants.TASK_STATUSES.unassigned)
   end
 end
diff --git a/client/COPY.json b/client/COPY.json
index df310a19b4a..1122f43aaaa 100644
--- a/client/COPY.json
+++ b/client/COPY.json
@@ -51,10 +51,10 @@
   "CASE_LIST_TABLE_QUEUE_DROPDOWN_OWN_CASES_LABEL": "Your cases",
   "CASE_LIST_TABLE_QUEUE_DROPDOWN_TEAM_CASES_LABEL": "%s team cases",
   "CASE_LIST_TABLE_QUEUE_DROPDOWN_CORRESPONDENCE_CASES": "Correspondence Cases",
-  "TITLE_MODAL_EDIT_DOCUMENT_TYPE_CORRESPONDENCE": "Edit document type",
-  "TEXT_MODAL_EDIT_DOCUMENT_TYPE_CORRESPONDENCE": "Change the document type of the selected document.",
-  "ORIGINAL_DOC_EDIT_DOCUMENT_TYPE_CORRESPONDENCE": "Original document type",
-  "NEW_DOC_EDIT_DOCUMENT_TYPE_CORRESPONDENCE": "New document type",
+  "TITLE_MODAL_EDIT_DOCUMENT_TYPE_CORRESPONDENCE" : "Edit document type",
+  "TEXT_MODAL_EDIT_DOCUMENT_TYPE_CORRESPONDENCE" : "Change the document type of the selected document.",
+  "ORIGINAL_DOC_EDIT_DOCUMENT_TYPE_CORRESPONDENCE" : "Original document type",
+  "NEW_DOC_EDIT_DOCUMENT_TYPE_CORRESPONDENCE" : "New document type",
   "CASE_LIST_TABLE_EMPTY_TEXT": "This Veteran has no appeals at this time.",
   "CASE_LIST_TABLE_TOTAL_DAYS_COLUMN_TITLE": "Total Days",
   "CASE_LIST_TABLE_BOARD_INTAKE": "Board Intake",
@@ -1449,8 +1449,6 @@
   "CORRESPONDENCE_READONLY_BANNER_HEADER": "This package has a pending request",
   "CORRESPONDENCE_READONLY_BANNER_MESSAGE": "Any further actions cannot be made on this package until a supervisor or superuser reviews the request.",
   "ASSOCIATED_WITH_CLAIMS_FOLDER_MAIL_TASK_LABEL": "Associated with claims folder",
-  "CORRESPONDENCE_CASES_REMOVE_PACKAGE_MODAL_TITLE": "Review request",
-  "CORRESPONDENCE_CASES_REASSIGN_PACKAGE_MODAL_TITLE": "Review request",
   "VACOLS_UPDATED_MAIL_TASK_LABEL": "VACOLS updated",
   "SENT_TO_ROJ_MAIL_TASK_LABEL": "Sent to ROJ",
   "CASE_DISTRIBUTION_TITLE": "Case Distribution Algorithm Values",
diff --git a/client/app/components/FilterOption.jsx b/client/app/components/FilterOption.jsx
index c7a7e55bc57..311e4873d7e 100644
--- a/client/app/components/FilterOption.jsx
+++ b/client/app/components/FilterOption.jsx
@@ -36,6 +36,7 @@ const FilterOption = ({ options, setSelectedValue,
         <label htmlFor={`${index}-${option.value}`}>
           {option.displayText}
         </label>
+
       </li>;
     })}
   </ul>;
diff --git a/client/app/components/ReceiptDatePicker.jsx b/client/app/components/ReceiptDatePicker.jsx
deleted file mode 100644
index c9dd4dfdd86..00000000000
--- a/client/app/components/ReceiptDatePicker.jsx
+++ /dev/null
@@ -1,100 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import ReactSelectDropdown from '../../../client/app/components/ReactSelectDropdown';
-import DateSelector from './DateSelector';
-import Button from './Button';
-
-const dateDropdownMap = [
-  { value: 0, label: 'Between these dates' },
-  { value: 1, label: 'Before this date' },
-  { value: 2, label: 'After this date' },
-  { value: 3, label: 'On this date' }
-];
-
-const receiptDatePicker = (props) => {
-
-  const getDatePickerElements = () => {
-    const receiptDateFilterStates = props.receiptDateFilterStates;
-
-    switch (props.receiptDateState) {
-    case receiptDateFilterStates.BETWEEN: return (
-      <div style={{ marginLeft: '5%', marginRight: '5%' }}>
-        <DateSelector
-          onChange={props.handleDateChange}
-          label="From"
-          type="date" />
-        <DateSelector
-          onChange={props.handleSecondaryDateChange}
-          label="To"
-          type="date" />
-      </div>);
-    case receiptDateFilterStates.BEFORE: return (
-      <div style={{ marginLeft: '5%', marginRight: '5%' }}>
-        <DateSelector
-          onChange={(value) => props.handleDateChange(value)}
-          type="date" />
-      </div>
-    );
-    case receiptDateFilterStates.AFTER: return (
-      <div style={{ marginLeft: '5%', marginRight: '5%' }}>
-        <DateSelector
-          onChange={(value) => props.handleDateChange(value)}
-          type="date" />
-      </div>
-    );
-    case receiptDateFilterStates.ON: return (
-      <div style={{ marginLeft: '5%', marginRight: '5%' }}>
-        <DateSelector
-          onChange={(value) => props.handleDateChange(value)}
-          type="date" />
-      </div>
-    );
-
-    default:
-    }
-  };
-
-  return <div id="dropdown">
-    <div style={{ marginLeft: '5%', marginRight: '5%' }}>
-      <ReactSelectDropdown
-        label="Date filter parameters"
-        options={dateDropdownMap}
-        onChangeMethod={props.onChangeMethod}
-      />
-    </div>
-    <div style={{ width: '100%', margin: 'auto' }}>
-      {getDatePickerElements()}
-    </div>
-
-    <div style={{ display: 'flex', margin: '10px 0px', justifyContent: 'center', width: '190px' }}>
-      <Button disabled={props.isApplyButtonEnabled} onClick={props.handleApplyFilter}>
-        <span>Apply Filter</span>
-      </Button>
-    </div>
-
-  </div>;
-};
-
-receiptDatePicker.propTypes = {
-  receiptDateFilterStates: PropTypes.object,
-  receiptDateState: PropTypes.number,
-  handleApplyFilter: PropTypes.func.isRequired,
-  handleDateChange: PropTypes.func.isRequired,
-  handleSecondaryDateChange: PropTypes.func.isRequired,
-  isApplyButtonEnabled: PropTypes.bool.isRequired,
-  onChange: PropTypes.func,
-  options: PropTypes.arrayOf(
-    PropTypes.shape({
-      value: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
-      displayText: PropTypes.string,
-    })
-  ),
-  defaultValue: PropTypes.object,
-  label: PropTypes.string,
-  onChangeMethod: PropTypes.func,
-  className: PropTypes.string,
-  disabled: PropTypes.bool,
-  customPlaceholder: PropTypes.string
-};
-
-export default receiptDatePicker;
diff --git a/client/app/components/TableFilter.jsx b/client/app/components/TableFilter.jsx
index 736d255cf8e..bccd70ce974 100644
--- a/client/app/components/TableFilter.jsx
+++ b/client/app/components/TableFilter.jsx
@@ -153,7 +153,6 @@ class TableFilter extends React.PureComponent {
     let newFilteredByList = _.clone(filteredByList);
 
     newFilteredByList[columnName] = newFilters;
-
     this.props.updateFilters(newFilteredByList);
     this.toggleDropdown();
   }
@@ -210,14 +209,10 @@ class TableFilter extends React.PureComponent {
         {this.state.open &&
           <QueueDropdownFilter
             clearFilters={this.clearFilteredByList}
-            isReceiptDateFilter={this.props.isReceiptDateFilter}
-            isTaskCompletedDateFilter={this.props.isTaskCompletedDateFilter}
             name={valueName || columnName}
             isClearEnabled={anyFiltersAreSet}
             handleClose={this.toggleDropdown}
-            setSelectedValue={(value) => this.updateSelectedFilter(value, columnName)}
             addClearFiltersRow>
-
             <FilterOption
               options={filterOptions}
               setSelectedValue={(value) => this.updateSelectedFilter(value, columnName)} />
@@ -233,8 +228,6 @@ TableFilter.defaultProps = {
 };
 
 TableFilter.propTypes = {
-  isReceiptDateFilter: PropTypes.bool,
-  isTaskCompletedDateFilter: PropTypes.bool,
   enableFilter: PropTypes.bool,
   enableFilterTextTransform: PropTypes.bool,
   getFilterIconRef: PropTypes.func,
diff --git a/client/app/components/TaskCompletedDatePicker.jsx b/client/app/components/TaskCompletedDatePicker.jsx
deleted file mode 100644
index 962d1929dfb..00000000000
--- a/client/app/components/TaskCompletedDatePicker.jsx
+++ /dev/null
@@ -1,104 +0,0 @@
-import React, { useState } from 'react';
-import PropTypes from 'prop-types';
-import ReactSelectDropdown from '../../../client/app/components/ReactSelectDropdown';
-import DateSelector from './DateSelector';
-import Button from './Button';
-
-const dateDropdownMap = [
-  { value: 0, label: 'Between these dates' },
-  { value: 1, label: 'Before this date' },
-  { value: 2, label: 'After this date' },
-  { value: 3, label: 'On this date' }
-];
-
-const TaskCompletedDatePicker = (props) => {
-  const [isDateSelected, setDateSelected] = useState(false);
-  const [isSecondaryDateSelected, setSecondaryDateSelected] = useState(false);
-
-  const handleDateChange = (value) => {
-    props.handleTaskCompletedDateChange(value);
-    setDateSelected(Boolean(value));
-  };
-
-  const handleSecondaryDateChange = (value) => {
-    props.handleTaskCompletedSecondaryDateChange(value);
-    setSecondaryDateSelected(Boolean(value));
-  };
-
-  const handleApplyFilter = () => {
-    props.handleTaskCompletedApplyFilter();
-  };
-
-  const taskCompletedDateFilterStates = props.taskCompletedDateFilterStates;
-  const isApplyFilterButtonDisabled =
-    props.taskCompletedDateState === taskCompletedDateFilterStates.BETWEEN ?
-      !(isDateSelected && isSecondaryDateSelected) :
-      !isDateSelected;
-
-  const getDatePickerElements = () => {
-
-    switch (props.taskCompletedDateState) {
-    case taskCompletedDateFilterStates.BETWEEN: return (
-      <div style={{ margin: '5% 5%' }}>
-        <DateSelector onChange={handleDateChange} label="From" type="date" />
-        <DateSelector onChange={handleSecondaryDateChange} label="To" type="date" />
-      </div>);
-    case taskCompletedDateFilterStates.BEFORE: return (
-      <div style={{ margin: '5% 5%' }}>
-        <DateSelector onChange={handleDateChange} label="To" type="date" />
-      </div>
-    );
-    case taskCompletedDateFilterStates.AFTER: return (
-      <div style={{ margin: '5% 5%' }}>
-        <DateSelector onChange={handleDateChange} type="date" />
-      </div>
-    );
-    case taskCompletedDateFilterStates.ON: return (
-      <div style={{ margin: '5% 5%' }}>
-        <DateSelector onChange={handleDateChange} label="Date Completed" type="date" />
-      </div>
-    );
-
-    default:
-    }
-  };
-
-  return <div id="dropdown">
-    <div style={{ marginLeft: '5%', marginRight: '5%' }}>
-      <ReactSelectDropdown
-        label="Date filter parameters"
-        options={dateDropdownMap}
-        onChangeMethod={props.onChangeMethod} />
-    </div>
-
-    <div style={{ width: '100%', margin: 'auto' }}>
-      {getDatePickerElements()}
-    </div>
-    <div style={{ margin: '10px 20px', display: 'flex', justifyContent: 'end', width: '190px' }}>
-      <Button onClick={handleApplyFilter} disabled={isApplyFilterButtonDisabled}>Apply filter</Button>
-    </div>
-  </div>;
-};
-
-TaskCompletedDatePicker.propTypes = {
-  taskCompletedDateFilterStates: PropTypes.object,
-  taskCompletedDateState: PropTypes.number,
-  handleTaskCompletedApplyFilter: PropTypes.func.isRequired,
-  handleTaskCompletedDateChange: PropTypes.func.isRequired,
-  handleTaskCompletedSecondaryDateChange: PropTypes.func.isRequired,
-  onChange: PropTypes.func,
-  options: PropTypes.arrayOf(
-    PropTypes.shape({
-      value: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
-      displayText: PropTypes.string,
-    })
-  ),
-  defaultValue: PropTypes.object,
-  label: PropTypes.string,
-  onChangeMethod: PropTypes.func,
-  className: PropTypes.string,
-  disabled: PropTypes.bool,
-  customPlaceholder: PropTypes.string
-};
-
-export default TaskCompletedDatePicker;
diff --git a/client/app/queue/QueueApp.jsx b/client/app/queue/QueueApp.jsx
index c5fe8db1386..3d50666dea9 100644
--- a/client/app/queue/QueueApp.jsx
+++ b/client/app/queue/QueueApp.jsx
@@ -25,9 +25,6 @@ import {
   setUserIsCamoEmployee,
   setFeedbackUrl,
   setOrganizations,
-  setMailTeamUser,
-  setMailSupervisor,
-  setMailSuperUser
 } from './uiReducer/uiActions';
 
 import ScrollToTop from '../components/ScrollToTop';
@@ -99,7 +96,6 @@ import TASK_ACTIONS from '../../constants/TASK_ACTIONS';
 import TASK_STATUSES from '../../constants/TASK_STATUSES';
 import USER_ROLE_TYPES from '../../constants/USER_ROLE_TYPES';
 import DECISION_TYPES from '../../constants/APPEAL_DECISION_TYPES';
-import QUEUE_CONFIG from '../../constants/QUEUE_CONFIG';
 import { FlashAlerts } from '../nonComp/components/Alerts';
 
 import { PulacCerulloReminderModal } from './pulacCerullo/PulacCerulloReminderModal';
@@ -131,9 +127,6 @@ class QueueApp extends React.PureComponent {
     this.props.setUserRole(this.props.userRole);
     this.props.setUserCssId(this.props.userCssId);
     this.props.setOrganizations(this.props.organizations);
-    this.props.setMailTeamUser(this.props.isMailTeamUser);
-    this.props.setMailSupervisor(this.props.isMailSupervisor);
-    this.props.setMailSuperUser(this.props.isMailSuperUser);
     this.props.setUserIsVsoEmployee(this.props.userIsVsoEmployee);
     this.props.setUserIsCamoEmployee(this.props.userIsCamoEmployee);
     this.props.setFeedbackUrl(this.props.feedbackUrl);
@@ -695,10 +688,6 @@ class QueueApp extends React.PureComponent {
     <CorrespondenceCases {...this.props} />
   );
 
-  routedCorrespondenceTeam = () => (
-    <CorrespondenceCases {...this.props} />
-  );
-
   routedCompleteHearingWithdrawalRequest = (props) => (
     <CompleteHearingWithdrawalRequestModal {...props.match.params} />
   );
@@ -757,17 +746,10 @@ class QueueApp extends React.PureComponent {
               render={this.routedQueueList}
             />
 
-            <PageRoute
-              exact
-              path="/queue/correspondence/team"
-              title={`${QUEUE_CONFIG.CORRESPONDENCE_ORG_TABLE_TITLE}`}
-              render={this.routedCorrespondenceCase}
-            />
-
             <PageRoute
               exact
               path="/queue/correspondence"
-              title={`${QUEUE_CONFIG.CORRESPONDENCE_USER_TABLE_TITLE}`}
+              title={`${PAGE_TITLES.CORRESPONDENCE_CASES_LIST}`}
               render={this.routedCorrespondenceCase}
             />
 
@@ -1509,12 +1491,6 @@ QueueApp.propTypes = {
   setUserCssId: PropTypes.func,
   setUserId: PropTypes.func,
   setOrganizations: PropTypes.func,
-  setMailTeamUser: PropTypes.func,
-  setMailSupervisor: PropTypes.func,
-  setMailSuperUser: PropTypes.func,
-  isMailTeamUser: PropTypes.bool,
-  isMailSupervisor: PropTypes.bool,
-  isMailSuperUser: PropTypes.bool,
   organizations: PropTypes.array,
   setUserIsVsoEmployee: PropTypes.func,
   userIsVsoEmployee: PropTypes.bool,
@@ -1562,9 +1538,6 @@ const mapDispatchToProps = (dispatch) =>
       setUserIsCamoEmployee,
       setFeedbackUrl,
       setOrganizations,
-      setMailTeamUser,
-      setMailSupervisor,
-      setMailSuperUser,
     },
     dispatch
   );
diff --git a/client/app/queue/QueueDropdownFilter.jsx b/client/app/queue/QueueDropdownFilter.jsx
index de7b217e111..8444a439381 100644
--- a/client/app/queue/QueueDropdownFilter.jsx
+++ b/client/app/queue/QueueDropdownFilter.jsx
@@ -3,8 +3,6 @@ import PropTypes from 'prop-types';
 import { COLORS } from '@department-of-veterans-affairs/caseflow-frontend-toolkit/util/StyleConstants';
 import { css } from 'glamor';
 import { startCase } from 'lodash';
-import ReceiptDatePicker from '../components/ReceiptDatePicker';
-import TaskCompletedDatePicker from '../components/TaskCompletedDatePicker';
 
 const dropdownFilterViewListStyle = css({
   margin: 0
@@ -20,112 +18,14 @@ const dropdownFilterViewListItemStyle = css(
   }
 );
 
-const receiptDateFilterStates = {
-  UNINITIALIZED: '',
-  BETWEEN: 0,
-  BEFORE: 1,
-  AFTER: 2,
-  ON: 3
-};
-
-const taskCompletedDateFilterStates = {
-  UNINITIALIZED: '',
-  BETWEEN: 0,
-  BEFORE: 1,
-  AFTER: 2,
-  ON: 3
-};
-
 class QueueDropdownFilter extends React.PureComponent {
   constructor() {
     super();
     this.state = {
-      rootElemWidth: null,
-      receiptDateState: -1,
-      receiptDatePrimaryValue: '',
-      receiptDateSecondaryValue: '',
-      taskCompletedDateState: -1,
-      taskCompletedDatePrimaryValue: '',
-      taskCompletedDateSecondaryValue: ''
+      rootElemWidth: null
     };
   }
 
-  setreceiptDateState = (value) => {
-    this.setState({ receiptDateState: value.value });
-  };
-
-  setTaskCompletedDateState = (value) => {
-    this.setState({ taskCompletedDateState: value.value });
-  };
-
-  handleDateChange = (value) => {
-    this.setState({ receiptDatePrimaryValue: value });
-  }
-
-  handleTaskCompletedDateChange = (value) => {
-    this.setState({ taskCompletedDatePrimaryValue: value });
-  }
-
-  // Used when the between dates option is selected to store the second date.
-  handleSecondaryDateChange = (value) => {
-    this.setState({ receiptDateSecondaryValue: value });
-  }
-
-  handleTaskCompletedSecondaryDateChange = (value) => {
-    this.setState({ taskCompletedDateSecondaryValue: value });
-  }
-
-  handleApplyFilter = () => {
-    if (this.state.receiptDateState === 0) {
-      this.props.setSelectedValue(
-        [
-          this.state.receiptDateState,
-          this.state.receiptDatePrimaryValue,
-          this.state.receiptDateSecondaryValue
-        ], 'vaDor');
-    } else {
-      this.props.setSelectedValue([this.state.receiptDateState, this.state.receiptDatePrimaryValue], 'vaDor');
-    }
-  }
-
-  isApplyButtonEnabled = () => {
-    if (this.state.receiptDateState >= 1 && this.state.receiptDatePrimaryValue !== '') {
-      return false;
-    }
-    if (this.state.receiptDateState === 0 &&
-      this.state.receiptDatePrimaryValue.length > 0 &&
-      this.state.receiptDateSecondaryValue.length > 0) {
-      return false;
-    }
-
-    return true;
-  }
-
-  clearAllFilters = () => {
-    this.setreceiptDateState(-1);
-    this.setState({ receiptDatePrimaryValue: '' });
-    this.setState({ receiptDateSecondaryValue: '' });
-    this.setTaskCompletedDateState(-1);
-    this.setState({ taskCompletedDatePrimaryValue: '' });
-    this.setState({ taskCompletedDateSecondaryValue: '' });
-    this.props.clearFilters();
-
-  }
-
-  handleTaskCompletedApplyFilter = () => {
-    if (this.state.taskCompletedDateState === 0) {
-      this.props.setSelectedValue(
-        [
-          this.state.taskCompletedDateState,
-          this.state.taskCompletedDatePrimaryValue,
-          this.state.taskCompletedDateSecondaryValue
-        ], 'completedDateColumn');
-    } else {
-      this.props.setSelectedValue([this.state.taskCompletedDateState, this.state.taskCompletedDatePrimaryValue],
-        'completedDateColumn');
-    }
-  }
-
   render() {
     const { children, name } = this.props;
 
@@ -142,8 +42,8 @@ class QueueDropdownFilter extends React.PureComponent {
         this.rootElem = rootElem;
       }}>
         {this.props.addClearFiltersRow &&
-          <div className="cf-filter-option-row" onClick={this.clearAllFilters}>
-            <button className="cf-text-button"
+          <div className="cf-filter-option-row">
+            <button className="cf-text-button" onClick={this.props.clearFilters}
               disabled={!this.props.isClearEnabled}>
               <div className="cf-clear-filter-button-wrapper">
                 Clear {displayName} filter
@@ -151,34 +51,10 @@ class QueueDropdownFilter extends React.PureComponent {
             </button>
           </div>
         }
-        {this.props.isReceiptDateFilter && <ReceiptDatePicker
-          handleDateChange={this.handleDateChange}
-          handleSecondaryDateChange={this.handleSecondaryDateChange}
-          setSelectedValue={this.props.setSelectedValue}
-          handleApplyFilter={this.handleApplyFilter}
-          onChangeMethod={this.setreceiptDateState}
-          receiptDateState={this.state.receiptDateState}
-          receiptDateValues={this.state.receiptDateValues}
-          receiptDateFilterStates={receiptDateFilterStates}
-          isApplyButtonEnabled={this.isApplyButtonEnabled()}
-        />}
-        {this.props.isTaskCompletedDateFilter && <TaskCompletedDatePicker
-          handleTaskCompletedDateChange={this.handleTaskCompletedDateChange}
-          handleTaskCompletedSecondaryDateChange={this.handleTaskCompletedSecondaryDateChange}
-          setSelectedValue={this.props.setSelectedValue}
-          handleTaskCompletedApplyFilter={this.handleTaskCompletedApplyFilter}
-          onChangeMethod={this.setTaskCompletedDateState}
-          taskCompletedDateState={this.state.taskCompletedDateState}
-          taskCompletedDateValues={this.state.taskCompletedDateValues}
-          taskCompletedDateFilterStates={taskCompletedDateFilterStates}
-        />
-
-        }
-        {!(this.props.isReceiptDateFilter || this.props.isTaskCompletedDateFilter) &&
-          React.cloneElement(React.Children.only(children), {
-            dropdownFilterViewListStyle,
-            dropdownFilterViewListItemStyle
-          })}
+        {React.cloneElement(React.Children.only(children), {
+          dropdownFilterViewListStyle,
+          dropdownFilterViewListItemStyle
+        })}
       </div>
     </div>;
   }
@@ -211,9 +87,6 @@ QueueDropdownFilter.propTypes = {
   handleClose: PropTypes.func,
   addClearFiltersRow: PropTypes.bool,
   name: PropTypes.string,
-  setSelectedValue: PropTypes.func.isRequired,
-  isReceiptDateFilter: PropTypes.func.isRequired,
-  isTaskCompletedDateFilter: PropTypes.func.isRequired
 };
 
 export default QueueDropdownFilter;
diff --git a/client/app/queue/QueueTable.jsx b/client/app/queue/QueueTable.jsx
index d0b040a145c..4267a27a259 100644
--- a/client/app/queue/QueueTable.jsx
+++ b/client/app/queue/QueueTable.jsx
@@ -13,7 +13,7 @@ import Pagination from '../components/Pagination/Pagination';
 import { COLORS, LOGO_COLORS } from '../constants/AppConstants';
 import ApiUtil from '../util/ApiUtil';
 import LoadingScreen from '../components/LoadingScreen';
-import { tasksWithAppealsFromRawTasks, tasksWithCorrespondenceFromRawTasks } from './utils';
+import { tasksWithAppealsFromRawTasks } from './utils';
 import QUEUE_CONFIG from '../../constants/QUEUE_CONFIG';
 import COPY from '../../COPY';
 
@@ -171,8 +171,6 @@ export const HeaderRow = (props) => {
                 filterOptionsFromApi={props.useTaskPagesApi && column.filterOptions}
                 updateFilters={(newFilters) => props.updateFilteredByList(newFilters)}
                 filteredByList={props.filteredByList}
-                isReceiptDateFilter={column.name === QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name}
-                isTaskCompletedDateFilter={column.name === QUEUE_CONFIG.COLUMNS.TASK_CLOSED_DATE.name}
               />
             );
           }
@@ -640,9 +638,7 @@ export default class QueueTable extends React.PureComponent {
           tasks: { data: tasks }
         } = response.body;
 
-        const preparedTasks = this.props.isCorrespondenceTable ?
-          tasksWithCorrespondenceFromRawTasks(tasks) :
-          tasksWithAppealsFromRawTasks(tasks);
+        const preparedTasks = tasksWithAppealsFromRawTasks(tasks);
 
         const preparedResponse = Object.assign(response.body, { tasks: preparedTasks });
 
@@ -847,7 +843,6 @@ HeaderRow.propTypes = FooterRow.propTypes = Row.propTypes = BodyRows.propTypes =
   }),
   onHistoryUpdate: PropTypes.func,
   preserveFilter: PropTypes.bool,
-  isCorrespondenceTable: PropTypes.bool
 };
 
 Row.propTypes.rowObjects = PropTypes.arrayOf(PropTypes.object);
diff --git a/client/app/queue/QueueTableBuilder.jsx b/client/app/queue/QueueTableBuilder.jsx
index 7ba3d817711..9d421e23f0f 100644
--- a/client/app/queue/QueueTableBuilder.jsx
+++ b/client/app/queue/QueueTableBuilder.jsx
@@ -250,13 +250,7 @@ const QueueTableBuilder = (props) => {
 
   return <div className={rootStyles}>
     <h1 {...css({ display: 'inline-block' })}>{config.table_title}</h1>
-    <QueueOrganizationDropdown
-      isMailTeamUser={props.isMailTeamUser}
-      isMailSupervisor={props.isMailSupervisor}
-      isMailSuperUser={props.isMailSuperUser}
-      organizations={props.organizations}
-      featureToggles = {props.featureToggles}
-    />
+    <QueueOrganizationDropdown organizations={props.organizations} featureToggles = {props.featureToggles} />
     <TabWindow
       name="tasks-tabwindow"
       tabs={tabsFromConfig(config)}
@@ -269,18 +263,12 @@ const mapStateToProps = (state) => {
   return {
     config: state.queue.queueConfig,
     organizations: state.ui.organizations,
-    isMailTeamUser: state.ui.isMailTeamUser,
-    isMailSupervisor: state.ui.isMailSupervisor,
-    isMailSuperUser: state.ui.isMailSuperUser,
     isVhaOrg: isActiveOrganizationVHA(state),
     userCanBulkAssign: state.ui.activeOrganization.userCanBulkAssign,
   };
 };
 
 QueueTableBuilder.propTypes = {
-  isMailTeamUser: PropTypes.bool,
-  isMailSupervisor: PropTypes.bool,
-  isMailSuperUser: PropTypes.bool,
   organizations: PropTypes.array,
   assignedTasks: PropTypes.array,
   config: PropTypes.shape({
diff --git a/client/app/queue/components/QueueOrganizationDropdown.jsx b/client/app/queue/components/QueueOrganizationDropdown.jsx
index 71f381c081d..2b7140f765c 100644
--- a/client/app/queue/components/QueueOrganizationDropdown.jsx
+++ b/client/app/queue/components/QueueOrganizationDropdown.jsx
@@ -1,17 +1,13 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { sprintf } from 'sprintf-js';
-// import { useLocation } from 'react-router-dom';
+
 import QueueSelectorDropdown from './QueueSelectorDropdown';
 import COPY from '../../../COPY';
-import QUEUE_CONFIG from '../../../constants/QUEUE_CONFIG';
 
 export default class QueueOrganizationDropdown extends React.Component {
   render = () => {
     const { organizations } = this.props;
-    const { isMailTeamUser } = this.props;
-    const { isMailSupervisor } = this.props;
-    const { isMailSuperUser } = this.props;
     const url = window.location.pathname.split('/');
     const location = url[url.length - 1];
     const queueHref = (location === 'queue') ? '#' : '/queue';
@@ -40,37 +36,16 @@ export default class QueueOrganizationDropdown extends React.Component {
 
     let items = [queueItem, ...organizationItems];
 
-    if (isMailSuperUser === true || isMailSupervisor === true) {
-      const orgHref = '/queue/correspondence/team';
-
-      correspondenceItems = {
-        key: (2).toString(),
-        href: orgHref,
-        label: sprintf(QUEUE_CONFIG.CASE_LIST_TABLE_QUEUE_DROPDOWN_CORRESPONDENCE_CASES)
-      };
-
-      items = [...items, correspondenceItems];
-    }
-    if (isMailTeamUser === true) {
+    if (organizations[0].name === 'Mail' || organizations[0].name === 'Inbound Ops Team') {
       const orgHref = '/queue/correspondence';
 
       correspondenceItems = {
         key: (2).toString(),
         href: orgHref,
-        label: sprintf(QUEUE_CONFIG.CASE_LIST_TABLE_QUEUE_DROPDOWN_OWN_CORRESPONDENCE_LABEL)
+        label: sprintf(COPY.CASE_LIST_TABLE_QUEUE_DROPDOWN_CORRESPONDENCE_CASES)
       };
-      // This places the "Your Correspondence" option at the 2nd(1) index
-      const items1 = items.slice(0, 1);
-      const items2 = items.slice(1);
 
-      items = [...items1, correspondenceItems, ...items2];
-
-      // const browserLocation = useLocation();
-
-      // console.log(browserLocation);
-      // if (browserLocation === '/queue/correspondence/team') {
-      //   return <Redirect to= "/queue/correspondence" />;
-      // }
+      items = [...items, correspondenceItems];
     }
 
     return <QueueSelectorDropdown items={items} />;
@@ -78,9 +53,6 @@ export default class QueueOrganizationDropdown extends React.Component {
 }
 
 QueueOrganizationDropdown.propTypes = {
-  isMailTeamUser: PropTypes.bool,
-  isMailSupervisor: PropTypes.bool,
-  isMailSuperUser: PropTypes.bool,
   organizations: PropTypes.arrayOf(PropTypes.shape({
     name: PropTypes.string.isRequired,
     url: PropTypes.string.isRequired
diff --git a/client/app/queue/components/TaskTableColumns.jsx b/client/app/queue/components/TaskTableColumns.jsx
index ef381858f36..85ca86f9d5f 100644
--- a/client/app/queue/components/TaskTableColumns.jsx
+++ b/client/app/queue/components/TaskTableColumns.jsx
@@ -13,16 +13,9 @@ import ContinuousProgressBar from 'app/components/ContinuousProgressBar';
 import OnHoldLabel, { numDaysOnHold } from './OnHoldLabel';
 import IhpDaysWaitingTooltip from './IhpDaysWaitingTooltip';
 import TranscriptionTaskTooltip from './TranscriptionTaskTooltip';
-import Checkbox from '../../components/Checkbox';
-import { useDispatch, useSelector } from 'react-redux';
-import {
-  setShowReassignPackageModal,
-  setShowRemovePackageModal,
-  setSelectedTasks
-} from 'app/queue/correspondence/correspondenceReducer/correspondenceActions';
 
 import { taskHasCompletedHold, hasDASRecord, collapseColumn, regionalOfficeCity, renderAppealType } from '../utils';
-import { daysSinceAssigned, daysSincePlacedOnHold } from '../../util/DateUtil';
+import { DateString, daysSinceAssigned, daysSincePlacedOnHold } from '../../util/DateUtil';
 
 import COPY from '../../../COPY';
 import QUEUE_CONFIG from '../../../constants/QUEUE_CONFIG';
@@ -229,147 +222,6 @@ export const assignedByColumn = () => {
   };
 };
 
-export const veteranDetails = () => {
-  const dispatch = useDispatch();
-
-  const showReassignPackageModal = () => {
-    dispatch(setShowReassignPackageModal(true));
-  };
-
-  const showRemovePackageModal = () => {
-    dispatch(setShowRemovePackageModal(true));
-  };
-
-  return {
-    header: 'Veteran Details',
-    label: 'Veteran Details',
-    name: QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
-    backendCanSort: true,
-    getSortValue: (task) => task.veteranDetails,
-    valueFunction: (task) => {
-      if (task.taskUrl === '/modal/reassign_package') {
-        return <a
-          href="#"
-          onClick={showReassignPackageModal}
-          aria-label={`${task.label } Link`}
-          id="task-link"
-        >
-          {task.veteranDetails}
-        </a>;
-      } else if (task.taskUrl === '/modal/remove_package') {
-        return <a
-          href="#"
-          onClick={showRemovePackageModal}
-          aria-label={`${task.label } Link`}
-          id="task-link"
-        >
-          {task.veteranDetails}
-        </a>;
-      }
-
-      return <a
-        href={task.taskUrl}
-        id="task-link"
-        aria-label={`${task.label } Link`}
-      >
-        {task.veteranDetails}
-      </a>;
-    },
-  };
-};
-
-export const vaDor = () => {
-  return {
-    header: 'VA DOR',
-    filterOptions: [],
-    columnName: 'Receipt Date',
-    backendCanSort: true,
-    enableFilter: true,
-    getSortValue: (task) => task.vaDor,
-    name: QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
-    label: QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
-    valueFunction: (task) => {
-      return moment(task.vaDor).format('MM/DD/YYYY');
-    }
-  };
-};
-
-export const notes = () => {
-  return {
-    header: 'Notes',
-    name: QUEUE_CONFIG.COLUMNS.NOTES.name,
-    valueFunction: (task) => task.notes,
-    backendCanSort: true,
-    getSortValue: (task) => task.notes
-  };
-};
-export const checkboxColumn = (handleCheckboxChange) => {
-  const dispatch = useDispatch();
-
-  const currentlySelectedTasks = useSelector((state) => state.intakeCorrespondence.selectedTasks);
-
-  const toggleChange = (value) => {
-    const indexOfTask = currentlySelectedTasks.indexOf(value);
-
-    const newSelectedTasks = currentlySelectedTasks;
-
-    if (indexOfTask === -1) {
-      newSelectedTasks.push(value);
-    } else {
-      newSelectedTasks.splice(indexOfTask, 1);
-    }
-
-    dispatch(setSelectedTasks(newSelectedTasks));
-
-    handleCheckboxChange(newSelectedTasks.length > 0);
-
-  };
-
-  return {
-    header: 'Select',
-    checked: true,
-    name: QUEUE_CONFIG.COLUMNS.CHECKBOX_COLUMN,
-    valueFunction: (task) => {
-
-      if (task) {
-        return <Checkbox
-          id={task.uniqueId}
-          value={Boolean(currentlySelectedTasks.includes(task.uniqueId))}
-          name={task.uniqueId}
-          hideLabel
-          onChange={() => toggleChange(task.uniqueId)}
-        />;
-      }
-
-      return null;
-      // or any other valid JSX element
-
-    }
-
-  };
-};
-
-export const actionType = () => {
-  return {
-    header: 'Action Type',
-    name: QUEUE_CONFIG.COLUMNS.ACTION_TYPE.name,
-    backendCanSort: true,
-    getSortValue: (task) => task.label,
-    valueFunction: (task) => task.label.split(' ')[0]
-  };
-};
-
-export const daysWaitingCorrespondence = () => {
-  return {
-    header: 'Days Waiting',
-    name: QUEUE_CONFIG.COLUMNS.DAYS_WAITING.name,
-    enableFilter: true,
-    backendCanSort: true,
-    getSortValue: (task) => task.daysWaiting,
-    valueFunction: (task) => task.daysWaiting
-  };
-};
-
 export const regionalOfficeColumn = (tasks, filterOptions) => {
   return {
     header: COPY.CASE_LIST_TABLE_REGIONAL_OFFICE_COLUMN_TITLE,
@@ -605,18 +457,8 @@ export const taskCompletedDateColumn = () => {
   return {
     header: COPY.CASE_LIST_TABLE_COMPLETED_ON_DATE_COLUMN_TITLE,
     name: QUEUE_CONFIG.COLUMNS.TASK_CLOSED_DATE.name,
-    filterOptions: [],
-    valueName: 'Date Completed',
-    customFilterLabels: CO_LOCATED_ADMIN_ACTIONS,
-    label: 'Filter by date completed',
-    columnName: QUEUE_CONFIG.COLUMNS.TASK_CLOSED_DATE.name,
-    anyFiltersAreSet: true,
+    valueFunction: (task) => task.closedAt ? <DateString date={task.closedAt} /> : null,
     backendCanSort: true,
-    enableFilter: true,
-    filterable: true,
-    valueFunction: (task) => {
-      return moment(task.closedAt).format('MM/DD/YYYY');
-    },
     getSortValue: (task) => task.closedAt ? new Date(task.closedAt) : null
   };
 };
diff --git a/client/app/queue/correspondence/CorrespondenceCases.jsx b/client/app/queue/correspondence/CorrespondenceCases.jsx
index f8b2aee08d6..5b159dfc588 100644
--- a/client/app/queue/correspondence/CorrespondenceCases.jsx
+++ b/client/app/queue/correspondence/CorrespondenceCases.jsx
@@ -1,106 +1,102 @@
-import React, { useState, useEffect } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import {
-  loadCorrespondenceConfig,
-  setShowReassignPackageModal,
-  setShowRemovePackageModal
-} from './correspondenceReducer/correspondenceActions';
+import * as React from 'react';
+import { connect } from 'react-redux';
+import { bindActionCreators } from 'redux';
+import ApiUtil from '../../util/ApiUtil';
+import { loadVetCorrespondence } from './correspondenceReducer/correspondenceActions';
 import AppSegment from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/AppSegment';
-import PropTypes, { string } from 'prop-types';
+import PropTypes from 'prop-types';
 import COPY from '../../../COPY';
 import { sprintf } from 'sprintf-js';
-import CorrespondenceTableBuilder from './CorrespondenceTableBuilder';
+import { css } from 'glamor';
+import CorrespondenceTable from './CorrespondenceTable';
+import QueueOrganizationDropdown from '../components/QueueOrganizationDropdown';
 import Alert from '../../components/Alert';
-import Modal from 'app/components/Modal';
-import Button from '../../components/Button';
 
-const CorrespondenceCases = (props) => {
-  const dispatch = useDispatch();
-  const configUrl = props.configUrl;
+// import {
+//   initialAssignTasksToUser,
+//   initialCamoAssignTasksToVhaProgramOffice
+// } from '../QueueActions';
 
-  const currentAction = useSelector((state) => state.reviewPackage.lastAction);
-  const veteranInformation = useSelector((state) => state.reviewPackage.veteranInformation);
+class CorrespondenceCases extends React.PureComponent {
 
-  const [vetName, setVetName] = useState('');
+  // grabs correspondences and loads into intakeCorrespondence redux store.
+  getVeteransWithCorrespondence() {
+    return ApiUtil.get('/queue/correspondence?json').then((response) => {
+      const returnedObject = response.body;
+      const vetCorrespondences = returnedObject.vetCorrespondences;
 
-  useEffect(() => {
-    dispatch(loadCorrespondenceConfig(configUrl));
-  }, []);
+      this.props.loadVetCorrespondence(vetCorrespondences);
+    }).
+      catch((err) => {
+        // allow HTTP errors to fall on the floor via the console.
+        console.error(new Error(`Problem with GET /queue/correspondence?json ${err}`));
+      });
+  }
 
-  const config = useSelector((state) => state.intakeCorrespondence.correspondenceConfig);
-  const showReassignPackageModal = useSelector((state) => state.intakeCorrespondence.showReassignPackageModal);
-  const showRemovePackageModal = useSelector((state) => state.intakeCorrespondence.showRemovePackageModal);
+  // load veteran correspondence info on page load
+  componentDidMount() {
+    // Retry the request after a delay
+    setTimeout(() => {
+      this.getVeteransWithCorrespondence();
+    }, 1000);
+  }
 
-  const closeReassignPackageModal = () => {
-    dispatch(setShowReassignPackageModal(false));
-  };
+  render = () => {
+    const {
+      organizations,
+      currentAction,
+      veteranInformation
 
-  const closeRemovePackageModal = () => {
-    dispatch(setShowRemovePackageModal(false));
-  };
+    } = this.props;
 
-  useEffect(() => {
-    if (
-      veteranInformation?.veteranName?.firstName &&
-      veteranInformation?.veteranName?.lastName
-    ) {
-      setVetName(
-        `${veteranInformation.veteranName.firstName.trim()} ${veteranInformation.veteranName.lastName.trim()}`);
+    let vetName = '';
+
+    if (Object.keys(veteranInformation).length > 0) {
+      vetName = `${veteranInformation.veteran_name.first_name.trim()} ${
+        veteranInformation.veteran_name.last_name.trim()}`;
     }
-  }, [veteranInformation]);
 
-  return (
-    <>
-      {props.responseType && (
-        <Alert
-          type={props.responseType}
-          title={props.responseHeader}
-          message={props.responseMessage}
-          scrollOnAlert={false}
-        />
-      )}
-      <AppSegment filledBackground>
-        {(veteranInformation?.veteranName?.firstName && veteranInformation?.veteranName?.lastName) &&
-          currentAction.action_type === 'DeleteReviewPackage' && (
-          <Alert
-            type="success"
-            title={sprintf(COPY.CORRESPONDENCE_TITLE_REMOVE_PACKAGE_BANNER, vetName)}
-            message={COPY.CORRESPONDENCE_MESSAGE_REMOVE_PACKAGE_BANNER}
-            scrollOnAlert={false}
+    return (
+      <React.Fragment>
+        <AppSegment filledBackground>
+          {(Object.keys(veteranInformation).length > 0) &&
+            currentAction.action_type === 'DeleteReviewPackage' &&
+          <Alert type="success" title={sprintf(COPY.CORRESPONDENCE_TITLE_REMOVE_PACKAGE_BANNER, vetName)}
+            message={COPY.CORRESPONDENCE_MESSAGE_REMOVE_PACKAGE_BANNER} scrollOnAlert={false} />}
+          <h1 {...css({ display: 'inline-block' })}>{COPY.CASE_LIST_TABLE_QUEUE_DROPDOWN_CORRESPONDENCE_CASES}</h1>
+          <QueueOrganizationDropdown organizations={organizations} />
+          {this.props.vetCorrespondences &&
+          <CorrespondenceTable
+            vetCorrespondences={this.props.vetCorrespondences}
           />
-        )}
-        {config &&
-        <CorrespondenceTableBuilder mailTeamUsers={props.mailTeamUsers} />}
-        {showReassignPackageModal &&
-        <Modal
-          title={COPY.CORRESPONDENCE_CASES_REASSIGN_PACKAGE_MODAL_TITLE}
-          closeHandler={closeReassignPackageModal}
-          cancelButton={<Button linkStyling onClick={closeReassignPackageModal}>Cancel</Button>}
-        />}
-        {showRemovePackageModal &&
-        <Modal
-          title={COPY.CORRESPONDENCE_CASES_REMOVE_PACKAGE_MODAL_TITLE}
-          closeHandler={closeRemovePackageModal}
-          cancelButton={<Button linkStyling onClick={closeRemovePackageModal}>Cancel</Button>}
-        />}
-      </AppSegment>
-    </>
-  );
-};
+          }
+        </AppSegment>
+      </React.Fragment>
+    );
+  }
+}
 
 CorrespondenceCases.propTypes = {
   organizations: PropTypes.array,
-  loadCorrespondenceConfig: PropTypes.func,
-  correspondenceConfig: PropTypes.object,
+  loadVetCorrespondence: PropTypes.func,
+  vetCorrespondences: PropTypes.array,
   currentAction: PropTypes.object,
-  veteranInformation: PropTypes.object,
-  configUrl: PropTypes.string,
-  mailTeamUsers: PropTypes.arrayOf(string),
-  responseType: PropTypes.string,
-  responseHeader: PropTypes.string,
-  responseMessage: PropTypes.string,
-  taskIds: PropTypes.array
-
+  veteranInformation: PropTypes.object
 };
 
-export default CorrespondenceCases;
+const mapStateToProps = (state) => ({
+  vetCorrespondences: state.intakeCorrespondence.vetCorrespondences,
+  currentAction: state.reviewPackage.lastAction,
+  veteranInformation: state.reviewPackage.veteranInformation
+});
+
+const mapDispatchToProps = (dispatch) => (
+  bindActionCreators({
+    loadVetCorrespondence
+  }, dispatch)
+);
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(CorrespondenceCases);
diff --git a/client/app/queue/correspondence/CorrespondenceTable.jsx b/client/app/queue/correspondence/CorrespondenceTable.jsx
index 6bec750926b..a872c351678 100644
--- a/client/app/queue/correspondence/CorrespondenceTable.jsx
+++ b/client/app/queue/correspondence/CorrespondenceTable.jsx
@@ -38,7 +38,7 @@ class CorrespondenceTable extends React.Component {
       <QueueTable
         className="assign-correspondence-table"
         columns={columns}
-        rowObjects={this.props.correspondenceConfig}
+        rowObjects={this.props.vetCorrespondences}
         summary="scheduled-hearings-table"
         enablePagination
         tabPaginationOptions={tabPaginationOptions}
@@ -51,8 +51,8 @@ CorrespondenceTable.propTypes = {
   hearingScheduleColumns: PropTypes.array,
   hearingScheduleRows: PropTypes.array,
   onApply: PropTypes.func,
-  loadCorrespondenceConfig: PropTypes.func,
-  correspondenceConfig: PropTypes.array,
+  loadVetCorrespondence: PropTypes.func,
+  vetCorrespondences: PropTypes.array,
   history: PropTypes.object,
   user: PropTypes.shape({
     userCanBuildHearingSchedule: PropTypes.bool
diff --git a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
deleted file mode 100644
index 225a60314b4..00000000000
--- a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
+++ /dev/null
@@ -1,289 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { useSelector, connect } from 'react-redux';
-import _ from 'lodash';
-import PropTypes from 'prop-types';
-import { sprintf } from 'sprintf-js';
-import querystring from 'querystring';
-import Button from '../../components/Button';
-import SearchableDropdown from '../../components/SearchableDropdown';
-import QueueTable from '../QueueTable';
-import TabWindow from '../../components/TabWindow';
-import Link from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/Link';
-import QueueOrganizationDropdown from '../components/QueueOrganizationDropdown';
-import {
-  actionType,
-  assignedToColumn,
-  assignedByColumn,
-  checkboxColumn,
-  daysWaitingCorrespondence,
-  notes,
-  taskColumn,
-  taskCompletedDateColumn,
-  vaDor,
-  veteranDetails
-} from '../components/TaskTableColumns';
-
-import { tasksWithCorrespondenceFromRawTasks } from '../utils';
-
-import COPY from '../../../COPY';
-import QUEUE_CONFIG from '../../../constants/QUEUE_CONFIG';
-import { css } from 'glamor';
-import { isActiveOrganizationVHA } from '../selectors';
-
-const rootStyles = css({
-  '.usa-alert + &': {
-    marginTop: '1.5em'
-  }
-});
-
-/**
- * A component to create a queue table's tabs and columns from a queue config or the assignee's tasks
- * The props are:
- * - @assignedTasks {array[object]} array of task objects to appear in the assigned tab
- **/
-
-const buildMailUserData = (data) => {
-  return data.map((user) => {
-    return {
-      value: user,
-      label: user
-    };
-  });
-};
-
-const CorrespondenceTableBuilder = (props) => {
-  const [selectedMailTeamUser, setSelectedMailTeamUser] = useState(null);
-  const [isAnyCheckboxSelected, setIsAnyCheckboxSelected] = useState(false);
-  const [isDropdownItemSelected, setIsDropdownItemSelected] = useState(false);
-  const selectedTasks = useSelector((state) => state.intakeCorrespondence.selectedTasks);
-
-  const paginationOptions = () => querystring.parse(window.location.search.slice(1));
-  const [storedPaginationOptions, setStoredPaginationOptions] = useState(
-    querystring.parse(window.location.search.slice(1))
-  );
-
-  const isInboundOpsTeam = props.organizations.find((org) => org.name === 'Inbound Ops Team');
-
-  // Causes one additional rerender of the QueueTables/tabs but prevents saved pagination behavior
-  // e.g. clearing filter in a tab, then swapping tabs, then swapping back and the filter will still be applied
-  useEffect(() => {
-    setStoredPaginationOptions({});
-  }, []);
-
-  const handleMailTeamUserChange = (selectedUser) => {
-    setSelectedMailTeamUser(selectedUser);
-    setIsDropdownItemSelected(Boolean(selectedUser));
-  };
-
-  const handleCheckboxChange = (isChecked) => {
-    setIsAnyCheckboxSelected(isChecked);
-  };
-
-  const handleAssignButtonClick = () => {
-    // Logic to handle assigning tasks to the selected mail team user
-    if (selectedMailTeamUser && isDropdownItemSelected && isAnyCheckboxSelected) {
-      const mailTeamUser = selectedMailTeamUser.value;
-      const taskIds = selectedTasks.map((task) => task);
-      let newUrl = window.location.href;
-
-      newUrl += newUrl.includes('?') ? `&user=${mailTeamUser}&taskIds=${taskIds}` :
-        `?user=${mailTeamUser}&taskIds=${taskIds}`;
-      window.location.href = newUrl;
-    }
-  };
-
-  const calcActiveTabIndex = (config) => {
-    const tabNames = config.tabs.map((tab) => {
-      return tab.name;
-    });
-
-    const activeTab = paginationOptions().tab || config.active_tab;
-    const index = _.indexOf(tabNames, activeTab);
-
-    return index === -1 ? 0 : index;
-  };
-
-  const queueConfig = () => {
-    const { config } = props;
-
-    config.active_tab_index = calcActiveTabIndex(config);
-
-    return config;
-  };
-
-  const filterValuesForColumn = (column) =>
-    column && column.filterable && column.filter_options;
-
-  const createColumnObject = (column, config, tasks) => {
-
-    const filterOptions = filterValuesForColumn(column);
-    const functionForColumn = {
-      [QUEUE_CONFIG.COLUMNS.DAYS_WAITING_CORRESPONDENCE.name]: daysWaitingCorrespondence(),
-      [QUEUE_CONFIG.COLUMNS.TASK_ASSIGNEE.name]: assignedToColumn(
-        tasks,
-        filterOptions
-      ),
-      [QUEUE_CONFIG.COLUMNS.TASK_ASSIGNED_BY.name]: assignedByColumn(),
-      [QUEUE_CONFIG.COLUMNS.TASK_CLOSED_DATE.name]: taskCompletedDateColumn(),
-      [QUEUE_CONFIG.COLUMNS.TASK_TYPE.name]: taskColumn(tasks, filterOptions),
-      [QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name]: veteranDetails(),
-      [QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name]: vaDor(tasks, filterOptions),
-      [QUEUE_CONFIG.COLUMNS.NOTES.name]: notes(),
-      [QUEUE_CONFIG.COLUMNS.CHECKBOX_COLUMN.name]: checkboxColumn(handleCheckboxChange),
-      [QUEUE_CONFIG.COLUMNS.ACTION_TYPE.name]: actionType(),
-    };
-
-    return functionForColumn[column.name];
-  };
-
-  const columnsFromConfig = (config, tabConfig, tasks) =>
-    (tabConfig.columns || []).map((column) =>
-      createColumnObject(column, config, tasks)
-    );
-
-  const taskTableTabFactory = (tabConfig, config) => {
-    const savedPaginationOptions = storedPaginationOptions;
-    const tasks = tasksWithCorrespondenceFromRawTasks(tabConfig.tasks);
-    let totalTaskCount = tabConfig.total_task_count;
-    let noCasesMessage;
-
-    const { isVhaOrg } = props;
-
-    if (tabConfig.contains_legacy_tasks) {
-      tasks.unshift(...props.assignedTasks);
-      totalTaskCount = tasks.length;
-
-      noCasesMessage = totalTaskCount === 0 && (
-        <p>
-          {COPY.NO_CASES_IN_QUEUE_MESSAGE}
-          <b>
-            <Link to="/search">{COPY.NO_CASES_IN_QUEUE_LINK_TEXT}</Link>
-          </b>
-          .
-        </p>
-      );
-    }
-
-    // Setup default sorting.
-    const defaultSort = {};
-
-    // If there is no sort by column in the pagination options, then use the tab config default sort
-    // eslint-disable-next-line camelcase
-    if (!savedPaginationOptions?.sort_by) {
-      Object.assign(defaultSort, tabConfig.defaultSort);
-    }
-
-    return {
-      label: sprintf(tabConfig.label, totalTaskCount),
-      page: (
-        <>
-          {isInboundOpsTeam &&
-            (tabConfig.name === 'correspondence_unassigned' || tabConfig.name === 'correspondence_team_assigned') &&
-            <>
-              <p className="cf-margin-bottom-0rem">Assign to mail team user</p>
-              <div style={{ display: 'flex', flexDirection: 'row' }}>
-                <SearchableDropdown
-                  className="cf-dropdown"
-                  name="Assign to mail team user"
-                  hideLabel
-                  styling={{ width: '200px', marginRight: '2rem' }}
-                  dropdownStyling={{ width: '200px' }}
-                  options={buildMailUserData(props.mailTeamUsers)}
-                  onChange={handleMailTeamUserChange}
-                />
-                {tabConfig.name === 'correspondence_unassigned' &&
-              <>
-                <Button
-                  name="Assign"
-                  onClick={handleAssignButtonClick}
-                  disabled={!isDropdownItemSelected || !isAnyCheckboxSelected}
-                />
-                <span style={{ marginLeft: 'auto' }}>
-                  <Button
-                    name="Auto assign correspondence"
-                    />
-                  </span>
-                </>
-                }
-                {tabConfig.name === 'correspondence_team_assigned' &&
-            <Button
-              name="Reassign"
-              onClick={handleAssignButtonClick}
-              disabled={!isDropdownItemSelected || !isAnyCheckboxSelected}
-            />
-                }
-              </div>
-              <hr></hr>
-            </>
-          }
-          <p className="cf-margin-top-0">
-            {noCasesMessage || tabConfig.description}
-          </p>
-          <QueueTable
-            key={tabConfig.name}
-            columns={columnsFromConfig(config, tabConfig, tasks)}
-            rowObjects={tasks}
-            getKeyForRow={(_rowNumber, task) => task.uniqueId}
-            casesPerPage={config.tasks_per_page}
-            numberOfPages={tabConfig.task_page_count}
-            totalTaskCount={totalTaskCount}
-            taskPagesApiEndpoint={tabConfig.task_page_endpoint_base_path}
-            tabPaginationOptions={
-              savedPaginationOptions.tab === tabConfig.name ? savedPaginationOptions : {}
-            }
-            // Limit filter preservation/retention to only VHA orgs for now.
-            {...(isVhaOrg ? { preserveFilter: true } : {})}
-            defaultSort={defaultSort}
-            useTaskPagesApi={
-              config.use_task_pages_api && !tabConfig.contains_legacy_tasks
-            }
-            enablePagination
-            isCorrespondenceTable
-          />
-        </>
-      ),
-    };
-  };
-
-  const tabsFromConfig = (config) =>
-    (config.tabs || []).map((tabConfig) =>
-      taskTableTabFactory(tabConfig, config)
-    );
-
-  const config = queueConfig();
-
-  return <div className={rootStyles}>
-    <h1 {...css({ display: 'inline-block' })}>{config.table_title}</h1>
-    <QueueOrganizationDropdown organizations={props.organizations} featureToggles = {props.featureToggles} />
-    <TabWindow
-      name="tasks-tabwindow"
-      tabs={tabsFromConfig(config)}
-      defaultPage={config.active_tab_index}
-    />
-  </div>;
-};
-
-const mapStateToProps = (state) => {
-  return {
-    config: state.intakeCorrespondence.correspondenceConfig,
-    organizations: state.ui.organizations,
-    isVhaOrg: isActiveOrganizationVHA(state),
-    userCanBulkAssign: state.ui.activeOrganization.userCanBulkAssign,
-  };
-};
-
-CorrespondenceTableBuilder.propTypes = {
-  organizations: PropTypes.array,
-  assignedTasks: PropTypes.array,
-  config: PropTypes.shape({
-    table_title: PropTypes.string,
-    active_tab_index: PropTypes.number,
-  }),
-  userCanBulkAssign: PropTypes.bool,
-  isVhaOrg: PropTypes.bool,
-  featureToggles: PropTypes.object,
-  mailTeamUsers: PropTypes.array,
-  selectedTasks: PropTypes.array,
-};
-
-export default connect(mapStateToProps)(CorrespondenceTableBuilder);
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
index e66ac30e4da..4866db8154b 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
@@ -1,5 +1,4 @@
 import { ACTIONS } from './correspondenceConstants';
-import ApiUtil from '../../../util/ApiUtil';
 
 export const loadCurrentCorrespondence = (currentCorrespondence) =>
   (dispatch) => {
@@ -41,28 +40,6 @@ export const loadVetCorrespondence = (vetCorrespondences) =>
     });
   };
 
-export const loadCorrespondenceConfig = (configUrl) =>
-  (dispatch) => {
-    ApiUtil.get(configUrl).then(
-      (response) => {
-        const returnedObject = response.body;
-        const correspondenceConfig = returnedObject.correspondence_config;
-
-        dispatch(
-          {
-            type: ACTIONS.LOAD_CORRESPONDENCE_CONFIG,
-            payload: {
-              correspondenceConfig
-            }
-          });
-
-      }).
-      catch(
-        (err) => {
-          console.error(new Error(`Problem with GET ${configUrl} ${err}`));
-        });
-  };
-
 export const updateRadioValue = (value) =>
   (dispatch) => {
     dispatch({
@@ -88,14 +65,6 @@ export const clearCheckboxState = () =>
     });
   };
 
-export const setSelectedTasks = (values) =>
-  (dispatch) => {
-    dispatch({
-      type: ACTIONS.SET_SELECTED_TASKS,
-      payload: { values }
-    });
-  };
-
 export const setTaskRelatedAppealIds = (appealIds) =>
   (dispatch) => {
     dispatch({
@@ -154,21 +123,3 @@ export const setWaivedEvidenceTasks = (task) => (dispatch) => {
     }
   });
 };
-
-export const setShowReassignPackageModal = (isVisible) => (dispatch) => {
-  dispatch({
-    type: ACTIONS.SET_SHOW_REASSIGN_PACKAGE_MODAL,
-    payload: {
-      isVisible
-    }
-  });
-};
-
-export const setShowRemovePackageModal = (isVisible) => (dispatch) => {
-  dispatch({
-    type: ACTIONS.SET_SHOW_REMOVE_PACKAGE_MODAL,
-    payload: {
-      isVisible
-    }
-  });
-};
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
index bbfee2df05b..5ccbf472a5b 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
@@ -3,8 +3,6 @@ export const ACTIONS = {
   LOAD_CORRESPONDENCES: 'LOAD_CORRESPONDENCES',
   LOAD_VETERAN_INFORMATION: 'LOAD_VETERAN_INFORMATION',
   LOAD_VET_CORRESPONDENCE: 'LOAD_VET_CORRESPONDENCE',
-  LOAD_CORRESPONDENCE_CONFIG: 'LOAD_CORRESPONDENCE_CONFIG',
-  LOAD_MAIL_TEAM_USERS: 'LOAD_MAIL_TEAM_USERS',
   UPDATE_RADIO_VALUE: 'UPDATE_RADIO_VALUE',
   SAVE_CHECKBOX_STATE: 'SAVE_CHECKBOX_STATE',
   CLEAR_CHECKBOX_STATE: 'CLEAR_CHECKBOX_STATE',
@@ -14,7 +12,4 @@ export const ACTIONS = {
   SET_FETCHED_APPEALS: 'SET_FETCHED_APPEALS',
   SET_NEW_APPEAL_RELATED_TASKS: 'SET_NEW_APPEAL_RELATED_TASKS',
   SET_WAIVED_EVIDENCE_TASKS: 'SET_WAIVED_EVIDENCE_TASKS',
-  SET_SHOW_REASSIGN_PACKAGE_MODAL: 'SET_SHOW_REASSIGN_PACKAGE_MODAL',
-  SET_SHOW_REMOVE_PACKAGE_MODAL: 'SET_SHOW_REMOVE_PACKAGE_MODAL',
-  SET_SELECTED_TASKS: 'SET_SELECTED_TASKS'
 };
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
index e5f851abafb..5ab2391e9d5 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
@@ -8,14 +8,11 @@ export const initialState = {
   correspondences: [],
   radioValue: '0',
   relatedCorrespondences: [],
-  selectedTasks: [],
   mailTasks: [],
   unrelatedTasks: [],
   currentCorrespondence: [],
   veteranInformation: [],
   waivedEvidenceTasks: [],
-  showReassignPackageModal: false,
-  showRemovePackageModal: false,
 };
 
 export const intakeCorrespondenceReducer = (state = initialState, action = {}) => {
@@ -48,20 +45,6 @@ export const intakeCorrespondenceReducer = (state = initialState, action = {}) =
       }
     });
 
-  case ACTIONS.LOAD_CORRESPONDENCE_CONFIG:
-    return update(state, {
-      correspondenceConfig: {
-        $set: action.payload.correspondenceConfig
-      }
-    });
-
-  case ACTIONS.LOAD_MAIL_TEAM_USERS:
-    return update(state, {
-      mailTeamUsers: {
-        $set: action.payload.mailTeamUsers
-      }
-    });
-
   case ACTIONS.UPDATE_RADIO_VALUE:
     return update(state, {
       radioValue: {
@@ -91,14 +74,6 @@ export const intakeCorrespondenceReducer = (state = initialState, action = {}) =
       }
     });
 
-    // fix this to use the actual value for set
-  case ACTIONS.SET_SELECTED_TASKS:
-    return update(state, {
-      selectedTasks: {
-        $set: [...action.payload.values]
-      }
-    });
-
   case ACTIONS.SET_UNRELATED_TASKS:
     return update(state, {
       unrelatedTasks: {
@@ -141,20 +116,6 @@ export const intakeCorrespondenceReducer = (state = initialState, action = {}) =
       }
     });
 
-  case ACTIONS.SET_SHOW_REASSIGN_PACKAGE_MODAL:
-    return update(state, {
-      showReassignPackageModal: {
-        $set: action.payload.isVisible
-      }
-    });
-
-  case ACTIONS.SET_SHOW_REMOVE_PACKAGE_MODAL:
-    return update(state, {
-      showRemovePackageModal: {
-        $set: action.payload.isVisible
-      }
-    });
-
   default:
     return state;
   }
diff --git a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/SubmitCorrespondenceModal.jsx b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/SubmitCorrespondenceModal.jsx
index 0c6fd9a6275..2cc5e52d867 100644
--- a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/SubmitCorrespondenceModal.jsx
+++ b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/SubmitCorrespondenceModal.jsx
@@ -25,7 +25,7 @@ export const SubmitCorrespondenceModal = ({ setSubmitCorrespondenceModalVisible,
 
   const handleRouting = (status) => {
     if (status === 201) {
-      window.location.href = '/queue/correspondence?tab=correspondence_assigned&page=1&sort_by=vaDor&order=asc';
+      window.location.href = '/queue/correspondence';
     } else {
       setErrorBannerVisible(true);
       onCancel();
diff --git a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
index 1fc2ff03046..d4d141da5ef 100644
--- a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
+++ b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
@@ -10,6 +10,7 @@ import PropTypes from 'prop-types';
 import { setFileNumberSearch, doFileNumberSearch } from '../../../intake/actions/intake';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
+import { useHistory } from 'react-router';
 import PackageActionModal from '../modals/PackageActionModal';
 import ReviewPackageNotificationBanner from './ReviewPackageNotificationBanner';
 import {
@@ -41,6 +42,7 @@ export const CorrespondenceReviewPackage = (props) => {
   // {  title: ,  message: ,  bannerType: }
   const [bannerInformation, setBannerInformation] = useState(null);
 
+  const history = useHistory();
   const fetchData = async () => {
     const correspondence = props;
 
diff --git a/client/app/queue/uiReducer/uiActions.js b/client/app/queue/uiReducer/uiActions.js
index 716cebc5057..c428b105da2 100644
--- a/client/app/queue/uiReducer/uiActions.js
+++ b/client/app/queue/uiReducer/uiActions.js
@@ -220,21 +220,6 @@ export const setOrganizations = (organizations) => ({
   payload: { organizations }
 });
 
-export const setMailTeamUser = (isMailTeamUser) => ({
-  type: ACTIONS.SET_MAIL_TEAM_USER,
-  payload: { isMailTeamUser }
-});
-
-export const setMailSupervisor = (isMailSupervisor) => ({
-  type: ACTIONS.SET_MAIL_SUPERVISOR,
-  payload: { isMailSupervisor }
-});
-
-export const setMailSuperUser = (isMailSuperUser) => ({
-  type: ACTIONS.SET_MAIL_SUPER_USER,
-  payload: { isMailSuperUser }
-});
-
 export const setActiveOrganization = (id, type, name, isVso, userCanBulkAssign) => ({
   type: ACTIONS.SET_ACTIVE_ORGANIZATION,
   payload: {
diff --git a/client/app/queue/uiReducer/uiConstants.js b/client/app/queue/uiReducer/uiConstants.js
index ff0beb1e3ce..212902a93d2 100644
--- a/client/app/queue/uiReducer/uiConstants.js
+++ b/client/app/queue/uiReducer/uiConstants.js
@@ -38,9 +38,6 @@ export const ACTIONS = {
   SET_USER_IS_CAMO_EMPLOYEE: 'SET_USER_IS_CAMO_EMPLOYEE',
   SET_ORGANIZATION_IDS: 'SET_ORGANIZATION_IDS',
   SET_ORGANIZATIONS: 'SET_ORGANIZATIONS',
-  SET_MAIL_TEAM_USER: 'SET_MAIL_TEAM_USER',
-  SET_MAIL_SUPERVISOR: 'SET_MAIL_SUPERVISOR',
-  SET_MAIL_SUPER_USER: 'SET_MAIL_SUPER_USER',
 
   SET_CAN_EDIT_AOD: 'SET_CAN_EDIT_AOD',
   SET_CAN_EDIT_NOD_DATE: 'SET_CAN_EDIT_NOD_DATE',
diff --git a/client/app/queue/uiReducer/uiReducer.js b/client/app/queue/uiReducer/uiReducer.js
index 2daf42bb727..2fbbf3871b4 100644
--- a/client/app/queue/uiReducer/uiReducer.js
+++ b/client/app/queue/uiReducer/uiReducer.js
@@ -20,9 +20,6 @@ export const initialState = {
   userCssId: '',
   userInfo: null,
   organizations: [],
-  isMailTeamUser: false,
-  isMailSupervisor: false,
-  isMailSuperUser: false,
   activeOrganization: {
     id: null,
     name: null,
@@ -252,24 +249,6 @@ const workQueueUiReducer = (state = initialState, action = {}) => {
         $set: null
       }
     });
-  case ACTIONS.SET_MAIL_TEAM_USER:
-    return update(state, {
-      isMailTeamUser: {
-        $set: action.payload.isMailTeamUser
-      }
-    });
-  case ACTIONS.SET_MAIL_SUPERVISOR:
-    return update(state, {
-      isMailSupervisor: {
-        $set: action.payload.isMailSupervisor
-      }
-    });
-  case ACTIONS.SET_MAIL_SUPER_USER:
-    return update(state, {
-      isMailSuperUser: {
-        $set: action.payload.isMailSuperUser
-      }
-    });
   case ACTIONS.SET_ORGANIZATIONS:
     return update(state, {
       organizations: {
diff --git a/client/app/queue/utils.js b/client/app/queue/utils.js
index 625bb96b172..dc794b1447f 100644
--- a/client/app/queue/utils.js
+++ b/client/app/queue/utils.js
@@ -75,35 +75,6 @@ export const prepareMostRecentlyHeldHearingForStore = (appealId, hearing) => {
   };
 };
 
-const correspondenceTaskAttributesFromRawTask = (task) => {
-  return {
-    uniqueId: task.attributes.unique_id,
-    instructions: task.attributes.instructions,
-    veteranDetails: task.attributes.veteran_details,
-    notes: task.attributes.notes,
-    closedAt: task.attributes.completion_date,
-    daysWaiting: task.attributes.days_waiting,
-    vaDor: task.attributes.va_date_of_receipt,
-    label: task.attributes.label,
-    taskUrl: task.attributes.task_url,
-    status: task.attributes.status,
-    assignedAt: task.attributes.assigned_at,
-    assignedTo: {
-      cssId: task.attributes.assigned_to.css_id,
-      isOrganization: task.attributes.assigned_to.is_organization,
-      id: task.attributes.assigned_to.id,
-      type: task.attributes.assigned_to.type,
-      name: task.attributes.assigned_to.name,
-    },
-    assignedBy: {
-      firstName: task.attributes.assigned_by.first_name,
-      lastName: task.attributes.assigned_by.last_name,
-      cssId: task.attributes.assigned_by.css_id,
-      pgId: task.attributes.assigned_by.pg_id,
-    }
-  };
-};
-
 const taskAttributesFromRawTask = (task) => {
   const decisionPreparedBy = task.attributes.decision_prepared_by?.first_name ?
     {
@@ -260,11 +231,6 @@ export const tasksWithAppealsFromRawTasks = (tasks) =>
     appeal: appealAttributesFromRawTask(task),
   }));
 
-export const tasksWithCorrespondenceFromRawTasks = (tasks) =>
-  tasks?.map((task) => ({
-    ...correspondenceTaskAttributesFromRawTask(task)
-  }));
-
 export const prepareLegacyTasksForStore = (tasks) => {
   const mappedLegacyTasks = tasks.map((task) => {
     return {
@@ -280,8 +246,8 @@ export const prepareLegacyTasksForStore = (tasks) => {
       assigneeName: task.attributes.assignee_name,
       assignedTo: {
         cssId: task.attributes.assigned_to.css_id,
-        id: task.attributes.assigned_to.id,
         isOrganization: task.attributes.assigned_to.is_organization,
+        id: task.attributes.assigned_to.id,
         type: task.attributes.assigned_to.type,
         name: task.attributes.assigned_to.name,
       },
diff --git a/client/constants/CORRESPONDENCE_TASK_URL.json b/client/constants/CORRESPONDENCE_TASK_URL.json
deleted file mode 100644
index 35770c140a6..00000000000
--- a/client/constants/CORRESPONDENCE_TASK_URL.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "INTAKE_TASK_URL": "/queue/correspondence/uuid/intake",
-  "REVIEW_PACKAGE_TASK_URL": "/queue/correspondence/uuid/review_package",
-  "REASSIGN_PACKAGE_TASK_MODAL_URL": "/modal/reassign_package",
-  "REMOVE_PACKAGE_TASK_MODAL_URL": "/modal/remove_package"
-}
diff --git a/client/constants/QUEUE_CONFIG.json b/client/constants/QUEUE_CONFIG.json
index 0dd27fc682a..86691f396cc 100644
--- a/client/constants/QUEUE_CONFIG.json
+++ b/client/constants/QUEUE_CONFIG.json
@@ -24,10 +24,6 @@
   "VHA_PO_ON_HOLD_TASKS_TAB_NAME": "po_on_hold",
   "VHA_PO_COMPLETED_TASKS_TAB_NAME": "po_completed",
 
-  "CASE_LIST_TABLE_QUEUE_DROPDOWN_OWN_CORRESPONDENCE_LABEL": "Your Correspondence",
-  "CASE_LIST_TABLE_QUEUE_DROPDOWN_OWN_CASES_LABEL": "Your cases",
-  "CASE_LIST_TABLE_QUEUE_DROPDOWN_CORRESPONDENCE_CASES": "Correspondence Cases",
-
   "EDUCATION_RPO_ASSIGNED_TASKS_TAB_NAME": "education_rpo_assigned",
   "EDUCATION_RPO_IN_PROGRESS_TASKS_TAB_NAME": "education_rpo_in_progress",
   "EDUCATION_RPO_COMPLETED_TASKS_TAB_NAME": "education_rpo_completed",
@@ -40,43 +36,7 @@
   "CAREGIVER_SUPPORT_IN_PROGRESS_TASKS_TAB_NAME": "caregiver_support_in_progress",
   "CAREGIVER_SUPPORT_COMPLETED_TASKS_TAB_NAME": "caregiver_support_completed",
 
-  "CORRESPONDENCE_ASSIGNED_TASKS_LABEL": "Assigned",
-  "CORRESPONDENCE_COMPLETED_TASKS_LABEL": "Completed",
-  "CORRESPONDENCE_IN_PROGRESS_TASKS_LABEL": "In Progress",
-  "CORRESPONDENCE_ACTION_REQUIRED_TASKS_LABEL": "Action Required",
-  "CORRESPONDENCE_TEAM_ASSIGNED_TASKS_LABEL": "Assigned",
-  "CORRESPONDENCE_TEAM_COMPLETED_TASKS_LABEL": "Completed",
-  "CORRESPONDENCE_PENDING_TASKS_LABEL": "Pending",
-  "CORRESPONDENCE_UNASSIGNED_TASKS_LABEL": "Unassigned",
-
-  "CORRESPONDENCE_ASSIGNED_TASKS_TAB_NAME": "correspondence_assigned",
-  "CORRESPONDENCE_COMPLETED_TASKS_TAB_NAME": "correspondence_completed",
-  "CORRESPONDENCE_IN_PROGRESS_TASKS_TAB_NAME": "correspondence_in_progress",
-  "CORRESPONDENCE_ACTION_REQUIRED_TASKS_TAB_NAME": "correspondence_action_required",
-  "CORRESPONDENCE_TEAM_ASSIGNED_TASKS_TAB_NAME": "correspondence_team_assigned",
-  "CORRESPONDENCE_TEAM_COMPLETED_TASKS_TAB_NAME": "correspondence_team_completed",
-  "CORRESPONDENCE_PENDING_TASKS_TAB_NAME": "correspondence_pending",
-  "CORRESPONDENCE_UNASSIGNED_TASKS_TAB_NAME": "correspondence_unassigned",
-
-  "CORRESPONDENCE_ASSIGNED_TASKS_DESCRIPTION": "Correspondence assigned to you:",
-  "CORRESPONDENCE_COMPLETED_TASKS_DESCRIPTION": "Completed correspondence:",
-  "CORRESPONDENCE_IN_PROGRESS_TASKS_DESCRIPTION": "Correspondence in progress that are assigned to you:",
-  "CORRESPONDENCE_ACTION_REQUIRED_TASKS_DESCRIPTION": "Correspondence with pending requests:",
-  "CORRESPONDENCE_TEAM_ASSIGNED_TASKS_DESCRIPTION": "Correspondence that is currently assigned to mail team users:",
-  "CORRESPONDENCE_TEAM_COMPLETED_TASKS_DESCRIPTION": "Completed correspondence:",
-  "CORRESPONDENCE_PENDING_TASKS_DESCRIPTION": "Correspondence that is currently assigned to non-mail team users:",
-  "CORRESPONDENCE_UNASSIGNED_TASKS_DESCRIPTION": "Correspondence owned by the Mail team are unassigned to an individual:",
-
-  "CORRESPONDENCE_ORG_TABLE_TITLE": "Correspondence cases",
-  "CORRESPONDENCE_USER_TABLE_TITLE": "Your correspondence",
-
-
   "COLUMNS": {
-    "ACTION_TYPE": {
-      "name": "actionType",
-      "sorting_table": "tasks",
-      "sorting_columns": ["type"]
-    },
     "APPEAL_TYPE": {
       "filterable": true,
       "name": "typeColumn"
@@ -91,9 +51,6 @@
       "sorting_table": "cached_appeal_attributes",
       "sorting_columns": ["veteran_name"]
     },
-    "CHECKBOX_COLUMN": {
-      "name": "checkboxColumn"
-    },
     "DAYS_ON_HOLD": {
       "name": "daysOnHoldColumn"
     },
@@ -115,11 +72,6 @@
       "sorting_table": "tasks",
       "sorting_columns": ["assigned_at"]
     },
-    "DAYS_WAITING_CORRESPONDENCE": {
-      "name": "daysWaitingCorrespondence",
-      "sorting_table": "tasks",
-      "sorting_columns": ["assigned_at"]
-    },
     "LAST_ACTION": {
       "name": "lastActionColumn"
     },
@@ -154,15 +106,6 @@
         "issue_types"
       ]
     },
-    "NOTES": {
-      "name": "notes"
-    },
-    "VA_DATE_OF_RECEIPT": {
-      "name": "vaDor"
-    },
-    "VETERAN_DETAILS": {
-      "name": "veteranDetails"
-    },
     "VETERAN_PARTICIPANT_ID": {
       "name": "veteranParticipantIdColumn"
     },
diff --git a/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap b/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap
index 72a7022346d..a467c6c7045 100644
--- a/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap
+++ b/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap
@@ -14,53 +14,58 @@ exports[`CaseWorkerIndex renders correctly 1`] = `
             class="cf-push-left"
             data-css-1vh8afw=""
           >
-            <p
-              data-css-14vgq4z=""
+            <a
+              href="/dispatch/establish-claim/"
             >
-              <a
-                href="/dispatch/establish-claim/"
+              <p
+                data-css-14vgq4z=""
               >
-                <svg
-                  data-css-fu31os=""
-                  height="500px"
-                  version="1.1"
-                  viewBox="0 0 500 500"
-                  width="500px"
+                <a
+                  href="/dispatch/establish-claim/"
                 >
-                  <g
-                    fill="none"
-                    fill-rule="evenodd"
-                    stroke="none"
-                    stroke-width="1"
+                  <svg
+                    data-css-fu31os=""
+                    height="500px"
+                    version="1.1"
+                    viewBox="0 0 500 500"
+                    width="500px"
                   >
-                    <path
-                      d="M389.959839,442.284569 C383.432096,442.271612 376.963574,441.048453 370.883534,438.677355 L257.429719,394.98998 C252.590851,393.086238 247.208346,393.086238 242.369478,394.98998 L129.016064,438.677355 C106.320107,447.603374 80.4584687,439.55605 66.8674699,419.338677 C57.0515074,405.211352 54.9782782,387.116356 61.3453815,371.142285 L105.120482,258.016032 C107.028046,253.186861 107.028046,247.815143 105.120482,242.985972 L61.3453815,129.95992 C54.9782782,113.985849 57.0515074,95.8908522 66.8674699,81.7635271 C80.4584687,61.5461545 106.320107,53.4988304 129.016064,62.4248497 L242.269076,106.112224 C247.107944,108.015966 252.490449,108.015966 257.329317,106.112224 L370.783133,62.4248497 C393.47909,53.4988304 419.340728,61.5461545 432.931727,81.7635271 C442.747689,95.8908522 444.820919,113.985849 438.453815,129.95992 L394.678715,243.086172 C392.77115,247.915343 392.77115,253.287062 394.678715,258.116232 L438.453815,371.342685 C444.820919,387.316757 442.747689,405.411753 432.931727,419.539078 C423.237855,433.723837 407.164043,442.231882 389.959839,442.284569 M249.899598,362.224449 C256.353168,362.233978 262.750462,363.422577 268.7751,365.731463 L382.228916,409.418838 C384.691595,410.389201 387.312266,410.898698 389.959839,410.921844 C396.866782,410.810028 403.280763,407.328714 407.128514,401.603206 C411.093101,395.97649 411.889064,388.713698 409.236948,382.364729 L365.461847,269.138277 C360.743378,257.021258 360.743378,243.579944 365.461847,231.462926 L409.236948,118.336673 C411.813252,111.977018 411.021397,104.751703 407.128514,99.0981964 C401.695283,90.9837231 391.338118,87.7327557 382.228916,91.2825651 L268.7751,134.96994 C256.614316,139.574339 243.184881,139.574339 231.024096,134.96994 L117.771084,91.2825651 C108.661882,87.7327557 98.3047167,90.9837231 92.8714859,99.0981964 C88.9068988,104.724913 88.1109359,111.987705 90.7630522,118.336673 L134.538153,231.362725 C139.256622,243.479744 139.256622,256.921058 134.538153,269.038076 L90.7630522,382.164329 C87.7347473,389.869273 89.5592305,398.632331 95.4124457,404.495531 C101.265661,410.358732 110.039485,412.212063 117.771084,409.218437 L231.124498,365.531062 C237.149529,363.373645 243.498568,362.255472 249.899598,362.224449"
-                      fill="#D6D7D9"
-                    />
-                    <path
-                      d="M209.226908,407.765531 L179.959839,419.048096 L202.108434,468.937876 C210.52076,487.825367 229.289165,499.997401 250,499.997401 C270.710835,499.997401 289.47924,487.825367 297.891566,468.937876 L319.97992,419.088176 L290.753012,407.815631 L269.176707,456.412826 C265.803034,463.96969 258.289598,468.837793 250,468.837793 C241.710402,468.837793 234.196966,463.96969 230.823293,456.412826 L209.226908,407.765531 M378.905622,303.837675 L345.180723,318.737475 C333.273614,324.007833 323.754837,333.507534 318.473896,345.390782 L303.504016,379.108216 L332.771084,390.380762 L347.188755,357.915832 C349.28122,353.172217 353.078185,349.382861 357.831325,347.294589 L390.150602,333.006012 L378.875502,303.837675 M121.074297,303.837675 L109.789157,332.995992 L142.168675,347.294589 C146.901437,349.412477 150.689105,353.192554 152.811245,357.915832 L167.138554,390.190381 L196.405622,378.907816 L181.526104,345.390782 C176.245163,333.507534 166.726386,324.007833 154.819277,318.737475 L121.074297,303.817635 M80.9136546,180.571142 L31.124498,202.60521 C12.1990801,211.000678 0.00260459933,229.731472 0.00260459933,250.400802 C0.00260459933,271.070132 12.1990801,289.800925 31.124498,298.196393 L81.0341365,320.240481 L92.3192771,291.082164 L43.7751004,269.639279 C36.2030617,266.272366 31.3251832,258.773988 31.3251832,250.501002 C31.3251832,242.228016 36.2030617,234.729638 43.7751004,231.362725 L92.3092369,209.91984 L80.9538153,180.591182 M418.885542,180.521042 L407.540161,209.849699 L456.2249,231.362725 C463.796938,234.729638 468.674817,242.228016 468.674817,250.501002 C468.674817,258.773988 463.796938,266.272366 456.2249,269.639279 L407.46988,291.192385 L418.74498,320.360721 L468.875502,298.196393 C487.80092,289.800925 499.997395,271.070132 499.997395,250.400802 C499.997395,229.731472 487.80092,211.000678 468.875502,202.60521 L418.885542,180.561122 M167.329317,110.420842 L152.911647,142.885772 C150.819182,147.629387 147.022217,151.418742 142.269076,153.507014 L109.919679,167.795591 L121.2751,197.124248 L154.919679,182.264529 C166.826788,176.994171 176.345565,167.49447 181.626506,155.611222 L196.686747,121.723447 L167.349398,110.400802 M332.670683,110.400802 L303.323293,121.703407 L318.383534,155.641283 C323.664475,167.52453 333.183252,177.024231 345.090361,182.294589 L378.75502,197.164329 L390.100402,167.835671 L357.730924,153.507014 C352.977783,151.418742 349.180818,147.629387 347.088353,142.885772 L332.650602,110.370741 M250,1.00200401 C229.237589,0.829550704 210.38235,13.058923 202.108434,32.0641283 L179.909639,82.0541082 L209.246988,93.3767535 L230.823293,44.7895792 C234.196966,37.2327148 241.710402,32.3646117 250,32.3646117 C258.289598,32.3646117 265.803034,37.2327148 269.176707,44.7895792 L290.692771,93.2665331 L320.040161,81.9639279 L297.891566,32.0641283 C289.61765,13.058923 270.762411,0.829550704 250,1.00200401"
-                      fill="#844e9f"
-                    />
-                    <path
-                      d="M303.504016,379.108216 L290.753012,407.815631 L320.02008,419.088176 L332.771084,390.370741 L303.504016,379.098196 M196.405622,378.907816 L167.138554,390.190381 L179.949799,419.048096 L209.216867,407.765531 L196.405622,378.907816 M407.459839,291.192385 L378.865462,303.837675 L390.140562,333.006012 L418.73494,320.360721 L407.459839,291.192385 M92.3092369,291.102204 L81.0240964,320.260521 L109.789157,332.975952 L121.074297,303.817635 L92.3192771,291.102204 M390.090361,167.805611 L378.74498,197.134269 L407.540161,209.849699 L418.885542,180.521042 L390.090361,167.805611 M109.909639,167.805611 L80.9538153,180.591182 L92.3192771,209.91984 L121.285141,197.124248 L109.929719,167.795591 M179.929719,82.0541082 L167.349398,110.400802 L196.686747,121.723447 L209.267068,93.3767535 L179.929719,82.0541082 M320.060241,81.9539078 L290.692771,93.2665331 L303.303213,121.673347 L332.650602,110.370741 L320.040161,81.9639279"
-                      fill="#7a4b91"
-                    />
-                  </g>
-                </svg>
-                Caseflow
-              </a>
-              <a
-                href="/dispatch/establish-claim/"
-              >
-                <span
-                  class="cf-application-title"
-                  data-css-1mdtwij=""
-                  id="page-title"
+                    <g
+                      fill="none"
+                      fill-rule="evenodd"
+                      stroke="none"
+                      stroke-width="1"
+                    >
+                      <path
+                        d="M389.959839,442.284569 C383.432096,442.271612 376.963574,441.048453 370.883534,438.677355 L257.429719,394.98998 C252.590851,393.086238 247.208346,393.086238 242.369478,394.98998 L129.016064,438.677355 C106.320107,447.603374 80.4584687,439.55605 66.8674699,419.338677 C57.0515074,405.211352 54.9782782,387.116356 61.3453815,371.142285 L105.120482,258.016032 C107.028046,253.186861 107.028046,247.815143 105.120482,242.985972 L61.3453815,129.95992 C54.9782782,113.985849 57.0515074,95.8908522 66.8674699,81.7635271 C80.4584687,61.5461545 106.320107,53.4988304 129.016064,62.4248497 L242.269076,106.112224 C247.107944,108.015966 252.490449,108.015966 257.329317,106.112224 L370.783133,62.4248497 C393.47909,53.4988304 419.340728,61.5461545 432.931727,81.7635271 C442.747689,95.8908522 444.820919,113.985849 438.453815,129.95992 L394.678715,243.086172 C392.77115,247.915343 392.77115,253.287062 394.678715,258.116232 L438.453815,371.342685 C444.820919,387.316757 442.747689,405.411753 432.931727,419.539078 C423.237855,433.723837 407.164043,442.231882 389.959839,442.284569 M249.899598,362.224449 C256.353168,362.233978 262.750462,363.422577 268.7751,365.731463 L382.228916,409.418838 C384.691595,410.389201 387.312266,410.898698 389.959839,410.921844 C396.866782,410.810028 403.280763,407.328714 407.128514,401.603206 C411.093101,395.97649 411.889064,388.713698 409.236948,382.364729 L365.461847,269.138277 C360.743378,257.021258 360.743378,243.579944 365.461847,231.462926 L409.236948,118.336673 C411.813252,111.977018 411.021397,104.751703 407.128514,99.0981964 C401.695283,90.9837231 391.338118,87.7327557 382.228916,91.2825651 L268.7751,134.96994 C256.614316,139.574339 243.184881,139.574339 231.024096,134.96994 L117.771084,91.2825651 C108.661882,87.7327557 98.3047167,90.9837231 92.8714859,99.0981964 C88.9068988,104.724913 88.1109359,111.987705 90.7630522,118.336673 L134.538153,231.362725 C139.256622,243.479744 139.256622,256.921058 134.538153,269.038076 L90.7630522,382.164329 C87.7347473,389.869273 89.5592305,398.632331 95.4124457,404.495531 C101.265661,410.358732 110.039485,412.212063 117.771084,409.218437 L231.124498,365.531062 C237.149529,363.373645 243.498568,362.255472 249.899598,362.224449"
+                        fill="#D6D7D9"
+                      />
+                      <path
+                        d="M209.226908,407.765531 L179.959839,419.048096 L202.108434,468.937876 C210.52076,487.825367 229.289165,499.997401 250,499.997401 C270.710835,499.997401 289.47924,487.825367 297.891566,468.937876 L319.97992,419.088176 L290.753012,407.815631 L269.176707,456.412826 C265.803034,463.96969 258.289598,468.837793 250,468.837793 C241.710402,468.837793 234.196966,463.96969 230.823293,456.412826 L209.226908,407.765531 M378.905622,303.837675 L345.180723,318.737475 C333.273614,324.007833 323.754837,333.507534 318.473896,345.390782 L303.504016,379.108216 L332.771084,390.380762 L347.188755,357.915832 C349.28122,353.172217 353.078185,349.382861 357.831325,347.294589 L390.150602,333.006012 L378.875502,303.837675 M121.074297,303.837675 L109.789157,332.995992 L142.168675,347.294589 C146.901437,349.412477 150.689105,353.192554 152.811245,357.915832 L167.138554,390.190381 L196.405622,378.907816 L181.526104,345.390782 C176.245163,333.507534 166.726386,324.007833 154.819277,318.737475 L121.074297,303.817635 M80.9136546,180.571142 L31.124498,202.60521 C12.1990801,211.000678 0.00260459933,229.731472 0.00260459933,250.400802 C0.00260459933,271.070132 12.1990801,289.800925 31.124498,298.196393 L81.0341365,320.240481 L92.3192771,291.082164 L43.7751004,269.639279 C36.2030617,266.272366 31.3251832,258.773988 31.3251832,250.501002 C31.3251832,242.228016 36.2030617,234.729638 43.7751004,231.362725 L92.3092369,209.91984 L80.9538153,180.591182 M418.885542,180.521042 L407.540161,209.849699 L456.2249,231.362725 C463.796938,234.729638 468.674817,242.228016 468.674817,250.501002 C468.674817,258.773988 463.796938,266.272366 456.2249,269.639279 L407.46988,291.192385 L418.74498,320.360721 L468.875502,298.196393 C487.80092,289.800925 499.997395,271.070132 499.997395,250.400802 C499.997395,229.731472 487.80092,211.000678 468.875502,202.60521 L418.885542,180.561122 M167.329317,110.420842 L152.911647,142.885772 C150.819182,147.629387 147.022217,151.418742 142.269076,153.507014 L109.919679,167.795591 L121.2751,197.124248 L154.919679,182.264529 C166.826788,176.994171 176.345565,167.49447 181.626506,155.611222 L196.686747,121.723447 L167.349398,110.400802 M332.670683,110.400802 L303.323293,121.703407 L318.383534,155.641283 C323.664475,167.52453 333.183252,177.024231 345.090361,182.294589 L378.75502,197.164329 L390.100402,167.835671 L357.730924,153.507014 C352.977783,151.418742 349.180818,147.629387 347.088353,142.885772 L332.650602,110.370741 M250,1.00200401 C229.237589,0.829550704 210.38235,13.058923 202.108434,32.0641283 L179.909639,82.0541082 L209.246988,93.3767535 L230.823293,44.7895792 C234.196966,37.2327148 241.710402,32.3646117 250,32.3646117 C258.289598,32.3646117 265.803034,37.2327148 269.176707,44.7895792 L290.692771,93.2665331 L320.040161,81.9639279 L297.891566,32.0641283 C289.61765,13.058923 270.762411,0.829550704 250,1.00200401"
+                        fill="#844e9f"
+                      />
+                      <path
+                        d="M303.504016,379.108216 L290.753012,407.815631 L320.02008,419.088176 L332.771084,390.370741 L303.504016,379.098196 M196.405622,378.907816 L167.138554,390.190381 L179.949799,419.048096 L209.216867,407.765531 L196.405622,378.907816 M407.459839,291.192385 L378.865462,303.837675 L390.140562,333.006012 L418.73494,320.360721 L407.459839,291.192385 M92.3092369,291.102204 L81.0240964,320.260521 L109.789157,332.975952 L121.074297,303.817635 L92.3192771,291.102204 M390.090361,167.805611 L378.74498,197.134269 L407.540161,209.849699 L418.885542,180.521042 L390.090361,167.805611 M109.909639,167.805611 L80.9538153,180.591182 L92.3192771,209.91984 L121.285141,197.124248 L109.929719,167.795591 M179.929719,82.0541082 L167.349398,110.400802 L196.686747,121.723447 L209.267068,93.3767535 L179.929719,82.0541082 M320.060241,81.9539078 L290.692771,93.2665331 L303.303213,121.673347 L332.650602,110.370741 L320.040161,81.9639279"
+                        fill="#7a4b91"
+                      />
+                    </g>
+                  </svg>
+                  Caseflow
+                </a>
+                <a
+                  href="/dispatch/establish-claim/"
                 >
-                  Dispatch
-                </span>
-              </a>
-            </p>
+                  <span
+                    class="cf-application-title"
+                    data-css-1mdtwij=""
+                    id="page-title"
+                    tabindex="-1"
+                  >
+                    Dispatch
+                  </span>
+                </a>
+              </p>
+            </a>
             <div
               data-css-1mdtwij=""
             />
diff --git a/client/test/app/queue/__snapshots__/QueueTable.test.js.snap b/client/test/app/queue/__snapshots__/QueueTable.test.js.snap
index 5674c3e4876..7ef3c929441 100644
--- a/client/test/app/queue/__snapshots__/QueueTable.test.js.snap
+++ b/client/test/app/queue/__snapshots__/QueueTable.test.js.snap
@@ -399,8 +399,6 @@ exports[`QueueTable HeaderRow Can filter when using task pages API and column ha
           filterOptions={Array []}
           filterOptionsFromApi={Array []}
           header="Third"
-          isReceiptDateFilter={false}
-          isTaskCompletedDateFilter={false}
           tableData={
             Array [
               Object {
diff --git a/config/routes.rb b/config/routes.rb
index 81f24cc4ad2..34518ee1b66 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -313,7 +313,6 @@
   scope path: '/queue' do
     get '/', to: 'queue#index'
     get '/correspondence', to: 'correspondence#correspondence_cases'
-    get '/correspondence/mail_team_users', to: 'correspondence#mail_team_users'
     get '/correspondence/:correspondence_uuid/intake', to: 'correspondence#intake', as: :queue_correspondence_intake
     post '/correspondence/:correspondence_uuid/current_step', to: 'correspondence#current_step', as: :queue_correspondence_intake_current_step
     post '/correspondence/:correspondence_uuid/correspondence_intake_task', to: 'correspondence_tasks#create_correspondence_intake_task'
@@ -326,7 +325,6 @@
     get '/correspondence/:correspondence_uuid/veteran', to: 'correspondence#veteran'
     put '/correspondence/:correspondence_uuid/update_cmp', to: 'correspondence#update_cmp'
     get '/correspondence/packages', to: 'correspondence#package_documents'
-    get '/correspondence/team', to: 'correspondence#correspondence_team'
     get '/correspondence/:correspondence_uuid', to: 'correspondence#show'
     get '/correspondence/:pdf_id/pdf', to: 'correspondence#pdf'
     patch '/correspondence/:correspondence_uuid', to: 'correspondence#update'
@@ -338,8 +336,6 @@
     get '/appeals/:appeal_id/cavc_dashboard', to: 'cavc_dashboard#index'
     get '/appeals/:vacols_id/tasks/:task_id/schedule_veteran', to: 'queue#index' # Allow direct navigation from the Hearings App
     get '/appeals/:vacols_id/*all', to: redirect('/queue/appeals/%{vacols_id}')
-    get 'correspondence/users/:user_id(*rest)', to: 'correspondence_task_pages#index'
-    get 'correspondence/organizations/:organization_id(*rest)', to: 'correspondence_task_pages#index'
     get '/:user_id(*rest)', to: 'legacy_tasks#index'
   end
   match '/explain/correspondence/:correspondence_uuid/:any' => 'explain#show', via: [:get]
diff --git a/db/seeds.rb b/db/seeds.rb
index 614b044710f..f5f7ca6bcb1 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -73,7 +73,6 @@ def seed
     call_and_log_seed_step Seeds::PackageDocumentTypes
     call_and_log_seed_step Seeds::Correspondence
     call_and_log_seed_step Seeds::MultiCorrespondences
-    call_and_log_seed_step Seeds::QueueCorrespondences
     call_and_log_seed_step Seeds::VbmsDocumentTypes
     call_and_log_seed_step Seeds::CasesTiedToJudgesNoLongerWithBoard
     call_and_log_seed_step Seeds::VhaChangeHistory
diff --git a/db/seeds/helpers/queue_helpers.rb b/db/seeds/helpers/queue_helpers.rb
deleted file mode 100644
index 98ef609a66c..00000000000
--- a/db/seeds/helpers/queue_helpers.rb
+++ /dev/null
@@ -1,153 +0,0 @@
-# frozen_string_literal: true
-
-# rubocop:disable Metrics/ModuleLength
-module QueueHelpers
-  def create_veteran(options = {})
-    @file_number += 1
-    @participant_id += 1
-    @cmp_packet_number ||= 1_000_000_000
-    params = {
-      file_number: format("%<n>09d", n: @file_number),
-      participant_id: format("%<n>09d", n: @participant_id)
-    }
-    veteran = create(:veteran, params.merge(options))
-    2.times do
-      appeal = create(:appeal, veteran_file_number: veteran.file_number)
-      InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
-    end
-    veteran
-  end
-
-  def create_correspondence
-    vet = create_veteran
-    ::Correspondence.create!(
-      uuid: SecureRandom.uuid,
-      portal_entry_date: Time.zone.now,
-      source_type: "Mail",
-      package_document_type_id: (1..20).to_a.sample,
-      correspondence_type_id: CorrespondenceType.all.sample&.id,
-      cmp_queue_id: 1,
-      cmp_packet_number: @cmp_packet_number,
-      va_date_of_receipt: rand(1.month.ago..1.day.ago),
-      notes: "Notes from CMP - Queue Correspondence Seed".split(" ").shuffle.join,
-      assigned_by_id: 81,
-      updated_by_id: 81,
-      veteran_id: vet.id
-    ).tap { @cmp_packet_number += 1 }
-  end
-
-  # :reek:UtilityFunction
-  def create_correspondence_document(correspondence, veteran)
-    CorrespondenceDocument.find_or_create_by!(
-      document_file_number: veteran.file_number,
-      uuid: SecureRandom.uuid,
-      vbms_document_type_id: 1250,
-      document_type: 1250,
-      pages: 30,
-      correspondence_id: correspondence.id
-    )
-  end
-
-  # :reek:UtilityFunction
-  def create_correspondence_intake(correspondence, user)
-    parent = correspondence&.root_task
-    complete_task(ReviewPackageTask.find_by(appeal_id: correspondence.id), user.id)
-    cit = CorrespondenceIntakeTask.create_from_params(parent, user)
-    randomize_days_waiting_value(cit)
-    cit
-  end
-
-  # :reek:UtilityFunction
-  def assign_review_package_task(correspondence, user)
-    review_package_task = ReviewPackageTask.find_by(appeal_id: correspondence.id)
-    review_package_task.update!(
-      assigned_to: user,
-      status: Constants.TASK_STATUSES.assigned,
-      assigned_at: rand(1.month.ago..1.day.ago)
-    )
-  end
-
-  # :reek:UtilityFunction
-  # :reek:FeatureEnvy
-  def create_efolderupload_failed_task(correspondence, parent)
-    euft = EfolderUploadFailedTask.create!(
-      parent_id: parent.id,
-      appeal_id: correspondence.id,
-      appeal_type: "Correspondence",
-      assigned_to: parent.assigned_to,
-      status: Constants.TASK_STATUSES.in_progress
-    )
-    randomize_days_waiting_value(euft)
-  end
-
-  # :reek:UtilityFunction
-  # :reek:LongParameterList
-  def create_action_required_tasks(correspondence, status:, parent_task:, task_type:)
-    task_type.create!(
-      parent_id: parent_task.id,
-      appeal_id: correspondence.id,
-      appeal_type: "Correspondence",
-      status: status,
-      assigned_to: InboundOpsTeam.singleton
-    )
-  end
-
-  # :reek:FeatureEnvy
-  def create_and_complete_mail_task(correspondence, user)
-    process_correspondence(correspondence, user)
-    assigned_by = CorrespondenceIntakeTask.find_by(appeal_id: correspondence.id).completed_by
-    cavct = CavcCorrespondenceMailTask.find_or_create_by!(
-      parent_id: correspondence&.root_task&.id,
-      appeal_id: correspondence.id,
-      appeal_type: "Correspondence",
-      assigned_by: assigned_by,
-      assigned_to: InboundOpsTeam.singleton
-    )
-    cavct.update!(status: Constants.TASK_STATUSES.completed)
-    cavct
-  end
-
-  # :reek:FeatureEnvy
-  def create_cavc_mailtask(correspondence, user)
-    process_correspondence(correspondence, user)
-    assigned_by = CorrespondenceIntakeTask.find_by(appeal_id: correspondence.id).completed_by
-    CavcCorrespondenceMailTask.create!(
-      appeal_id: correspondence.id,
-      appeal_type: "Correspondence",
-      assigned_by: assigned_by,
-      assigned_to: CavcLitigationSupport.singleton,
-      status: Constants.TASK_STATUSES.assigned
-    )
-  end
-  # :reek:FeatureEnvy
-  def create_congress_interest_mailtask(correspondence, user)
-    process_correspondence(correspondence, user)
-    assigned_by = CorrespondenceIntakeTask.find_by(appeal_id: correspondence.id).completed_by
-    CongressionalInterestMailTask.create!(
-      appeal_id: correspondence.id,
-      appeal_type: "Correspondence",
-      assigned_by: assigned_by,
-      assigned_to: LitigationSupport.singleton,
-      status: Constants.TASK_STATUSES.assigned,
-      parent_id: correspondence&.root_task&.id
-    )
-  end
-
-  # :reek:UtilityFunction
-  def complete_task(task, user_id)
-    task.update!(status: Constants.TASK_STATUSES.completed, completed_by_id: user_id)
-  end
-
-  # :reek:UtilityFunction
-  def process_correspondence(correspondence, user)
-    rpt = ReviewPackageTask.find_by(appeal_id: correspondence.id)
-    rpt.update!(status: Constants.TASK_STATUSES.completed, completed_by_id: user.id)
-
-    cit = CorrespondenceIntakeTask.create_from_params(correspondence&.root_task, user)
-    cit.update!(status: Constants.TASK_STATUSES.completed, completed_by_id: user.id)
-  end
-
-  def randomize_days_waiting_value(task)
-    task.update(assigned_at: rand(1.month.ago..1.day.ago))
-  end
-end
diff --git a/db/seeds/queue_correspondences.rb b/db/seeds/queue_correspondences.rb
deleted file mode 100644
index 09cf711eeba..00000000000
--- a/db/seeds/queue_correspondences.rb
+++ /dev/null
@@ -1,195 +0,0 @@
-# frozen_string_literal: true
-
-# create queue correspondence seeds
-require_relative "./helpers/queue_helpers"
-
-module Seeds
-  # :reek:InstanceVariableAssumption
-  class QueueCorrespondences < Base
-    include QueueHelpers
-
-    def initialize
-      initial_id_values
-      RequestStore[:current_user] = User.find_by_css_id("JOLLY_POSTMAN")
-    end
-
-    def mail_team_user
-      @mail_team_user ||= User.find_by_css_id("JOLLY_POSTMAN")
-    end
-
-    def mail_team_superuser
-      @mail_team_superuser ||= User.find_by_css_id("AMBRISVACO")
-    end
-
-    def seed!
-      create_queue_correspondences
-    end
-
-    private
-
-    def initial_id_values
-      @file_number ||= 550_000_000
-      @participant_id ||= 650_000_000
-      while Veteran.find_by(file_number: format("%<n>09d", n: @file_number + 1))
-        @file_number += 100
-        @participant_id += 100
-      end
-
-      @cmp_packet_number ||= 2_000_000_000
-      @cmp_packet_number += 10_000 while ::Correspondence.find_by(cmp_packet_number: @cmp_packet_number + 1)
-    end
-
-    # rubocop:disable Metrics/MethodLength
-    def create_queue_correspondences
-      # 20 Correspondences with unassigned ReviewPackageTask
-      20.times do
-        create_correspondence_with_unassigned_review_package_task
-      end
-
-      # 20 Correspondences with eFolderFailedUploadTask with a parent CorrespondenceIntakeTask
-      20.times do
-        create_correspondence_with_intake_and_failed_upload_task(mail_team_user)
-        create_correspondence_with_intake_and_failed_upload_task(mail_team_superuser)
-      end
-
-      # 20 Correspondences with CorrespondenceIntakeTask with a status of in_progress
-      20.times do
-        create_correspondence_with_intake_task(mail_team_user)
-        create_correspondence_with_intake_task(mail_team_superuser)
-      end
-
-      # 20 Correspondences with eFolderFailedUploadTask with a parent ReviewPackageTask
-      20.times do
-        create_correspondence_with_review_package_and_failed_upload_task(mail_team_user)
-        create_correspondence_with_review_package_and_failed_upload_task(mail_team_superuser)
-      end
-
-      # 20 Correspondences with the CorrespondenceRootTask with the status of completed
-      20.times do
-        create_correspondence_with_completed_root_task
-      end
-
-      # 20 Correspondences with ReviewPackageTask in progress
-      20.times do
-        create_correspondence_with_review_package_task(mail_team_user)
-        create_correspondence_with_review_package_task(mail_team_superuser)
-      end
-
-      # 20 Correspondences with the tasks for Action Required tab and an on_hold ReviewPackageTask as their parent
-      5.times do
-        # below method creates 4 correspondence records
-        create_correspondence_with_action_required_tasks
-      end
-
-      # 10 Correspondences with in-progress CorrespondenceRootTask and completed Mail Task
-      10.times do
-        create_correspondence_with_completed_mail_task(mail_team_user)
-        create_correspondence_with_completed_mail_task(mail_team_superuser)
-      end
-
-      # 5 Correspondences with the CorrespondenceRootTask with the status of canceled
-      5.times do
-        create_correspondence_with_canceled_root_task
-      end
-
-      # 20 Correspondences with the tasks for CAVC and Congress Interest
-      20.times do
-        create_cavc_mailtask(create_correspondence, mail_team_user)
-        create_cavc_mailtask(create_correspondence, mail_team_superuser)
-      end
-
-      20.times do
-        create_congress_interest_mailtask(create_correspondence, mail_team_user)
-        create_congress_interest_mailtask(create_correspondence, mail_team_superuser)
-      end
-
-      10.times do
-        create_correspondence_with_in_progress_review_package_task(mail_team_user)
-        create_correspondence_with_in_progress_review_package_task(mail_team_superuser)
-      end
-
-      10.times do
-        create_correspondence_with_in_progress_intake_task(mail_team_user)
-        create_correspondence_with_in_progress_intake_task(mail_team_superuser)
-      end
-    end
-    # rubocop:enable Metrics/MethodLength
-
-    def create_correspondence_with_intake_and_failed_upload_task(user)
-      corres = create_correspondence
-      parent_task = create_correspondence_intake(corres, user)
-      create_efolderupload_failed_task(corres, parent_task)
-    end
-
-    def create_correspondence_with_intake_task(user)
-      corres = create_correspondence
-      create_correspondence_intake(corres, user)
-    end
-
-    def create_correspondence_with_in_progress_intake_task(user)
-      corres = create_correspondence
-      cit = create_correspondence_intake(corres, user)
-      cit.update!(status: Constants.TASK_STATUSES.in_progress)
-    end
-
-    def create_correspondence_with_unassigned_review_package_task
-      corres = create_correspondence
-      # vary days waiting to be able to test column sorting
-      rpt = ReviewPackageTask.find_by(appeal_id: corres.id)
-      rpt.update(assigned_at: corres.va_date_of_receipt)
-    end
-
-    def create_correspondence_with_review_package_task(user)
-      corres = create_correspondence
-      assign_review_package_task(corres, user)
-    end
-
-    def create_correspondence_with_in_progress_review_package_task(user)
-      corres = create_correspondence
-      assign_review_package_task(corres, user)
-      rpt = ReviewPackageTask.find_by(appeal_id: corres.id)
-      rpt.update!(status: Constants.TASK_STATUSES.in_progress)
-    end
-
-    def create_correspondence_with_review_package_and_failed_upload_task(user)
-      corres = create_correspondence
-      assign_review_package_task(corres, user)
-      parent_task = ReviewPackageTask.find_by(appeal_id: corres.id, type: ReviewPackageTask.name)
-      create_efolderupload_failed_task(corres, parent_task)
-    end
-
-    def create_correspondence_with_completed_root_task
-      corres = create_correspondence
-      corres.root_task.update!(status: Constants.TASK_STATUSES.completed)
-      corres.root_task.update!(closed_at: rand(1.month.ago..1.day.ago))
-    end
-
-    def create_correspondence_with_action_required_tasks
-      corres_array = (1..4).map { create_correspondence }
-      task_array = [ReassignPackageTask, RemovePackageTask, SplitPackageTask, MergePackageTask]
-
-      corres_array.each_with_index do |corres, index|
-        rpt = ReviewPackageTask.find_by(appeal_id: corres.id)
-        rpt.update(assigned_to_id: mail_team_superuser.id) if index.even?
-        pat = task_array[index].create!(
-          parent_id: rpt.id,
-          appeal_id: corres.id,
-          appeal_type: "Correspondence",
-          assigned_to: InboundOpsTeam.singleton,
-          assigned_by_id: rpt.assigned_to_id
-        )
-        pat.update(assigned_at: corres.va_date_of_receipt)
-      end
-    end
-
-    def create_correspondence_with_completed_mail_task(user)
-      correspondence = create_correspondence
-      create_and_complete_mail_task(correspondence, user)
-    end
-
-    def create_correspondence_with_canceled_root_task
-      corres = create_correspondence
-      corres.root_task.update!(status: Constants.TASK_STATUSES.cancelled)
-    end
-  end
-end
diff --git a/lib/tasks/correspondence.rake b/lib/tasks/correspondence.rake
index 92b16bfb203..4ceb135959a 100644
--- a/lib/tasks/correspondence.rake
+++ b/lib/tasks/correspondence.rake
@@ -6,7 +6,6 @@ require_relative "../../db/seeds/vbms_document_types"
 require_relative "../../db/seeds/correspondence_types"
 require_relative "../../db/seeds/package_document_types"
 require_relative "../../db/seeds/multi_correspondences"
-require_relative "../../db/seeds/queue_correspondences"
 
 namespace :correspondence do
   desc "setup data for intake correspondence (autotext and correspondence type)in UAT/PROD"
diff --git a/spec/factories/correspondence.rb b/spec/factories/correspondence.rb
index 5687efee792..ab1f4cbc98c 100644
--- a/spec/factories/correspondence.rb
+++ b/spec/factories/correspondence.rb
@@ -27,12 +27,7 @@
       end
 
       after(:create) do |correspondence, evaluator|
-        create(
-          :correspondence_intake_task,
-          appeal: correspondence,
-          assigned_to: evaluator.assigned_to,
-          appeal_type: Correspondence.name
-        )
+        create(:correspondence_intake_task, appeal: correspondence, assigned_to: evaluator.assigned_to)
       end
     end
   end
diff --git a/spec/factories/task.rb b/spec/factories/task.rb
index ba3ae784d3d..daef960451a 100644
--- a/spec/factories/task.rb
+++ b/spec/factories/task.rb
@@ -400,7 +400,6 @@ def self.find_first_task_or_create(appeal, task_type, **kwargs)
       # > overridden parameters in the instance variable @overrides.
       # It's a clean solution that doesn't require updating tests or adding a new transient attribute.
       appeal { @overrides[:parent] ? @overrides[:parent].appeal : create(:appeal) }
-      appeal_type { appeal.class.name }
 
       before :create do |task, _eval|
         task.update(type: task.class.name)
@@ -619,7 +618,6 @@ def self.find_first_task_or_create(appeal, task_type, **kwargs)
       end
 
       factory :correspondence_intake_task, class: CorrespondenceIntakeTask do
-        appeal_type { Correspondence.name }
       end
 
       factory :efolder_upload_failed_task, class: EfolderUploadFailedTask do
diff --git a/spec/feature/queue/correspondence/correspondence_cases_batch_assignment.rb b/spec/feature/queue/correspondence/correspondence_cases_batch_assignment.rb
deleted file mode 100644
index f11fc5d0f76..00000000000
--- a/spec/feature/queue/correspondence/correspondence_cases_batch_assignment.rb
+++ /dev/null
@@ -1,163 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.feature("The Correspondence Cases page") do
-  include CorrespondenceTaskHelpers
-  # alias this to avoid the method name collision
-  alias_method :create_efolderupload_task, :create_efolderupload_failed_task
-  context "correspondence batch assignment cases for assigned and unassigned tabs" do
-    let(:current_user) { create(:user) }
-    before :each do
-      InboundOpsTeam.singleton.add_user(current_user)
-      User.authenticate!(user: current_user)
-    end
-    let(:organization) { MailTeam.singleton }
-    let(:mail_user) { User.authenticate!(roles: ["Mail Team"]) }
-    let(:target_user) { create(:user, css_id: "TARGET_USER") }
-
-    let(:wait_time) { 30 }
-
-    before do
-      organization.add_user(mail_user)
-      mail_user.reload
-    end
-
-    before do
-      organization.add_user(target_user)
-      target_user.reload
-    end
-
-    before do
-      Timecop.freeze(Time.zone.local(2020, 5, 15))
-      5.times do
-        corres_array = (1..4).map { create(:correspondence) }
-        task_array = [ReassignPackageTask, RemovePackageTask, SplitPackageTask, MergePackageTask]
-
-        corres_array.each_with_index do |corres, index|
-          rpt = ReviewPackageTask.find_by(appeal_id: corres.id)
-          task_array[index].create!(
-            parent_id: rpt.id,
-            appeal_id: corres.id,
-            appeal_type: "Correspondence",
-            assigned_to: InboundOpsTeam.singleton,
-            assigned_by_id: rpt.assigned_to_id
-          )
-        end
-      end
-
-      # Used to mock a single task to compare task sorting
-      ReassignPackageTask.first.correspondence.update!(
-        va_date_of_receipt: Date.new(2000, 10, 10),
-        updated_by_id: current_user.id
-      )
-      ReassignPackageTask.last.correspondence.update!(
-        va_date_of_receipt: Date.new(2050, 10, 10),
-        updated_by_id: current_user.id
-      )
-      FeatureToggle.enable!(:correspondence_queue)
-    end
-
-    before do
-      Timecop.freeze(Time.zone.local(2020, 5, 15))
-      40.times do
-        correspondence = create(:correspondence)
-        parent_task = create_correspondence_intake(correspondence, target_user)
-        create_efolderupload_task(correspondence, parent_task, user: target_user)
-      end
-    end
-
-    it "successfully loads the unassigned tab" do
-      visit "/queue/correspondence/team?tab=correspondence_unassigned"
-      expect(page).to have_content("Correspondence owned by the Mail team are unassigned to an individual:")
-      expect(page).to have_content("Assign to mail team user")
-      expect(page).to have_button("Assign", disabled: true)
-      expect(page).to have_button("Auto assign correspondence")
-    end
-
-    it "Verify the mail team user batch assignment with Assign button" do
-      visit "/queue/correspondence/team?tab=correspondence_unassigned"
-      expect(page).to have_content("Assign to mail team user")
-      expect(page).to have_button("Assign", disabled: true)
-      expect(page).to have_selector(".cf-select__input")
-      all(".cf-select__input").first.click
-      find_by_id("react-select-2-option-0").click
-      page.execute_script('
-        document.querySelectorAll(".cf-form-checkbox input[type=\'checkbox\']").forEach((checkbox, index) => {
-          if (index < 3) {
-            checkbox.click();
-          }
-        });
-      ')
-      expect(page).to have_button("Assign", disabled: false)
-      find_by_id("button-Assign").click
-      expect(page).to have_content("You have successfully assigned 3 Correspondence to #{mail_user.css_id}.")
-      expect(page).to have_content("Please go to your individual queue to see any self-assigned correspondence.")
-    end
-
-    it "Verify the mail team user batch assignment with assign button with queue limit" do
-      visit "/queue/correspondence/team?tab=correspondence_unassigned"
-      expect(page).to have_content("Assign to mail team user")
-      expect(page).to have_button("Assign", disabled: true)
-      expect(page).to have_selector(".cf-select__input")
-      all(".cf-select__input").first.click
-      find_by_id("react-select-2-option-1").click
-      page.execute_script('
-        document.querySelectorAll(".cf-form-checkbox input[type=\'checkbox\']").forEach((checkbox, index) => {
-          if (index < 3) {
-            checkbox.click();
-          }
-        });
-      ')
-      expect(page).to have_button("Assign", disabled: false)
-      find_by_id("button-Assign").click
-      expect(page).to have_content("Correspondence assignment to #{target_user.css_id} has failed")
-      expect(page).to have_content("Queue volume has reached maximum capacity for this user.")
-    end
-
-    it "successfully loads the assigned tab" do
-      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
-      expect(page).to have_content("Correspondence that is currently assigned to mail team users:")
-      expect(page).to have_content("Assign to mail team user")
-      expect(page).to have_button("Reassign", disabled: true)
-    end
-
-    it "Verify the mail team user batch reassignment with Reassign button" do
-      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
-      expect(page).to have_content("Assign to mail team user")
-      expect(page).to have_button("Reassign", disabled: true)
-      expect(page).to have_selector(".cf-select__input")
-      all(".cf-select__input").first.click
-      find_by_id("react-select-2-option-0").click
-      page.execute_script('
-        document.querySelectorAll(".cf-form-checkbox input[type=\'checkbox\']").forEach((checkbox, index) => {
-          if (index < 3) {
-            checkbox.click();
-          }
-        });
-      ')
-      expect(page).to have_button("Reassign", disabled: false)
-      find_by_id("button-Reassign").click
-      expect(page).to have_content("You have successfully reassigned 3 Correspondence to #{mail_user.css_id}.")
-      expect(page).to have_content("Please go to your individual queue to see any self-assigned correspondence.")
-    end
-
-    it "Verify the mail team user batch reassignment with reassign button with queue limit" do
-      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
-      expect(page).to have_content("Assign to mail team user")
-      expect(page).to have_button("Reassign", disabled: true)
-      expect(page).to have_selector(".cf-select__input")
-      all(".cf-select__input").first.click
-      find_by_id("react-select-2-option-1").click
-      page.execute_script('
-        document.querySelectorAll(".cf-form-checkbox input[type=\'checkbox\']").forEach((checkbox, index) => {
-          if (index < 3) {
-            checkbox.click();
-          }
-        });
-      ')
-      expect(page).to have_button("Reassign", disabled: false)
-      find_by_id("button-Reassign").click
-      expect(page).to have_content("Correspondence reassignment to #{target_user.css_id} has failed")
-      expect(page).to have_content("Queue volume has reached maximum capacity for this user.")
-    end
-  end
-end
diff --git a/spec/feature/queue/correspondence/correspondence_cases_spec.rb b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
index cd74f35ec15..371e6b7ff4d 100644
--- a/spec/feature/queue/correspondence/correspondence_cases_spec.rb
+++ b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
@@ -1,14 +1,10 @@
 # frozen_string_literal: true
 
 RSpec.feature("The Correspondence Cases page") do
-  include CorrespondenceTaskHelpers
-  # alias this to avoid the method name collision
-  alias_method :create_efolderupload_task, :create_efolderupload_failed_task
-
   context "correspondece cases feature toggle" do
     let(:current_user) { create(:user) }
     before :each do
-      MailTeam.singleton.add_user(current_user)
+      InboundOpsTeam.singleton.add_user(current_user)
       User.authenticate!(user: current_user)
       @correspondence_uuid = "123456789"
     end
@@ -33,864 +29,4 @@
       @correspondence_uuid = "123456789"
     end
   end
-
-  context "correspondence tasks in-progress tab" do
-    let(:current_user) { create(:user) }
-    before :each do
-      MailTeam.singleton.add_user(current_user)
-      User.authenticate!(user: current_user)
-    end
-
-    before do
-      Timecop.freeze(Time.zone.local(2020, 5, 15))
-      20.times do
-        correspondence = create(:correspondence)
-        parent_task = create_correspondence_intake(correspondence, current_user)
-        create_efolderupload_task(correspondence, parent_task, user: current_user)
-      end
-      # Used to mock a single task to compare task sorting
-      EfolderUploadFailedTask.first.update!(type: "ReviewPackageTask")
-      EfolderUploadFailedTask.first.correspondence.update!(
-        va_date_of_receipt: Date.new(2000, 10, 10),
-        updated_by_id: current_user.id
-      )
-      EfolderUploadFailedTask.last.correspondence.update!(
-        va_date_of_receipt: Date.new(2024, 10, 10),
-        updated_by_id: current_user.id
-      )
-      FeatureToggle.enable!(:correspondence_queue)
-    end
-
-    it "successfully loads the in progress tab" do
-      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
-      expect(page).to have_content("Correspondence in progress")
-    end
-
-    it "uses veteran details sort correctly." do
-      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
-      # put page in the sorted A-Z state
-      find("[aria-label='Sort by Veteran Details']").click
-      first_vet_info = page.all("#task-link")[0].text
-      # put page in the sorted Z-A state
-      find("[aria-label='Sort by Veteran Details']").click
-      last_vet_info = page.all("#task-link")[0].text
-      # return to A-Z, compare veteran details
-      find("[aria-label='Sort by Veteran Details']").click
-      expect(page.all("#task-link")[0].text == first_vet_info)
-      # return to Z-A, compare details again
-      find("[aria-label='Sort by Veteran Details']").click
-      expect(page.all("#task-link")[0].text == last_vet_info)
-    end
-
-    it "uses VA DOR sort correctly." do
-      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
-      # put page in the sorted A-Z state
-      find("[aria-label='Sort by VA DOR']").click
-      first_date = find("tbody > tr:nth-child(1) > td:nth-child(2)")
-      # put page in the sorted Z-A state
-      find("[aria-label='Sort by VA DOR']").click
-      last_date = find("tbody > tr:nth-child(1) > td:nth-child(2)")
-      # return to A-Z, compare veteran details
-      find("[aria-label='Sort by VA DOR']").click
-      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == first_date)
-      # return to Z-A, compare details again
-      find("[aria-label='Sort by VA DOR']").click
-      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == last_date)
-    end
-
-    it "uses tasks sort correctly." do
-      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
-      # put page in the sorted A-Z state
-      find("[aria-label='Sort by Tasks']").click
-      first_task_type = find("tbody > tr:nth-child(1) > td:nth-child(3)").text
-      # put page in the sorted Z-A state
-      find("[aria-label='Sort by Tasks']").click
-      second_task_type = find("tbody > tr:nth-child(1) > td:nth-child(3)").text
-      # return to A-Z, compare veteran details
-      find("[aria-label='Sort by Tasks']").click
-      expect(find("tbody > tr:nth-child(1) > td:nth-child(3)").text == first_task_type)
-      # return to Z-A, compare details again
-      find("[aria-label='Sort by Tasks']").click
-      expect(find("tbody > tr:nth-child(1) > td:nth-child(3)").text == second_task_type)
-    end
-
-    it "uses days waiting sort correctly" do
-      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
-      # put page in the sorted A-Z state
-      find("[aria-label='Sort by Days Waiting']").click
-      first_day_amount = find("tbody > tr:nth-child(1) > td:nth-child(4)").text
-      # put page in the sorted Z-A state
-      find("[aria-label='Sort by Days Waiting']").click
-      second_day_amount = find("tbody > tr:nth-child(1) > td:nth-child(4)").text
-      # return to A-Z, compare veteran details
-      find("[aria-label='Sort by Days Waiting']").click
-      expect(find("tbody > tr:nth-child(1) > td:nth-child(4)").text == first_day_amount)
-      # return to Z-A, compare details again
-      find("[aria-label='Sort by Days Waiting']").click
-      expect(find("tbody > tr:nth-child(1) > td:nth-child(4)").text == second_day_amount)
-    end
-
-    it "uses notes sort correctly" do
-      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
-      # put page in the sorted A-Z state
-      find("[aria-label='Sort by Notes']").click
-      first_note = find("tbody > tr:nth-child(1) > td:nth-child(5)").text
-      # put page in the sorted Z-A state
-      find("[aria-label='Sort by Notes']").click
-      second_note = find("tbody > tr:nth-child(1) > td:nth-child(5)").text
-      # return to A-Z, compare veteran details
-      find("[aria-label='Sort by Notes']").click
-      expect(find("tbody > tr:nth-child(1) > td:nth-child(5)").text == first_note)
-      # return to Z-A, compare details again
-      find("[aria-label='Sort by Notes']").click
-      expect(find("tbody > tr:nth-child(1) > td:nth-child(5)").text == second_note)
-    end
-
-    it "uses receipt date between filter correctly" do
-      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
-      all(".unselected-filter-icon")[0].click
-      find_by_id("reactSelectContainer").click
-      find_by_id("react-select-2-option-0").click
-      all("div.input-container > input")[0].fill_in(with: "10/09/2000")
-      all("div.input-container > input")[1].fill_in(with: "10/11/2000")
-      find(".cf-submit").click
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
-    end
-
-    it "uses receipt date before filter correctly" do
-      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
-      all(".unselected-filter-icon")[0].click
-      find_by_id("reactSelectContainer").click
-      find_by_id("react-select-2-option-1").click
-      all("div.input-container > input")[0].fill_in(with: "10/01/2001")
-      find(".cf-submit").click
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
-    end
-
-    it "uses receipt date after filter correctly" do
-      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
-      all(".unselected-filter-icon")[0].click
-      find_by_id("reactSelectContainer").click
-      find_by_id("react-select-2-option-2").click
-      all("div.input-container > input")[0].fill_in(with: "10/01/2024")
-      find(".cf-submit").click
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
-    end
-
-    it "uses receipt date on filter correctly" do
-      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
-      all(".unselected-filter-icon")[0].click
-      find_by_id("reactSelectContainer").click
-      find_by_id("react-select-2-option-3").click
-      all("div.input-container > input")[0].fill_in(with: "10/10/2000")
-      find(".cf-submit").click
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
-    end
-
-    it "uses uses task filter correctly" do
-      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
-      all(".unselected-filter-icon")[1].click
-      find("label", text: "Review Package Task (1)").click
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
-    end
-  end
-
-  context "correspondence tasks completed tab" do
-    let(:current_user) { create(:user) }
-    before :each do
-      InboundOpsTeam.singleton.add_user(current_user)
-      User.authenticate!(user: current_user)
-    end
-
-    before do
-      20.times do
-        correspondence = create(:correspondence)
-        correspondence.root_task.update!(status: Constants.TASK_STATUSES.completed,
-                                         closed_at: rand(6 * 24 * 60).minutes.ago)
-      end
-    end
-
-    before :each do
-      FeatureToggle.enable!(:correspondence_queue)
-      FeatureToggle.enable!(:user_queue_pagination)
-    end
-
-    it "displays all completed correspondence tasks" do
-      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=completedDateColumn&order=asc"
-      expect(page).to have_content("Completed correspondence:")
-      expect(page).to have_content("Viewing 1-15 of 20 total")
-      expect(page).to have_button("Next")
-      expect(page).not_to have_button("Previous")
-
-      click_button("Next", match: :first)
-      expect(page).to have_content("Viewing 16-20 of 20 total")
-      expect(page).to have_button("Previous")
-      expect(page).not_to have_button("Next")
-
-      click_button("Previous", match: :first)
-      expect(page).to have_content("Viewing 1-15 of 20 total")
-    end
-
-    it "displays all correspondence tasks sorted by date completed" do
-      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=completedDateColumn&order=asc"
-      find("[aria-label='Sort by Date Completed']").click
-
-      dates = all("tbody > tr > td:nth-child(3)").map(&:text)
-      expect(dates).to eq(dates.sort.reverse)
-
-      find("[aria-label='Sort by Date Completed']").click
-      dates = all("tbody > tr > td:nth-child(3)").map(&:text)
-      expect(dates).to eq(dates.sort)
-    end
-
-    it "filters date column with 'between' the dates" do
-      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=completedDateColumn&order=asc"
-
-      find("[aria-label='Filter by date completed']").click
-      expect(page).to have_content("Date filter parameters")
-      expect(page).to have_button("Apply filter", disabled: true)
-
-      find("#reactSelectContainer").click
-      find("#react-select-2-option-0").click
-      current_date = Time.zone.today
-      start_date = current_date.strftime("%m/%d/%Y")
-      end_date = (current_date + 1).strftime("%m/%d/%Y")
-
-      all("div.input-container > input")[0].fill_in(with: start_date)
-      all("div.input-container > input")[1].fill_in(with: end_date)
-
-      expect(page).to have_button("Apply filter", disabled: false)
-      find(".cf-submit").click
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(3)").length).to eq(1)
-    end
-
-    it "filters date column with 'before' this date" do
-      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=completedDateColumn&order=asc"
-
-      find("[aria-label='Filter by date completed']").click
-      expect(page).to have_content("Date filter parameters")
-      expect(page).to have_button("Apply filter", disabled: true)
-
-      find("#reactSelectContainer").click
-      find("#react-select-2-option-1").click
-      current_date = Time.zone.today
-      start_date = (current_date - 1).strftime("%m/%d/%Y")
-
-      all("div.input-container > input")[0].fill_in(with: start_date)
-      expect(page).to have_button("Apply filter", disabled: false)
-      find(".cf-submit").click
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(3)").length).to eq(1)
-    end
-
-    it "filters date column with 'after' this date" do
-      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=completedDateColumn&order=asc"
-
-      find("[aria-label='Filter by date completed']").click
-      expect(page).to have_content("Date filter parameters")
-      expect(page).to have_button("Apply filter", disabled: true)
-
-      find("#reactSelectContainer").click
-      find("#react-select-2-option-2").click
-      current_date = Time.zone.yesterday
-      after_date = (current_date + 1).strftime("%m/%d/%Y")
-      all("div.input-container > input")[0].fill_in(with: after_date)
-      expect(page).to have_button("Apply filter", disabled: false)
-      find(".cf-submit").click
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(3)").length).to eq(1)
-    end
-
-    it "filters date column with 'on' this date" do
-      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=completedDateColumn&order=asc"
-
-      find("[aria-label='Filter by date completed']").click
-      expect(page).to have_content("Date filter parameters")
-      expect(page).to have_button("Apply filter", disabled: true)
-
-      find("#reactSelectContainer").click
-      find("#react-select-2-option-3").click
-      current_date = Time.zone.today
-      on_this_date = current_date.strftime("%m/%d/%Y")
-      all("div.input-container > input")[0].fill_in(with: on_this_date)
-      find(".cf-submit").click
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(3)").length).to eq(1)
-    end
-
-    it "sorts by Veteran Details column" do
-      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=veteranDetailsColumn&order=asc"
-      find("[aria-label='Sort by Veteran Details']").click
-
-      veterans = all("#task-link").map(&:text)
-      expect(veterans).to eq(veterans.sort.reverse)
-
-      find("[aria-label='Sort by Veteran Details']").click
-      veterans = all("#task-link").map(&:text)
-      expect(veterans).to eq(veterans.sort)
-    end
-
-    it "sorts by Notes column" do
-      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=notes&order=asc"
-      find("[aria-label='Sort by Notes']").click
-
-      notes = all("tbody > tr > td:nth-child(4)").map(&:text)
-      expect(notes).to eq(notes.sort.reverse)
-
-      find("[aria-label='Sort by Notes']").click
-      notes = all("tbody > tr > td:nth-child(4)").map(&:text)
-      expect(notes).to eq(notes.sort)
-    end
-  end
-
-  context "correspondence cases action required tab" do
-    let(:current_user) { create(:user) }
-    before :each do
-      InboundOpsTeam.singleton.add_user(current_user)
-      User.authenticate!(user: current_user)
-    end
-    before do
-      Timecop.freeze(Time.zone.local(2020, 5, 15))
-      5.times do
-        corres_array = (1..4).map { create(:correspondence) }
-        task_array = [ReassignPackageTask, RemovePackageTask, SplitPackageTask, MergePackageTask]
-
-        corres_array.each_with_index do |corres, index|
-          rpt = ReviewPackageTask.find_by(appeal_id: corres.id)
-          task_array[index].create!(
-            parent_id: rpt.id,
-            appeal_type: "Correspondence",
-            appeal_id: corres.id,
-            assigned_to: InboundOpsTeam.singleton,
-            assigned_by_id: rpt.assigned_to_id
-          )
-        end
-      end
-      # Used to mock a single task to compare task sorting
-      ReassignPackageTask.first.correspondence.update!(
-        va_date_of_receipt: Date.new(2000, 10, 10),
-        updated_by_id: current_user.id
-      )
-      ReassignPackageTask.last.correspondence.update!(
-        va_date_of_receipt: Date.new(2050, 10, 10),
-        updated_by_id: current_user.id
-      )
-      FeatureToggle.enable!(:correspondence_queue)
-    end
-
-    it "successfully loads the action required tab" do
-      visit "/queue/correspondence/team?tab=correspondence_action_required"
-      expect(page).to have_content("Correspondence with pending requests:")
-    end
-
-    it "uses veteran details sort correctly." do
-      visit "/queue/correspondence/team?tab=correspondence_action_required"
-      # put page in the sorted A-Z state
-      find("[aria-label='Sort by Veteran Details']").click
-      first_vet_info = page.all("#task-link")[0].text
-      # put page in the sorted Z-A state
-      find("[aria-label='Sort by Veteran Details']").click
-      last_vet_info = page.all("#task-link")[0].text
-      # return to A-Z, compare veteran details
-      find("[aria-label='Sort by Veteran Details']").click
-      expect(page.all("#task-link")[0].text == first_vet_info)
-      # return to Z-A, compare details again
-      find("[aria-label='Sort by Veteran Details']").click
-      expect(page.all("#task-link")[0].text == last_vet_info)
-    end
-
-    it "uses VA DOR sort correctly." do
-      visit "/queue/correspondence/team?tab=correspondence_action_required"
-      # put page in the sorted A-Z state
-      find("[aria-label='Sort by VA DOR']").click
-      first_date = find("tbody > tr:nth-child(1) > td:nth-child(2)")
-      # put page in the sorted Z-A state
-      find("[aria-label='Sort by VA DOR']").click
-      last_date = find("tbody > tr:nth-child(1) > td:nth-child(2)")
-      # return to A-Z, compare veteran details
-      find("[aria-label='Sort by VA DOR']").click
-      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == first_date)
-      # return to Z-A, compare details again
-      find("[aria-label='Sort by VA DOR']").click
-      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == last_date)
-    end
-
-    it "uses action type sort correctly." do
-      visit "/queue/correspondence/team?tab=correspondence_action_required"
-      # put page in the sorted A-Z state
-      find("[aria-label='Sort by Action Type']").click
-      first_task_type = find("tbody > tr:nth-child(1) > td:nth-child(3)").text
-      # put page in the sorted Z-A state
-      find("[aria-label='Sort by Action Type']").click
-      second_task_type = find("tbody > tr:nth-child(1) > td:nth-child(3)").text
-      # return to A-Z, compare veteran details
-      find("[aria-label='Sort by Action Type']").click
-      expect(find("tbody > tr:nth-child(1) > td:nth-child(3)").text == first_task_type)
-      # return to Z-A, compare details again
-      find("[aria-label='Sort by Action Type']").click
-      expect(find("tbody > tr:nth-child(1) > td:nth-child(3)").text == second_task_type)
-    end
-
-    it "uses days waiting sort correctly" do
-      visit "/queue/correspondence/team?tab=correspondence_action_required"
-      # put page in the sorted A-Z state
-      find("[aria-label='Sort by Days Waiting']").click
-      first_day_amount = find("tbody > tr:nth-child(1) > td:nth-child(4)").text
-      # put page in the sorted Z-A state
-      find("[aria-label='Sort by Days Waiting']").click
-      second_day_amount = find("tbody > tr:nth-child(1) > td:nth-child(4)").text
-      # return to A-Z, compare veteran details
-      find("[aria-label='Sort by Days Waiting']").click
-      expect(find("tbody > tr:nth-child(1) > td:nth-child(4)").text == first_day_amount)
-      # return to Z-A, compare details again
-      find("[aria-label='Sort by Days Waiting']").click
-      expect(find("tbody > tr:nth-child(1) > td:nth-child(4)").text == second_day_amount)
-    end
-
-    it "uses notes sort correctly" do
-      visit "/queue/correspondence/team?tab=correspondence_action_required"
-      # put page in the sorted A-Z state
-      find("[aria-label='Sort by Notes']").click
-      first_note = find("tbody > tr:nth-child(1) > td:nth-child(5)").text
-      # put page in the sorted Z-A state
-      find("[aria-label='Sort by Notes']").click
-      second_note = find("tbody > tr:nth-child(1) > td:nth-child(5)").text
-      # return to A-Z, compare veteran details
-      find("[aria-label='Sort by Notes']").click
-      expect(find("tbody > tr:nth-child(1) > td:nth-child(5)").text == first_note)
-      # return to Z-A, compare details again
-      find("[aria-label='Sort by Notes']").click
-      expect(find("tbody > tr:nth-child(1) > td:nth-child(5)").text == second_note)
-    end
-
-    it "uses receipt date between filter correctly" do
-      visit "/queue/correspondence/team?tab=correspondence_action_required"
-      all(".unselected-filter-icon")[0].click
-      find_by_id("reactSelectContainer").click
-      find_by_id("react-select-2-option-0").click
-      all("div.input-container > input")[0].fill_in(with: "10/09/2000")
-      all("div.input-container > input")[1].fill_in(with: "10/11/2000")
-      find(".cf-submit").click
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
-    end
-
-    it "uses receipt date before filter correctly" do
-      visit "/queue/correspondence/team?tab=correspondence_action_required"
-      all(".unselected-filter-icon")[0].click
-      find_by_id("reactSelectContainer").click
-      find_by_id("react-select-2-option-1").click
-      all("div.input-container > input")[0].fill_in(with: "10/01/2001")
-      find(".cf-submit").click
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
-    end
-
-    it "uses receipt date after filter correctly" do
-      visit "/queue/correspondence/team?tab=correspondence_action_required"
-      all(".unselected-filter-icon")[0].click
-      find_by_id("reactSelectContainer").click
-      find_by_id("react-select-2-option-2").click
-      all("div.input-container > input")[0].fill_in(with: "10/01/2024")
-      find(".cf-submit").click
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
-    end
-
-    it "uses receipt date on filter correctly" do
-      visit "/queue/correspondence/team?tab=correspondence_action_required"
-      all(".unselected-filter-icon")[0].click
-      find_by_id("reactSelectContainer").click
-      find_by_id("react-select-2-option-3").click
-      all("div.input-container > input")[0].fill_in(with: "10/10/2000")
-      find(".cf-submit").click
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
-    end
-  end
-
-  context "correspondence cases unassigned tab" do
-    let(:current_user) { create(:user) }
-    before :each do
-      InboundOpsTeam.singleton.add_user(current_user)
-      User.authenticate!(user: current_user)
-    end
-
-    before do
-      Timecop.freeze(Time.zone.local(2020, 5, 15))
-      5.times do
-        corres_array = (1..4).map { create(:correspondence) }
-        task_array = [ReassignPackageTask, RemovePackageTask, SplitPackageTask, MergePackageTask]
-
-        corres_array.each_with_index do |corres, index|
-          rpt = ReviewPackageTask.find_by(appeal_id: corres.id)
-          task_array[index].create!(
-            parent_id: rpt.id,
-            appeal_type: "Correspondence",
-            assigned_to: InboundOpsTeam.singleton,
-            appeal_id: corres.id,
-            assigned_by_id: rpt.assigned_to_id
-          )
-        end
-      end
-
-      # Used to mock a single task to compare task sorting
-      ReassignPackageTask.first.correspondence.update!(
-        va_date_of_receipt: Date.new(2000, 10, 10),
-        updated_by_id: current_user.id
-      )
-      ReassignPackageTask.last.correspondence.update!(
-        va_date_of_receipt: Date.new(2050, 10, 10),
-        updated_by_id: current_user.id
-      )
-      FeatureToggle.enable!(:correspondence_queue)
-    end
-
-    it "successfully loads the unassigned tab" do
-      visit "/queue/correspondence/team?tab=correspondence_unassigned"
-      expect(page).to have_content("Correspondence owned by the Mail team are unassigned to an individual:")
-      expect(page).to have_content("Assign to mail team user")
-      expect(page).to have_button("Assign")
-      expect(page).to have_button("Auto assign correspondence")
-    end
-
-    it "uses veteran details sort correctly." do
-      visit "/queue/correspondence/team?tab=correspondence_unassigned"
-      # put page in the sorted A-Z state
-      find("[aria-label='Sort by Veteran Details']").click
-      first_vet_info = page.all("#task-link")[0].text
-      # put page in the sorted Z-A state
-      find("[aria-label='Sort by Veteran Details']").click
-      last_vet_info = page.all("#task-link")[0].text
-      # return to A-Z, compare veteran details
-      find("[aria-label='Sort by Veteran Details']").click
-      expect(page.all("#task-link")[0].text == first_vet_info)
-      # return to Z-A, compare details again
-      find("[aria-label='Sort by Veteran Details']").click
-      expect(page.all("#task-link")[0].text == last_vet_info)
-    end
-
-    it "uses VA DOR sort correctly." do
-      visit "/queue/correspondence/team?tab=correspondence_unassigned"
-      # put page in the sorted A-Z state
-      find("[aria-label='Sort by VA DOR']").click
-      first_date = find("tbody > tr:nth-child(1) > td:nth-child(2)")
-      # put page in the sorted Z-A state
-      find("[aria-label='Sort by VA DOR']").click
-      last_date = find("tbody > tr:nth-child(1) > td:nth-child(2)")
-      # return to A-Z, compare veteran details
-      find("[aria-label='Sort by VA DOR']").click
-      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == first_date)
-      # return to Z-A, compare details again
-      find("[aria-label='Sort by VA DOR']").click
-      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == last_date)
-    end
-
-    it "uses days waiting sort correctly" do
-      visit "/queue/correspondence/team?tab=correspondence_unassigned"
-      # put page in the sorted A-Z state
-      find("[aria-label='Sort by Days Waiting']").click
-      first_day_amount = find("tbody > tr:nth-child(1) > td:nth-child(4)").text
-      # put page in the sorted Z-A state
-      find("[aria-label='Sort by Days Waiting']").click
-      second_day_amount = find("tbody > tr:nth-child(1) > td:nth-child(4)").text
-      # return to A-Z, compare veteran details
-      find("[aria-label='Sort by Days Waiting']").click
-      expect(find("tbody > tr:nth-child(1) > td:nth-child(4)").text == first_day_amount)
-      # return to Z-A, compare details again
-      find("[aria-label='Sort by Days Waiting']").click
-      expect(find("tbody > tr:nth-child(1) > td:nth-child(4)").text == second_day_amount)
-    end
-
-    it "uses notes sort correctly" do
-      visit "/queue/correspondence/team?tab=correspondence_unassigned"
-      # put page in the sorted A-Z state
-      find("[aria-label='Sort by Notes']").click
-      first_note = find("tbody > tr:nth-child(1) > td:nth-child(5)").text
-      # put page in the sorted Z-A state
-      find("[aria-label='Sort by Notes']").click
-      second_note = find("tbody > tr:nth-child(1) > td:nth-child(5)").text
-      # return to A-Z, compare veteran details
-      find("[aria-label='Sort by Notes']").click
-      expect(find("tbody > tr:nth-child(1) > td:nth-child(5)").text == first_note)
-      # return to Z-A, compare details again
-      find("[aria-label='Sort by Notes']").click
-      expect(find("tbody > tr:nth-child(1) > td:nth-child(5)").text == second_note)
-    end
-
-    it "uses receipt date between filter correctly" do
-      visit "/queue/correspondence/team?tab=correspondence_unassigned"
-      all(".unselected-filter-icon")[0].click
-      find_by_id("reactSelectContainer").click
-      find_by_id("react-select-3-option-0").click
-      all("div.input-container > input")[0].fill_in(with: "10/09/2000")
-      all("div.input-container > input")[1].fill_in(with: "10/11/2000")
-      click_button("Apply Filter")
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
-    end
-
-    it "uses receipt date before filter correctly" do
-      visit "/queue/correspondence/team?tab=correspondence_unassigned"
-      all(".unselected-filter-icon")[0].click
-      find_by_id("reactSelectContainer").click
-      find_by_id("react-select-3-option-1").click
-      all("div.input-container > input")[0].fill_in(with: "10/01/2001")
-      click_button("Apply Filter")
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
-    end
-
-    it "uses receipt date after filter correctly" do
-      visit "/queue/correspondence/team?tab=correspondence_unassigned"
-      all(".unselected-filter-icon")[0].click
-      find_by_id("reactSelectContainer").click
-      find_by_id("react-select-3-option-2").click
-      all("div.input-container > input")[0].fill_in(with: "10/01/2024")
-      click_button("Apply Filter")
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
-    end
-
-    it "uses receipt date on filter correctly" do
-      visit "/queue/correspondence/team?tab=correspondence_unassigned"
-      all(".unselected-filter-icon")[0].click
-      find_by_id("reactSelectContainer").click
-      find_by_id("react-select-3-option-3").click
-      all("div.input-container > input")[0].fill_in(with: "10/10/2000")
-      click_button("Apply Filter")
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
-    end
-  end
-
-  context "correspondence cases assigned tab" do
-    let(:current_user) { create(:user) }
-    before :each do
-      InboundOpsTeam.singleton.add_user(current_user)
-      User.authenticate!(user: current_user)
-    end
-
-    before do
-      Timecop.freeze(Time.zone.local(2020, 5, 15))
-      (1..10).map { create(:correspondence, :with_correspondence_intake_task) }
-      10.times do
-        review_correspondence = create(:correspondence)
-        rpt = ReviewPackageTask.find_by(appeal_id: review_correspondence.id)
-        rpt.update!(assigned_to: current_user, status: "assigned")
-        rpt.save!
-      end
-      10.times do
-        corr = create(:correspondence)
-
-        rpt = ReviewPackageTask.find_by(appeal_id: corr.id)
-
-        EfolderUploadFailedTask.create!(
-          parent_id: rpt.id,
-          appeal_id: corr.id,
-          appeal_type: "Correspondence",
-          assigned_to: current_user,
-          assigned_by_id: rpt.assigned_to_id
-        )
-      end
-
-      # Used to mock a single task to compare task sorting
-      EfolderUploadFailedTask.first.correspondence.update!(
-        va_date_of_receipt: Date.new(2000, 10, 10),
-        updated_by_id: current_user.id
-      )
-      EfolderUploadFailedTask.last.correspondence.update!(
-        va_date_of_receipt: Date.new(2050, 10, 10),
-        updated_by_id: current_user.id
-      )
-      FeatureToggle.enable!(:correspondence_queue)
-    end
-
-    it "successfully loads the assigned tab" do
-      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
-      expect(page).to have_content("Correspondence that is currently assigned to mail team users:")
-      expect(page).to have_content("Assign to mail team user")
-      expect(page).to have_button("Reassign", disabled: true)
-    end
-
-    it "uses veteran details sort correctly." do
-      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
-      # put page in the sorted A-Z state
-      find("[aria-label='Sort by Veteran Details']").click
-      first_vet_info = page.all("#task-link")[0].text
-      # put page in the sorted Z-A state
-      find("[aria-label='Sort by Veteran Details']").click
-      last_vet_info = page.all("#task-link")[0].text
-      # return to A-Z, compare veteran details
-      find("[aria-label='Sort by Veteran Details']").click
-      expect(page.all("#task-link")[0].text == first_vet_info)
-      # return to Z-A, compare details again
-      find("[aria-label='Sort by Veteran Details']").click
-      expect(page.all("#task-link")[0].text == last_vet_info)
-    end
-
-    it "uses VA DOR sort correctly." do
-      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
-      # put page in the sorted A-Z state
-      find("[aria-label='Sort by VA DOR']").click
-      first_date = find("tbody > tr:nth-child(1) > td:nth-child(2)")
-      # put page in the sorted Z-A state
-      find("[aria-label='Sort by VA DOR']").click
-      last_date = find("tbody > tr:nth-child(1) > td:nth-child(2)")
-      # return to A-Z, compare veteran details
-      find("[aria-label='Sort by VA DOR']").click
-      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == first_date)
-      # return to Z-A, compare details again
-      find("[aria-label='Sort by VA DOR']").click
-      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == last_date)
-    end
-
-    it "use tasks filter correctly" do
-      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
-      find("[aria-label='Filter by task']").click
-      find("label", text: "Correspondence Intake Task (10)").click
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
-    end
-
-    it "uses days waiting sort correctly" do
-      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
-      # put page in the sorted A-Z state
-      find("[aria-label='Sort by Days Waiting']").click
-      first_day_amount = find("tbody > tr:nth-child(1) > td:nth-child(4)").text
-      # put page in the sorted Z-A state
-      find("[aria-label='Sort by Days Waiting']").click
-      second_day_amount = find("tbody > tr:nth-child(1) > td:nth-child(4)").text
-      # return to A-Z, compare veteran details
-      find("[aria-label='Sort by Days Waiting']").click
-      expect(find("tbody > tr:nth-child(1) > td:nth-child(4)").text == first_day_amount)
-      # return to Z-A, compare details again
-      find("[aria-label='Sort by Days Waiting']").click
-      expect(find("tbody > tr:nth-child(1) > td:nth-child(4)").text == second_day_amount)
-    end
-
-    it "uses notes sort correctly" do
-      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
-      # put page in the sorted A-Z state
-      find("[aria-label='Sort by Notes']").click
-      first_note = find("tbody > tr:nth-child(1) > td:nth-child(5)").text
-      # put page in the sorted Z-A state
-      find("[aria-label='Sort by Notes']").click
-      second_note = find("tbody > tr:nth-child(1) > td:nth-child(5)").text
-      # return to A-Z, compare veteran details
-      find("[aria-label='Sort by Notes']").click
-      expect(find("tbody > tr:nth-child(1) > td:nth-child(5)").text == first_note)
-      # return to Z-A, compare details again
-      find("[aria-label='Sort by Notes']").click
-      expect(find("tbody > tr:nth-child(1) > td:nth-child(5)").text == second_note)
-    end
-
-    it "uses receipt date between filter correctly" do
-      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
-      all(".unselected-filter-icon")[0].click
-      find_by_id("reactSelectContainer").click
-      find_by_id("react-select-3-option-0").click
-      all("div.input-container > input")[0].fill_in(with: "10/09/2000")
-      all("div.input-container > input")[1].fill_in(with: "10/11/2000")
-      click_button("Apply Filter")
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
-    end
-
-    it "uses receipt date before filter correctly" do
-      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
-      all(".unselected-filter-icon")[0].click
-      find_by_id("reactSelectContainer").click
-      find_by_id("react-select-3-option-1").click
-      all("div.input-container > input")[0].fill_in(with: "10/01/2001")
-      click_button("Apply Filter")
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
-    end
-
-    it "uses receipt date after filter correctly" do
-      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
-      all(".unselected-filter-icon")[0].click
-      find_by_id("reactSelectContainer").click
-      find_by_id("react-select-3-option-2").click
-      all("div.input-container > input")[0].fill_in(with: "10/01/2024")
-      click_button("Apply Filter")
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
-    end
-
-    it "uses receipt date on filter correctly" do
-      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
-      all(".unselected-filter-icon")[0].click
-      find_by_id("reactSelectContainer").click
-      find_by_id("react-select-3-option-3").click
-      all("div.input-container > input")[0].fill_in(with: "10/10/2000")
-      click_button("Apply Filter")
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
-    end
-  end
-
-  context "Your Correspondence assigned tab" do
-    let(:current_user) { create(:user) }
-    before :each do
-      InboundOpsTeam.singleton.add_user(current_user)
-      User.authenticate!(user: current_user)
-    end
-
-    before do
-      Timecop.freeze(Time.zone.local(2020, 5, 15))
-      (1..10).map { create(:correspondence, :with_correspondence_intake_task) }
-      10.times do
-        review_correspondence = create(:correspondence)
-        rpt = ReviewPackageTask.find_by(appeal_id: review_correspondence.id)
-        rpt.update!(assigned_to: current_user, status: "assigned")
-        rpt.save!
-      end
-      10.times do
-        corr = create(:correspondence)
-
-        rpt = ReviewPackageTask.find_by(appeal_id: corr.id)
-
-        EfolderUploadFailedTask.create!(
-          parent_id: rpt.id,
-          appeal_id: corr.id,
-          appeal_type: "Correspondence",
-          assigned_to: current_user,
-          assigned_by_id: rpt.assigned_to_id
-        )
-      end
-
-      # Used to mock a single task to compare task sorting
-      EfolderUploadFailedTask.first.correspondence.update!(
-        va_date_of_receipt: Date.new(2000, 10, 10),
-        updated_by_id: current_user.id
-      )
-      EfolderUploadFailedTask.last.correspondence.update!(
-        va_date_of_receipt: Date.new(2050, 10, 10),
-        updated_by_id: current_user.id
-      )
-      FeatureToggle.enable!(:correspondence_queue)
-    end
-
-    it "successfully loads the assigned tab" do
-      visit "/queue/correspondence?tab=correspondence_assigned&page=1&sort_by=vaDor&order=asc"
-    end
-
-    it "uses VA DOR sort correctly." do
-      visit "/queue/correspondence?tab=correspondence_assigned&page=1&sort_by=vaDor&order=asc"
-      # put page in the sorted A-Z state
-      find("[aria-label='Sort by VA DOR']").click
-      first_date = find("tbody > tr:nth-child(1) > td:nth-child(2)")
-      # put page in the sorted Z-A state
-      find("[aria-label='Sort by VA DOR']").click
-      last_date = find("tbody > tr:nth-child(1) > td:nth-child(2)")
-      # return to A-Z, compare veteran details
-      find("[aria-label='Sort by VA DOR']").click
-      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == first_date)
-      # return to Z-A, compare details again
-      find("[aria-label='Sort by VA DOR']").click
-      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == last_date)
-    end
-
-    it "uses notes sort correctly" do
-      visit "/queue/correspondence?tab=correspondence_assigned&page=1&sort_by=vaDor&order=asc"
-      # put page in the sorted A-Z state
-      find("[aria-label='Sort by Notes']").click
-      first_note = find("tbody > tr:nth-child(1) > td:nth-child(5)").text
-      # put page in the sorted Z-A state
-      find("[aria-label='Sort by Notes']").click
-      second_note = find("tbody > tr:nth-child(1) > td:nth-child(5)").text
-      # return to A-Z, compare veteran details
-      find("[aria-label='Sort by Notes']").click
-      expect(find("tbody > tr:nth-child(1) > td:nth-child(5)").text == first_note)
-      # return to Z-A, compare details again
-      find("[aria-label='Sort by Notes']").click
-      expect(find("tbody > tr:nth-child(1) > td:nth-child(5)").text == second_note)
-    end
-  end
 end
diff --git a/spec/feature/queue/correspondence/correspondence_queue_task_link_spec.rb b/spec/feature/queue/correspondence/correspondence_queue_task_link_spec.rb
deleted file mode 100644
index 73111655cd3..00000000000
--- a/spec/feature/queue/correspondence/correspondence_queue_task_link_spec.rb
+++ /dev/null
@@ -1,118 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.feature "Task Links on Your Correspondence and Correspondence Cases pages" do
-  include CorrespondenceTaskHelpers
-
-  describe "When a user clicks a task link in veterans details column" do
-    let(:current_user) { create(:user) }
-    before :each do
-      FeatureToggle.enable!(:correspondence_queue)
-      MailTeam.singleton.add_user(current_user)
-      User.authenticate!(user: current_user)
-    end
-
-    context "the task is an active CorrespondenceIntakeTask" do
-      it "routes to the Correspondence Intake page" do
-        correspondence = create(:correspondence)
-        create_correspondence_intake(correspondence, current_user)
-        visit "/queue/correspondence?tab=correspondence_assigned&page=1&sort_by=vaDor&order=asc"
-        find_all("#task-link").last.click
-        using_wait_time(10) do
-          expect(page).to have_content("Add Related Correspondence")
-        end
-      end
-    end
-
-    context "the task is an active ReviewPackageTask" do
-      it "routes to the Review Package page" do
-        correspondence = create(:correspondence)
-        assign_review_package_task(correspondence, current_user)
-        visit "/queue/correspondence?tab=correspondence_assigned&page=1&sort_by=vaDor&order=asc"
-        find_all("#task-link").last.click
-        using_wait_time(10) do
-          expect(page).to have_content("Review Package")
-        end
-      end
-    end
-
-    context "the task is an EfolderFailedUploadTask" do
-      context "with a parent task that is a ReviewPackageTask" do
-        it "routes to the Review Package page" do
-          correspondence = create(:correspondence)
-          assign_review_package_task(correspondence, current_user)
-          process_correspondence(correspondence, current_user)
-          parent_task = ReviewPackageTask.find_by(appeal_id: correspondence.id)
-          create_efolderupload_failed_task(correspondence, parent_task, user: current_user)
-          visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
-          find_all("#task-link").last.click
-          using_wait_time(10) do
-            expect(page).to have_content("Review Package")
-          end
-        end
-      end
-
-      context "with a parent task that is a CorrespondenceIntakeTask" do
-        it "routes to the Correspondence Intake page" do
-          correspondence = create(:correspondence)
-          parent_task = create_correspondence_intake(correspondence, current_user)
-          create_efolderupload_failed_task(correspondence, parent_task, user: current_user)
-          visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
-          find_all("#task-link").last.click
-          using_wait_time(10) do
-            expect(page).to have_content("Add Related Correspondence")
-          end
-        end
-      end
-    end
-
-    context "the task is a Package Action Task" do
-      context "type ReassignPackageTask" do
-        before do
-          correspondence = create(:correspondence)
-          parent_task = ReviewPackageTask.find_by(appeal_id: correspondence.id)
-          ReassignPackageTask.create!(
-            parent_id: parent_task&.id,
-            appeal_id: correspondence&.id,
-            appeal_type: "Correspondence",
-            assigned_to: InboundOpsTeam.singleton
-          )
-          InboundOpsTeam.singleton.add_user(current_user)
-          visit "/queue/correspondence/team?tab=correspondence_action_required&page=1&sort_by=vaDor&order=asc"
-          find_all("#task-link").last.click
-        end
-
-        it "user remains on Correspondence Cases" do
-          expect(page).to have_content("Correspondence cases")
-        end
-
-        it "a modal appears on the screen" do
-          expect(page).to have_css(".cf-modal-body")
-        end
-      end
-
-      context "type RemovePackageTask" do
-        before do
-          correspondence = create(:correspondence)
-          parent_task = ReviewPackageTask.find_by(appeal_id: correspondence.id)
-          RemovePackageTask.create!(
-            parent_id: parent_task&.id,
-            appeal_id: correspondence&.id,
-            appeal_type: "Correspondence",
-            assigned_to: InboundOpsTeam.singleton
-          )
-          InboundOpsTeam.singleton.add_user(current_user)
-          visit "/queue/correspondence/team?tab=correspondence_action_required&page=1&sort_by=vaDor&order=asc"
-          find_all("#task-link").last.click
-        end
-
-        it "user remains on Correspondence Cases" do
-          expect(page).to have_content("Correspondence cases")
-        end
-
-        it "a modal appears on the screen" do
-          expect(page).to have_css(".cf-modal-body")
-        end
-      end
-    end
-  end
-end
diff --git a/spec/feature/queue/correspondence/review_package_spec.rb b/spec/feature/queue/correspondence/review_package_spec.rb
index 487132719d3..129077f3ea9 100644
--- a/spec/feature/queue/correspondence/review_package_spec.rb
+++ b/spec/feature/queue/correspondence/review_package_spec.rb
@@ -109,7 +109,7 @@
         click_button "Review removal request"
         page.all(".cf-form-radio-option > label")[0].click
         click_button("Confirm")
-        using_wait_time(20) do
+        using_wait_time(10) do
           expect(page).to have_content("The package has been removed from Caseflow and must be manually uploaded again from the Centralized Mail Portal, if it needs to be processed.")
         end
       end
diff --git a/spec/models/correspondence_config_spec.rb b/spec/models/correspondence_config_spec.rb
deleted file mode 100644
index 0a3bbd9a16c..00000000000
--- a/spec/models/correspondence_config_spec.rb
+++ /dev/null
@@ -1,106 +0,0 @@
-# frozen_string_literal: true
-
-describe CorrespondenceConfig, :postgres do
-  before do
-    RequestStore[:current_user] = user
-  end
-
-  describe ".to_hash" do
-    let(:assignee) { create(:organization) }
-    let(:user) { create(:user) }
-
-    subject { CorrespondenceConfig.new(assignee: assignee).to_hash }
-
-    describe "shape of the returned hash" do
-      it "returns the correct top level keys in the response" do
-        expect(subject.keys).to match_array([:table_title, :active_tab, :tasks_per_page, :use_task_pages_api, :tabs])
-      end
-    end
-
-    describe "title" do
-      context "when assigned to an org" do
-        it "is formatted as expected" do
-          expect(subject[:table_title]).to eq("Correspondence cases")
-        end
-      end
-
-      context "when assigned to a user" do
-        let(:assignee) { user }
-
-        it "is formatted as expected" do
-          expect(subject[:table_title]).to eq("Your correspondence")
-        end
-      end
-    end
-
-    describe "active_tab" do
-      it "is the unassigned tab" do
-        expect(subject[:active_tab]).to eq("correspondence_unassigned")
-      end
-
-      context "when assigned to a user" do
-        let(:assignee) { user }
-
-        it "is the assigned tab" do
-          expect(subject[:active_tab]).to eq("correspondence_assigned")
-        end
-      end
-    end
-
-    describe "tabs array" do
-      context "when assigned to an organization" do
-        it "has the correct tabs" do
-          expect(subject[:tabs].map do |tab|
-            tab[:label]
-          end).to eq(%w[Unassigned Action\ Required Pending Assigned Completed])
-        end
-
-        it "tabs have the correct columns" do
-          expect(subject[:tabs].find { |tab| tab[:label] == "Unassigned" }[:columns]
-          .map { |column| column[:name] })
-            .to eq(%w[checkboxColumn veteranDetails vaDor daysWaitingCorrespondence notes])
-
-          expect(subject[:tabs].find { |tab| tab[:label] == "Action Required" }[:columns]
-          .map { |column| column[:name] })
-            .to eq(%w[veteranDetails vaDor daysWaitingCorrespondence assignedByColumn actionType notes])
-
-          expect(subject[:tabs].find { |tab| tab[:label] == "Pending" }[:columns]
-          .map { |column| column[:name] })
-            .to eq(%w[veteranDetails vaDor daysWaitingCorrespondence taskColumn assignedToColumn])
-
-          expect(subject[:tabs].find { |tab| tab[:label] == "Assigned" }[:columns]
-          .map { |column| column[:name] })
-            .to eq(%w[checkboxColumn veteranDetails vaDor daysWaitingCorrespondence taskColumn assignedToColumn notes])
-
-          expect(subject[:tabs].find { |tab| tab[:label] == "Completed" }[:columns]
-          .map { |column| column[:name] })
-            .to eq(%w[veteranDetails vaDor completedDateColumn notes])
-        end
-      end
-
-      context "when assigned to a user" do
-        let(:assignee) { user }
-
-        it "has the correct tabs" do
-          expect(subject[:tabs].map do |tab|
-            tab[:label]
-          end).to eq(%w[Assigned In\ Progress Completed])
-        end
-
-        it "tabs have the correct columns" do
-          expect(subject[:tabs].find { |tab| tab[:label] == "Assigned" }[:columns]
-          .map { |column| column[:name] })
-            .to eq(%w[veteranDetails vaDor daysWaitingCorrespondence notes])
-
-          expect(subject[:tabs].find { |tab| tab[:label] == "In Progress" }[:columns]
-          .map { |column| column[:name] })
-            .to eq(%w[veteranDetails vaDor taskColumn daysWaitingCorrespondence notes])
-
-          expect(subject[:tabs].find { |tab| tab[:label] == "Completed" }[:columns]
-          .map { |column| column[:name] })
-            .to eq(%w[veteranDetails vaDor completedDateColumn notes])
-        end
-      end
-    end
-  end
-end
diff --git a/spec/models/task_spec.rb b/spec/models/task_spec.rb
index 4e5df7227ce..21bac51e3b6 100644
--- a/spec/models/task_spec.rb
+++ b/spec/models/task_spec.rb
@@ -1997,126 +1997,4 @@ def next_assignee(_options = {})
       end
     end
   end
-
-  describe "Correspondence Tasks" do
-    context "Correspondence Intake Task" do
-      it "has a task_url" do
-        correspondence = create(:correspondence)
-        cit = create(
-          :correspondence_intake_task,
-          appeal: correspondence,
-          appeal_type: Correspondence.name,
-          assigned_to: create(:user)
-        )
-        expect(cit.task_url).to eq("/queue/correspondence/#{cit.correspondence.uuid}/intake")
-      end
-    end
-
-    context "Review Package Task" do
-      it "has a task_url" do
-        correspondence = create(:correspondence)
-        rpt = ReviewPackageTask.find_or_create_by(
-          appeal_id: correspondence.id,
-          assigned_to: InboundOpsTeam.singleton,
-          appeal_type: Correspondence.name
-        )
-
-        expect(rpt.task_url).to eq("/queue/correspondence/#{correspondence.uuid}/review_package")
-      end
-    end
-
-    context "eFolder Upload Failed Task" do
-      it "has a review_package task_url if parent is review package task" do
-        correspondence = create(:correspondence)
-        rpt = ReviewPackageTask.find_or_create_by(
-          appeal_id: correspondence.id,
-          assigned_to: InboundOpsTeam.singleton,
-          appeal_type: Correspondence.name
-        )
-
-        uft = EfolderUploadFailedTask.create(
-          appeal_id: correspondence.id,
-          assigned_to: InboundOpsTeam.singleton,
-          appeal_type: Correspondence.name,
-          parent_id: rpt.id
-        )
-
-        expect(uft.task_url).to eq("/queue/correspondence/#{correspondence.uuid}/review_package")
-      end
-
-      it "has an intake task_url if parent is correspondence intake task" do
-        correspondence = create(:correspondence)
-        cit = CorrespondenceIntakeTask.find_or_create_by(
-          appeal_id: correspondence.id,
-          assigned_to: InboundOpsTeam.singleton,
-          appeal_type: Correspondence.name
-        )
-
-        uft = EfolderUploadFailedTask.create(
-          appeal_id: correspondence.id,
-          assigned_to: InboundOpsTeam.singleton,
-          appeal_type: Correspondence.name,
-          parent_id: cit.id
-        )
-
-        expect(uft.task_url).to eq("/queue/correspondence/#{correspondence.uuid}/intake")
-      end
-    end
-
-    context "package action tasks" do
-      it "verifies no other open package action task on correspondence before creation" do
-        correspondence = create(:correspondence)
-        parent_task = ReviewPackageTask.find_by(appeal_id: correspondence.id)
-        reassign_pt = ReassignPackageTask.create!(
-          parent_id: parent_task&.id,
-          appeal_id: correspondence&.id,
-          appeal_type: Correspondence.name,
-          assigned_to: InboundOpsTeam.singleton
-        )
-
-        # creation ok with no pre-existing package action task
-        expect(reassign_pt).to be_a(ReassignPackageTask)
-
-        # creation fails due to pre-existing package action task
-        expect do
-          RemovePackageTask.create!(
-            parent_id: parent_task&.id,
-            appeal_id: correspondence&.id,
-            appeal_type: Correspondence.name,
-            assigned_to: InboundOpsTeam.singleton
-          )
-        end.to raise_error(Caseflow::Error::MultipleOpenTasksOfSameTypeError)
-
-        # creation fails due to pre-existing package action task
-        expect do
-          SplitPackageTask.create!(
-            parent_id: parent_task&.id,
-            appeal_id: correspondence&.id,
-            appeal_type: Correspondence.name,
-            assigned_to: InboundOpsTeam.singleton
-          )
-        end.to raise_error(Caseflow::Error::MultipleOpenTasksOfSameTypeError)
-
-        # creation fails due to pre-existing package action task
-        expect do
-          MergePackageTask.create!(
-            parent_id: parent_task&.id,
-            appeal_id: correspondence&.id,
-            appeal_type: Correspondence.name,
-            assigned_to: InboundOpsTeam.singleton
-          )
-        end.to raise_error(Caseflow::Error::MultipleOpenTasksOfSameTypeError)
-
-        reassign_pt.update!(status: Constants.TASK_STATUSES.completed)
-
-        # creation ok due to pre-existing package action task status update
-        expect(RemovePackageTask.create!(
-                 parent_id: parent_task&.id,
-                 appeal_id: correspondence&.id,
-                 appeal_type: Correspondence.name,
-                 assigned_to: InboundOpsTeam.singleton
-               )).to be_a(RemovePackageTask)
-      end
-    end
-  end
 end
diff --git a/spec/requests/correspondence_controller_spec.rb b/spec/requests/correspondence_controller_spec.rb
index 91bf09b67f4..be7746c1639 100644
--- a/spec/requests/correspondence_controller_spec.rb
+++ b/spec/requests/correspondence_controller_spec.rb
@@ -62,93 +62,6 @@
     end
   end
 
-  describe "correspondence_cases" do
-    before do
-      get correspondence_path, as: :json
-    end
-
-    it "returns 200 status" do
-      expect(response).to have_http_status(:ok)
-    end
-
-    it "returns json in the expected shape for correspondence_cases" do
-      data = JSON.parse(response.body, symbolize_names: true)
-      expect(data[:correspondence_config][:table_title]).to be_a(String)
-      expect(data[:correspondence_config]).to be_a(Hash)
-      expect(data[:correspondence_config][:active_tab]).to be_a(String)
-      expect(data[:correspondence_config][:tasks_per_page]).to be_a(Integer)
-      expect(data[:correspondence_config][:use_task_pages_api?]).to eq(nil).or be_a(TrueClass || FalseClass)
-      expect(data[:correspondence_config][:tabs]).to be_a(Array)
-
-      data[:correspondence_config][:tabs].each do |tab|
-        expect(tab[:label]).to be_a(String)
-        expect(tab[:name]).to be_a(String)
-        expect(tab[:description]).to be_a(String)
-        expect(tab[:columns]).to be_a(Array)
-        expect(tab[:defaultSort]).to be_a(Hash)
-        expect(tab[:tasks]).to be_a(Array)
-
-        tab[:tasks]&.each do |task|
-          expect(task[:attributes]).to be_a(Hash)
-          expect(task[:attributes][:unique_id]).to be_a(String)
-          expect(task[:attributes][:instructions]).to be_a(Array)
-          expect(task[:attributes][:veteran_details]).to be_a(String)
-          expect(task[:attributes][:completion_date]).to eq(nil).or be_a(String)
-          expect(task[:attributes][:days_waiting]).to be_a(Integer)
-          expect(task[:attributes][:va_date_of_receipt]).to be_a(String)
-          expect(task[:attributes][:label]).to be_a(String)
-          expect(task[:attributes][:status]).to be_a(String)
-          expect(task[:attributes][:assigned_to]).to be_a(Hash)
-          expect(task[:attributes][:assigned_by]).to be_a(Hash)
-        end
-      end
-    end
-  end
-
-  describe "correspondence_team" do
-    before do
-      InboundOpsTeam.singleton.add_user(current_user)
-      get correspondence_team_path, as: :json
-    end
-
-    it "returns 200 status" do
-      expect(response).to have_http_status(:ok)
-    end
-
-    it "returns json in the expected shape correspondence_team" do
-      data = JSON.parse(response.body, symbolize_names: true)
-      expect(data[:correspondence_config][:table_title]).to be_a(String)
-      expect(data[:correspondence_config]).to be_a(Hash)
-      expect(data[:correspondence_config][:active_tab]).to be_a(String)
-      expect(data[:correspondence_config][:tasks_per_page]).to be_a(Integer)
-      expect(data[:correspondence_config][:use_task_pages_api?]).to eq(nil).or be_a(TrueClass || FalseClass)
-      expect(data[:correspondence_config][:tabs]).to be_a(Array)
-
-      data[:correspondence_config][:tabs].each do |tab|
-        expect(tab[:label]).to be_a(String)
-        expect(tab[:name]).to be_a(String)
-        expect(tab[:description]).to be_a(String)
-        expect(tab[:columns]).to be_a(Array)
-        expect(tab[:defaultSort]).to be_a(Hash)
-        expect(tab[:tasks]).to be_a(Array)
-
-        tab[:tasks]&.each do |task|
-          expect(task[:attributes]).to be_a(Hash)
-          expect(task[:attributes][:unique_id]).to be_a(String)
-          expect(task[:attributes][:instructions]).to be_a(Array)
-          expect(task[:attributes][:veteran_details]).to be_a(String)
-          expect(task[:attributes][:completion_date]).to eq(nil).or be_a(String)
-          expect(task[:attributes][:days_waiting]).to be_a(Integer)
-          expect(task[:attributes][:va_date_of_receipt]).to be_a(String)
-          expect(task[:attributes][:label]).to be_a(String)
-          expect(task[:attributes][:status]).to be_a(String)
-          expect(task[:attributes][:assigned_to]).to be_a(Hash)
-          expect(task[:attributes][:assigned_by]).to be_a(Hash)
-        end
-      end
-    end
-  end
-
   describe "#process_intake" do
     context "tasks_not_related_to_appeal" do
       shared_examples "successful unrelated task creation" do |klass_name, assignee|
diff --git a/spec/services/correspondence_documents_efolder_uploader_spec.rb b/spec/services/correspondence_documents_efolder_uploader_spec.rb
index 2c38a8a2a72..63b3f31bc48 100644
--- a/spec/services/correspondence_documents_efolder_uploader_spec.rb
+++ b/spec/services/correspondence_documents_efolder_uploader_spec.rb
@@ -52,9 +52,8 @@
       end
 
       context "with existing EfolderUploadFailedTask" do
-        # rubocop:disable Layout/LineLength
-        let!(:existing_failed_task) { create(:efolder_upload_failed_task, appeal: correspondence, appeal_type: "Correspondence") }
-        # rubocop:enable Layout/LineLength
+        let!(:existing_failed_task) { create(:efolder_upload_failed_task, appeal: correspondence) }
+
         it "does not create a new EfolderUploadFailedTask if one already exists" do
           expect do
             described.upload_documents_to_claim_evidence(correspondence, current_user, parent_task)
diff --git a/spec/support/correspondence_task_helpers.rb b/spec/support/correspondence_task_helpers.rb
deleted file mode 100644
index ccb0bc01e69..00000000000
--- a/spec/support/correspondence_task_helpers.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-module CorrespondenceTaskHelpers
-  def create_correspondence_intake(correspondence, user)
-    parent = correspondence&.root_task
-    cit = CorrespondenceIntakeTask.create_from_params(parent, user)
-    cit
-  end
-
-  def assign_review_package_task(correspondence, user)
-    review_package_task = ReviewPackageTask.find_by(appeal_id: correspondence.id)
-    review_package_task.update!(assigned_to: user, status: Constants.TASK_STATUSES.assigned)
-  end
-
-  def create_efolderupload_failed_task(correspondence, parent, user:)
-    correspondence.update!(
-      va_date_of_receipt: rand(1.month.ago..1.day.ago),
-      notes: "ABCDEFG".split("").shuffle.join,
-      updated_by_id: user.id
-    )
-    EfolderUploadFailedTask.create!(
-      parent_id: parent.id,
-      appeal_id: correspondence.id,
-      appeal_type: "Correspondence",
-      assigned_to: parent.assigned_to,
-      status: Constants.TASK_STATUSES.in_progress
-    ).update!(assigned_at: rand(1.month.ago..1.day.ago))
-  end
-
-  def process_correspondence(correspondence, user)
-    rpt = ReviewPackageTask.find_by(appeal_id: correspondence.id)
-    rpt.update!(status: Constants.TASK_STATUSES.completed, completed_by_id: user.id)
-
-    cit = CorrespondenceIntakeTask.create_from_params(correspondence&.root_task, user)
-    cit.update!(status: Constants.TASK_STATUSES.completed, completed_by_id: user.id)
-  end
-end

From 34cebfe6269028ebe17586f2a5935c81821fc121 Mon Sep 17 00:00:00 2001
From: HunJerBAH <Jeremy.Hunton@va.gov>
Date: Wed, 6 Mar 2024 13:49:12 -0500
Subject: [PATCH 144/237] Revert "Revert "Merge branch 'feature/APPEALS-32900'
 into feature/APPEALS-27311""

This reverts commit 1599cfaca6a8328ca92d56c8f934dea5fc975ace.
---
 .../concerns/task_pagination_concern.rb       |  27 +
 app/controllers/correspondence_controller.rb  | 102 ++-
 .../correspondence_task_pages_controller.rb   |  17 +
 app/jobs/no_available_modifiers_fix_job.rb    |   1 -
 app/models/correspondence_config.rb           |  68 ++
 app/models/correspondence_queue_column.rb     |  45 +
 app/models/correspondence_queue_tab.rb        |  30 +
 app/models/correspondence_task_pager.rb       |  18 +
 app/models/organization.rb                    |  30 +
 app/models/queue_column.rb                    |  11 +-
 .../correspondence_assigned_tasks_tab.rb      |  33 +
 .../correspondence_completed_tasks_tab.rb     |  46 +
 .../correspondence_in_progress_tasks_tab.rb   |  36 +
 .../organization_completed_tasks_tab.rb       |   3 +
 ...orrespondence_action_required_tasks_tab.rb |  41 +
 ...ation_correspondence_assigned_tasks_tab.rb |  36 +
 ...tion_correspondence_completed_tasks_tab.rb |  45 +
 ...zation_correspondence_pending_tasks_tab.rb |  40 +
 ...ion_correspondence_unassigned_tasks_tab.rb |  34 +
 .../work_queue/appeal_search_serializer.rb    |   1 +
 .../correspondence_task_column_serializer.rb  |  60 ++
 .../work_queue/task_column_serializer.rb      |   2 +-
 app/models/task_sorter.rb                     |  15 +-
 .../tasks/cavc_correspondence_mail_task.rb    |   8 +
 .../correspondence/reassign_package_task.rb   |   5 +
 .../tasks/correspondence_intake_task.rb       |   4 +
 app/models/tasks/correspondence_task.rb       |  25 +-
 .../tasks/correspondence_task_filter.rb       |  87 ++
 .../tasks/efolder_upload_failed_task.rb       |   3 +
 app/models/tasks/remove_package_task.rb       |   5 +
 app/models/tasks/review_package_task.rb       |   8 +
 app/models/user.rb                            |  34 +
 app/models/vacols/case_docket.rb              |   1 -
 .../correspondence_cases.html.erb             |   1 +
 .../correspondence_team.html.erb              |  22 +
 app/views/queue/index.html.erb                |   3 +
 .../correspondence_root_task_factory.rb       |   2 +
 client/COPY.json                              |  10 +-
 client/app/components/FilterOption.jsx        |   1 -
 client/app/components/ReceiptDatePicker.jsx   | 100 ++
 client/app/components/TableFilter.jsx         |   7 +
 .../components/TaskCompletedDatePicker.jsx    | 104 +++
 client/app/queue/QueueApp.jsx                 |  29 +-
 client/app/queue/QueueDropdownFilter.jsx      | 141 ++-
 client/app/queue/QueueTable.jsx               |   9 +-
 client/app/queue/QueueTableBuilder.jsx        |  14 +-
 .../components/QueueOrganizationDropdown.jsx  |  36 +-
 .../app/queue/components/TaskTableColumns.jsx | 162 +++-
 .../correspondence/CorrespondenceCases.jsx    | 166 ++--
 .../correspondence/CorrespondenceTable.jsx    |   6 +-
 .../CorrespondenceTableBuilder.jsx            | 289 ++++++
 .../correspondenceActions.js                  |  49 +
 .../correspondenceConstants.js                |   5 +
 .../correspondenceReducer.js                  |  39 +
 .../SubmitCorrespondenceModal.jsx             |   2 +-
 .../CorrespondenceReviewPackage.jsx           |   2 -
 client/app/queue/uiReducer/uiActions.js       |  15 +
 client/app/queue/uiReducer/uiConstants.js     |   3 +
 client/app/queue/uiReducer/uiReducer.js       |  21 +
 client/app/queue/utils.js                     |  36 +-
 client/constants/CORRESPONDENCE_TASK_URL.json |   6 +
 client/constants/QUEUE_CONFIG.json            |  57 ++
 .../CaseWorkerIndex.test.js.snap              |  89 +-
 .../__snapshots__/QueueTable.test.js.snap     |   2 +
 config/routes.rb                              |   4 +
 db/seeds.rb                                   |   1 +
 db/seeds/helpers/queue_helpers.rb             | 153 ++++
 db/seeds/queue_correspondences.rb             | 195 ++++
 lib/tasks/correspondence.rake                 |   1 +
 spec/factories/correspondence.rb              |   7 +-
 spec/factories/task.rb                        |   2 +
 .../correspondence_cases_batch_assignment.rb  | 163 ++++
 .../correspondence_cases_spec.rb              | 866 +++++++++++++++++-
 .../correspondence_queue_task_link_spec.rb    | 118 +++
 .../correspondence/review_package_spec.rb     |   2 +-
 spec/models/correspondence_config_spec.rb     | 106 +++
 spec/models/task_spec.rb                      | 122 +++
 .../correspondence_controller_spec.rb         |  87 ++
 ...ondence_documents_efolder_uploader_spec.rb |   5 +-
 spec/support/correspondence_task_helpers.rb   |  37 +
 80 files changed, 4043 insertions(+), 175 deletions(-)
 create mode 100644 app/controllers/correspondence_task_pages_controller.rb
 create mode 100644 app/models/correspondence_config.rb
 create mode 100644 app/models/correspondence_queue_column.rb
 create mode 100644 app/models/correspondence_queue_tab.rb
 create mode 100644 app/models/correspondence_task_pager.rb
 create mode 100644 app/models/queue_tabs/correspondence_assigned_tasks_tab.rb
 create mode 100644 app/models/queue_tabs/correspondence_completed_tasks_tab.rb
 create mode 100644 app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb
 create mode 100644 app/models/queue_tabs/organization_correspondence_action_required_tasks_tab.rb
 create mode 100644 app/models/queue_tabs/organization_correspondence_assigned_tasks_tab.rb
 create mode 100644 app/models/queue_tabs/organization_correspondence_completed_tasks_tab.rb
 create mode 100644 app/models/queue_tabs/organization_correspondence_pending_tasks_tab.rb
 create mode 100644 app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb
 create mode 100644 app/models/serializers/work_queue/correspondence_task_column_serializer.rb
 create mode 100644 app/models/tasks/correspondence_task_filter.rb
 create mode 100644 app/views/correspondence/correspondence_team.html.erb
 create mode 100644 client/app/components/ReceiptDatePicker.jsx
 create mode 100644 client/app/components/TaskCompletedDatePicker.jsx
 create mode 100644 client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
 create mode 100644 client/constants/CORRESPONDENCE_TASK_URL.json
 create mode 100644 db/seeds/helpers/queue_helpers.rb
 create mode 100644 db/seeds/queue_correspondences.rb
 create mode 100644 spec/feature/queue/correspondence/correspondence_cases_batch_assignment.rb
 create mode 100644 spec/feature/queue/correspondence/correspondence_queue_task_link_spec.rb
 create mode 100644 spec/models/correspondence_config_spec.rb
 create mode 100644 spec/support/correspondence_task_helpers.rb

diff --git a/app/controllers/concerns/task_pagination_concern.rb b/app/controllers/concerns/task_pagination_concern.rb
index eb2ce725391..b3c61cef704 100644
--- a/app/controllers/concerns/task_pagination_concern.rb
+++ b/app/controllers/concerns/task_pagination_concern.rb
@@ -17,8 +17,28 @@ def pagination_json
     }
   end
 
+  def correspondence_pagination_json
+    {
+      tasks: correspondence_json_tasks(correspondence_task_pager.paged_tasks),
+      task_page_count: correspondence_task_pager.task_page_count,
+      total_task_count: correspondence_task_pager.total_task_count,
+      tasks_per_page: CorrespondenceTaskPager::TASKS_PER_PAGE
+    }
+  end
+
   private
 
+  def correspondence_task_pager
+    @correspondence_task_pager ||= CorrespondenceTaskPager.new(
+      assignee: assignee,
+      tab_name: params[Constants.QUEUE_CONFIG.TAB_NAME_REQUEST_PARAM.to_sym],
+      page: params[Constants.QUEUE_CONFIG.PAGE_NUMBER_REQUEST_PARAM.to_sym],
+      sort_order: params[Constants.QUEUE_CONFIG.SORT_DIRECTION_REQUEST_PARAM.to_sym],
+      sort_by: params[Constants.QUEUE_CONFIG.SORT_COLUMN_REQUEST_PARAM.to_sym],
+      filters: params[Constants.QUEUE_CONFIG.FILTER_COLUMN_REQUEST_PARAM.to_sym]
+    )
+  end
+
   def task_pager
     @task_pager ||= TaskPager.new(
       assignee: assignee,
@@ -30,6 +50,13 @@ def task_pager
     )
   end
 
+  def correspondence_json_tasks(tasks)
+    { data: WorkQueue::CorrespondenceTaskColumnSerializer.new(
+      tasks,
+      is_collection: true
+    ).serializable_hash[:data] }
+  end
+
   def json_tasks(tasks)
     tasks = AppealRepository.eager_load_legacy_appeals_for_tasks(tasks)
     params = { user: current_user }
diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index 1d36aacae74..b56feeafb49 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -7,6 +7,7 @@ class CorrespondenceController < ApplicationController
   before_action :correspondence
   before_action :auto_texts
   before_action :veteran_information
+  MAX_QUEUED_ITEMS = 60
 
   def intake
     respond_to do |format|
@@ -40,14 +41,39 @@ def current_step
   end
 
   def correspondence_cases
+    if current_user.mail_supervisor?
+      redirect_to "/queue/correspondence/team"
+    elsif current_user.mail_superuser? || current_user.mail_team_user?
+      respond_to do |format|
+        format.html { "your_correspondence" }
+        format.json do
+          render json: { correspondence_config: CorrespondenceConfig.new(assignee: current_user) }
+        end
+      end
+    else
+      redirect_to "/unauthorized"
+    end
+  end
+
+  def mail_team_users
+    mail_team_users = User.mail_team_users
     respond_to do |format|
-      format.html { "correspondence_cases" }
       format.json do
-        render json: { vetCorrespondences: veterans_with_correspondences }
+        render json: { mail_team_users: mail_team_users }
       end
     end
   end
 
+  def correspondence_team
+    if current_user.mail_superuser? || current_user.mail_supervisor?
+      handle_mail_superuser_or_supervisor
+    elsif current_user.mail_team_user?
+      redirect_to "/queue/correspondence"
+    else
+      redirect_to "/unauthorized"
+    end
+  end
+
   def review_package
     render "correspondence/review_package"
   end
@@ -174,6 +200,74 @@ def process_intake
 
   private
 
+  def handle_mail_superuser_or_supervisor
+    @mail_team_users = User.mail_team_users.pluck(:css_id)
+    mail_team_user = User.find_by(css_id: params[:user]) if params[:user].present?
+    task_ids = params[:taskIds]&.split(",") if params[:taskIds].present?
+    tab = params[:tab] if params[:tab].present?
+
+    respond_to do |format|
+      format.html { handle_html_response(mail_team_user, task_ids, tab) }
+      format.json { handle_json_response(mail_team_user, task_ids, tab) }
+    end
+  end
+
+  def handle_html_response(mail_team_user, task_ids, tab)
+    if mail_team_user && task_ids.present?
+      set_banner_params(mail_team_user, task_ids.count, tab)
+      update_tasks(mail_team_user, task_ids)
+    end
+    render "correspondence_team"
+  end
+
+  def handle_json_response(mail_team_user, task_ids, tab)
+    if mail_team_user && task_ids.present?
+      set_banner_params(mail_team_user, task_ids&.count, tab)
+    else
+      render json: { correspondence_config: CorrespondenceConfig.new(assignee: InboundOpsTeam.singleton) }
+    end
+  end
+
+  def update_tasks(mail_team_user, task_ids)
+    return unless @response_type == "success"
+
+    tasks = Task.where(id: task_ids)
+    tasks.update_all(assigned_to_id: mail_team_user.id, assigned_to_type: "User", status: "assigned")
+  end
+
+  def set_banner_params(user, task_count, tab)
+    template = message_template(user, task_count, tab)
+    response_type(user)
+    @response_header = template[:header]
+    @response_message = template[:message]
+  end
+
+  def message_template(user, task_count, tab)
+    success_header_unassigned = "You have successfully assigned #{task_count} Correspondence to #{user.css_id}."
+    success_header_assigned = "You have successfully reassigned #{task_count} Correspondence to #{user.css_id}."
+    success_message = "Please go to your individual queue to see any self-assigned correspondence."
+    failure_header_unassigned = "Correspondence assignment to #{user.css_id} has failed"
+    failure_header_assigned = "Correspondence reassignment to #{user.css_id} has failed"
+    failure_message = "Queue volume has reached maximum capacity for this user."
+
+    case tab
+    when "correspondence_unassigned"
+      {
+        header: (user.tasks.length < MAX_QUEUED_ITEMS) ? success_header_unassigned : failure_header_unassigned,
+        message: (user.tasks.length < MAX_QUEUED_ITEMS) ? success_message : failure_message
+      }
+    when "correspondence_team_assigned"
+      {
+        header: (user.tasks.length < MAX_QUEUED_ITEMS) ? success_header_assigned : failure_header_assigned,
+        message: (user.tasks.length < MAX_QUEUED_ITEMS) ? success_message : failure_message
+      }
+    end
+  end
+
+  def response_type(user)
+    @response_type = (user.tasks.length < MAX_QUEUED_ITEMS) ? "success" : "warning"
+  end
+
   # :reek:FeatureEnvy
   def vbms_document_types
     begin
@@ -201,7 +295,9 @@ def set_flash_intake_success_message
 
   def verify_correspondence_access
     return true if InboundOpsTeam.singleton.user_has_access?(current_user) ||
-                   MailTeam.singleton.user_has_access?(current_user)
+                   MailTeam.singleton.user_has_access?(current_user) ||
+                   BvaIntake.singleton.user_is_admin?(current_user) ||
+                   MailTeam.singleton.user_is_admin?(current_user)
 
     redirect_to "/unauthorized"
   end
diff --git a/app/controllers/correspondence_task_pages_controller.rb b/app/controllers/correspondence_task_pages_controller.rb
new file mode 100644
index 00000000000..92686e06d66
--- /dev/null
+++ b/app/controllers/correspondence_task_pages_controller.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class CorrespondenceTaskPagesController < ApplicationController
+  include TaskPaginationConcern
+
+  def index
+    render json: correspondence_pagination_json
+  end
+
+  def assignee
+    if params[:user_id]
+      User.find(params[:user_id])
+    elsif params[:organization_id]
+      Organization.find(params[:organization_id])
+    end
+  end
+end
diff --git a/app/jobs/no_available_modifiers_fix_job.rb b/app/jobs/no_available_modifiers_fix_job.rb
index 6cbf4c65a50..cd2fe35bc32 100644
--- a/app/jobs/no_available_modifiers_fix_job.rb
+++ b/app/jobs/no_available_modifiers_fix_job.rb
@@ -50,7 +50,6 @@ def process_records(supp_claims, available_space)
     supp_claims.each do |sc|
       next if available_space <= 0
 
-      # binding.pry
       @stuck_job_report_service.append_single_record(sc.class.name, sc.id)
       ActiveRecord::Base.transaction do
         DecisionReviewProcessJob.perform_now(sc)
diff --git a/app/models/correspondence_config.rb b/app/models/correspondence_config.rb
new file mode 100644
index 00000000000..6712a25caba
--- /dev/null
+++ b/app/models/correspondence_config.rb
@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+# :reek:RepeatedConditional
+
+class CorrespondenceConfig < QueueConfig
+  def to_hash
+    {
+      table_title: table_title,
+      active_tab: default_active_tab,
+      tasks_per_page: 15,
+      use_task_pages_api: true,
+      tabs: assignee.correspondence_queue_tabs.map { |tab| attach_tasks_to_tab(tab) }
+    }
+  end
+
+  private
+
+  # :reek:FeatureEnvy
+  def attach_tasks_to_tab(tab)
+    task_pager = CorrespondenceTaskPager.new(
+      assignee: assignee,
+      tab_name: tab.name,
+      sort_by: tab.default_sorting_column.name,
+      sort_order: tab.default_sorting_direction
+    )
+    endpoint = "task_pages?#{Constants.QUEUE_CONFIG.TAB_NAME_REQUEST_PARAM}=#{tab.name}"
+    base_path = if assignee_is_org?
+                  "organizations/#{assignee.id}/#{endpoint}"
+                else
+                  "correspondence/users/#{assignee.id}/#{endpoint}"
+                end
+
+    tab.to_hash.merge(
+      tasks: serialized_tasks_for_columns(task_pager.paged_tasks, tab.column_names),
+      task_page_count: task_pager.task_page_count,
+      total_task_count: task_pager.total_task_count,
+      task_page_endpoint_base_path: base_path
+    )
+  end
+
+  def serialized_tasks_for_columns(tasks, columns)
+    WorkQueue::CorrespondenceTaskColumnSerializer.new(
+      tasks,
+      is_collection: true,
+      params: { columns: columns }
+    ).serializable_hash[:data]
+  end
+
+  def table_title
+    if assignee_is_org?
+      Constants.QUEUE_CONFIG.CORRESPONDENCE_ORG_TABLE_TITLE
+    else
+      Constants.QUEUE_CONFIG.CORRESPONDENCE_USER_TABLE_TITLE
+    end
+  end
+
+  def default_active_tab
+    if assignee_is_org?
+      Constants.QUEUE_CONFIG.CORRESPONDENCE_UNASSIGNED_TASKS_TAB_NAME
+    else
+      Constants.QUEUE_CONFIG.CORRESPONDENCE_ASSIGNED_TASKS_TAB_NAME
+    end
+  end
+
+  def default_sorting_column
+    Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name
+  end
+end
diff --git a/app/models/correspondence_queue_column.rb b/app/models/correspondence_queue_column.rb
new file mode 100644
index 00000000000..80ffa3d347d
--- /dev/null
+++ b/app/models/correspondence_queue_column.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+class CorrespondenceQueueColumn < QueueColumn
+  include ActiveModel::Model
+
+  attr_accessor :filterable, :name
+
+  def initialize(args)
+    super
+    @filterable ||= false
+  end
+
+  def to_hash(tasks)
+    {
+      name: name,
+      filterable: filterable,
+      filter_options: filterable ? filter_options(tasks) : []
+    }
+  end
+
+  FILTER_OPTIONS = {
+    Constants.QUEUE_CONFIG.COLUMNS.TASK_TYPE.name => :task_type_options,
+    Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name => :va_dor_options,
+    Constants.QUEUE_CONFIG.COLUMNS.TASK_CLOSED_DATE.name => :date_completed_options,
+    Constants.QUEUE_CONFIG.COLUMNS.TASK_ASSIGNEE.name => :task_type_options
+  }.freeze
+
+  private
+
+  def task_type_options(tasks)
+    tasks.group(:type).count.each_pair.map do |option, count|
+      label = self.class.format_option_label(Object.const_get(option).label, count)
+      self.class.filter_option_hash(option, label)
+    end
+  end
+
+  # placeholder method because the function is required
+  def va_dor_options(dummy)
+    dummy
+  end
+
+  def date_completed_options(dummy)
+    dummy
+  end
+end
diff --git a/app/models/correspondence_queue_tab.rb b/app/models/correspondence_queue_tab.rb
new file mode 100644
index 00000000000..fee50b3bd03
--- /dev/null
+++ b/app/models/correspondence_queue_tab.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class CorrespondenceQueueTab < QueueTab
+  def columns
+    column_names.map { |column_name| CorrespondenceQueueColumn.from_name(column_name) }
+  end
+
+  def task_includes
+    [
+      { appeal: [:package_document_type] },
+      :assigned_by,
+      :assigned_to,
+      :children,
+      :parent
+    ]
+  end
+
+  # :reek:UtilityFunction
+  def default_sorting_column
+    CorrespondenceQueueColumn.from_name(Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name)
+  end
+
+  # If you don't create your own tab name it will default to the tab defined in QueueTab
+  def self.from_name(tab_name)
+    tab = descendants.find { |subclass| subclass.tab_name == tab_name }
+    fail(Caseflow::Error::InvalidTaskTableTab, tab_name: tab_name) unless tab
+
+    tab
+  end
+end
diff --git a/app/models/correspondence_task_pager.rb b/app/models/correspondence_task_pager.rb
new file mode 100644
index 00000000000..53a6eb494c6
--- /dev/null
+++ b/app/models/correspondence_task_pager.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class CorrespondenceTaskPager < TaskPager
+  def filtered_tasks
+    CorrespondenceTaskFilter.new(filter_params: filters, tasks: tasks_for_tab).filtered_tasks
+  end
+
+  def queue_tab
+    @queue_tab ||= CorrespondenceQueueTab.from_name(tab_name).new(assignee: assignee)
+  end
+
+  def paged_tasks
+    @paged_tasks ||= begin
+      tasks = sorted_tasks(filtered_tasks)
+      pagination_enabled ? tasks.page(page).per(TASKS_PER_PAGE) : tasks
+    end
+  end
+end
diff --git a/app/models/organization.rb b/app/models/organization.rb
index 9b05f6d3287..78d0fb32cae 100644
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@@ -138,6 +138,16 @@ def queue_tabs
     ]
   end
 
+  def correspondence_queue_tabs
+    [
+      correspondence_unassigned_tasks_tab,
+      correspondence_action_required_tasks_tab,
+      correspondence_pending_tasks_tab,
+      correspondence_assigned_tasks_tab,
+      correspondence_completed_tasks_tab
+    ]
+  end
+
   def unassigned_tasks_tab
     ::OrganizationUnassignedTasksTab.new(
       assignee: self,
@@ -158,6 +168,26 @@ def completed_tasks_tab
     ::OrganizationCompletedTasksTab.new(assignee: self, show_regional_office_column: show_regional_office_in_queue?)
   end
 
+  def correspondence_unassigned_tasks_tab
+    ::OrganizationCorrespondenceUnassignedTasksTab.new(assignee: self)
+  end
+
+  def correspondence_action_required_tasks_tab
+    ::OrganizationCorrespondenceActionRequiredTasksTab.new(assignee: self)
+  end
+
+  def correspondence_assigned_tasks_tab
+    ::OrganizationCorrespondenceAssignedTasksTab.new(assignee: self)
+  end
+
+  def correspondence_pending_tasks_tab
+    ::OrganizationCorrespondencePendingTasksTab.new(assignee: self)
+  end
+
+  def correspondence_completed_tasks_tab
+    ::OrganizationCorrespondenceCompletedTasksTab.new(assignee: self)
+  end
+
   def serialize
     {
       accepts_priority_pushed_cases: accepts_priority_pushed_cases,
diff --git a/app/models/queue_column.rb b/app/models/queue_column.rb
index b848c345925..162d0dae631 100644
--- a/app/models/queue_column.rb
+++ b/app/models/queue_column.rb
@@ -41,7 +41,8 @@ def to_hash(tasks)
   }.freeze
 
   def filter_options(tasks)
-    filter_option_func = FILTER_OPTIONS[name]
+    filter_option_func = self.class::FILTER_OPTIONS[name]
+
     if filter_option_func
       send(filter_option_func, tasks)
     else
@@ -68,6 +69,14 @@ def self.filter_option_hash(value, label)
 
   private
 
+  def va_dor_options
+    nil
+  end
+
+  def date_completed_options
+    nil
+  end
+
   def case_type_options(tasks)
     options = tasks.with_cached_appeals.group(:case_type).count.each_pair.map do |option, count|
       label = self.class.format_option_label(option, count)
diff --git a/app/models/queue_tabs/correspondence_assigned_tasks_tab.rb b/app/models/queue_tabs/correspondence_assigned_tasks_tab.rb
new file mode 100644
index 00000000000..a1074835cfd
--- /dev/null
+++ b/app/models/queue_tabs/correspondence_assigned_tasks_tab.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+class CorrespondenceAssignedTasksTab < CorrespondenceQueueTab
+  validate :assignee_is_user
+
+  # :reek:UtilityFunction
+  def label
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_ASSIGNED_TASKS_LABEL
+  end
+
+  def self.tab_name
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_ASSIGNED_TASKS_TAB_NAME
+  end
+
+  # :reek:UtilityFunction
+  def description
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_ASSIGNED_TASKS_DESCRIPTION
+  end
+
+  def tasks
+    CorrespondenceTask.where(assigned_to_id: assignee.id)
+  end
+
+  # :reek:UtilityFunction
+  def column_names
+    [
+      Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
+      Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
+      Constants.QUEUE_CONFIG.COLUMNS.DAYS_WAITING_CORRESPONDENCE.name,
+      Constants.QUEUE_CONFIG.COLUMNS.NOTES.name
+    ]
+  end
+end
diff --git a/app/models/queue_tabs/correspondence_completed_tasks_tab.rb b/app/models/queue_tabs/correspondence_completed_tasks_tab.rb
new file mode 100644
index 00000000000..356a4f34ff9
--- /dev/null
+++ b/app/models/queue_tabs/correspondence_completed_tasks_tab.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+class CorrespondenceCompletedTasksTab < CorrespondenceQueueTab
+  validate :assignee_is_user
+
+  # :reek:UtilityFunction
+  def label
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_COMPLETED_TASKS_LABEL
+  end
+
+  def self.tab_name
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_COMPLETED_TASKS_TAB_NAME
+  end
+
+  # :reek:UtilityFunction
+  def description
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_COMPLETED_TASKS_DESCRIPTION
+  end
+
+  def tasks
+    completed_root_tasks = CorrespondenceRootTask.includes(:children).where(
+      status: Constants.TASK_STATUSES.completed,
+      assigned_to: assignee
+    ).pluck(:id)
+
+    tasks_with_completed_children = CorrespondenceRootTask.includes(:children)
+      .where.not(status: Constants.TASK_STATUSES.completed)
+      .filter do |task|
+        task.children.all?(&:completed?) && task.children.any? { |child| child.assigned_to == assignee }
+      end
+      .pluck(:id)
+
+    CorrespondenceTask.includes(*task_includes)
+      .where(id: completed_root_tasks + tasks_with_completed_children).recently_completed
+  end
+
+  # :reek:UtilityFunction
+  def column_names
+    [
+      Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
+      Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
+      Constants.QUEUE_CONFIG.COLUMNS.TASK_CLOSED_DATE.name,
+      Constants.QUEUE_CONFIG.COLUMNS.NOTES.name
+    ]
+  end
+end
diff --git a/app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb b/app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb
new file mode 100644
index 00000000000..1cf5e82b6b9
--- /dev/null
+++ b/app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+class CorrespondenceInProgressTasksTab < CorrespondenceQueueTab
+  validate :assignee_is_user
+
+  # :reek:UtilityFunction
+  def label
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_IN_PROGRESS_TASKS_LABEL
+  end
+
+  def self.tab_name
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_IN_PROGRESS_TASKS_TAB_NAME
+  end
+
+  # :reek:UtilityFunction
+  def description
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_IN_PROGRESS_TASKS_DESCRIPTION
+  end
+
+  def tasks
+    CorrespondenceTask.where(assigned_to: assignee)
+      .where.not(type: "EfolderUploadFailedTask")
+      .where(status: ["in_progress", "on_hold"]).in_progress
+  end
+
+  # :reek:UtilityFunction
+  def column_names
+    [
+      Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
+      Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
+      Constants.QUEUE_CONFIG.COLUMNS.TASK_TYPE.name,
+      Constants.QUEUE_CONFIG.COLUMNS.DAYS_WAITING_CORRESPONDENCE.name,
+      Constants.QUEUE_CONFIG.COLUMNS.NOTES.name
+    ]
+  end
+end
diff --git a/app/models/queue_tabs/organization_completed_tasks_tab.rb b/app/models/queue_tabs/organization_completed_tasks_tab.rb
index f189af5cada..385a3961f1c 100644
--- a/app/models/queue_tabs/organization_completed_tasks_tab.rb
+++ b/app/models/queue_tabs/organization_completed_tasks_tab.rb
@@ -3,6 +3,7 @@
 class OrganizationCompletedTasksTab < QueueTab
   validate :assignee_is_organization
 
+  # :reek:UtilityFunction
   def label
     COPY::QUEUE_PAGE_COMPLETE_TAB_TITLE
   end
@@ -11,6 +12,7 @@ def self.tab_name
     Constants.QUEUE_CONFIG.COMPLETED_TASKS_TAB_NAME
   end
 
+  # :reek:UtilityFunction
   def description
     COPY::QUEUE_PAGE_COMPLETE_LAST_SEVEN_DAYS_TASKS_DESCRIPTION
   end
@@ -19,6 +21,7 @@ def tasks
     recently_completed_tasks
   end
 
+  # :reek:UtilityFunction
   # rubocop:disable Metrics/AbcSize
   def column_names
     [
diff --git a/app/models/queue_tabs/organization_correspondence_action_required_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_action_required_tasks_tab.rb
new file mode 100644
index 00000000000..d4481cd2507
--- /dev/null
+++ b/app/models/queue_tabs/organization_correspondence_action_required_tasks_tab.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+class OrganizationCorrespondenceActionRequiredTasksTab < CorrespondenceQueueTab
+  validate :assignee_is_organization
+
+  # :reek:UtilityFunction
+  def label
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_ACTION_REQUIRED_TASKS_LABEL
+  end
+
+  def self.tab_name
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_ACTION_REQUIRED_TASKS_TAB_NAME
+  end
+
+  # :reek:UtilityFunction
+  def description
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_ACTION_REQUIRED_TASKS_DESCRIPTION
+  end
+
+  def tasks
+    tasks = CorrespondenceTask.includes(*task_includes).package_action_tasks
+
+    tasks = if RequestStore[:current_user].mail_supervisor?
+              tasks.where(assigned_to: assignee).active
+            else
+              tasks.where.not(type: RemovePackageTask.name).where(assigned_to: assignee).active
+            end
+  end
+
+  # :reek:UtilityFunction
+  def column_names
+    [
+      Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
+      Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
+      Constants.QUEUE_CONFIG.COLUMNS.DAYS_WAITING_CORRESPONDENCE.name,
+      Constants.QUEUE_CONFIG.COLUMNS.TASK_ASSIGNED_BY.name,
+      Constants.QUEUE_CONFIG.COLUMNS.ACTION_TYPE.name,
+      Constants.QUEUE_CONFIG.COLUMNS.NOTES.name
+    ]
+  end
+end
diff --git a/app/models/queue_tabs/organization_correspondence_assigned_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_assigned_tasks_tab.rb
new file mode 100644
index 00000000000..355335fe744
--- /dev/null
+++ b/app/models/queue_tabs/organization_correspondence_assigned_tasks_tab.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+class OrganizationCorrespondenceAssignedTasksTab < CorrespondenceQueueTab
+  validate :assignee_is_organization
+
+  # :reek:UtilityFunction
+  def label
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_TEAM_ASSIGNED_TASKS_LABEL
+  end
+
+  def self.tab_name
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_TEAM_ASSIGNED_TASKS_TAB_NAME
+  end
+
+  # :reek:UtilityFunction
+  def description
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_TEAM_ASSIGNED_TASKS_DESCRIPTION
+  end
+
+  def tasks
+    CorrespondenceTask.includes(*task_includes).active.where.not(assigned_to_type: "Organization")
+  end
+
+  # :reek:UtilityFunction
+  def column_names
+    [
+      Constants.QUEUE_CONFIG.COLUMNS.CHECKBOX_COLUMN.name,
+      Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
+      Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
+      Constants.QUEUE_CONFIG.COLUMNS.DAYS_WAITING_CORRESPONDENCE.name,
+      Constants.QUEUE_CONFIG.COLUMNS.TASK_TYPE.name,
+      Constants.QUEUE_CONFIG.COLUMNS.TASK_ASSIGNEE.name,
+      Constants.QUEUE_CONFIG.COLUMNS.NOTES.name
+    ]
+  end
+end
diff --git a/app/models/queue_tabs/organization_correspondence_completed_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_completed_tasks_tab.rb
new file mode 100644
index 00000000000..f45f434eebe
--- /dev/null
+++ b/app/models/queue_tabs/organization_correspondence_completed_tasks_tab.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+class OrganizationCorrespondenceCompletedTasksTab < CorrespondenceQueueTab
+  validate :assignee_is_organization
+
+  # :reek:UtilityFunction
+  def label
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_TEAM_COMPLETED_TASKS_LABEL
+  end
+
+  def self.tab_name
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_TEAM_COMPLETED_TASKS_TAB_NAME
+  end
+
+  # :reek:UtilityFunction
+  def description
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_TEAM_COMPLETED_TASKS_DESCRIPTION
+  end
+
+  def tasks
+    completed_root_tasks = CorrespondenceRootTask.includes(:children).where(
+      status: Constants.TASK_STATUSES.completed,
+      assigned_to: assignee
+    ).pluck(:id)
+
+    tasks_with_completed_children = CorrespondenceRootTask.includes(:children).where.not(
+      status: Constants.TASK_STATUSES.completed
+    ).select do |task|
+      task.children.all?(&:completed?)
+    end.pluck(:id)
+
+    CorrespondenceTask.includes(*task_includes)
+      .where(id: completed_root_tasks + tasks_with_completed_children).recently_completed
+  end
+
+  # :reek:UtilityFunction
+  def column_names
+    [
+      Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
+      Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
+      Constants.QUEUE_CONFIG.COLUMNS.TASK_CLOSED_DATE.name,
+      Constants.QUEUE_CONFIG.COLUMNS.NOTES.name
+    ]
+  end
+end
diff --git a/app/models/queue_tabs/organization_correspondence_pending_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_pending_tasks_tab.rb
new file mode 100644
index 00000000000..085e0fc01cb
--- /dev/null
+++ b/app/models/queue_tabs/organization_correspondence_pending_tasks_tab.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+class OrganizationCorrespondencePendingTasksTab < CorrespondenceQueueTab
+  validate :assignee_is_organization
+
+  # :reek:UtilityFunction
+  def label
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_PENDING_TASKS_LABEL
+  end
+
+  def self.tab_name
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_PENDING_TASKS_TAB_NAME
+  end
+
+  # :reek:UtilityFunction
+  def description
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_PENDING_TASKS_DESCRIPTION
+  end
+
+  # :reek:UtilityFunction
+  def tasks
+    Task.none
+    # CorrespondenceTask
+    # .where(status: "on_hold")
+    # .find(
+    #   MailTask.active.where(appeal_type: "Correspondence").pluck(:parent_id)
+    # )
+  end
+
+  # :reek:UtilityFunction
+  def column_names
+    [
+      Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
+      Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
+      Constants.QUEUE_CONFIG.COLUMNS.DAYS_WAITING_CORRESPONDENCE.name,
+      Constants.QUEUE_CONFIG.COLUMNS.TASK_TYPE.name,
+      Constants.QUEUE_CONFIG.COLUMNS.TASK_ASSIGNEE.name
+    ]
+  end
+end
diff --git a/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb
new file mode 100644
index 00000000000..60e84ba378c
--- /dev/null
+++ b/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+class OrganizationCorrespondenceUnassignedTasksTab < CorrespondenceQueueTab
+  validate :assignee_is_organization
+
+  # :reek:UtilityFunction
+  def label
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_UNASSIGNED_TASKS_LABEL
+  end
+
+  def self.tab_name
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_UNASSIGNED_TASKS_TAB_NAME
+  end
+
+  # :reek:UtilityFunction
+  def description
+    Constants.QUEUE_CONFIG.CORRESPONDENCE_UNASSIGNED_TASKS_DESCRIPTION
+  end
+
+  def tasks
+    CorrespondenceTask.includes(*task_includes).where(assigned_to: assignee, status: "unassigned")
+  end
+
+  # :reek:UtilityFunction
+  def column_names
+    [
+      Constants.QUEUE_CONFIG.COLUMNS.CHECKBOX_COLUMN.name,
+      Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
+      Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
+      Constants.QUEUE_CONFIG.COLUMNS.DAYS_WAITING_CORRESPONDENCE.name,
+      Constants.QUEUE_CONFIG.COLUMNS.NOTES.name
+    ]
+  end
+end
diff --git a/app/models/serializers/work_queue/appeal_search_serializer.rb b/app/models/serializers/work_queue/appeal_search_serializer.rb
index 27ca83b0929..d3e7fee9ea8 100644
--- a/app/models/serializers/work_queue/appeal_search_serializer.rb
+++ b/app/models/serializers/work_queue/appeal_search_serializer.rb
@@ -138,6 +138,7 @@ class WorkQueue::AppealSearchSerializer
   attribute :evidence_submission_task do |object|
     object.tasks.find_by(type: "EvidenceSubmissionWindowTask", status: "assigned")
   end
+
   attribute :readable_hearing_request_type, &:readable_current_hearing_request_type
 
   attribute :readable_original_hearing_request_type, &:readable_original_hearing_request_type
diff --git a/app/models/serializers/work_queue/correspondence_task_column_serializer.rb b/app/models/serializers/work_queue/correspondence_task_column_serializer.rb
new file mode 100644
index 00000000000..4e7f87f53be
--- /dev/null
+++ b/app/models/serializers/work_queue/correspondence_task_column_serializer.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+class WorkQueue::CorrespondenceTaskColumnSerializer
+  include FastJsonapi::ObjectSerializer
+
+  attribute :unique_id do |object|
+    object.id.to_s
+  end
+
+  attribute :instructions
+
+  attribute :veteran_details do |object|
+    vet = Veteran.find(object.correspondence.veteran_id)
+    "#{vet.first_name} #{vet.last_name} (#{vet.file_number})"
+  end
+
+  attribute :notes do |object|
+    object.correspondence.notes
+  end
+
+  attribute :cmp_packet_number do |object|
+    object.correspondence.cmp_packet_number
+  end
+
+  attribute(:completion_date, &:closed_at)
+
+  attribute :days_waiting
+
+  attribute :va_date_of_receipt do |object|
+    object.correspondence.va_date_of_receipt
+  end
+
+  attribute :label
+
+  attribute :status
+
+  attribute :assigned_at
+
+  attribute :task_url
+
+  attribute :assigned_to do |object|
+    assignee = object.assigned_to
+    {
+      css_id: assignee.try(:css_id),
+      is_organization: assignee.is_a?(Organization),
+      name: assignee.is_a?(Organization) ? assignee.name : assignee.css_id,
+      type: assignee.class.name,
+      id: assignee.id
+    }
+  end
+
+  attribute :assigned_by do |object|
+    {
+      first_name: object.assigned_by_display_name.first,
+      last_name: object.assigned_by_display_name.last,
+      css_id: object.assigned_by.try(:css_id),
+      pg_id: object.assigned_by.try(:id)
+    }
+  end
+end
diff --git a/app/models/serializers/work_queue/task_column_serializer.rb b/app/models/serializers/work_queue/task_column_serializer.rb
index f2ed1f5655a..e0ab6df9e1d 100644
--- a/app/models/serializers/work_queue/task_column_serializer.rb
+++ b/app/models/serializers/work_queue/task_column_serializer.rb
@@ -177,8 +177,8 @@ def self.serialize_attribute?(params, columns)
     if serialize_attribute?(params, columns)
       {
         css_id: assignee.try(:css_id),
-        is_organization: assignee.is_a?(Organization),
         name: assignee.is_a?(Organization) ? assignee.name : assignee.css_id,
+        is_organization: assignee.is_a?(Organization),
         type: assignee.class.name,
         id: assignee.id
       }
diff --git a/app/models/task_sorter.rb b/app/models/task_sorter.rb
index 13c364866cd..7b45cf6d11f 100644
--- a/app/models/task_sorter.rb
+++ b/app/models/task_sorter.rb
@@ -21,13 +21,26 @@ def initialize(args)
     fail(Caseflow::Error::MissingRequiredProperty, message: errors.full_messages.join(", ")) unless valid?
   end
 
+  # rubocop:disable Metrics/AbcSize
   def sorted_tasks
     return tasks unless tasks.any?
 
     # Always join to the CachedAppeal and users tables because we sometimes need it, joining does not slow down the
     # application, and conditional logic to only join sometimes adds unnecessary complexity.
-    tasks.with_assignees.with_assigners.with_cached_appeals.order(order_clause)
+    case column.name
+    when Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name
+      tasks.joins(appeal: :veteran).order(last_name: sort_order.to_sym, first_name: sort_order.to_sym)
+    when Constants.QUEUE_CONFIG.COLUMNS.NOTES.name
+      tasks.joins(:appeal).order(notes: sort_order.to_sym)
+    when Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name
+      tasks.joins(:appeal).order(va_date_of_receipt: sort_order.to_sym)
+    when Constants.QUEUE_CONFIG.COLUMNS.DAYS_WAITING.name
+      tasks.joins(:appeal).order(assigned_at: sort_order.to_sym)
+    else
+      tasks.with_assignees.with_assigners.with_cached_appeals.order(order_clause)
+    end
   end
+  # rubocop:enable Metrics/AbcSize
 
   private
 
diff --git a/app/models/tasks/cavc_correspondence_mail_task.rb b/app/models/tasks/cavc_correspondence_mail_task.rb
index a5aff59b3d4..cd56d7da7de 100644
--- a/app/models/tasks/cavc_correspondence_mail_task.rb
+++ b/app/models/tasks/cavc_correspondence_mail_task.rb
@@ -77,4 +77,12 @@ def user_task_assigned_to_cavc_lit_support
   def assigned_to_cavc_lit_team_member
     CavcLitigationSupport.singleton.users.include?(assigned_to)
   end
+
+  def status_is_valid_on_create
+    unless [Constants.TASK_STATUSES.assigned, Constants.TASK_STATUSES.completed].include?(status)
+      fail Caseflow::Error::InvalidStatusOnTaskCreate, task_type: type
+    end
+
+    true
+  end
 end
diff --git a/app/models/tasks/correspondence/reassign_package_task.rb b/app/models/tasks/correspondence/reassign_package_task.rb
index 335e3133df9..8fb51fa32a6 100644
--- a/app/models/tasks/correspondence/reassign_package_task.rb
+++ b/app/models/tasks/correspondence/reassign_package_task.rb
@@ -2,4 +2,9 @@
 
 class ReassignPackageTask < CorrespondenceTask
   before_create :verify_no_other_open_package_action_task_on_correspondence
+
+  # :reek:UtilityFunction
+  def task_url
+    Constants.CORRESPONDENCE_TASK_URL.REASSIGN_PACKAGE_TASK_MODAL_URL
+  end
 end
diff --git a/app/models/tasks/correspondence_intake_task.rb b/app/models/tasks/correspondence_intake_task.rb
index 7e63dba9fc7..952b88e3a04 100644
--- a/app/models/tasks/correspondence_intake_task.rb
+++ b/app/models/tasks/correspondence_intake_task.rb
@@ -27,4 +27,8 @@ def verify_current_user_can_create!(user)
       MailTeam.singleton.user_has_access?(user)
     end
   end
+
+  def task_url
+    closed? ? "/under_construction" : Constants.CORRESPONDENCE_TASK_URL.INTAKE_TASK_URL.sub("uuid", correspondence.uuid)
+  end
 end
diff --git a/app/models/tasks/correspondence_task.rb b/app/models/tasks/correspondence_task.rb
index 2d99f91fa2c..c8082867d98 100644
--- a/app/models/tasks/correspondence_task.rb
+++ b/app/models/tasks/correspondence_task.rb
@@ -4,6 +4,7 @@ class CorrespondenceTask < Task
   self.abstract_class = true
 
   before_create :verify_org_task_unique
+  belongs_to :appeal, class_name: "Correspondence", foreign_key: :appeal_id
   validate :status_is_valid_on_create, on: :create
   validate :assignee_status_is_valid_on_create, on: :create
 
@@ -62,17 +63,31 @@ def self.create_child_task(parent_task, current_user, params)
     )
   end
 
+  def correspondence
+    appeal
+  end
+
+  def task_url
+    "/under_construction"
+  end
+
   private
 
+  # rubocop:disable Metrics/CyclomaticComplexity
   def status_is_valid_on_create
-    if type == "ReviewPackageTask" && status != Constants.TASK_STATUSES.unassigned
-      update!(status: :unassigned)
-    elsif type != "ReviewPackageTask" && status != Constants.TASK_STATUSES.assigned
-      fail Caseflow::Error::InvalidStatusOnTaskCreate, task_type: type
+    case type
+    when "ReviewPackageTask"
+      return Constants.TASK_STATUSES.on_hold if status != Constants.TASK_STATUSES.on_hold
+    when "CorrespondenceIntakeTask", "EfolderUploadFailedTask"
+      return Constants.TASK_STATUSES.in_progress if status != Constants.TASK_STATUSES.in_progress
+    when "CorrespondenceRootTask", "HearingPostponementRequestMailTask"
+      return Constants.TASK_STATUSES.completed if status != Constants.TASK_STATUSES.completed
+    else
+      fail Caseflow::Error::InvalidStatusOnTaskCreate, task_type: type unless status == Constants.TASK_STATUSES.assigned
     end
-
     true
   end
+  # rubocop:enable Metrics/CyclomaticComplexity
 
   def assignee_status_is_valid_on_create
     if parent&.child_must_have_active_assignee? && assigned_to.is_a?(User) && !assigned_to.active?
diff --git a/app/models/tasks/correspondence_task_filter.rb b/app/models/tasks/correspondence_task_filter.rb
new file mode 100644
index 00000000000..306ce4fba4d
--- /dev/null
+++ b/app/models/tasks/correspondence_task_filter.rb
@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+class CorrespondenceTaskFilter < TaskFilter
+  def filtered_tasks
+    va_dor_params = filter_params.select { |param| param.include?("col=vaDor") }
+    task_column_params = filter_params.select { |param| param.include?("col=taskColumn") }
+
+    # task_column_params comes in as a single string, delimited by |. Updates task_column_params
+    # to be an array of the incoming values.
+    unless task_column_params == []
+      task_column_params[0].slice!("col=taskColumn&val=")[0]
+      task_column_params = task_column_params[0].split("|")
+    end
+
+    result = tasks.all
+    va_dor_params.each do |param|
+      value_hash = Rack::Utils.parse_nested_query(param).deep_symbolize_keys
+      result = result.merge(filter_by_va_dor(value_hash[:val]))
+    end
+
+    unless task_column_params.empty?
+      result = result.merge(filter_by_task(task_column_params))
+    end
+    result
+  end
+
+  private
+
+  def filter_by_date(date_info)
+    date_type, first_date, second_date = date_info.split(",")
+
+    case date_type
+    when "0"
+      tasks.where("closed_at > ? AND closed_at < ?", Time.zone.parse(first_date), Time.zone.parse(second_date))
+    when "1"
+      tasks.where("closed_at < ?", Time.zone.parse(first_date))
+    when "2"
+      tasks.where("closed_at > ?", Time.zone.parse(first_date))
+    when "3"
+      tasks.where("DATE(closed_at) = (?)", Time.zone.parse(first_date))
+    end
+  end
+
+  def filter_by_va_dor(date_info)
+    date_type, first_date, second_date = date_info.split(",")
+
+    case date_type
+    when "0"
+      filter_between_dates(first_date, second_date)
+    when "1"
+      filter_before_date(first_date)
+    when "2"
+      filter_after_date(first_date)
+    when "3"
+      filter_on_date(first_date)
+    end
+  end
+
+  def filter_by_task(task_types)
+    # Initialize collection to an empty scope
+    collection = Task.none
+    task_types.each do |task_type|
+      t = tasks.where(type: task_type)
+      collection = collection.or(t)
+    end
+    collection
+  end
+
+  def filter_between_dates(start_date, end_date)
+    tasks.joins(:appeal)
+      .where("correspondences.va_date_of_receipt > ? AND correspondences.va_date_of_receipt < ?",
+             Time.zone.parse(start_date),
+             Time.zone.parse(end_date))
+  end
+
+  def filter_before_date(date)
+    tasks.joins(:appeal).where("correspondences.va_date_of_receipt < ?", Time.zone.parse(date))
+  end
+
+  def filter_after_date(date)
+    tasks.joins(:appeal).where("correspondences.va_date_of_receipt > ?", Time.zone.parse(date))
+  end
+
+  def filter_on_date(date)
+    tasks.joins(:appeal).where("DATE(correspondences.va_date_of_receipt) = (?)", Time.zone.parse(date))
+  end
+end
diff --git a/app/models/tasks/efolder_upload_failed_task.rb b/app/models/tasks/efolder_upload_failed_task.rb
index 3cfae9fd4ae..8fccff6545e 100644
--- a/app/models/tasks/efolder_upload_failed_task.rb
+++ b/app/models/tasks/efolder_upload_failed_task.rb
@@ -1,4 +1,7 @@
 # frozen_string_literal: true
 
 class EfolderUploadFailedTask < CorrespondenceTask
+  def task_url
+    Constants.CORRESPONDENCE_TASK_URL.REVIEW_PACKAGE_TASK_URL.sub("uuid", correspondence.uuid)
+  end
 end
diff --git a/app/models/tasks/remove_package_task.rb b/app/models/tasks/remove_package_task.rb
index aa6d4db778e..7e4ab28fb8e 100644
--- a/app/models/tasks/remove_package_task.rb
+++ b/app/models/tasks/remove_package_task.rb
@@ -2,4 +2,9 @@
 
 class RemovePackageTask < CorrespondenceTask
   before_create :verify_no_other_open_package_action_task_on_correspondence
+
+  # :reek:UtilityFunction
+  def task_url
+    Constants.CORRESPONDENCE_TASK_URL.REMOVE_PACKAGE_TASK_MODAL_URL
+  end
 end
diff --git a/app/models/tasks/review_package_task.rb b/app/models/tasks/review_package_task.rb
index 85d6ac257c3..4f204de93ed 100644
--- a/app/models/tasks/review_package_task.rb
+++ b/app/models/tasks/review_package_task.rb
@@ -16,4 +16,12 @@ def create_from_params(params, user)
   def when_child_task_created(_child_task)
     true
   end
+
+  def task_url
+    if closed?
+      "/under_construction"
+    else
+      Constants.CORRESPONDENCE_TASK_URL.REVIEW_PACKAGE_TASK_URL.sub("uuid", correspondence.uuid)
+    end
+  end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index e663375c066..e2a64407587 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -21,6 +21,8 @@ class User < CaseflowRecord # rubocop:disable Metrics/ClassLength
 
   # Alternative: where("roles @> ARRAY[?]::varchar[]", role)
   scope :with_role, ->(role) { where("? = ANY(roles)", role) }
+  scope :mail_team_users, -> { joins(:organizations).where(organizations: { type: MailTeam.name }) }
+
 
   BOARD_STATION_ID = "101"
   LAST_LOGIN_PRECISION = 5.minutes
@@ -95,6 +97,18 @@ def hearings_user?
     can_any_of_these_roles?(["Build HearSched", "Edit HearSched", "RO ViewHearSched", "VSO", "Hearing Prep"])
   end
 
+  def mail_team_user?
+    organizations.include?(MailTeam.singleton)
+  end
+
+  def mail_supervisor?
+    organizations.include?(InboundOpsTeam.singleton)
+  end
+
+  def mail_superuser?
+    organizations_users.where(admin: true, organization_id: MailTeam.singleton.id || BvaIntake.singleton.id).any?
+  end
+
   def can_assign_hearing_schedule?
     can_any_of_these_roles?(["Edit HearSched", "Build HearSched"])
   end
@@ -424,6 +438,14 @@ def queue_tabs
     end
   end
 
+  def correspondence_queue_tabs
+    [
+      correspondence_assigned_tasks_tab,
+      correspondence_in_progress_tasks_tab,
+      correspondence_completed_tasks_tab
+    ]
+  end
+
   def self.default_active_tab
     Constants.QUEUE_CONFIG.INDIVIDUALLY_ASSIGNED_TASKS_TAB_NAME
   end
@@ -440,6 +462,18 @@ def completed_tasks_tab
     ::CompletedTasksTab.new(assignee: self, show_regional_office_column: show_regional_office_in_queue?)
   end
 
+  def correspondence_assigned_tasks_tab
+    ::CorrespondenceAssignedTasksTab.new(assignee: self)
+  end
+
+  def correspondence_in_progress_tasks_tab
+    ::CorrespondenceInProgressTasksTab.new(assignee: self)
+  end
+
+  def correspondence_completed_tasks_tab
+    ::CorrespondenceCompletedTasksTab.new(assignee: self)
+  end
+
   def can_edit_unrecognized_poa?
     allowed_orgs = [LitigationSupport, ClerkOfTheBoard, BoardProductOwners, BvaIntake].map(&:singleton)
     colocated_in_vacols? || allowed_orgs.any? { |org| org.user_has_access?(self) }
diff --git a/app/models/vacols/case_docket.rb b/app/models/vacols/case_docket.rb
index 41440a2b5b0..f4b57b92509 100644
--- a/app/models/vacols/case_docket.rb
+++ b/app/models/vacols/case_docket.rb
@@ -469,7 +469,6 @@ def self.distribute_nonpriority_appeals(judge, genpop, range, limit, bust_backlo
     distribute_appeals(fmtd_query, judge, dry_run)
   end
 
-  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/ParameterLists, Metrics/MethodLength
   def self.distribute_priority_appeals(judge, genpop, limit, dry_run = false)
     query = if use_by_docket_date?
               <<-SQL
diff --git a/app/views/correspondence/correspondence_cases.html.erb b/app/views/correspondence/correspondence_cases.html.erb
index 74298a297bc..6feaf79a547 100644
--- a/app/views/correspondence/correspondence_cases.html.erb
+++ b/app/views/correspondence/correspondence_cases.html.erb
@@ -9,6 +9,7 @@
     dropdownUrls: dropdown_urls,
     applicationUrls: application_urls,
     feedbackUrl: feedback_url,
+    configUrl: '/queue/correspondence?json',
     flash: flash,
     featureToggles: {
       correspondence_queue: FeatureToggle.enabled?(:correspondence_queue, user: current_user)
diff --git a/app/views/correspondence/correspondence_team.html.erb b/app/views/correspondence/correspondence_team.html.erb
new file mode 100644
index 00000000000..a1eaf8a2983
--- /dev/null
+++ b/app/views/correspondence/correspondence_team.html.erb
@@ -0,0 +1,22 @@
+<% content_for :full_page_content do %>
+  <%= react_component("Queue", props: {
+    userDisplayName: current_user.display_name,
+    userId: current_user.id,
+    userRole: (current_user.vacols_roles.first || "").capitalize,
+    userCssId: current_user.css_id,
+    organizations: current_user.selectable_organizations.map {|o| o.slice(:name, :url)},
+    caseSearchHomePage: case_search_home_page,
+    dropdownUrls: dropdown_urls,
+    applicationUrls: application_urls,
+    feedbackUrl: feedback_url,
+    configUrl: '/queue/correspondence/team?json',
+    flash: flash,
+    mailTeamUsers: @mail_team_users,
+    responseType: @response_type,
+    responseHeader: @response_header,
+    responseMessage: @response_message,
+    featureToggles: {
+      correspondence_queue: FeatureToggle.enabled?(:correspondence_queue, user: current_user)
+    }
+  }) %>
+<% end %>
diff --git a/app/views/queue/index.html.erb b/app/views/queue/index.html.erb
index 5e2afcde681..f09fa482de4 100644
--- a/app/views/queue/index.html.erb
+++ b/app/views/queue/index.html.erb
@@ -20,6 +20,9 @@
     userCanViewHearingSchedule: current_user.can_view_hearing_schedule?,
     userCanViewOvertimeStatus: current_user.can_view_overtime_status?,
     userCanViewEditNodDate: current_user.can_view_edit_nod_date?,
+    isMailTeamUser: current_user.mail_team_user?,
+    isMailSupervisor: current_user.mail_supervisor?,
+    isMailSuperUser: current_user.mail_superuser?,
     canEditCavcRemands: current_user.can_edit_cavc_remands?,
     canEditCavcDashboards: current_user.can_edit_cavc_dashboards?,
     canViewCavcDashboards: current_user.can_view_cavc_dashboards?,
diff --git a/app/workflows/correspondence_root_task_factory.rb b/app/workflows/correspondence_root_task_factory.rb
index 9594abc9b29..00e150898d0 100644
--- a/app/workflows/correspondence_root_task_factory.rb
+++ b/app/workflows/correspondence_root_task_factory.rb
@@ -34,5 +34,7 @@ def create_subtasks!
       parent_id: @root_task.id,
       type: ReviewPackageTask.name
     )
+
+    @review_package_task.update!(status: Constants.TASK_STATUSES.unassigned)
   end
 end
diff --git a/client/COPY.json b/client/COPY.json
index 1122f43aaaa..df310a19b4a 100644
--- a/client/COPY.json
+++ b/client/COPY.json
@@ -51,10 +51,10 @@
   "CASE_LIST_TABLE_QUEUE_DROPDOWN_OWN_CASES_LABEL": "Your cases",
   "CASE_LIST_TABLE_QUEUE_DROPDOWN_TEAM_CASES_LABEL": "%s team cases",
   "CASE_LIST_TABLE_QUEUE_DROPDOWN_CORRESPONDENCE_CASES": "Correspondence Cases",
-  "TITLE_MODAL_EDIT_DOCUMENT_TYPE_CORRESPONDENCE" : "Edit document type",
-  "TEXT_MODAL_EDIT_DOCUMENT_TYPE_CORRESPONDENCE" : "Change the document type of the selected document.",
-  "ORIGINAL_DOC_EDIT_DOCUMENT_TYPE_CORRESPONDENCE" : "Original document type",
-  "NEW_DOC_EDIT_DOCUMENT_TYPE_CORRESPONDENCE" : "New document type",
+  "TITLE_MODAL_EDIT_DOCUMENT_TYPE_CORRESPONDENCE": "Edit document type",
+  "TEXT_MODAL_EDIT_DOCUMENT_TYPE_CORRESPONDENCE": "Change the document type of the selected document.",
+  "ORIGINAL_DOC_EDIT_DOCUMENT_TYPE_CORRESPONDENCE": "Original document type",
+  "NEW_DOC_EDIT_DOCUMENT_TYPE_CORRESPONDENCE": "New document type",
   "CASE_LIST_TABLE_EMPTY_TEXT": "This Veteran has no appeals at this time.",
   "CASE_LIST_TABLE_TOTAL_DAYS_COLUMN_TITLE": "Total Days",
   "CASE_LIST_TABLE_BOARD_INTAKE": "Board Intake",
@@ -1449,6 +1449,8 @@
   "CORRESPONDENCE_READONLY_BANNER_HEADER": "This package has a pending request",
   "CORRESPONDENCE_READONLY_BANNER_MESSAGE": "Any further actions cannot be made on this package until a supervisor or superuser reviews the request.",
   "ASSOCIATED_WITH_CLAIMS_FOLDER_MAIL_TASK_LABEL": "Associated with claims folder",
+  "CORRESPONDENCE_CASES_REMOVE_PACKAGE_MODAL_TITLE": "Review request",
+  "CORRESPONDENCE_CASES_REASSIGN_PACKAGE_MODAL_TITLE": "Review request",
   "VACOLS_UPDATED_MAIL_TASK_LABEL": "VACOLS updated",
   "SENT_TO_ROJ_MAIL_TASK_LABEL": "Sent to ROJ",
   "CASE_DISTRIBUTION_TITLE": "Case Distribution Algorithm Values",
diff --git a/client/app/components/FilterOption.jsx b/client/app/components/FilterOption.jsx
index 311e4873d7e..c7a7e55bc57 100644
--- a/client/app/components/FilterOption.jsx
+++ b/client/app/components/FilterOption.jsx
@@ -36,7 +36,6 @@ const FilterOption = ({ options, setSelectedValue,
         <label htmlFor={`${index}-${option.value}`}>
           {option.displayText}
         </label>
-
       </li>;
     })}
   </ul>;
diff --git a/client/app/components/ReceiptDatePicker.jsx b/client/app/components/ReceiptDatePicker.jsx
new file mode 100644
index 00000000000..c9dd4dfdd86
--- /dev/null
+++ b/client/app/components/ReceiptDatePicker.jsx
@@ -0,0 +1,100 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ReactSelectDropdown from '../../../client/app/components/ReactSelectDropdown';
+import DateSelector from './DateSelector';
+import Button from './Button';
+
+const dateDropdownMap = [
+  { value: 0, label: 'Between these dates' },
+  { value: 1, label: 'Before this date' },
+  { value: 2, label: 'After this date' },
+  { value: 3, label: 'On this date' }
+];
+
+const receiptDatePicker = (props) => {
+
+  const getDatePickerElements = () => {
+    const receiptDateFilterStates = props.receiptDateFilterStates;
+
+    switch (props.receiptDateState) {
+    case receiptDateFilterStates.BETWEEN: return (
+      <div style={{ marginLeft: '5%', marginRight: '5%' }}>
+        <DateSelector
+          onChange={props.handleDateChange}
+          label="From"
+          type="date" />
+        <DateSelector
+          onChange={props.handleSecondaryDateChange}
+          label="To"
+          type="date" />
+      </div>);
+    case receiptDateFilterStates.BEFORE: return (
+      <div style={{ marginLeft: '5%', marginRight: '5%' }}>
+        <DateSelector
+          onChange={(value) => props.handleDateChange(value)}
+          type="date" />
+      </div>
+    );
+    case receiptDateFilterStates.AFTER: return (
+      <div style={{ marginLeft: '5%', marginRight: '5%' }}>
+        <DateSelector
+          onChange={(value) => props.handleDateChange(value)}
+          type="date" />
+      </div>
+    );
+    case receiptDateFilterStates.ON: return (
+      <div style={{ marginLeft: '5%', marginRight: '5%' }}>
+        <DateSelector
+          onChange={(value) => props.handleDateChange(value)}
+          type="date" />
+      </div>
+    );
+
+    default:
+    }
+  };
+
+  return <div id="dropdown">
+    <div style={{ marginLeft: '5%', marginRight: '5%' }}>
+      <ReactSelectDropdown
+        label="Date filter parameters"
+        options={dateDropdownMap}
+        onChangeMethod={props.onChangeMethod}
+      />
+    </div>
+    <div style={{ width: '100%', margin: 'auto' }}>
+      {getDatePickerElements()}
+    </div>
+
+    <div style={{ display: 'flex', margin: '10px 0px', justifyContent: 'center', width: '190px' }}>
+      <Button disabled={props.isApplyButtonEnabled} onClick={props.handleApplyFilter}>
+        <span>Apply Filter</span>
+      </Button>
+    </div>
+
+  </div>;
+};
+
+receiptDatePicker.propTypes = {
+  receiptDateFilterStates: PropTypes.object,
+  receiptDateState: PropTypes.number,
+  handleApplyFilter: PropTypes.func.isRequired,
+  handleDateChange: PropTypes.func.isRequired,
+  handleSecondaryDateChange: PropTypes.func.isRequired,
+  isApplyButtonEnabled: PropTypes.bool.isRequired,
+  onChange: PropTypes.func,
+  options: PropTypes.arrayOf(
+    PropTypes.shape({
+      value: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+      displayText: PropTypes.string,
+    })
+  ),
+  defaultValue: PropTypes.object,
+  label: PropTypes.string,
+  onChangeMethod: PropTypes.func,
+  className: PropTypes.string,
+  disabled: PropTypes.bool,
+  customPlaceholder: PropTypes.string
+};
+
+export default receiptDatePicker;
diff --git a/client/app/components/TableFilter.jsx b/client/app/components/TableFilter.jsx
index bccd70ce974..736d255cf8e 100644
--- a/client/app/components/TableFilter.jsx
+++ b/client/app/components/TableFilter.jsx
@@ -153,6 +153,7 @@ class TableFilter extends React.PureComponent {
     let newFilteredByList = _.clone(filteredByList);
 
     newFilteredByList[columnName] = newFilters;
+
     this.props.updateFilters(newFilteredByList);
     this.toggleDropdown();
   }
@@ -209,10 +210,14 @@ class TableFilter extends React.PureComponent {
         {this.state.open &&
           <QueueDropdownFilter
             clearFilters={this.clearFilteredByList}
+            isReceiptDateFilter={this.props.isReceiptDateFilter}
+            isTaskCompletedDateFilter={this.props.isTaskCompletedDateFilter}
             name={valueName || columnName}
             isClearEnabled={anyFiltersAreSet}
             handleClose={this.toggleDropdown}
+            setSelectedValue={(value) => this.updateSelectedFilter(value, columnName)}
             addClearFiltersRow>
+
             <FilterOption
               options={filterOptions}
               setSelectedValue={(value) => this.updateSelectedFilter(value, columnName)} />
@@ -228,6 +233,8 @@ TableFilter.defaultProps = {
 };
 
 TableFilter.propTypes = {
+  isReceiptDateFilter: PropTypes.bool,
+  isTaskCompletedDateFilter: PropTypes.bool,
   enableFilter: PropTypes.bool,
   enableFilterTextTransform: PropTypes.bool,
   getFilterIconRef: PropTypes.func,
diff --git a/client/app/components/TaskCompletedDatePicker.jsx b/client/app/components/TaskCompletedDatePicker.jsx
new file mode 100644
index 00000000000..962d1929dfb
--- /dev/null
+++ b/client/app/components/TaskCompletedDatePicker.jsx
@@ -0,0 +1,104 @@
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+import ReactSelectDropdown from '../../../client/app/components/ReactSelectDropdown';
+import DateSelector from './DateSelector';
+import Button from './Button';
+
+const dateDropdownMap = [
+  { value: 0, label: 'Between these dates' },
+  { value: 1, label: 'Before this date' },
+  { value: 2, label: 'After this date' },
+  { value: 3, label: 'On this date' }
+];
+
+const TaskCompletedDatePicker = (props) => {
+  const [isDateSelected, setDateSelected] = useState(false);
+  const [isSecondaryDateSelected, setSecondaryDateSelected] = useState(false);
+
+  const handleDateChange = (value) => {
+    props.handleTaskCompletedDateChange(value);
+    setDateSelected(Boolean(value));
+  };
+
+  const handleSecondaryDateChange = (value) => {
+    props.handleTaskCompletedSecondaryDateChange(value);
+    setSecondaryDateSelected(Boolean(value));
+  };
+
+  const handleApplyFilter = () => {
+    props.handleTaskCompletedApplyFilter();
+  };
+
+  const taskCompletedDateFilterStates = props.taskCompletedDateFilterStates;
+  const isApplyFilterButtonDisabled =
+    props.taskCompletedDateState === taskCompletedDateFilterStates.BETWEEN ?
+      !(isDateSelected && isSecondaryDateSelected) :
+      !isDateSelected;
+
+  const getDatePickerElements = () => {
+
+    switch (props.taskCompletedDateState) {
+    case taskCompletedDateFilterStates.BETWEEN: return (
+      <div style={{ margin: '5% 5%' }}>
+        <DateSelector onChange={handleDateChange} label="From" type="date" />
+        <DateSelector onChange={handleSecondaryDateChange} label="To" type="date" />
+      </div>);
+    case taskCompletedDateFilterStates.BEFORE: return (
+      <div style={{ margin: '5% 5%' }}>
+        <DateSelector onChange={handleDateChange} label="To" type="date" />
+      </div>
+    );
+    case taskCompletedDateFilterStates.AFTER: return (
+      <div style={{ margin: '5% 5%' }}>
+        <DateSelector onChange={handleDateChange} type="date" />
+      </div>
+    );
+    case taskCompletedDateFilterStates.ON: return (
+      <div style={{ margin: '5% 5%' }}>
+        <DateSelector onChange={handleDateChange} label="Date Completed" type="date" />
+      </div>
+    );
+
+    default:
+    }
+  };
+
+  return <div id="dropdown">
+    <div style={{ marginLeft: '5%', marginRight: '5%' }}>
+      <ReactSelectDropdown
+        label="Date filter parameters"
+        options={dateDropdownMap}
+        onChangeMethod={props.onChangeMethod} />
+    </div>
+
+    <div style={{ width: '100%', margin: 'auto' }}>
+      {getDatePickerElements()}
+    </div>
+    <div style={{ margin: '10px 20px', display: 'flex', justifyContent: 'end', width: '190px' }}>
+      <Button onClick={handleApplyFilter} disabled={isApplyFilterButtonDisabled}>Apply filter</Button>
+    </div>
+  </div>;
+};
+
+TaskCompletedDatePicker.propTypes = {
+  taskCompletedDateFilterStates: PropTypes.object,
+  taskCompletedDateState: PropTypes.number,
+  handleTaskCompletedApplyFilter: PropTypes.func.isRequired,
+  handleTaskCompletedDateChange: PropTypes.func.isRequired,
+  handleTaskCompletedSecondaryDateChange: PropTypes.func.isRequired,
+  onChange: PropTypes.func,
+  options: PropTypes.arrayOf(
+    PropTypes.shape({
+      value: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+      displayText: PropTypes.string,
+    })
+  ),
+  defaultValue: PropTypes.object,
+  label: PropTypes.string,
+  onChangeMethod: PropTypes.func,
+  className: PropTypes.string,
+  disabled: PropTypes.bool,
+  customPlaceholder: PropTypes.string
+};
+
+export default TaskCompletedDatePicker;
diff --git a/client/app/queue/QueueApp.jsx b/client/app/queue/QueueApp.jsx
index 3d50666dea9..c5fe8db1386 100644
--- a/client/app/queue/QueueApp.jsx
+++ b/client/app/queue/QueueApp.jsx
@@ -25,6 +25,9 @@ import {
   setUserIsCamoEmployee,
   setFeedbackUrl,
   setOrganizations,
+  setMailTeamUser,
+  setMailSupervisor,
+  setMailSuperUser
 } from './uiReducer/uiActions';
 
 import ScrollToTop from '../components/ScrollToTop';
@@ -96,6 +99,7 @@ import TASK_ACTIONS from '../../constants/TASK_ACTIONS';
 import TASK_STATUSES from '../../constants/TASK_STATUSES';
 import USER_ROLE_TYPES from '../../constants/USER_ROLE_TYPES';
 import DECISION_TYPES from '../../constants/APPEAL_DECISION_TYPES';
+import QUEUE_CONFIG from '../../constants/QUEUE_CONFIG';
 import { FlashAlerts } from '../nonComp/components/Alerts';
 
 import { PulacCerulloReminderModal } from './pulacCerullo/PulacCerulloReminderModal';
@@ -127,6 +131,9 @@ class QueueApp extends React.PureComponent {
     this.props.setUserRole(this.props.userRole);
     this.props.setUserCssId(this.props.userCssId);
     this.props.setOrganizations(this.props.organizations);
+    this.props.setMailTeamUser(this.props.isMailTeamUser);
+    this.props.setMailSupervisor(this.props.isMailSupervisor);
+    this.props.setMailSuperUser(this.props.isMailSuperUser);
     this.props.setUserIsVsoEmployee(this.props.userIsVsoEmployee);
     this.props.setUserIsCamoEmployee(this.props.userIsCamoEmployee);
     this.props.setFeedbackUrl(this.props.feedbackUrl);
@@ -688,6 +695,10 @@ class QueueApp extends React.PureComponent {
     <CorrespondenceCases {...this.props} />
   );
 
+  routedCorrespondenceTeam = () => (
+    <CorrespondenceCases {...this.props} />
+  );
+
   routedCompleteHearingWithdrawalRequest = (props) => (
     <CompleteHearingWithdrawalRequestModal {...props.match.params} />
   );
@@ -746,10 +757,17 @@ class QueueApp extends React.PureComponent {
               render={this.routedQueueList}
             />
 
+            <PageRoute
+              exact
+              path="/queue/correspondence/team"
+              title={`${QUEUE_CONFIG.CORRESPONDENCE_ORG_TABLE_TITLE}`}
+              render={this.routedCorrespondenceCase}
+            />
+
             <PageRoute
               exact
               path="/queue/correspondence"
-              title={`${PAGE_TITLES.CORRESPONDENCE_CASES_LIST}`}
+              title={`${QUEUE_CONFIG.CORRESPONDENCE_USER_TABLE_TITLE}`}
               render={this.routedCorrespondenceCase}
             />
 
@@ -1491,6 +1509,12 @@ QueueApp.propTypes = {
   setUserCssId: PropTypes.func,
   setUserId: PropTypes.func,
   setOrganizations: PropTypes.func,
+  setMailTeamUser: PropTypes.func,
+  setMailSupervisor: PropTypes.func,
+  setMailSuperUser: PropTypes.func,
+  isMailTeamUser: PropTypes.bool,
+  isMailSupervisor: PropTypes.bool,
+  isMailSuperUser: PropTypes.bool,
   organizations: PropTypes.array,
   setUserIsVsoEmployee: PropTypes.func,
   userIsVsoEmployee: PropTypes.bool,
@@ -1538,6 +1562,9 @@ const mapDispatchToProps = (dispatch) =>
       setUserIsCamoEmployee,
       setFeedbackUrl,
       setOrganizations,
+      setMailTeamUser,
+      setMailSupervisor,
+      setMailSuperUser,
     },
     dispatch
   );
diff --git a/client/app/queue/QueueDropdownFilter.jsx b/client/app/queue/QueueDropdownFilter.jsx
index 8444a439381..de7b217e111 100644
--- a/client/app/queue/QueueDropdownFilter.jsx
+++ b/client/app/queue/QueueDropdownFilter.jsx
@@ -3,6 +3,8 @@ import PropTypes from 'prop-types';
 import { COLORS } from '@department-of-veterans-affairs/caseflow-frontend-toolkit/util/StyleConstants';
 import { css } from 'glamor';
 import { startCase } from 'lodash';
+import ReceiptDatePicker from '../components/ReceiptDatePicker';
+import TaskCompletedDatePicker from '../components/TaskCompletedDatePicker';
 
 const dropdownFilterViewListStyle = css({
   margin: 0
@@ -18,14 +20,112 @@ const dropdownFilterViewListItemStyle = css(
   }
 );
 
+const receiptDateFilterStates = {
+  UNINITIALIZED: '',
+  BETWEEN: 0,
+  BEFORE: 1,
+  AFTER: 2,
+  ON: 3
+};
+
+const taskCompletedDateFilterStates = {
+  UNINITIALIZED: '',
+  BETWEEN: 0,
+  BEFORE: 1,
+  AFTER: 2,
+  ON: 3
+};
+
 class QueueDropdownFilter extends React.PureComponent {
   constructor() {
     super();
     this.state = {
-      rootElemWidth: null
+      rootElemWidth: null,
+      receiptDateState: -1,
+      receiptDatePrimaryValue: '',
+      receiptDateSecondaryValue: '',
+      taskCompletedDateState: -1,
+      taskCompletedDatePrimaryValue: '',
+      taskCompletedDateSecondaryValue: ''
     };
   }
 
+  setreceiptDateState = (value) => {
+    this.setState({ receiptDateState: value.value });
+  };
+
+  setTaskCompletedDateState = (value) => {
+    this.setState({ taskCompletedDateState: value.value });
+  };
+
+  handleDateChange = (value) => {
+    this.setState({ receiptDatePrimaryValue: value });
+  }
+
+  handleTaskCompletedDateChange = (value) => {
+    this.setState({ taskCompletedDatePrimaryValue: value });
+  }
+
+  // Used when the between dates option is selected to store the second date.
+  handleSecondaryDateChange = (value) => {
+    this.setState({ receiptDateSecondaryValue: value });
+  }
+
+  handleTaskCompletedSecondaryDateChange = (value) => {
+    this.setState({ taskCompletedDateSecondaryValue: value });
+  }
+
+  handleApplyFilter = () => {
+    if (this.state.receiptDateState === 0) {
+      this.props.setSelectedValue(
+        [
+          this.state.receiptDateState,
+          this.state.receiptDatePrimaryValue,
+          this.state.receiptDateSecondaryValue
+        ], 'vaDor');
+    } else {
+      this.props.setSelectedValue([this.state.receiptDateState, this.state.receiptDatePrimaryValue], 'vaDor');
+    }
+  }
+
+  isApplyButtonEnabled = () => {
+    if (this.state.receiptDateState >= 1 && this.state.receiptDatePrimaryValue !== '') {
+      return false;
+    }
+    if (this.state.receiptDateState === 0 &&
+      this.state.receiptDatePrimaryValue.length > 0 &&
+      this.state.receiptDateSecondaryValue.length > 0) {
+      return false;
+    }
+
+    return true;
+  }
+
+  clearAllFilters = () => {
+    this.setreceiptDateState(-1);
+    this.setState({ receiptDatePrimaryValue: '' });
+    this.setState({ receiptDateSecondaryValue: '' });
+    this.setTaskCompletedDateState(-1);
+    this.setState({ taskCompletedDatePrimaryValue: '' });
+    this.setState({ taskCompletedDateSecondaryValue: '' });
+    this.props.clearFilters();
+
+  }
+
+  handleTaskCompletedApplyFilter = () => {
+    if (this.state.taskCompletedDateState === 0) {
+      this.props.setSelectedValue(
+        [
+          this.state.taskCompletedDateState,
+          this.state.taskCompletedDatePrimaryValue,
+          this.state.taskCompletedDateSecondaryValue
+        ], 'completedDateColumn');
+    } else {
+      this.props.setSelectedValue([this.state.taskCompletedDateState, this.state.taskCompletedDatePrimaryValue],
+        'completedDateColumn');
+    }
+  }
+
   render() {
     const { children, name } = this.props;
 
@@ -42,8 +142,8 @@ class QueueDropdownFilter extends React.PureComponent {
         this.rootElem = rootElem;
       }}>
         {this.props.addClearFiltersRow &&
-          <div className="cf-filter-option-row">
-            <button className="cf-text-button" onClick={this.props.clearFilters}
+          <div className="cf-filter-option-row" onClick={this.clearAllFilters}>
+            <button className="cf-text-button"
               disabled={!this.props.isClearEnabled}>
               <div className="cf-clear-filter-button-wrapper">
                 Clear {displayName} filter
@@ -51,10 +151,34 @@ class QueueDropdownFilter extends React.PureComponent {
             </button>
           </div>
         }
-        {React.cloneElement(React.Children.only(children), {
-          dropdownFilterViewListStyle,
-          dropdownFilterViewListItemStyle
-        })}
+        {this.props.isReceiptDateFilter && <ReceiptDatePicker
+          handleDateChange={this.handleDateChange}
+          handleSecondaryDateChange={this.handleSecondaryDateChange}
+          setSelectedValue={this.props.setSelectedValue}
+          handleApplyFilter={this.handleApplyFilter}
+          onChangeMethod={this.setreceiptDateState}
+          receiptDateState={this.state.receiptDateState}
+          receiptDateValues={this.state.receiptDateValues}
+          receiptDateFilterStates={receiptDateFilterStates}
+          isApplyButtonEnabled={this.isApplyButtonEnabled()}
+        />}
+        {this.props.isTaskCompletedDateFilter && <TaskCompletedDatePicker
+          handleTaskCompletedDateChange={this.handleTaskCompletedDateChange}
+          handleTaskCompletedSecondaryDateChange={this.handleTaskCompletedSecondaryDateChange}
+          setSelectedValue={this.props.setSelectedValue}
+          handleTaskCompletedApplyFilter={this.handleTaskCompletedApplyFilter}
+          onChangeMethod={this.setTaskCompletedDateState}
+          taskCompletedDateState={this.state.taskCompletedDateState}
+          taskCompletedDateValues={this.state.taskCompletedDateValues}
+          taskCompletedDateFilterStates={taskCompletedDateFilterStates}
+        />
+
+        }
+        {!(this.props.isReceiptDateFilter || this.props.isTaskCompletedDateFilter) &&
+          React.cloneElement(React.Children.only(children), {
+            dropdownFilterViewListStyle,
+            dropdownFilterViewListItemStyle
+          })}
       </div>
     </div>;
   }
@@ -87,6 +211,9 @@ QueueDropdownFilter.propTypes = {
   handleClose: PropTypes.func,
   addClearFiltersRow: PropTypes.bool,
   name: PropTypes.string,
+  setSelectedValue: PropTypes.func.isRequired,
+  isReceiptDateFilter: PropTypes.func.isRequired,
+  isTaskCompletedDateFilter: PropTypes.func.isRequired
 };
 
 export default QueueDropdownFilter;
diff --git a/client/app/queue/QueueTable.jsx b/client/app/queue/QueueTable.jsx
index 4267a27a259..d0b040a145c 100644
--- a/client/app/queue/QueueTable.jsx
+++ b/client/app/queue/QueueTable.jsx
@@ -13,7 +13,7 @@ import Pagination from '../components/Pagination/Pagination';
 import { COLORS, LOGO_COLORS } from '../constants/AppConstants';
 import ApiUtil from '../util/ApiUtil';
 import LoadingScreen from '../components/LoadingScreen';
-import { tasksWithAppealsFromRawTasks } from './utils';
+import { tasksWithAppealsFromRawTasks, tasksWithCorrespondenceFromRawTasks } from './utils';
 import QUEUE_CONFIG from '../../constants/QUEUE_CONFIG';
 import COPY from '../../COPY';
 
@@ -171,6 +171,8 @@ export const HeaderRow = (props) => {
                 filterOptionsFromApi={props.useTaskPagesApi && column.filterOptions}
                 updateFilters={(newFilters) => props.updateFilteredByList(newFilters)}
                 filteredByList={props.filteredByList}
+                isReceiptDateFilter={column.name === QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name}
+                isTaskCompletedDateFilter={column.name === QUEUE_CONFIG.COLUMNS.TASK_CLOSED_DATE.name}
               />
             );
           }
@@ -638,7 +640,9 @@ export default class QueueTable extends React.PureComponent {
           tasks: { data: tasks }
         } = response.body;
 
-        const preparedTasks = tasksWithAppealsFromRawTasks(tasks);
+        const preparedTasks = this.props.isCorrespondenceTable ?
+          tasksWithCorrespondenceFromRawTasks(tasks) :
+          tasksWithAppealsFromRawTasks(tasks);
 
         const preparedResponse = Object.assign(response.body, { tasks: preparedTasks });
 
@@ -843,6 +847,7 @@ HeaderRow.propTypes = FooterRow.propTypes = Row.propTypes = BodyRows.propTypes =
   }),
   onHistoryUpdate: PropTypes.func,
   preserveFilter: PropTypes.bool,
+  isCorrespondenceTable: PropTypes.bool
 };
 
 Row.propTypes.rowObjects = PropTypes.arrayOf(PropTypes.object);
diff --git a/client/app/queue/QueueTableBuilder.jsx b/client/app/queue/QueueTableBuilder.jsx
index 9d421e23f0f..7ba3d817711 100644
--- a/client/app/queue/QueueTableBuilder.jsx
+++ b/client/app/queue/QueueTableBuilder.jsx
@@ -250,7 +250,13 @@ const QueueTableBuilder = (props) => {
 
   return <div className={rootStyles}>
     <h1 {...css({ display: 'inline-block' })}>{config.table_title}</h1>
-    <QueueOrganizationDropdown organizations={props.organizations} featureToggles = {props.featureToggles} />
+    <QueueOrganizationDropdown
+      isMailTeamUser={props.isMailTeamUser}
+      isMailSupervisor={props.isMailSupervisor}
+      isMailSuperUser={props.isMailSuperUser}
+      organizations={props.organizations}
+      featureToggles = {props.featureToggles}
+    />
     <TabWindow
       name="tasks-tabwindow"
       tabs={tabsFromConfig(config)}
@@ -263,12 +269,18 @@ const mapStateToProps = (state) => {
   return {
     config: state.queue.queueConfig,
     organizations: state.ui.organizations,
+    isMailTeamUser: state.ui.isMailTeamUser,
+    isMailSupervisor: state.ui.isMailSupervisor,
+    isMailSuperUser: state.ui.isMailSuperUser,
     isVhaOrg: isActiveOrganizationVHA(state),
     userCanBulkAssign: state.ui.activeOrganization.userCanBulkAssign,
   };
 };
 
 QueueTableBuilder.propTypes = {
+  isMailTeamUser: PropTypes.bool,
+  isMailSupervisor: PropTypes.bool,
+  isMailSuperUser: PropTypes.bool,
   organizations: PropTypes.array,
   assignedTasks: PropTypes.array,
   config: PropTypes.shape({
diff --git a/client/app/queue/components/QueueOrganizationDropdown.jsx b/client/app/queue/components/QueueOrganizationDropdown.jsx
index 2b7140f765c..71f381c081d 100644
--- a/client/app/queue/components/QueueOrganizationDropdown.jsx
+++ b/client/app/queue/components/QueueOrganizationDropdown.jsx
@@ -1,13 +1,17 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { sprintf } from 'sprintf-js';
-
+// import { useLocation } from 'react-router-dom';
 import QueueSelectorDropdown from './QueueSelectorDropdown';
 import COPY from '../../../COPY';
+import QUEUE_CONFIG from '../../../constants/QUEUE_CONFIG';
 
 export default class QueueOrganizationDropdown extends React.Component {
   render = () => {
     const { organizations } = this.props;
+    const { isMailTeamUser } = this.props;
+    const { isMailSupervisor } = this.props;
+    const { isMailSuperUser } = this.props;
     const url = window.location.pathname.split('/');
     const location = url[url.length - 1];
     const queueHref = (location === 'queue') ? '#' : '/queue';
@@ -36,23 +40,47 @@ export default class QueueOrganizationDropdown extends React.Component {
 
     let items = [queueItem, ...organizationItems];
 
-    if (organizations[0].name === 'Mail' || organizations[0].name === 'Inbound Ops Team') {
-      const orgHref = '/queue/correspondence';
+    if (isMailSuperUser === true || isMailSupervisor === true) {
+      const orgHref = '/queue/correspondence/team';
 
       correspondenceItems = {
         key: (2).toString(),
         href: orgHref,
-        label: sprintf(COPY.CASE_LIST_TABLE_QUEUE_DROPDOWN_CORRESPONDENCE_CASES)
+        label: sprintf(QUEUE_CONFIG.CASE_LIST_TABLE_QUEUE_DROPDOWN_CORRESPONDENCE_CASES)
       };
 
       items = [...items, correspondenceItems];
     }
+    if (isMailTeamUser === true) {
+      const orgHref = '/queue/correspondence';
+
+      correspondenceItems = {
+        key: (2).toString(),
+        href: orgHref,
+        label: sprintf(QUEUE_CONFIG.CASE_LIST_TABLE_QUEUE_DROPDOWN_OWN_CORRESPONDENCE_LABEL)
+      };
+      // This places the "Your Correspondence" option at the 2nd(1) index
+      const items1 = items.slice(0, 1);
+      const items2 = items.slice(1);
+
+      items = [...items1, correspondenceItems, ...items2];
+
+      // const browserLocation = useLocation();
+
+      // console.log(browserLocation);
+      // if (browserLocation === '/queue/correspondence/team') {
+      //   return <Redirect to= "/queue/correspondence" />;
+      // }
+    }
 
     return <QueueSelectorDropdown items={items} />;
   }
 }
 
 QueueOrganizationDropdown.propTypes = {
+  isMailTeamUser: PropTypes.bool,
+  isMailSupervisor: PropTypes.bool,
+  isMailSuperUser: PropTypes.bool,
   organizations: PropTypes.arrayOf(PropTypes.shape({
     name: PropTypes.string.isRequired,
     url: PropTypes.string.isRequired
diff --git a/client/app/queue/components/TaskTableColumns.jsx b/client/app/queue/components/TaskTableColumns.jsx
index 85ca86f9d5f..ef381858f36 100644
--- a/client/app/queue/components/TaskTableColumns.jsx
+++ b/client/app/queue/components/TaskTableColumns.jsx
@@ -13,9 +13,16 @@ import ContinuousProgressBar from 'app/components/ContinuousProgressBar';
 import OnHoldLabel, { numDaysOnHold } from './OnHoldLabel';
 import IhpDaysWaitingTooltip from './IhpDaysWaitingTooltip';
 import TranscriptionTaskTooltip from './TranscriptionTaskTooltip';
+import Checkbox from '../../components/Checkbox';
+import { useDispatch, useSelector } from 'react-redux';
+import {
+  setShowReassignPackageModal,
+  setShowRemovePackageModal,
+  setSelectedTasks
+} from 'app/queue/correspondence/correspondenceReducer/correspondenceActions';
 
 import { taskHasCompletedHold, hasDASRecord, collapseColumn, regionalOfficeCity, renderAppealType } from '../utils';
-import { DateString, daysSinceAssigned, daysSincePlacedOnHold } from '../../util/DateUtil';
+import { daysSinceAssigned, daysSincePlacedOnHold } from '../../util/DateUtil';
 
 import COPY from '../../../COPY';
 import QUEUE_CONFIG from '../../../constants/QUEUE_CONFIG';
@@ -222,6 +229,147 @@ export const assignedByColumn = () => {
   };
 };
 
+export const veteranDetails = () => {
+  const dispatch = useDispatch();
+
+  const showReassignPackageModal = () => {
+    dispatch(setShowReassignPackageModal(true));
+  };
+
+  const showRemovePackageModal = () => {
+    dispatch(setShowRemovePackageModal(true));
+  };
+
+  return {
+    header: 'Veteran Details',
+    label: 'Veteran Details',
+    name: QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
+    backendCanSort: true,
+    getSortValue: (task) => task.veteranDetails,
+    valueFunction: (task) => {
+      if (task.taskUrl === '/modal/reassign_package') {
+        return <a
+          href="#"
+          onClick={showReassignPackageModal}
+          aria-label={`${task.label } Link`}
+          id="task-link"
+        >
+          {task.veteranDetails}
+        </a>;
+      } else if (task.taskUrl === '/modal/remove_package') {
+        return <a
+          href="#"
+          onClick={showRemovePackageModal}
+          aria-label={`${task.label } Link`}
+          id="task-link"
+        >
+          {task.veteranDetails}
+        </a>;
+      }
+
+      return <a
+        href={task.taskUrl}
+        id="task-link"
+        aria-label={`${task.label } Link`}
+      >
+        {task.veteranDetails}
+      </a>;
+    },
+  };
+};
+
+export const vaDor = () => {
+  return {
+    header: 'VA DOR',
+    filterOptions: [],
+    columnName: 'Receipt Date',
+    backendCanSort: true,
+    enableFilter: true,
+    getSortValue: (task) => task.vaDor,
+    name: QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
+    label: QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
+    valueFunction: (task) => {
+      return moment(task.vaDor).format('MM/DD/YYYY');
+    }
+  };
+};
+
+export const notes = () => {
+  return {
+    header: 'Notes',
+    name: QUEUE_CONFIG.COLUMNS.NOTES.name,
+    valueFunction: (task) => task.notes,
+    backendCanSort: true,
+    getSortValue: (task) => task.notes
+  };
+};
+export const checkboxColumn = (handleCheckboxChange) => {
+  const dispatch = useDispatch();
+
+  const currentlySelectedTasks = useSelector((state) => state.intakeCorrespondence.selectedTasks);
+
+  const toggleChange = (value) => {
+    const indexOfTask = currentlySelectedTasks.indexOf(value);
+
+    const newSelectedTasks = currentlySelectedTasks;
+
+    if (indexOfTask === -1) {
+      newSelectedTasks.push(value);
+    } else {
+      newSelectedTasks.splice(indexOfTask, 1);
+    }
+
+    dispatch(setSelectedTasks(newSelectedTasks));
+
+    handleCheckboxChange(newSelectedTasks.length > 0);
+
+  };
+
+  return {
+    header: 'Select',
+    checked: true,
+    name: QUEUE_CONFIG.COLUMNS.CHECKBOX_COLUMN,
+    valueFunction: (task) => {
+
+      if (task) {
+        return <Checkbox
+          id={task.uniqueId}
+          value={Boolean(currentlySelectedTasks.includes(task.uniqueId))}
+          name={task.uniqueId}
+          hideLabel
+          onChange={() => toggleChange(task.uniqueId)}
+        />;
+      }
+
+      return null;
+      // or any other valid JSX element
+
+    }
+
+  };
+};
+
+export const actionType = () => {
+  return {
+    header: 'Action Type',
+    name: QUEUE_CONFIG.COLUMNS.ACTION_TYPE.name,
+    backendCanSort: true,
+    getSortValue: (task) => task.label,
+    valueFunction: (task) => task.label.split(' ')[0]
+  };
+};
+
+export const daysWaitingCorrespondence = () => {
+  return {
+    header: 'Days Waiting',
+    name: QUEUE_CONFIG.COLUMNS.DAYS_WAITING.name,
+    enableFilter: true,
+    backendCanSort: true,
+    getSortValue: (task) => task.daysWaiting,
+    valueFunction: (task) => task.daysWaiting
+  };
+};
+
 export const regionalOfficeColumn = (tasks, filterOptions) => {
   return {
     header: COPY.CASE_LIST_TABLE_REGIONAL_OFFICE_COLUMN_TITLE,
@@ -457,8 +605,18 @@ export const taskCompletedDateColumn = () => {
   return {
     header: COPY.CASE_LIST_TABLE_COMPLETED_ON_DATE_COLUMN_TITLE,
     name: QUEUE_CONFIG.COLUMNS.TASK_CLOSED_DATE.name,
-    valueFunction: (task) => task.closedAt ? <DateString date={task.closedAt} /> : null,
+    filterOptions: [],
+    valueName: 'Date Completed',
+    customFilterLabels: CO_LOCATED_ADMIN_ACTIONS,
+    label: 'Filter by date completed',
+    columnName: QUEUE_CONFIG.COLUMNS.TASK_CLOSED_DATE.name,
+    anyFiltersAreSet: true,
     backendCanSort: true,
+    enableFilter: true,
+    filterable: true,
+    valueFunction: (task) => {
+      return moment(task.closedAt).format('MM/DD/YYYY');
+    },
     getSortValue: (task) => task.closedAt ? new Date(task.closedAt) : null
   };
 };
diff --git a/client/app/queue/correspondence/CorrespondenceCases.jsx b/client/app/queue/correspondence/CorrespondenceCases.jsx
index 5b159dfc588..f8b2aee08d6 100644
--- a/client/app/queue/correspondence/CorrespondenceCases.jsx
+++ b/client/app/queue/correspondence/CorrespondenceCases.jsx
@@ -1,102 +1,106 @@
-import * as React from 'react';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-import ApiUtil from '../../util/ApiUtil';
-import { loadVetCorrespondence } from './correspondenceReducer/correspondenceActions';
+import React, { useState, useEffect } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import {
+  loadCorrespondenceConfig,
+  setShowReassignPackageModal,
+  setShowRemovePackageModal
+} from './correspondenceReducer/correspondenceActions';
 import AppSegment from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/AppSegment';
-import PropTypes from 'prop-types';
+import PropTypes, { string } from 'prop-types';
 import COPY from '../../../COPY';
 import { sprintf } from 'sprintf-js';
-import { css } from 'glamor';
-import CorrespondenceTable from './CorrespondenceTable';
-import QueueOrganizationDropdown from '../components/QueueOrganizationDropdown';
+import CorrespondenceTableBuilder from './CorrespondenceTableBuilder';
 import Alert from '../../components/Alert';
+import Modal from 'app/components/Modal';
+import Button from '../../components/Button';
 
-// import {
-//   initialAssignTasksToUser,
-//   initialCamoAssignTasksToVhaProgramOffice
-// } from '../QueueActions';
+const CorrespondenceCases = (props) => {
+  const dispatch = useDispatch();
+  const configUrl = props.configUrl;
 
-class CorrespondenceCases extends React.PureComponent {
+  const currentAction = useSelector((state) => state.reviewPackage.lastAction);
+  const veteranInformation = useSelector((state) => state.reviewPackage.veteranInformation);
 
-  // grabs correspondences and loads into intakeCorrespondence redux store.
-  getVeteransWithCorrespondence() {
-    return ApiUtil.get('/queue/correspondence?json').then((response) => {
-      const returnedObject = response.body;
-      const vetCorrespondences = returnedObject.vetCorrespondences;
+  const [vetName, setVetName] = useState('');
 
-      this.props.loadVetCorrespondence(vetCorrespondences);
-    }).
-      catch((err) => {
-        // allow HTTP errors to fall on the floor via the console.
-        console.error(new Error(`Problem with GET /queue/correspondence?json ${err}`));
-      });
-  }
+  useEffect(() => {
+    dispatch(loadCorrespondenceConfig(configUrl));
+  }, []);
 
-  // load veteran correspondence info on page load
-  componentDidMount() {
-    // Retry the request after a delay
-    setTimeout(() => {
-      this.getVeteransWithCorrespondence();
-    }, 1000);
-  }
+  const config = useSelector((state) => state.intakeCorrespondence.correspondenceConfig);
+  const showReassignPackageModal = useSelector((state) => state.intakeCorrespondence.showReassignPackageModal);
+  const showRemovePackageModal = useSelector((state) => state.intakeCorrespondence.showRemovePackageModal);
 
-  render = () => {
-    const {
-      organizations,
-      currentAction,
-      veteranInformation
+  const closeReassignPackageModal = () => {
+    dispatch(setShowReassignPackageModal(false));
+  };
 
-    } = this.props;
+  const closeRemovePackageModal = () => {
+    dispatch(setShowRemovePackageModal(false));
+  };
 
-    let vetName = '';
-
-    if (Object.keys(veteranInformation).length > 0) {
-      vetName = `${veteranInformation.veteran_name.first_name.trim()} ${
-        veteranInformation.veteran_name.last_name.trim()}`;
+  useEffect(() => {
+    if (
+      veteranInformation?.veteranName?.firstName &&
+      veteranInformation?.veteranName?.lastName
+    ) {
+      setVetName(
+        `${veteranInformation.veteranName.firstName.trim()} ${veteranInformation.veteranName.lastName.trim()}`);
     }
+  }, [veteranInformation]);
 
-    return (
-      <React.Fragment>
-        <AppSegment filledBackground>
-          {(Object.keys(veteranInformation).length > 0) &&
-            currentAction.action_type === 'DeleteReviewPackage' &&
-          <Alert type="success" title={sprintf(COPY.CORRESPONDENCE_TITLE_REMOVE_PACKAGE_BANNER, vetName)}
-            message={COPY.CORRESPONDENCE_MESSAGE_REMOVE_PACKAGE_BANNER} scrollOnAlert={false} />}
-          <h1 {...css({ display: 'inline-block' })}>{COPY.CASE_LIST_TABLE_QUEUE_DROPDOWN_CORRESPONDENCE_CASES}</h1>
-          <QueueOrganizationDropdown organizations={organizations} />
-          {this.props.vetCorrespondences &&
-          <CorrespondenceTable
-            vetCorrespondences={this.props.vetCorrespondences}
+  return (
+    <>
+      {props.responseType && (
+        <Alert
+          type={props.responseType}
+          title={props.responseHeader}
+          message={props.responseMessage}
+          scrollOnAlert={false}
+        />
+      )}
+      <AppSegment filledBackground>
+        {(veteranInformation?.veteranName?.firstName && veteranInformation?.veteranName?.lastName) &&
+          currentAction.action_type === 'DeleteReviewPackage' && (
+          <Alert
+            type="success"
+            title={sprintf(COPY.CORRESPONDENCE_TITLE_REMOVE_PACKAGE_BANNER, vetName)}
+            message={COPY.CORRESPONDENCE_MESSAGE_REMOVE_PACKAGE_BANNER}
+            scrollOnAlert={false}
           />
-          }
-        </AppSegment>
-      </React.Fragment>
-    );
-  }
-}
+        )}
+        {config &&
+        <CorrespondenceTableBuilder mailTeamUsers={props.mailTeamUsers} />}
+        {showReassignPackageModal &&
+        <Modal
+          title={COPY.CORRESPONDENCE_CASES_REASSIGN_PACKAGE_MODAL_TITLE}
+          closeHandler={closeReassignPackageModal}
+          cancelButton={<Button linkStyling onClick={closeReassignPackageModal}>Cancel</Button>}
+        />}
+        {showRemovePackageModal &&
+        <Modal
+          title={COPY.CORRESPONDENCE_CASES_REMOVE_PACKAGE_MODAL_TITLE}
+          closeHandler={closeRemovePackageModal}
+          cancelButton={<Button linkStyling onClick={closeRemovePackageModal}>Cancel</Button>}
+        />}
+      </AppSegment>
+    </>
+  );
+};
 
 CorrespondenceCases.propTypes = {
   organizations: PropTypes.array,
-  loadVetCorrespondence: PropTypes.func,
-  vetCorrespondences: PropTypes.array,
+  loadCorrespondenceConfig: PropTypes.func,
+  correspondenceConfig: PropTypes.object,
   currentAction: PropTypes.object,
-  veteranInformation: PropTypes.object
-};
+  veteranInformation: PropTypes.object,
+  configUrl: PropTypes.string,
+  mailTeamUsers: PropTypes.arrayOf(string),
+  responseType: PropTypes.string,
+  responseHeader: PropTypes.string,
+  responseMessage: PropTypes.string,
+  taskIds: PropTypes.array
 
-const mapStateToProps = (state) => ({
-  vetCorrespondences: state.intakeCorrespondence.vetCorrespondences,
-  currentAction: state.reviewPackage.lastAction,
-  veteranInformation: state.reviewPackage.veteranInformation
-});
-
-const mapDispatchToProps = (dispatch) => (
-  bindActionCreators({
-    loadVetCorrespondence
-  }, dispatch)
-);
+};
 
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(CorrespondenceCases);
+export default CorrespondenceCases;
diff --git a/client/app/queue/correspondence/CorrespondenceTable.jsx b/client/app/queue/correspondence/CorrespondenceTable.jsx
index a872c351678..6bec750926b 100644
--- a/client/app/queue/correspondence/CorrespondenceTable.jsx
+++ b/client/app/queue/correspondence/CorrespondenceTable.jsx
@@ -38,7 +38,7 @@ class CorrespondenceTable extends React.Component {
       <QueueTable
         className="assign-correspondence-table"
         columns={columns}
-        rowObjects={this.props.vetCorrespondences}
+        rowObjects={this.props.correspondenceConfig}
         summary="scheduled-hearings-table"
         enablePagination
         tabPaginationOptions={tabPaginationOptions}
@@ -51,8 +51,8 @@ CorrespondenceTable.propTypes = {
   hearingScheduleColumns: PropTypes.array,
   hearingScheduleRows: PropTypes.array,
   onApply: PropTypes.func,
-  loadVetCorrespondence: PropTypes.func,
-  vetCorrespondences: PropTypes.array,
+  loadCorrespondenceConfig: PropTypes.func,
+  correspondenceConfig: PropTypes.array,
   history: PropTypes.object,
   user: PropTypes.shape({
     userCanBuildHearingSchedule: PropTypes.bool
diff --git a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
new file mode 100644
index 00000000000..225a60314b4
--- /dev/null
+++ b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
@@ -0,0 +1,289 @@
+import React, { useState, useEffect } from 'react';
+import { useSelector, connect } from 'react-redux';
+import _ from 'lodash';
+import PropTypes from 'prop-types';
+import { sprintf } from 'sprintf-js';
+import querystring from 'querystring';
+import Button from '../../components/Button';
+import SearchableDropdown from '../../components/SearchableDropdown';
+import QueueTable from '../QueueTable';
+import TabWindow from '../../components/TabWindow';
+import Link from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/Link';
+import QueueOrganizationDropdown from '../components/QueueOrganizationDropdown';
+import {
+  actionType,
+  assignedToColumn,
+  assignedByColumn,
+  checkboxColumn,
+  daysWaitingCorrespondence,
+  notes,
+  taskColumn,
+  taskCompletedDateColumn,
+  vaDor,
+  veteranDetails
+} from '../components/TaskTableColumns';
+
+import { tasksWithCorrespondenceFromRawTasks } from '../utils';
+
+import COPY from '../../../COPY';
+import QUEUE_CONFIG from '../../../constants/QUEUE_CONFIG';
+import { css } from 'glamor';
+import { isActiveOrganizationVHA } from '../selectors';
+
+const rootStyles = css({
+  '.usa-alert + &': {
+    marginTop: '1.5em'
+  }
+});
+
+/**
+ * A component to create a queue table's tabs and columns from a queue config or the assignee's tasks
+ * The props are:
+ * - @assignedTasks {array[object]} array of task objects to appear in the assigned tab
+ **/
+
+const buildMailUserData = (data) => {
+  return data.map((user) => {
+    return {
+      value: user,
+      label: user
+    };
+  });
+};
+
+const CorrespondenceTableBuilder = (props) => {
+  const [selectedMailTeamUser, setSelectedMailTeamUser] = useState(null);
+  const [isAnyCheckboxSelected, setIsAnyCheckboxSelected] = useState(false);
+  const [isDropdownItemSelected, setIsDropdownItemSelected] = useState(false);
+  const selectedTasks = useSelector((state) => state.intakeCorrespondence.selectedTasks);
+
+  const paginationOptions = () => querystring.parse(window.location.search.slice(1));
+  const [storedPaginationOptions, setStoredPaginationOptions] = useState(
+    querystring.parse(window.location.search.slice(1))
+  );
+
+  const isInboundOpsTeam = props.organizations.find((org) => org.name === 'Inbound Ops Team');
+
+  // Causes one additional rerender of the QueueTables/tabs but prevents saved pagination behavior
+  // e.g. clearing filter in a tab, then swapping tabs, then swapping back and the filter will still be applied
+  useEffect(() => {
+    setStoredPaginationOptions({});
+  }, []);
+
+  const handleMailTeamUserChange = (selectedUser) => {
+    setSelectedMailTeamUser(selectedUser);
+    setIsDropdownItemSelected(Boolean(selectedUser));
+  };
+
+  const handleCheckboxChange = (isChecked) => {
+    setIsAnyCheckboxSelected(isChecked);
+  };
+
+  const handleAssignButtonClick = () => {
+    // Logic to handle assigning tasks to the selected mail team user
+    if (selectedMailTeamUser && isDropdownItemSelected && isAnyCheckboxSelected) {
+      const mailTeamUser = selectedMailTeamUser.value;
+      const taskIds = selectedTasks.map((task) => task);
+      let newUrl = window.location.href;
+
+      newUrl += newUrl.includes('?') ? `&user=${mailTeamUser}&taskIds=${taskIds}` :
+        `?user=${mailTeamUser}&taskIds=${taskIds}`;
+      window.location.href = newUrl;
+    }
+  };
+
+  const calcActiveTabIndex = (config) => {
+    const tabNames = config.tabs.map((tab) => {
+      return tab.name;
+    });
+
+    const activeTab = paginationOptions().tab || config.active_tab;
+    const index = _.indexOf(tabNames, activeTab);
+
+    return index === -1 ? 0 : index;
+  };
+
+  const queueConfig = () => {
+    const { config } = props;
+
+    config.active_tab_index = calcActiveTabIndex(config);
+
+    return config;
+  };
+
+  const filterValuesForColumn = (column) =>
+    column && column.filterable && column.filter_options;
+
+  const createColumnObject = (column, config, tasks) => {
+
+    const filterOptions = filterValuesForColumn(column);
+    const functionForColumn = {
+      [QUEUE_CONFIG.COLUMNS.DAYS_WAITING_CORRESPONDENCE.name]: daysWaitingCorrespondence(),
+      [QUEUE_CONFIG.COLUMNS.TASK_ASSIGNEE.name]: assignedToColumn(
+        tasks,
+        filterOptions
+      ),
+      [QUEUE_CONFIG.COLUMNS.TASK_ASSIGNED_BY.name]: assignedByColumn(),
+      [QUEUE_CONFIG.COLUMNS.TASK_CLOSED_DATE.name]: taskCompletedDateColumn(),
+      [QUEUE_CONFIG.COLUMNS.TASK_TYPE.name]: taskColumn(tasks, filterOptions),
+      [QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name]: veteranDetails(),
+      [QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name]: vaDor(tasks, filterOptions),
+      [QUEUE_CONFIG.COLUMNS.NOTES.name]: notes(),
+      [QUEUE_CONFIG.COLUMNS.CHECKBOX_COLUMN.name]: checkboxColumn(handleCheckboxChange),
+      [QUEUE_CONFIG.COLUMNS.ACTION_TYPE.name]: actionType(),
+    };
+
+    return functionForColumn[column.name];
+  };
+
+  const columnsFromConfig = (config, tabConfig, tasks) =>
+    (tabConfig.columns || []).map((column) =>
+      createColumnObject(column, config, tasks)
+    );
+
+  const taskTableTabFactory = (tabConfig, config) => {
+    const savedPaginationOptions = storedPaginationOptions;
+    const tasks = tasksWithCorrespondenceFromRawTasks(tabConfig.tasks);
+    let totalTaskCount = tabConfig.total_task_count;
+    let noCasesMessage;
+
+    const { isVhaOrg } = props;
+
+    if (tabConfig.contains_legacy_tasks) {
+      tasks.unshift(...props.assignedTasks);
+      totalTaskCount = tasks.length;
+
+      noCasesMessage = totalTaskCount === 0 && (
+        <p>
+          {COPY.NO_CASES_IN_QUEUE_MESSAGE}
+          <b>
+            <Link to="/search">{COPY.NO_CASES_IN_QUEUE_LINK_TEXT}</Link>
+          </b>
+          .
+        </p>
+      );
+    }
+
+    // Setup default sorting.
+    const defaultSort = {};
+
+    // If there is no sort by column in the pagination options, then use the tab config default sort
+    // eslint-disable-next-line camelcase
+    if (!savedPaginationOptions?.sort_by) {
+      Object.assign(defaultSort, tabConfig.defaultSort);
+    }
+
+    return {
+      label: sprintf(tabConfig.label, totalTaskCount),
+      page: (
+        <>
+          {isInboundOpsTeam &&
+            (tabConfig.name === 'correspondence_unassigned' || tabConfig.name === 'correspondence_team_assigned') &&
+            <>
+              <p className="cf-margin-bottom-0rem">Assign to mail team user</p>
+              <div style={{ display: 'flex', flexDirection: 'row' }}>
+                <SearchableDropdown
+                  className="cf-dropdown"
+                  name="Assign to mail team user"
+                  hideLabel
+                  styling={{ width: '200px', marginRight: '2rem' }}
+                  dropdownStyling={{ width: '200px' }}
+                  options={buildMailUserData(props.mailTeamUsers)}
+                  onChange={handleMailTeamUserChange}
+                />
+                {tabConfig.name === 'correspondence_unassigned' &&
+              <>
+                <Button
+                  name="Assign"
+                  onClick={handleAssignButtonClick}
+                  disabled={!isDropdownItemSelected || !isAnyCheckboxSelected}
+                />
+                <span style={{ marginLeft: 'auto' }}>
+                  <Button
+                    name="Auto assign correspondence"
+                    />
+                  </span>
+                </>
+                }
+                {tabConfig.name === 'correspondence_team_assigned' &&
+            <Button
+              name="Reassign"
+              onClick={handleAssignButtonClick}
+              disabled={!isDropdownItemSelected || !isAnyCheckboxSelected}
+            />
+                }
+              </div>
+              <hr></hr>
+            </>
+          }
+          <p className="cf-margin-top-0">
+            {noCasesMessage || tabConfig.description}
+          </p>
+          <QueueTable
+            key={tabConfig.name}
+            columns={columnsFromConfig(config, tabConfig, tasks)}
+            rowObjects={tasks}
+            getKeyForRow={(_rowNumber, task) => task.uniqueId}
+            casesPerPage={config.tasks_per_page}
+            numberOfPages={tabConfig.task_page_count}
+            totalTaskCount={totalTaskCount}
+            taskPagesApiEndpoint={tabConfig.task_page_endpoint_base_path}
+            tabPaginationOptions={
+              savedPaginationOptions.tab === tabConfig.name ? savedPaginationOptions : {}
+            }
+            // Limit filter preservation/retention to only VHA orgs for now.
+            {...(isVhaOrg ? { preserveFilter: true } : {})}
+            defaultSort={defaultSort}
+            useTaskPagesApi={
+              config.use_task_pages_api && !tabConfig.contains_legacy_tasks
+            }
+            enablePagination
+            isCorrespondenceTable
+          />
+        </>
+      ),
+    };
+  };
+
+  const tabsFromConfig = (config) =>
+    (config.tabs || []).map((tabConfig) =>
+      taskTableTabFactory(tabConfig, config)
+    );
+
+  const config = queueConfig();
+
+  return <div className={rootStyles}>
+    <h1 {...css({ display: 'inline-block' })}>{config.table_title}</h1>
+    <QueueOrganizationDropdown organizations={props.organizations} featureToggles = {props.featureToggles} />
+    <TabWindow
+      name="tasks-tabwindow"
+      tabs={tabsFromConfig(config)}
+      defaultPage={config.active_tab_index}
+    />
+  </div>;
+};
+
+const mapStateToProps = (state) => {
+  return {
+    config: state.intakeCorrespondence.correspondenceConfig,
+    organizations: state.ui.organizations,
+    isVhaOrg: isActiveOrganizationVHA(state),
+    userCanBulkAssign: state.ui.activeOrganization.userCanBulkAssign,
+  };
+};
+
+CorrespondenceTableBuilder.propTypes = {
+  organizations: PropTypes.array,
+  assignedTasks: PropTypes.array,
+  config: PropTypes.shape({
+    table_title: PropTypes.string,
+    active_tab_index: PropTypes.number,
+  }),
+  userCanBulkAssign: PropTypes.bool,
+  isVhaOrg: PropTypes.bool,
+  featureToggles: PropTypes.object,
+  mailTeamUsers: PropTypes.array,
+  selectedTasks: PropTypes.array,
+};
+
+export default connect(mapStateToProps)(CorrespondenceTableBuilder);
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
index 4866db8154b..e66ac30e4da 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
@@ -1,4 +1,5 @@
 import { ACTIONS } from './correspondenceConstants';
+import ApiUtil from '../../../util/ApiUtil';
 
 export const loadCurrentCorrespondence = (currentCorrespondence) =>
   (dispatch) => {
@@ -40,6 +41,28 @@ export const loadVetCorrespondence = (vetCorrespondences) =>
     });
   };
 
+export const loadCorrespondenceConfig = (configUrl) =>
+  (dispatch) => {
+    ApiUtil.get(configUrl).then(
+      (response) => {
+        const returnedObject = response.body;
+        const correspondenceConfig = returnedObject.correspondence_config;
+
+        dispatch(
+          {
+            type: ACTIONS.LOAD_CORRESPONDENCE_CONFIG,
+            payload: {
+              correspondenceConfig
+            }
+          });
+
+      }).
+      catch(
+        (err) => {
+          console.error(new Error(`Problem with GET ${configUrl} ${err}`));
+        });
+  };
+
 export const updateRadioValue = (value) =>
   (dispatch) => {
     dispatch({
@@ -65,6 +88,14 @@ export const clearCheckboxState = () =>
     });
   };
 
+export const setSelectedTasks = (values) =>
+  (dispatch) => {
+    dispatch({
+      type: ACTIONS.SET_SELECTED_TASKS,
+      payload: { values }
+    });
+  };
+
 export const setTaskRelatedAppealIds = (appealIds) =>
   (dispatch) => {
     dispatch({
@@ -123,3 +154,21 @@ export const setWaivedEvidenceTasks = (task) => (dispatch) => {
     }
   });
 };
+
+export const setShowReassignPackageModal = (isVisible) => (dispatch) => {
+  dispatch({
+    type: ACTIONS.SET_SHOW_REASSIGN_PACKAGE_MODAL,
+    payload: {
+      isVisible
+    }
+  });
+};
+
+export const setShowRemovePackageModal = (isVisible) => (dispatch) => {
+  dispatch({
+    type: ACTIONS.SET_SHOW_REMOVE_PACKAGE_MODAL,
+    payload: {
+      isVisible
+    }
+  });
+};
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
index 5ccbf472a5b..bbfee2df05b 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
@@ -3,6 +3,8 @@ export const ACTIONS = {
   LOAD_CORRESPONDENCES: 'LOAD_CORRESPONDENCES',
   LOAD_VETERAN_INFORMATION: 'LOAD_VETERAN_INFORMATION',
   LOAD_VET_CORRESPONDENCE: 'LOAD_VET_CORRESPONDENCE',
+  LOAD_CORRESPONDENCE_CONFIG: 'LOAD_CORRESPONDENCE_CONFIG',
+  LOAD_MAIL_TEAM_USERS: 'LOAD_MAIL_TEAM_USERS',
   UPDATE_RADIO_VALUE: 'UPDATE_RADIO_VALUE',
   SAVE_CHECKBOX_STATE: 'SAVE_CHECKBOX_STATE',
   CLEAR_CHECKBOX_STATE: 'CLEAR_CHECKBOX_STATE',
@@ -12,4 +14,7 @@ export const ACTIONS = {
   SET_FETCHED_APPEALS: 'SET_FETCHED_APPEALS',
   SET_NEW_APPEAL_RELATED_TASKS: 'SET_NEW_APPEAL_RELATED_TASKS',
   SET_WAIVED_EVIDENCE_TASKS: 'SET_WAIVED_EVIDENCE_TASKS',
+  SET_SHOW_REASSIGN_PACKAGE_MODAL: 'SET_SHOW_REASSIGN_PACKAGE_MODAL',
+  SET_SHOW_REMOVE_PACKAGE_MODAL: 'SET_SHOW_REMOVE_PACKAGE_MODAL',
+  SET_SELECTED_TASKS: 'SET_SELECTED_TASKS'
 };
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
index 5ab2391e9d5..e5f851abafb 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
@@ -8,11 +8,14 @@ export const initialState = {
   correspondences: [],
   radioValue: '0',
   relatedCorrespondences: [],
+  selectedTasks: [],
   mailTasks: [],
   unrelatedTasks: [],
   currentCorrespondence: [],
   veteranInformation: [],
   waivedEvidenceTasks: [],
+  showReassignPackageModal: false,
+  showRemovePackageModal: false,
 };
 
 export const intakeCorrespondenceReducer = (state = initialState, action = {}) => {
@@ -45,6 +48,20 @@ export const intakeCorrespondenceReducer = (state = initialState, action = {}) =
       }
     });
 
+  case ACTIONS.LOAD_CORRESPONDENCE_CONFIG:
+    return update(state, {
+      correspondenceConfig: {
+        $set: action.payload.correspondenceConfig
+      }
+    });
+
+  case ACTIONS.LOAD_MAIL_TEAM_USERS:
+    return update(state, {
+      mailTeamUsers: {
+        $set: action.payload.mailTeamUsers
+      }
+    });
+
   case ACTIONS.UPDATE_RADIO_VALUE:
     return update(state, {
       radioValue: {
@@ -74,6 +91,14 @@ export const intakeCorrespondenceReducer = (state = initialState, action = {}) =
       }
     });
 
+    // fix this to use the actual value for set
+  case ACTIONS.SET_SELECTED_TASKS:
+    return update(state, {
+      selectedTasks: {
+        $set: [...action.payload.values]
+      }
+    });
+
   case ACTIONS.SET_UNRELATED_TASKS:
     return update(state, {
       unrelatedTasks: {
@@ -116,6 +141,20 @@ export const intakeCorrespondenceReducer = (state = initialState, action = {}) =
       }
     });
 
+  case ACTIONS.SET_SHOW_REASSIGN_PACKAGE_MODAL:
+    return update(state, {
+      showReassignPackageModal: {
+        $set: action.payload.isVisible
+      }
+    });
+
+  case ACTIONS.SET_SHOW_REMOVE_PACKAGE_MODAL:
+    return update(state, {
+      showRemovePackageModal: {
+        $set: action.payload.isVisible
+      }
+    });
+
   default:
     return state;
   }
diff --git a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/SubmitCorrespondenceModal.jsx b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/SubmitCorrespondenceModal.jsx
index 2cc5e52d867..0c6fd9a6275 100644
--- a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/SubmitCorrespondenceModal.jsx
+++ b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/SubmitCorrespondenceModal.jsx
@@ -25,7 +25,7 @@ export const SubmitCorrespondenceModal = ({ setSubmitCorrespondenceModalVisible,
 
   const handleRouting = (status) => {
     if (status === 201) {
-      window.location.href = '/queue/correspondence';
+      window.location.href = '/queue/correspondence?tab=correspondence_assigned&page=1&sort_by=vaDor&order=asc';
     } else {
       setErrorBannerVisible(true);
       onCancel();
diff --git a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
index d4d141da5ef..1fc2ff03046 100644
--- a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
+++ b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
@@ -10,7 +10,6 @@ import PropTypes from 'prop-types';
 import { setFileNumberSearch, doFileNumberSearch } from '../../../intake/actions/intake';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
-import { useHistory } from 'react-router';
 import PackageActionModal from '../modals/PackageActionModal';
 import ReviewPackageNotificationBanner from './ReviewPackageNotificationBanner';
 import {
@@ -42,7 +41,6 @@ export const CorrespondenceReviewPackage = (props) => {
   // {  title: ,  message: ,  bannerType: }
   const [bannerInformation, setBannerInformation] = useState(null);
 
-  const history = useHistory();
   const fetchData = async () => {
     const correspondence = props;
 
diff --git a/client/app/queue/uiReducer/uiActions.js b/client/app/queue/uiReducer/uiActions.js
index c428b105da2..716cebc5057 100644
--- a/client/app/queue/uiReducer/uiActions.js
+++ b/client/app/queue/uiReducer/uiActions.js
@@ -220,6 +220,21 @@ export const setOrganizations = (organizations) => ({
   payload: { organizations }
 });
 
+export const setMailTeamUser = (isMailTeamUser) => ({
+  type: ACTIONS.SET_MAIL_TEAM_USER,
+  payload: { isMailTeamUser }
+});
+
+export const setMailSupervisor = (isMailSupervisor) => ({
+  type: ACTIONS.SET_MAIL_SUPERVISOR,
+  payload: { isMailSupervisor }
+});
+
+export const setMailSuperUser = (isMailSuperUser) => ({
+  type: ACTIONS.SET_MAIL_SUPER_USER,
+  payload: { isMailSuperUser }
+});
+
 export const setActiveOrganization = (id, type, name, isVso, userCanBulkAssign) => ({
   type: ACTIONS.SET_ACTIVE_ORGANIZATION,
   payload: {
diff --git a/client/app/queue/uiReducer/uiConstants.js b/client/app/queue/uiReducer/uiConstants.js
index 212902a93d2..ff0beb1e3ce 100644
--- a/client/app/queue/uiReducer/uiConstants.js
+++ b/client/app/queue/uiReducer/uiConstants.js
@@ -38,6 +38,9 @@ export const ACTIONS = {
   SET_USER_IS_CAMO_EMPLOYEE: 'SET_USER_IS_CAMO_EMPLOYEE',
   SET_ORGANIZATION_IDS: 'SET_ORGANIZATION_IDS',
   SET_ORGANIZATIONS: 'SET_ORGANIZATIONS',
+  SET_MAIL_TEAM_USER: 'SET_MAIL_TEAM_USER',
+  SET_MAIL_SUPERVISOR: 'SET_MAIL_SUPERVISOR',
+  SET_MAIL_SUPER_USER: 'SET_MAIL_SUPER_USER',
 
   SET_CAN_EDIT_AOD: 'SET_CAN_EDIT_AOD',
   SET_CAN_EDIT_NOD_DATE: 'SET_CAN_EDIT_NOD_DATE',
diff --git a/client/app/queue/uiReducer/uiReducer.js b/client/app/queue/uiReducer/uiReducer.js
index 2fbbf3871b4..2daf42bb727 100644
--- a/client/app/queue/uiReducer/uiReducer.js
+++ b/client/app/queue/uiReducer/uiReducer.js
@@ -20,6 +20,9 @@ export const initialState = {
   userCssId: '',
   userInfo: null,
   organizations: [],
+  isMailTeamUser: false,
+  isMailSupervisor: false,
+  isMailSuperUser: false,
   activeOrganization: {
     id: null,
     name: null,
@@ -249,6 +252,24 @@ const workQueueUiReducer = (state = initialState, action = {}) => {
         $set: null
       }
     });
+  case ACTIONS.SET_MAIL_TEAM_USER:
+    return update(state, {
+      isMailTeamUser: {
+        $set: action.payload.isMailTeamUser
+      }
+    });
+  case ACTIONS.SET_MAIL_SUPERVISOR:
+    return update(state, {
+      isMailSupervisor: {
+        $set: action.payload.isMailSupervisor
+      }
+    });
+  case ACTIONS.SET_MAIL_SUPER_USER:
+    return update(state, {
+      isMailSuperUser: {
+        $set: action.payload.isMailSuperUser
+      }
+    });
   case ACTIONS.SET_ORGANIZATIONS:
     return update(state, {
       organizations: {
diff --git a/client/app/queue/utils.js b/client/app/queue/utils.js
index dc794b1447f..625bb96b172 100644
--- a/client/app/queue/utils.js
+++ b/client/app/queue/utils.js
@@ -75,6 +75,35 @@ export const prepareMostRecentlyHeldHearingForStore = (appealId, hearing) => {
   };
 };
 
+const correspondenceTaskAttributesFromRawTask = (task) => {
+  return {
+    uniqueId: task.attributes.unique_id,
+    instructions: task.attributes.instructions,
+    veteranDetails: task.attributes.veteran_details,
+    notes: task.attributes.notes,
+    closedAt: task.attributes.completion_date,
+    daysWaiting: task.attributes.days_waiting,
+    vaDor: task.attributes.va_date_of_receipt,
+    label: task.attributes.label,
+    taskUrl: task.attributes.task_url,
+    status: task.attributes.status,
+    assignedAt: task.attributes.assigned_at,
+    assignedTo: {
+      cssId: task.attributes.assigned_to.css_id,
+      isOrganization: task.attributes.assigned_to.is_organization,
+      id: task.attributes.assigned_to.id,
+      type: task.attributes.assigned_to.type,
+      name: task.attributes.assigned_to.name,
+    },
+    assignedBy: {
+      firstName: task.attributes.assigned_by.first_name,
+      lastName: task.attributes.assigned_by.last_name,
+      cssId: task.attributes.assigned_by.css_id,
+      pgId: task.attributes.assigned_by.pg_id,
+    }
+  };
+};
+
 const taskAttributesFromRawTask = (task) => {
   const decisionPreparedBy = task.attributes.decision_prepared_by?.first_name ?
     {
@@ -231,6 +260,11 @@ export const tasksWithAppealsFromRawTasks = (tasks) =>
     appeal: appealAttributesFromRawTask(task),
   }));
 
+export const tasksWithCorrespondenceFromRawTasks = (tasks) =>
+  tasks?.map((task) => ({
+    ...correspondenceTaskAttributesFromRawTask(task)
+  }));
+
 export const prepareLegacyTasksForStore = (tasks) => {
   const mappedLegacyTasks = tasks.map((task) => {
     return {
@@ -246,8 +280,8 @@ export const prepareLegacyTasksForStore = (tasks) => {
       assigneeName: task.attributes.assignee_name,
       assignedTo: {
         cssId: task.attributes.assigned_to.css_id,
-        isOrganization: task.attributes.assigned_to.is_organization,
         id: task.attributes.assigned_to.id,
+        isOrganization: task.attributes.assigned_to.is_organization,
         type: task.attributes.assigned_to.type,
         name: task.attributes.assigned_to.name,
       },
diff --git a/client/constants/CORRESPONDENCE_TASK_URL.json b/client/constants/CORRESPONDENCE_TASK_URL.json
new file mode 100644
index 00000000000..35770c140a6
--- /dev/null
+++ b/client/constants/CORRESPONDENCE_TASK_URL.json
@@ -0,0 +1,6 @@
+{
+  "INTAKE_TASK_URL": "/queue/correspondence/uuid/intake",
+  "REVIEW_PACKAGE_TASK_URL": "/queue/correspondence/uuid/review_package",
+  "REASSIGN_PACKAGE_TASK_MODAL_URL": "/modal/reassign_package",
+  "REMOVE_PACKAGE_TASK_MODAL_URL": "/modal/remove_package"
+}
diff --git a/client/constants/QUEUE_CONFIG.json b/client/constants/QUEUE_CONFIG.json
index 86691f396cc..0dd27fc682a 100644
--- a/client/constants/QUEUE_CONFIG.json
+++ b/client/constants/QUEUE_CONFIG.json
@@ -24,6 +24,10 @@
   "VHA_PO_ON_HOLD_TASKS_TAB_NAME": "po_on_hold",
   "VHA_PO_COMPLETED_TASKS_TAB_NAME": "po_completed",
 
+  "CASE_LIST_TABLE_QUEUE_DROPDOWN_OWN_CORRESPONDENCE_LABEL": "Your Correspondence",
+  "CASE_LIST_TABLE_QUEUE_DROPDOWN_OWN_CASES_LABEL": "Your cases",
+  "CASE_LIST_TABLE_QUEUE_DROPDOWN_CORRESPONDENCE_CASES": "Correspondence Cases",
+
   "EDUCATION_RPO_ASSIGNED_TASKS_TAB_NAME": "education_rpo_assigned",
   "EDUCATION_RPO_IN_PROGRESS_TASKS_TAB_NAME": "education_rpo_in_progress",
   "EDUCATION_RPO_COMPLETED_TASKS_TAB_NAME": "education_rpo_completed",
@@ -36,7 +40,43 @@
   "CAREGIVER_SUPPORT_IN_PROGRESS_TASKS_TAB_NAME": "caregiver_support_in_progress",
   "CAREGIVER_SUPPORT_COMPLETED_TASKS_TAB_NAME": "caregiver_support_completed",
 
+  "CORRESPONDENCE_ASSIGNED_TASKS_LABEL": "Assigned",
+  "CORRESPONDENCE_COMPLETED_TASKS_LABEL": "Completed",
+  "CORRESPONDENCE_IN_PROGRESS_TASKS_LABEL": "In Progress",
+  "CORRESPONDENCE_ACTION_REQUIRED_TASKS_LABEL": "Action Required",
+  "CORRESPONDENCE_TEAM_ASSIGNED_TASKS_LABEL": "Assigned",
+  "CORRESPONDENCE_TEAM_COMPLETED_TASKS_LABEL": "Completed",
+  "CORRESPONDENCE_PENDING_TASKS_LABEL": "Pending",
+  "CORRESPONDENCE_UNASSIGNED_TASKS_LABEL": "Unassigned",
+
+  "CORRESPONDENCE_ASSIGNED_TASKS_TAB_NAME": "correspondence_assigned",
+  "CORRESPONDENCE_COMPLETED_TASKS_TAB_NAME": "correspondence_completed",
+  "CORRESPONDENCE_IN_PROGRESS_TASKS_TAB_NAME": "correspondence_in_progress",
+  "CORRESPONDENCE_ACTION_REQUIRED_TASKS_TAB_NAME": "correspondence_action_required",
+  "CORRESPONDENCE_TEAM_ASSIGNED_TASKS_TAB_NAME": "correspondence_team_assigned",
+  "CORRESPONDENCE_TEAM_COMPLETED_TASKS_TAB_NAME": "correspondence_team_completed",
+  "CORRESPONDENCE_PENDING_TASKS_TAB_NAME": "correspondence_pending",
+  "CORRESPONDENCE_UNASSIGNED_TASKS_TAB_NAME": "correspondence_unassigned",
+
+  "CORRESPONDENCE_ASSIGNED_TASKS_DESCRIPTION": "Correspondence assigned to you:",
+  "CORRESPONDENCE_COMPLETED_TASKS_DESCRIPTION": "Completed correspondence:",
+  "CORRESPONDENCE_IN_PROGRESS_TASKS_DESCRIPTION": "Correspondence in progress that are assigned to you:",
+  "CORRESPONDENCE_ACTION_REQUIRED_TASKS_DESCRIPTION": "Correspondence with pending requests:",
+  "CORRESPONDENCE_TEAM_ASSIGNED_TASKS_DESCRIPTION": "Correspondence that is currently assigned to mail team users:",
+  "CORRESPONDENCE_TEAM_COMPLETED_TASKS_DESCRIPTION": "Completed correspondence:",
+  "CORRESPONDENCE_PENDING_TASKS_DESCRIPTION": "Correspondence that is currently assigned to non-mail team users:",
+  "CORRESPONDENCE_UNASSIGNED_TASKS_DESCRIPTION": "Correspondence owned by the Mail team are unassigned to an individual:",
+
+  "CORRESPONDENCE_ORG_TABLE_TITLE": "Correspondence cases",
+  "CORRESPONDENCE_USER_TABLE_TITLE": "Your correspondence",
+
+
   "COLUMNS": {
+    "ACTION_TYPE": {
+      "name": "actionType",
+      "sorting_table": "tasks",
+      "sorting_columns": ["type"]
+    },
     "APPEAL_TYPE": {
       "filterable": true,
       "name": "typeColumn"
@@ -51,6 +91,9 @@
       "sorting_table": "cached_appeal_attributes",
       "sorting_columns": ["veteran_name"]
     },
+    "CHECKBOX_COLUMN": {
+      "name": "checkboxColumn"
+    },
     "DAYS_ON_HOLD": {
       "name": "daysOnHoldColumn"
     },
@@ -72,6 +115,11 @@
       "sorting_table": "tasks",
       "sorting_columns": ["assigned_at"]
     },
+    "DAYS_WAITING_CORRESPONDENCE": {
+      "name": "daysWaitingCorrespondence",
+      "sorting_table": "tasks",
+      "sorting_columns": ["assigned_at"]
+    },
     "LAST_ACTION": {
       "name": "lastActionColumn"
     },
@@ -106,6 +154,15 @@
         "issue_types"
       ]
     },
+    "NOTES": {
+      "name": "notes"
+    },
+    "VA_DATE_OF_RECEIPT": {
+      "name": "vaDor"
+    },
+    "VETERAN_DETAILS": {
+      "name": "veteranDetails"
+    },
     "VETERAN_PARTICIPANT_ID": {
       "name": "veteranParticipantIdColumn"
     },
diff --git a/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap b/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap
index a467c6c7045..72a7022346d 100644
--- a/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap
+++ b/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap
@@ -14,58 +14,53 @@ exports[`CaseWorkerIndex renders correctly 1`] = `
             class="cf-push-left"
             data-css-1vh8afw=""
           >
-            <a
-              href="/dispatch/establish-claim/"
+            <p
+              data-css-14vgq4z=""
             >
-              <p
-                data-css-14vgq4z=""
+              <a
+                href="/dispatch/establish-claim/"
               >
-                <a
-                  href="/dispatch/establish-claim/"
+                <svg
+                  data-css-fu31os=""
+                  height="500px"
+                  version="1.1"
+                  viewBox="0 0 500 500"
+                  width="500px"
                 >
-                  <svg
-                    data-css-fu31os=""
-                    height="500px"
-                    version="1.1"
-                    viewBox="0 0 500 500"
-                    width="500px"
+                  <g
+                    fill="none"
+                    fill-rule="evenodd"
+                    stroke="none"
+                    stroke-width="1"
                   >
-                    <g
-                      fill="none"
-                      fill-rule="evenodd"
-                      stroke="none"
-                      stroke-width="1"
-                    >
-                      <path
-                        d="M389.959839,442.284569 C383.432096,442.271612 376.963574,441.048453 370.883534,438.677355 L257.429719,394.98998 C252.590851,393.086238 247.208346,393.086238 242.369478,394.98998 L129.016064,438.677355 C106.320107,447.603374 80.4584687,439.55605 66.8674699,419.338677 C57.0515074,405.211352 54.9782782,387.116356 61.3453815,371.142285 L105.120482,258.016032 C107.028046,253.186861 107.028046,247.815143 105.120482,242.985972 L61.3453815,129.95992 C54.9782782,113.985849 57.0515074,95.8908522 66.8674699,81.7635271 C80.4584687,61.5461545 106.320107,53.4988304 129.016064,62.4248497 L242.269076,106.112224 C247.107944,108.015966 252.490449,108.015966 257.329317,106.112224 L370.783133,62.4248497 C393.47909,53.4988304 419.340728,61.5461545 432.931727,81.7635271 C442.747689,95.8908522 444.820919,113.985849 438.453815,129.95992 L394.678715,243.086172 C392.77115,247.915343 392.77115,253.287062 394.678715,258.116232 L438.453815,371.342685 C444.820919,387.316757 442.747689,405.411753 432.931727,419.539078 C423.237855,433.723837 407.164043,442.231882 389.959839,442.284569 M249.899598,362.224449 C256.353168,362.233978 262.750462,363.422577 268.7751,365.731463 L382.228916,409.418838 C384.691595,410.389201 387.312266,410.898698 389.959839,410.921844 C396.866782,410.810028 403.280763,407.328714 407.128514,401.603206 C411.093101,395.97649 411.889064,388.713698 409.236948,382.364729 L365.461847,269.138277 C360.743378,257.021258 360.743378,243.579944 365.461847,231.462926 L409.236948,118.336673 C411.813252,111.977018 411.021397,104.751703 407.128514,99.0981964 C401.695283,90.9837231 391.338118,87.7327557 382.228916,91.2825651 L268.7751,134.96994 C256.614316,139.574339 243.184881,139.574339 231.024096,134.96994 L117.771084,91.2825651 C108.661882,87.7327557 98.3047167,90.9837231 92.8714859,99.0981964 C88.9068988,104.724913 88.1109359,111.987705 90.7630522,118.336673 L134.538153,231.362725 C139.256622,243.479744 139.256622,256.921058 134.538153,269.038076 L90.7630522,382.164329 C87.7347473,389.869273 89.5592305,398.632331 95.4124457,404.495531 C101.265661,410.358732 110.039485,412.212063 117.771084,409.218437 L231.124498,365.531062 C237.149529,363.373645 243.498568,362.255472 249.899598,362.224449"
-                        fill="#D6D7D9"
-                      />
-                      <path
-                        d="M209.226908,407.765531 L179.959839,419.048096 L202.108434,468.937876 C210.52076,487.825367 229.289165,499.997401 250,499.997401 C270.710835,499.997401 289.47924,487.825367 297.891566,468.937876 L319.97992,419.088176 L290.753012,407.815631 L269.176707,456.412826 C265.803034,463.96969 258.289598,468.837793 250,468.837793 C241.710402,468.837793 234.196966,463.96969 230.823293,456.412826 L209.226908,407.765531 M378.905622,303.837675 L345.180723,318.737475 C333.273614,324.007833 323.754837,333.507534 318.473896,345.390782 L303.504016,379.108216 L332.771084,390.380762 L347.188755,357.915832 C349.28122,353.172217 353.078185,349.382861 357.831325,347.294589 L390.150602,333.006012 L378.875502,303.837675 M121.074297,303.837675 L109.789157,332.995992 L142.168675,347.294589 C146.901437,349.412477 150.689105,353.192554 152.811245,357.915832 L167.138554,390.190381 L196.405622,378.907816 L181.526104,345.390782 C176.245163,333.507534 166.726386,324.007833 154.819277,318.737475 L121.074297,303.817635 M80.9136546,180.571142 L31.124498,202.60521 C12.1990801,211.000678 0.00260459933,229.731472 0.00260459933,250.400802 C0.00260459933,271.070132 12.1990801,289.800925 31.124498,298.196393 L81.0341365,320.240481 L92.3192771,291.082164 L43.7751004,269.639279 C36.2030617,266.272366 31.3251832,258.773988 31.3251832,250.501002 C31.3251832,242.228016 36.2030617,234.729638 43.7751004,231.362725 L92.3092369,209.91984 L80.9538153,180.591182 M418.885542,180.521042 L407.540161,209.849699 L456.2249,231.362725 C463.796938,234.729638 468.674817,242.228016 468.674817,250.501002 C468.674817,258.773988 463.796938,266.272366 456.2249,269.639279 L407.46988,291.192385 L418.74498,320.360721 L468.875502,298.196393 C487.80092,289.800925 499.997395,271.070132 499.997395,250.400802 C499.997395,229.731472 487.80092,211.000678 468.875502,202.60521 L418.885542,180.561122 M167.329317,110.420842 L152.911647,142.885772 C150.819182,147.629387 147.022217,151.418742 142.269076,153.507014 L109.919679,167.795591 L121.2751,197.124248 L154.919679,182.264529 C166.826788,176.994171 176.345565,167.49447 181.626506,155.611222 L196.686747,121.723447 L167.349398,110.400802 M332.670683,110.400802 L303.323293,121.703407 L318.383534,155.641283 C323.664475,167.52453 333.183252,177.024231 345.090361,182.294589 L378.75502,197.164329 L390.100402,167.835671 L357.730924,153.507014 C352.977783,151.418742 349.180818,147.629387 347.088353,142.885772 L332.650602,110.370741 M250,1.00200401 C229.237589,0.829550704 210.38235,13.058923 202.108434,32.0641283 L179.909639,82.0541082 L209.246988,93.3767535 L230.823293,44.7895792 C234.196966,37.2327148 241.710402,32.3646117 250,32.3646117 C258.289598,32.3646117 265.803034,37.2327148 269.176707,44.7895792 L290.692771,93.2665331 L320.040161,81.9639279 L297.891566,32.0641283 C289.61765,13.058923 270.762411,0.829550704 250,1.00200401"
-                        fill="#844e9f"
-                      />
-                      <path
-                        d="M303.504016,379.108216 L290.753012,407.815631 L320.02008,419.088176 L332.771084,390.370741 L303.504016,379.098196 M196.405622,378.907816 L167.138554,390.190381 L179.949799,419.048096 L209.216867,407.765531 L196.405622,378.907816 M407.459839,291.192385 L378.865462,303.837675 L390.140562,333.006012 L418.73494,320.360721 L407.459839,291.192385 M92.3092369,291.102204 L81.0240964,320.260521 L109.789157,332.975952 L121.074297,303.817635 L92.3192771,291.102204 M390.090361,167.805611 L378.74498,197.134269 L407.540161,209.849699 L418.885542,180.521042 L390.090361,167.805611 M109.909639,167.805611 L80.9538153,180.591182 L92.3192771,209.91984 L121.285141,197.124248 L109.929719,167.795591 M179.929719,82.0541082 L167.349398,110.400802 L196.686747,121.723447 L209.267068,93.3767535 L179.929719,82.0541082 M320.060241,81.9539078 L290.692771,93.2665331 L303.303213,121.673347 L332.650602,110.370741 L320.040161,81.9639279"
-                        fill="#7a4b91"
-                      />
-                    </g>
-                  </svg>
-                  Caseflow
-                </a>
-                <a
-                  href="/dispatch/establish-claim/"
+                    <path
+                      d="M389.959839,442.284569 C383.432096,442.271612 376.963574,441.048453 370.883534,438.677355 L257.429719,394.98998 C252.590851,393.086238 247.208346,393.086238 242.369478,394.98998 L129.016064,438.677355 C106.320107,447.603374 80.4584687,439.55605 66.8674699,419.338677 C57.0515074,405.211352 54.9782782,387.116356 61.3453815,371.142285 L105.120482,258.016032 C107.028046,253.186861 107.028046,247.815143 105.120482,242.985972 L61.3453815,129.95992 C54.9782782,113.985849 57.0515074,95.8908522 66.8674699,81.7635271 C80.4584687,61.5461545 106.320107,53.4988304 129.016064,62.4248497 L242.269076,106.112224 C247.107944,108.015966 252.490449,108.015966 257.329317,106.112224 L370.783133,62.4248497 C393.47909,53.4988304 419.340728,61.5461545 432.931727,81.7635271 C442.747689,95.8908522 444.820919,113.985849 438.453815,129.95992 L394.678715,243.086172 C392.77115,247.915343 392.77115,253.287062 394.678715,258.116232 L438.453815,371.342685 C444.820919,387.316757 442.747689,405.411753 432.931727,419.539078 C423.237855,433.723837 407.164043,442.231882 389.959839,442.284569 M249.899598,362.224449 C256.353168,362.233978 262.750462,363.422577 268.7751,365.731463 L382.228916,409.418838 C384.691595,410.389201 387.312266,410.898698 389.959839,410.921844 C396.866782,410.810028 403.280763,407.328714 407.128514,401.603206 C411.093101,395.97649 411.889064,388.713698 409.236948,382.364729 L365.461847,269.138277 C360.743378,257.021258 360.743378,243.579944 365.461847,231.462926 L409.236948,118.336673 C411.813252,111.977018 411.021397,104.751703 407.128514,99.0981964 C401.695283,90.9837231 391.338118,87.7327557 382.228916,91.2825651 L268.7751,134.96994 C256.614316,139.574339 243.184881,139.574339 231.024096,134.96994 L117.771084,91.2825651 C108.661882,87.7327557 98.3047167,90.9837231 92.8714859,99.0981964 C88.9068988,104.724913 88.1109359,111.987705 90.7630522,118.336673 L134.538153,231.362725 C139.256622,243.479744 139.256622,256.921058 134.538153,269.038076 L90.7630522,382.164329 C87.7347473,389.869273 89.5592305,398.632331 95.4124457,404.495531 C101.265661,410.358732 110.039485,412.212063 117.771084,409.218437 L231.124498,365.531062 C237.149529,363.373645 243.498568,362.255472 249.899598,362.224449"
+                      fill="#D6D7D9"
+                    />
+                    <path
+                      d="M209.226908,407.765531 L179.959839,419.048096 L202.108434,468.937876 C210.52076,487.825367 229.289165,499.997401 250,499.997401 C270.710835,499.997401 289.47924,487.825367 297.891566,468.937876 L319.97992,419.088176 L290.753012,407.815631 L269.176707,456.412826 C265.803034,463.96969 258.289598,468.837793 250,468.837793 C241.710402,468.837793 234.196966,463.96969 230.823293,456.412826 L209.226908,407.765531 M378.905622,303.837675 L345.180723,318.737475 C333.273614,324.007833 323.754837,333.507534 318.473896,345.390782 L303.504016,379.108216 L332.771084,390.380762 L347.188755,357.915832 C349.28122,353.172217 353.078185,349.382861 357.831325,347.294589 L390.150602,333.006012 L378.875502,303.837675 M121.074297,303.837675 L109.789157,332.995992 L142.168675,347.294589 C146.901437,349.412477 150.689105,353.192554 152.811245,357.915832 L167.138554,390.190381 L196.405622,378.907816 L181.526104,345.390782 C176.245163,333.507534 166.726386,324.007833 154.819277,318.737475 L121.074297,303.817635 M80.9136546,180.571142 L31.124498,202.60521 C12.1990801,211.000678 0.00260459933,229.731472 0.00260459933,250.400802 C0.00260459933,271.070132 12.1990801,289.800925 31.124498,298.196393 L81.0341365,320.240481 L92.3192771,291.082164 L43.7751004,269.639279 C36.2030617,266.272366 31.3251832,258.773988 31.3251832,250.501002 C31.3251832,242.228016 36.2030617,234.729638 43.7751004,231.362725 L92.3092369,209.91984 L80.9538153,180.591182 M418.885542,180.521042 L407.540161,209.849699 L456.2249,231.362725 C463.796938,234.729638 468.674817,242.228016 468.674817,250.501002 C468.674817,258.773988 463.796938,266.272366 456.2249,269.639279 L407.46988,291.192385 L418.74498,320.360721 L468.875502,298.196393 C487.80092,289.800925 499.997395,271.070132 499.997395,250.400802 C499.997395,229.731472 487.80092,211.000678 468.875502,202.60521 L418.885542,180.561122 M167.329317,110.420842 L152.911647,142.885772 C150.819182,147.629387 147.022217,151.418742 142.269076,153.507014 L109.919679,167.795591 L121.2751,197.124248 L154.919679,182.264529 C166.826788,176.994171 176.345565,167.49447 181.626506,155.611222 L196.686747,121.723447 L167.349398,110.400802 M332.670683,110.400802 L303.323293,121.703407 L318.383534,155.641283 C323.664475,167.52453 333.183252,177.024231 345.090361,182.294589 L378.75502,197.164329 L390.100402,167.835671 L357.730924,153.507014 C352.977783,151.418742 349.180818,147.629387 347.088353,142.885772 L332.650602,110.370741 M250,1.00200401 C229.237589,0.829550704 210.38235,13.058923 202.108434,32.0641283 L179.909639,82.0541082 L209.246988,93.3767535 L230.823293,44.7895792 C234.196966,37.2327148 241.710402,32.3646117 250,32.3646117 C258.289598,32.3646117 265.803034,37.2327148 269.176707,44.7895792 L290.692771,93.2665331 L320.040161,81.9639279 L297.891566,32.0641283 C289.61765,13.058923 270.762411,0.829550704 250,1.00200401"
+                      fill="#844e9f"
+                    />
+                    <path
+                      d="M303.504016,379.108216 L290.753012,407.815631 L320.02008,419.088176 L332.771084,390.370741 L303.504016,379.098196 M196.405622,378.907816 L167.138554,390.190381 L179.949799,419.048096 L209.216867,407.765531 L196.405622,378.907816 M407.459839,291.192385 L378.865462,303.837675 L390.140562,333.006012 L418.73494,320.360721 L407.459839,291.192385 M92.3092369,291.102204 L81.0240964,320.260521 L109.789157,332.975952 L121.074297,303.817635 L92.3192771,291.102204 M390.090361,167.805611 L378.74498,197.134269 L407.540161,209.849699 L418.885542,180.521042 L390.090361,167.805611 M109.909639,167.805611 L80.9538153,180.591182 L92.3192771,209.91984 L121.285141,197.124248 L109.929719,167.795591 M179.929719,82.0541082 L167.349398,110.400802 L196.686747,121.723447 L209.267068,93.3767535 L179.929719,82.0541082 M320.060241,81.9539078 L290.692771,93.2665331 L303.303213,121.673347 L332.650602,110.370741 L320.040161,81.9639279"
+                      fill="#7a4b91"
+                    />
+                  </g>
+                </svg>
+                Caseflow
+              </a>
+              <a
+                href="/dispatch/establish-claim/"
+              >
+                <span
+                  class="cf-application-title"
+                  data-css-1mdtwij=""
+                  id="page-title"
                 >
-                  <span
-                    class="cf-application-title"
-                    data-css-1mdtwij=""
-                    id="page-title"
-                    tabindex="-1"
-                  >
-                    Dispatch
-                  </span>
-                </a>
-              </p>
-            </a>
+                  Dispatch
+                </span>
+              </a>
+            </p>
             <div
               data-css-1mdtwij=""
             />
diff --git a/client/test/app/queue/__snapshots__/QueueTable.test.js.snap b/client/test/app/queue/__snapshots__/QueueTable.test.js.snap
index 7ef3c929441..5674c3e4876 100644
--- a/client/test/app/queue/__snapshots__/QueueTable.test.js.snap
+++ b/client/test/app/queue/__snapshots__/QueueTable.test.js.snap
@@ -399,6 +399,8 @@ exports[`QueueTable HeaderRow Can filter when using task pages API and column ha
           filterOptions={Array []}
           filterOptionsFromApi={Array []}
           header="Third"
+          isReceiptDateFilter={false}
+          isTaskCompletedDateFilter={false}
           tableData={
             Array [
               Object {
diff --git a/config/routes.rb b/config/routes.rb
index 34518ee1b66..81f24cc4ad2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -313,6 +313,7 @@
   scope path: '/queue' do
     get '/', to: 'queue#index'
     get '/correspondence', to: 'correspondence#correspondence_cases'
+    get '/correspondence/mail_team_users', to: 'correspondence#mail_team_users'
     get '/correspondence/:correspondence_uuid/intake', to: 'correspondence#intake', as: :queue_correspondence_intake
     post '/correspondence/:correspondence_uuid/current_step', to: 'correspondence#current_step', as: :queue_correspondence_intake_current_step
     post '/correspondence/:correspondence_uuid/correspondence_intake_task', to: 'correspondence_tasks#create_correspondence_intake_task'
@@ -325,6 +326,7 @@
     get '/correspondence/:correspondence_uuid/veteran', to: 'correspondence#veteran'
     put '/correspondence/:correspondence_uuid/update_cmp', to: 'correspondence#update_cmp'
     get '/correspondence/packages', to: 'correspondence#package_documents'
+    get '/correspondence/team', to: 'correspondence#correspondence_team'
     get '/correspondence/:correspondence_uuid', to: 'correspondence#show'
     get '/correspondence/:pdf_id/pdf', to: 'correspondence#pdf'
     patch '/correspondence/:correspondence_uuid', to: 'correspondence#update'
@@ -336,6 +338,8 @@
     get '/appeals/:appeal_id/cavc_dashboard', to: 'cavc_dashboard#index'
     get '/appeals/:vacols_id/tasks/:task_id/schedule_veteran', to: 'queue#index' # Allow direct navigation from the Hearings App
     get '/appeals/:vacols_id/*all', to: redirect('/queue/appeals/%{vacols_id}')
+    get 'correspondence/users/:user_id(*rest)', to: 'correspondence_task_pages#index'
+    get 'correspondence/organizations/:organization_id(*rest)', to: 'correspondence_task_pages#index'
     get '/:user_id(*rest)', to: 'legacy_tasks#index'
   end
   match '/explain/correspondence/:correspondence_uuid/:any' => 'explain#show', via: [:get]
diff --git a/db/seeds.rb b/db/seeds.rb
index f5f7ca6bcb1..614b044710f 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -73,6 +73,7 @@ def seed
     call_and_log_seed_step Seeds::PackageDocumentTypes
     call_and_log_seed_step Seeds::Correspondence
     call_and_log_seed_step Seeds::MultiCorrespondences
+    call_and_log_seed_step Seeds::QueueCorrespondences
     call_and_log_seed_step Seeds::VbmsDocumentTypes
     call_and_log_seed_step Seeds::CasesTiedToJudgesNoLongerWithBoard
     call_and_log_seed_step Seeds::VhaChangeHistory
diff --git a/db/seeds/helpers/queue_helpers.rb b/db/seeds/helpers/queue_helpers.rb
new file mode 100644
index 00000000000..98ef609a66c
--- /dev/null
+++ b/db/seeds/helpers/queue_helpers.rb
@@ -0,0 +1,153 @@
+# frozen_string_literal: true
+
+# rubocop:disable Metrics/ModuleLength
+module QueueHelpers
+  def create_veteran(options = {})
+    @file_number += 1
+    @participant_id += 1
+    @cmp_packet_number ||= 1_000_000_000
+    params = {
+      file_number: format("%<n>09d", n: @file_number),
+      participant_id: format("%<n>09d", n: @participant_id)
+    }
+    veteran = create(:veteran, params.merge(options))
+    2.times do
+      appeal = create(:appeal, veteran_file_number: veteran.file_number)
+      InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
+    end
+    veteran
+  end
+
+  def create_correspondence
+    vet = create_veteran
+    ::Correspondence.create!(
+      uuid: SecureRandom.uuid,
+      portal_entry_date: Time.zone.now,
+      source_type: "Mail",
+      package_document_type_id: (1..20).to_a.sample,
+      correspondence_type_id: CorrespondenceType.all.sample&.id,
+      cmp_queue_id: 1,
+      cmp_packet_number: @cmp_packet_number,
+      va_date_of_receipt: rand(1.month.ago..1.day.ago),
+      notes: "Notes from CMP - Queue Correspondence Seed".split(" ").shuffle.join,
+      assigned_by_id: 81,
+      updated_by_id: 81,
+      veteran_id: vet.id
+    ).tap { @cmp_packet_number += 1 }
+  end
+
+  # :reek:UtilityFunction
+  def create_correspondence_document(correspondence, veteran)
+    CorrespondenceDocument.find_or_create_by!(
+      document_file_number: veteran.file_number,
+      uuid: SecureRandom.uuid,
+      vbms_document_type_id: 1250,
+      document_type: 1250,
+      pages: 30,
+      correspondence_id: correspondence.id
+    )
+  end
+
+  # :reek:UtilityFunction
+  def create_correspondence_intake(correspondence, user)
+    parent = correspondence&.root_task
+    complete_task(ReviewPackageTask.find_by(appeal_id: correspondence.id), user.id)
+    cit = CorrespondenceIntakeTask.create_from_params(parent, user)
+    randomize_days_waiting_value(cit)
+    cit
+  end
+
+  # :reek:UtilityFunction
+  def assign_review_package_task(correspondence, user)
+    review_package_task = ReviewPackageTask.find_by(appeal_id: correspondence.id)
+    review_package_task.update!(
+      assigned_to: user,
+      status: Constants.TASK_STATUSES.assigned,
+      assigned_at: rand(1.month.ago..1.day.ago)
+    )
+  end
+
+  # :reek:UtilityFunction
+  # :reek:FeatureEnvy
+  def create_efolderupload_failed_task(correspondence, parent)
+    euft = EfolderUploadFailedTask.create!(
+      parent_id: parent.id,
+      appeal_id: correspondence.id,
+      appeal_type: "Correspondence",
+      assigned_to: parent.assigned_to,
+      status: Constants.TASK_STATUSES.in_progress
+    )
+    randomize_days_waiting_value(euft)
+  end
+
+  # :reek:UtilityFunction
+  # :reek:LongParameterList
+  def create_action_required_tasks(correspondence, status:, parent_task:, task_type:)
+    task_type.create!(
+      parent_id: parent_task.id,
+      appeal_id: correspondence.id,
+      appeal_type: "Correspondence",
+      status: status,
+      assigned_to: InboundOpsTeam.singleton
+    )
+  end
+
+  # :reek:FeatureEnvy
+  def create_and_complete_mail_task(correspondence, user)
+    process_correspondence(correspondence, user)
+    assigned_by = CorrespondenceIntakeTask.find_by(appeal_id: correspondence.id).completed_by
+    cavct = CavcCorrespondenceMailTask.find_or_create_by!(
+      parent_id: correspondence&.root_task&.id,
+      appeal_id: correspondence.id,
+      appeal_type: "Correspondence",
+      assigned_by: assigned_by,
+      assigned_to: InboundOpsTeam.singleton
+    )
+    cavct.update!(status: Constants.TASK_STATUSES.completed)
+    cavct
+  end
+
+  # :reek:FeatureEnvy
+  def create_cavc_mailtask(correspondence, user)
+    process_correspondence(correspondence, user)
+    assigned_by = CorrespondenceIntakeTask.find_by(appeal_id: correspondence.id).completed_by
+    CavcCorrespondenceMailTask.create!(
+      appeal_id: correspondence.id,
+      appeal_type: "Correspondence",
+      assigned_by: assigned_by,
+      assigned_to: CavcLitigationSupport.singleton,
+      status: Constants.TASK_STATUSES.assigned
+    )
+  end
+  # :reek:FeatureEnvy
+  def create_congress_interest_mailtask(correspondence, user)
+    process_correspondence(correspondence, user)
+    assigned_by = CorrespondenceIntakeTask.find_by(appeal_id: correspondence.id).completed_by
+    CongressionalInterestMailTask.create!(
+      appeal_id: correspondence.id,
+      appeal_type: "Correspondence",
+      assigned_by: assigned_by,
+      assigned_to: LitigationSupport.singleton,
+      status: Constants.TASK_STATUSES.assigned,
+      parent_id: correspondence&.root_task&.id
+    )
+  end
+
+  # :reek:UtilityFunction
+  def complete_task(task, user_id)
+    task.update!(status: Constants.TASK_STATUSES.completed, completed_by_id: user_id)
+  end
+
+  # :reek:UtilityFunction
+  def process_correspondence(correspondence, user)
+    rpt = ReviewPackageTask.find_by(appeal_id: correspondence.id)
+    rpt.update!(status: Constants.TASK_STATUSES.completed, completed_by_id: user.id)
+
+    cit = CorrespondenceIntakeTask.create_from_params(correspondence&.root_task, user)
+    cit.update!(status: Constants.TASK_STATUSES.completed, completed_by_id: user.id)
+  end
+
+  def randomize_days_waiting_value(task)
+    task.update(assigned_at: rand(1.month.ago..1.day.ago))
+  end
+end
diff --git a/db/seeds/queue_correspondences.rb b/db/seeds/queue_correspondences.rb
new file mode 100644
index 00000000000..09cf711eeba
--- /dev/null
+++ b/db/seeds/queue_correspondences.rb
@@ -0,0 +1,195 @@
+# frozen_string_literal: true
+
+# create queue correspondence seeds
+require_relative "./helpers/queue_helpers"
+
+module Seeds
+  # :reek:InstanceVariableAssumption
+  class QueueCorrespondences < Base
+    include QueueHelpers
+
+    def initialize
+      initial_id_values
+      RequestStore[:current_user] = User.find_by_css_id("JOLLY_POSTMAN")
+    end
+
+    def mail_team_user
+      @mail_team_user ||= User.find_by_css_id("JOLLY_POSTMAN")
+    end
+
+    def mail_team_superuser
+      @mail_team_superuser ||= User.find_by_css_id("AMBRISVACO")
+    end
+
+    def seed!
+      create_queue_correspondences
+    end
+
+    private
+
+    def initial_id_values
+      @file_number ||= 550_000_000
+      @participant_id ||= 650_000_000
+      while Veteran.find_by(file_number: format("%<n>09d", n: @file_number + 1))
+        @file_number += 100
+        @participant_id += 100
+      end
+
+      @cmp_packet_number ||= 2_000_000_000
+      @cmp_packet_number += 10_000 while ::Correspondence.find_by(cmp_packet_number: @cmp_packet_number + 1)
+    end
+
+    # rubocop:disable Metrics/MethodLength
+    def create_queue_correspondences
+      # 20 Correspondences with unassigned ReviewPackageTask
+      20.times do
+        create_correspondence_with_unassigned_review_package_task
+      end
+
+      # 20 Correspondences with eFolderFailedUploadTask with a parent CorrespondenceIntakeTask
+      20.times do
+        create_correspondence_with_intake_and_failed_upload_task(mail_team_user)
+        create_correspondence_with_intake_and_failed_upload_task(mail_team_superuser)
+      end
+
+      # 20 Correspondences with CorrespondenceIntakeTask with a status of in_progress
+      20.times do
+        create_correspondence_with_intake_task(mail_team_user)
+        create_correspondence_with_intake_task(mail_team_superuser)
+      end
+
+      # 20 Correspondences with eFolderFailedUploadTask with a parent ReviewPackageTask
+      20.times do
+        create_correspondence_with_review_package_and_failed_upload_task(mail_team_user)
+        create_correspondence_with_review_package_and_failed_upload_task(mail_team_superuser)
+      end
+
+      # 20 Correspondences with the CorrespondenceRootTask with the status of completed
+      20.times do
+        create_correspondence_with_completed_root_task
+      end
+
+      # 20 Correspondences with ReviewPackageTask in progress
+      20.times do
+        create_correspondence_with_review_package_task(mail_team_user)
+        create_correspondence_with_review_package_task(mail_team_superuser)
+      end
+
+      # 20 Correspondences with the tasks for Action Required tab and an on_hold ReviewPackageTask as their parent
+      5.times do
+        # below method creates 4 correspondence records
+        create_correspondence_with_action_required_tasks
+      end
+
+      # 10 Correspondences with in-progress CorrespondenceRootTask and completed Mail Task
+      10.times do
+        create_correspondence_with_completed_mail_task(mail_team_user)
+        create_correspondence_with_completed_mail_task(mail_team_superuser)
+      end
+
+      # 5 Correspondences with the CorrespondenceRootTask with the status of canceled
+      5.times do
+        create_correspondence_with_canceled_root_task
+      end
+
+      # 20 Correspondences with the tasks for CAVC and Congress Interest
+      20.times do
+        create_cavc_mailtask(create_correspondence, mail_team_user)
+        create_cavc_mailtask(create_correspondence, mail_team_superuser)
+      end
+
+      20.times do
+        create_congress_interest_mailtask(create_correspondence, mail_team_user)
+        create_congress_interest_mailtask(create_correspondence, mail_team_superuser)
+      end
+
+      10.times do
+        create_correspondence_with_in_progress_review_package_task(mail_team_user)
+        create_correspondence_with_in_progress_review_package_task(mail_team_superuser)
+      end
+
+      10.times do
+        create_correspondence_with_in_progress_intake_task(mail_team_user)
+        create_correspondence_with_in_progress_intake_task(mail_team_superuser)
+      end
+    end
+    # rubocop:enable Metrics/MethodLength
+
+    def create_correspondence_with_intake_and_failed_upload_task(user)
+      corres = create_correspondence
+      parent_task = create_correspondence_intake(corres, user)
+      create_efolderupload_failed_task(corres, parent_task)
+    end
+
+    def create_correspondence_with_intake_task(user)
+      corres = create_correspondence
+      create_correspondence_intake(corres, user)
+    end
+
+    def create_correspondence_with_in_progress_intake_task(user)
+      corres = create_correspondence
+      cit = create_correspondence_intake(corres, user)
+      cit.update!(status: Constants.TASK_STATUSES.in_progress)
+    end
+
+    def create_correspondence_with_unassigned_review_package_task
+      corres = create_correspondence
+      # vary days waiting to be able to test column sorting
+      rpt = ReviewPackageTask.find_by(appeal_id: corres.id)
+      rpt.update(assigned_at: corres.va_date_of_receipt)
+    end
+
+    def create_correspondence_with_review_package_task(user)
+      corres = create_correspondence
+      assign_review_package_task(corres, user)
+    end
+
+    def create_correspondence_with_in_progress_review_package_task(user)
+      corres = create_correspondence
+      assign_review_package_task(corres, user)
+      rpt = ReviewPackageTask.find_by(appeal_id: corres.id)
+      rpt.update!(status: Constants.TASK_STATUSES.in_progress)
+    end
+
+    def create_correspondence_with_review_package_and_failed_upload_task(user)
+      corres = create_correspondence
+      assign_review_package_task(corres, user)
+      parent_task = ReviewPackageTask.find_by(appeal_id: corres.id, type: ReviewPackageTask.name)
+      create_efolderupload_failed_task(corres, parent_task)
+    end
+
+    def create_correspondence_with_completed_root_task
+      corres = create_correspondence
+      corres.root_task.update!(status: Constants.TASK_STATUSES.completed)
+      corres.root_task.update!(closed_at: rand(1.month.ago..1.day.ago))
+    end
+
+    def create_correspondence_with_action_required_tasks
+      corres_array = (1..4).map { create_correspondence }
+      task_array = [ReassignPackageTask, RemovePackageTask, SplitPackageTask, MergePackageTask]
+
+      corres_array.each_with_index do |corres, index|
+        rpt = ReviewPackageTask.find_by(appeal_id: corres.id)
+        rpt.update(assigned_to_id: mail_team_superuser.id) if index.even?
+        pat = task_array[index].create!(
+          parent_id: rpt.id,
+          appeal_id: corres.id,
+          appeal_type: "Correspondence",
+          assigned_to: InboundOpsTeam.singleton,
+          assigned_by_id: rpt.assigned_to_id
+        )
+        pat.update(assigned_at: corres.va_date_of_receipt)
+      end
+    end
+
+    def create_correspondence_with_completed_mail_task(user)
+      correspondence = create_correspondence
+      create_and_complete_mail_task(correspondence, user)
+    end
+
+    def create_correspondence_with_canceled_root_task
+      corres = create_correspondence
+      corres.root_task.update!(status: Constants.TASK_STATUSES.cancelled)
+    end
+  end
+end
diff --git a/lib/tasks/correspondence.rake b/lib/tasks/correspondence.rake
index 4ceb135959a..92b16bfb203 100644
--- a/lib/tasks/correspondence.rake
+++ b/lib/tasks/correspondence.rake
@@ -6,6 +6,7 @@ require_relative "../../db/seeds/vbms_document_types"
 require_relative "../../db/seeds/correspondence_types"
 require_relative "../../db/seeds/package_document_types"
 require_relative "../../db/seeds/multi_correspondences"
+require_relative "../../db/seeds/queue_correspondences"
 
 namespace :correspondence do
   desc "setup data for intake correspondence (autotext and correspondence type)in UAT/PROD"
diff --git a/spec/factories/correspondence.rb b/spec/factories/correspondence.rb
index ab1f4cbc98c..5687efee792 100644
--- a/spec/factories/correspondence.rb
+++ b/spec/factories/correspondence.rb
@@ -27,7 +27,12 @@
       end
 
       after(:create) do |correspondence, evaluator|
-        create(:correspondence_intake_task, appeal: correspondence, assigned_to: evaluator.assigned_to)
+        create(
+          :correspondence_intake_task,
+          appeal: correspondence,
+          assigned_to: evaluator.assigned_to,
+          appeal_type: Correspondence.name
+        )
       end
     end
   end
diff --git a/spec/factories/task.rb b/spec/factories/task.rb
index daef960451a..ba3ae784d3d 100644
--- a/spec/factories/task.rb
+++ b/spec/factories/task.rb
@@ -400,6 +400,7 @@ def self.find_first_task_or_create(appeal, task_type, **kwargs)
       # > overridden parameters in the instance variable @overrides.
       # It's a clean solution that doesn't require updating tests or adding a new transient attribute.
       appeal { @overrides[:parent] ? @overrides[:parent].appeal : create(:appeal) }
+      appeal_type { appeal.class.name }
 
       before :create do |task, _eval|
         task.update(type: task.class.name)
@@ -618,6 +619,7 @@ def self.find_first_task_or_create(appeal, task_type, **kwargs)
       end
 
       factory :correspondence_intake_task, class: CorrespondenceIntakeTask do
+        appeal_type { Correspondence.name }
       end
 
       factory :efolder_upload_failed_task, class: EfolderUploadFailedTask do
diff --git a/spec/feature/queue/correspondence/correspondence_cases_batch_assignment.rb b/spec/feature/queue/correspondence/correspondence_cases_batch_assignment.rb
new file mode 100644
index 00000000000..f11fc5d0f76
--- /dev/null
+++ b/spec/feature/queue/correspondence/correspondence_cases_batch_assignment.rb
@@ -0,0 +1,163 @@
+# frozen_string_literal: true
+
+RSpec.feature("The Correspondence Cases page") do
+  include CorrespondenceTaskHelpers
+  # alias this to avoid the method name collision
+  alias_method :create_efolderupload_task, :create_efolderupload_failed_task
+  context "correspondence batch assignment cases for assigned and unassigned tabs" do
+    let(:current_user) { create(:user) }
+    before :each do
+      InboundOpsTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+    end
+    let(:organization) { MailTeam.singleton }
+    let(:mail_user) { User.authenticate!(roles: ["Mail Team"]) }
+    let(:target_user) { create(:user, css_id: "TARGET_USER") }
+
+    let(:wait_time) { 30 }
+
+    before do
+      organization.add_user(mail_user)
+      mail_user.reload
+    end
+
+    before do
+      organization.add_user(target_user)
+      target_user.reload
+    end
+
+    before do
+      Timecop.freeze(Time.zone.local(2020, 5, 15))
+      5.times do
+        corres_array = (1..4).map { create(:correspondence) }
+        task_array = [ReassignPackageTask, RemovePackageTask, SplitPackageTask, MergePackageTask]
+
+        corres_array.each_with_index do |corres, index|
+          rpt = ReviewPackageTask.find_by(appeal_id: corres.id)
+          task_array[index].create!(
+            parent_id: rpt.id,
+            appeal_id: corres.id,
+            appeal_type: "Correspondence",
+            assigned_to: InboundOpsTeam.singleton,
+            assigned_by_id: rpt.assigned_to_id
+          )
+        end
+      end
+
+      # Used to mock a single task to compare task sorting
+      ReassignPackageTask.first.correspondence.update!(
+        va_date_of_receipt: Date.new(2000, 10, 10),
+        updated_by_id: current_user.id
+      )
+      ReassignPackageTask.last.correspondence.update!(
+        va_date_of_receipt: Date.new(2050, 10, 10),
+        updated_by_id: current_user.id
+      )
+      FeatureToggle.enable!(:correspondence_queue)
+    end
+
+    before do
+      Timecop.freeze(Time.zone.local(2020, 5, 15))
+      40.times do
+        correspondence = create(:correspondence)
+        parent_task = create_correspondence_intake(correspondence, target_user)
+        create_efolderupload_task(correspondence, parent_task, user: target_user)
+      end
+    end
+
+    it "successfully loads the unassigned tab" do
+      visit "/queue/correspondence/team?tab=correspondence_unassigned"
+      expect(page).to have_content("Correspondence owned by the Mail team are unassigned to an individual:")
+      expect(page).to have_content("Assign to mail team user")
+      expect(page).to have_button("Assign", disabled: true)
+      expect(page).to have_button("Auto assign correspondence")
+    end
+
+    it "Verify the mail team user batch assignment with Assign button" do
+      visit "/queue/correspondence/team?tab=correspondence_unassigned"
+      expect(page).to have_content("Assign to mail team user")
+      expect(page).to have_button("Assign", disabled: true)
+      expect(page).to have_selector(".cf-select__input")
+      all(".cf-select__input").first.click
+      find_by_id("react-select-2-option-0").click
+      page.execute_script('
+        document.querySelectorAll(".cf-form-checkbox input[type=\'checkbox\']").forEach((checkbox, index) => {
+          if (index < 3) {
+            checkbox.click();
+          }
+        });
+      ')
+      expect(page).to have_button("Assign", disabled: false)
+      find_by_id("button-Assign").click
+      expect(page).to have_content("You have successfully assigned 3 Correspondence to #{mail_user.css_id}.")
+      expect(page).to have_content("Please go to your individual queue to see any self-assigned correspondence.")
+    end
+
+    it "Verify the mail team user batch assignment with assign button with queue limit" do
+      visit "/queue/correspondence/team?tab=correspondence_unassigned"
+      expect(page).to have_content("Assign to mail team user")
+      expect(page).to have_button("Assign", disabled: true)
+      expect(page).to have_selector(".cf-select__input")
+      all(".cf-select__input").first.click
+      find_by_id("react-select-2-option-1").click
+      page.execute_script('
+        document.querySelectorAll(".cf-form-checkbox input[type=\'checkbox\']").forEach((checkbox, index) => {
+          if (index < 3) {
+            checkbox.click();
+          }
+        });
+      ')
+      expect(page).to have_button("Assign", disabled: false)
+      find_by_id("button-Assign").click
+      expect(page).to have_content("Correspondence assignment to #{target_user.css_id} has failed")
+      expect(page).to have_content("Queue volume has reached maximum capacity for this user.")
+    end
+
+    it "successfully loads the assigned tab" do
+      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
+      expect(page).to have_content("Correspondence that is currently assigned to mail team users:")
+      expect(page).to have_content("Assign to mail team user")
+      expect(page).to have_button("Reassign", disabled: true)
+    end
+
+    it "Verify the mail team user batch reassignment with Reassign button" do
+      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
+      expect(page).to have_content("Assign to mail team user")
+      expect(page).to have_button("Reassign", disabled: true)
+      expect(page).to have_selector(".cf-select__input")
+      all(".cf-select__input").first.click
+      find_by_id("react-select-2-option-0").click
+      page.execute_script('
+        document.querySelectorAll(".cf-form-checkbox input[type=\'checkbox\']").forEach((checkbox, index) => {
+          if (index < 3) {
+            checkbox.click();
+          }
+        });
+      ')
+      expect(page).to have_button("Reassign", disabled: false)
+      find_by_id("button-Reassign").click
+      expect(page).to have_content("You have successfully reassigned 3 Correspondence to #{mail_user.css_id}.")
+      expect(page).to have_content("Please go to your individual queue to see any self-assigned correspondence.")
+    end
+
+    it "Verify the mail team user batch reassignment with reassign button with queue limit" do
+      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
+      expect(page).to have_content("Assign to mail team user")
+      expect(page).to have_button("Reassign", disabled: true)
+      expect(page).to have_selector(".cf-select__input")
+      all(".cf-select__input").first.click
+      find_by_id("react-select-2-option-1").click
+      page.execute_script('
+        document.querySelectorAll(".cf-form-checkbox input[type=\'checkbox\']").forEach((checkbox, index) => {
+          if (index < 3) {
+            checkbox.click();
+          }
+        });
+      ')
+      expect(page).to have_button("Reassign", disabled: false)
+      find_by_id("button-Reassign").click
+      expect(page).to have_content("Correspondence reassignment to #{target_user.css_id} has failed")
+      expect(page).to have_content("Queue volume has reached maximum capacity for this user.")
+    end
+  end
+end
diff --git a/spec/feature/queue/correspondence/correspondence_cases_spec.rb b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
index 371e6b7ff4d..cd74f35ec15 100644
--- a/spec/feature/queue/correspondence/correspondence_cases_spec.rb
+++ b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
@@ -1,10 +1,14 @@
 # frozen_string_literal: true
 
 RSpec.feature("The Correspondence Cases page") do
+  include CorrespondenceTaskHelpers
+  # alias this to avoid the method name collision
+  alias_method :create_efolderupload_task, :create_efolderupload_failed_task
+
   context "correspondece cases feature toggle" do
     let(:current_user) { create(:user) }
     before :each do
-      InboundOpsTeam.singleton.add_user(current_user)
+      MailTeam.singleton.add_user(current_user)
       User.authenticate!(user: current_user)
       @correspondence_uuid = "123456789"
     end
@@ -29,4 +33,864 @@
       @correspondence_uuid = "123456789"
     end
   end
+
+  context "correspondence tasks in-progress tab" do
+    let(:current_user) { create(:user) }
+    before :each do
+      MailTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+    end
+
+    before do
+      Timecop.freeze(Time.zone.local(2020, 5, 15))
+      20.times do
+        correspondence = create(:correspondence)
+        parent_task = create_correspondence_intake(correspondence, current_user)
+        create_efolderupload_task(correspondence, parent_task, user: current_user)
+      end
+      # Used to mock a single task to compare task sorting
+      EfolderUploadFailedTask.first.update!(type: "ReviewPackageTask")
+      EfolderUploadFailedTask.first.correspondence.update!(
+        va_date_of_receipt: Date.new(2000, 10, 10),
+        updated_by_id: current_user.id
+      )
+      EfolderUploadFailedTask.last.correspondence.update!(
+        va_date_of_receipt: Date.new(2024, 10, 10),
+        updated_by_id: current_user.id
+      )
+      FeatureToggle.enable!(:correspondence_queue)
+    end
+
+    it "successfully loads the in progress tab" do
+      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
+      expect(page).to have_content("Correspondence in progress")
+    end
+
+    it "uses veteran details sort correctly." do
+      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by Veteran Details']").click
+      first_vet_info = page.all("#task-link")[0].text
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by Veteran Details']").click
+      last_vet_info = page.all("#task-link")[0].text
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by Veteran Details']").click
+      expect(page.all("#task-link")[0].text == first_vet_info)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by Veteran Details']").click
+      expect(page.all("#task-link")[0].text == last_vet_info)
+    end
+
+    it "uses VA DOR sort correctly." do
+      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by VA DOR']").click
+      first_date = find("tbody > tr:nth-child(1) > td:nth-child(2)")
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by VA DOR']").click
+      last_date = find("tbody > tr:nth-child(1) > td:nth-child(2)")
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by VA DOR']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == first_date)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by VA DOR']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == last_date)
+    end
+
+    it "uses tasks sort correctly." do
+      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by Tasks']").click
+      first_task_type = find("tbody > tr:nth-child(1) > td:nth-child(3)").text
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by Tasks']").click
+      second_task_type = find("tbody > tr:nth-child(1) > td:nth-child(3)").text
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by Tasks']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(3)").text == first_task_type)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by Tasks']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(3)").text == second_task_type)
+    end
+
+    it "uses days waiting sort correctly" do
+      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by Days Waiting']").click
+      first_day_amount = find("tbody > tr:nth-child(1) > td:nth-child(4)").text
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by Days Waiting']").click
+      second_day_amount = find("tbody > tr:nth-child(1) > td:nth-child(4)").text
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by Days Waiting']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(4)").text == first_day_amount)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by Days Waiting']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(4)").text == second_day_amount)
+    end
+
+    it "uses notes sort correctly" do
+      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by Notes']").click
+      first_note = find("tbody > tr:nth-child(1) > td:nth-child(5)").text
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by Notes']").click
+      second_note = find("tbody > tr:nth-child(1) > td:nth-child(5)").text
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by Notes']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(5)").text == first_note)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by Notes']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(5)").text == second_note)
+    end
+
+    it "uses receipt date between filter correctly" do
+      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-2-option-0").click
+      all("div.input-container > input")[0].fill_in(with: "10/09/2000")
+      all("div.input-container > input")[1].fill_in(with: "10/11/2000")
+      find(".cf-submit").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+
+    it "uses receipt date before filter correctly" do
+      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-2-option-1").click
+      all("div.input-container > input")[0].fill_in(with: "10/01/2001")
+      find(".cf-submit").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+
+    it "uses receipt date after filter correctly" do
+      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-2-option-2").click
+      all("div.input-container > input")[0].fill_in(with: "10/01/2024")
+      find(".cf-submit").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+
+    it "uses receipt date on filter correctly" do
+      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-2-option-3").click
+      all("div.input-container > input")[0].fill_in(with: "10/10/2000")
+      find(".cf-submit").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+
+    it "uses uses task filter correctly" do
+      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
+      all(".unselected-filter-icon")[1].click
+      find("label", text: "Review Package Task (1)").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+  end
+
+  context "correspondence tasks completed tab" do
+    let(:current_user) { create(:user) }
+    before :each do
+      InboundOpsTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+    end
+
+    before do
+      20.times do
+        correspondence = create(:correspondence)
+        correspondence.root_task.update!(status: Constants.TASK_STATUSES.completed,
+                                         closed_at: rand(6 * 24 * 60).minutes.ago)
+      end
+    end
+
+    before :each do
+      FeatureToggle.enable!(:correspondence_queue)
+      FeatureToggle.enable!(:user_queue_pagination)
+    end
+
+    it "displays all completed correspondence tasks" do
+      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=completedDateColumn&order=asc"
+      expect(page).to have_content("Completed correspondence:")
+      expect(page).to have_content("Viewing 1-15 of 20 total")
+      expect(page).to have_button("Next")
+      expect(page).not_to have_button("Previous")
+
+      click_button("Next", match: :first)
+      expect(page).to have_content("Viewing 16-20 of 20 total")
+      expect(page).to have_button("Previous")
+      expect(page).not_to have_button("Next")
+
+      click_button("Previous", match: :first)
+      expect(page).to have_content("Viewing 1-15 of 20 total")
+    end
+
+    it "displays all correspondence tasks sorted by date completed" do
+      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=completedDateColumn&order=asc"
+      find("[aria-label='Sort by Date Completed']").click
+
+      dates = all("tbody > tr > td:nth-child(3)").map(&:text)
+      expect(dates).to eq(dates.sort.reverse)
+
+      find("[aria-label='Sort by Date Completed']").click
+      dates = all("tbody > tr > td:nth-child(3)").map(&:text)
+      expect(dates).to eq(dates.sort)
+    end
+
+    it "filters date column with 'between' the dates" do
+      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=completedDateColumn&order=asc"
+
+      find("[aria-label='Filter by date completed']").click
+      expect(page).to have_content("Date filter parameters")
+      expect(page).to have_button("Apply filter", disabled: true)
+
+      find("#reactSelectContainer").click
+      find("#react-select-2-option-0").click
+      current_date = Time.zone.today
+      start_date = current_date.strftime("%m/%d/%Y")
+      end_date = (current_date + 1).strftime("%m/%d/%Y")
+
+      all("div.input-container > input")[0].fill_in(with: start_date)
+      all("div.input-container > input")[1].fill_in(with: end_date)
+
+      expect(page).to have_button("Apply filter", disabled: false)
+      find(".cf-submit").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(3)").length).to eq(1)
+    end
+
+    it "filters date column with 'before' this date" do
+      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=completedDateColumn&order=asc"
+
+      find("[aria-label='Filter by date completed']").click
+      expect(page).to have_content("Date filter parameters")
+      expect(page).to have_button("Apply filter", disabled: true)
+
+      find("#reactSelectContainer").click
+      find("#react-select-2-option-1").click
+      current_date = Time.zone.today
+      start_date = (current_date - 1).strftime("%m/%d/%Y")
+
+      all("div.input-container > input")[0].fill_in(with: start_date)
+      expect(page).to have_button("Apply filter", disabled: false)
+      find(".cf-submit").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(3)").length).to eq(1)
+    end
+
+    it "filters date column with 'after' this date" do
+      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=completedDateColumn&order=asc"
+
+      find("[aria-label='Filter by date completed']").click
+      expect(page).to have_content("Date filter parameters")
+      expect(page).to have_button("Apply filter", disabled: true)
+
+      find("#reactSelectContainer").click
+      find("#react-select-2-option-2").click
+      current_date = Time.zone.yesterday
+      after_date = (current_date + 1).strftime("%m/%d/%Y")
+      all("div.input-container > input")[0].fill_in(with: after_date)
+      expect(page).to have_button("Apply filter", disabled: false)
+      find(".cf-submit").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(3)").length).to eq(1)
+    end
+
+    it "filters date column with 'on' this date" do
+      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=completedDateColumn&order=asc"
+
+      find("[aria-label='Filter by date completed']").click
+      expect(page).to have_content("Date filter parameters")
+      expect(page).to have_button("Apply filter", disabled: true)
+
+      find("#reactSelectContainer").click
+      find("#react-select-2-option-3").click
+      current_date = Time.zone.today
+      on_this_date = current_date.strftime("%m/%d/%Y")
+      all("div.input-container > input")[0].fill_in(with: on_this_date)
+      find(".cf-submit").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(3)").length).to eq(1)
+    end
+
+    it "sorts by Veteran Details column" do
+      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=veteranDetailsColumn&order=asc"
+      find("[aria-label='Sort by Veteran Details']").click
+
+      veterans = all("#task-link").map(&:text)
+      expect(veterans).to eq(veterans.sort.reverse)
+
+      find("[aria-label='Sort by Veteran Details']").click
+      veterans = all("#task-link").map(&:text)
+      expect(veterans).to eq(veterans.sort)
+    end
+
+    it "sorts by Notes column" do
+      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=notes&order=asc"
+      find("[aria-label='Sort by Notes']").click
+
+      notes = all("tbody > tr > td:nth-child(4)").map(&:text)
+      expect(notes).to eq(notes.sort.reverse)
+
+      find("[aria-label='Sort by Notes']").click
+      notes = all("tbody > tr > td:nth-child(4)").map(&:text)
+      expect(notes).to eq(notes.sort)
+    end
+  end
+
+  context "correspondence cases action required tab" do
+    let(:current_user) { create(:user) }
+    before :each do
+      InboundOpsTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+    end
+    before do
+      Timecop.freeze(Time.zone.local(2020, 5, 15))
+      5.times do
+        corres_array = (1..4).map { create(:correspondence) }
+        task_array = [ReassignPackageTask, RemovePackageTask, SplitPackageTask, MergePackageTask]
+
+        corres_array.each_with_index do |corres, index|
+          rpt = ReviewPackageTask.find_by(appeal_id: corres.id)
+          task_array[index].create!(
+            parent_id: rpt.id,
+            appeal_type: "Correspondence",
+            appeal_id: corres.id,
+            assigned_to: InboundOpsTeam.singleton,
+            assigned_by_id: rpt.assigned_to_id
+          )
+        end
+      end
+      # Used to mock a single task to compare task sorting
+      ReassignPackageTask.first.correspondence.update!(
+        va_date_of_receipt: Date.new(2000, 10, 10),
+        updated_by_id: current_user.id
+      )
+      ReassignPackageTask.last.correspondence.update!(
+        va_date_of_receipt: Date.new(2050, 10, 10),
+        updated_by_id: current_user.id
+      )
+      FeatureToggle.enable!(:correspondence_queue)
+    end
+
+    it "successfully loads the action required tab" do
+      visit "/queue/correspondence/team?tab=correspondence_action_required"
+      expect(page).to have_content("Correspondence with pending requests:")
+    end
+
+    it "uses veteran details sort correctly." do
+      visit "/queue/correspondence/team?tab=correspondence_action_required"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by Veteran Details']").click
+      first_vet_info = page.all("#task-link")[0].text
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by Veteran Details']").click
+      last_vet_info = page.all("#task-link")[0].text
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by Veteran Details']").click
+      expect(page.all("#task-link")[0].text == first_vet_info)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by Veteran Details']").click
+      expect(page.all("#task-link")[0].text == last_vet_info)
+    end
+
+    it "uses VA DOR sort correctly." do
+      visit "/queue/correspondence/team?tab=correspondence_action_required"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by VA DOR']").click
+      first_date = find("tbody > tr:nth-child(1) > td:nth-child(2)")
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by VA DOR']").click
+      last_date = find("tbody > tr:nth-child(1) > td:nth-child(2)")
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by VA DOR']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == first_date)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by VA DOR']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == last_date)
+    end
+
+    it "uses action type sort correctly." do
+      visit "/queue/correspondence/team?tab=correspondence_action_required"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by Action Type']").click
+      first_task_type = find("tbody > tr:nth-child(1) > td:nth-child(3)").text
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by Action Type']").click
+      second_task_type = find("tbody > tr:nth-child(1) > td:nth-child(3)").text
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by Action Type']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(3)").text == first_task_type)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by Action Type']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(3)").text == second_task_type)
+    end
+
+    it "uses days waiting sort correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_action_required"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by Days Waiting']").click
+      first_day_amount = find("tbody > tr:nth-child(1) > td:nth-child(4)").text
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by Days Waiting']").click
+      second_day_amount = find("tbody > tr:nth-child(1) > td:nth-child(4)").text
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by Days Waiting']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(4)").text == first_day_amount)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by Days Waiting']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(4)").text == second_day_amount)
+    end
+
+    it "uses notes sort correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_action_required"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by Notes']").click
+      first_note = find("tbody > tr:nth-child(1) > td:nth-child(5)").text
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by Notes']").click
+      second_note = find("tbody > tr:nth-child(1) > td:nth-child(5)").text
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by Notes']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(5)").text == first_note)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by Notes']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(5)").text == second_note)
+    end
+
+    it "uses receipt date between filter correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_action_required"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-2-option-0").click
+      all("div.input-container > input")[0].fill_in(with: "10/09/2000")
+      all("div.input-container > input")[1].fill_in(with: "10/11/2000")
+      find(".cf-submit").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+
+    it "uses receipt date before filter correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_action_required"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-2-option-1").click
+      all("div.input-container > input")[0].fill_in(with: "10/01/2001")
+      find(".cf-submit").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+
+    it "uses receipt date after filter correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_action_required"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-2-option-2").click
+      all("div.input-container > input")[0].fill_in(with: "10/01/2024")
+      find(".cf-submit").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+
+    it "uses receipt date on filter correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_action_required"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-2-option-3").click
+      all("div.input-container > input")[0].fill_in(with: "10/10/2000")
+      find(".cf-submit").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+  end
+
+  context "correspondence cases unassigned tab" do
+    let(:current_user) { create(:user) }
+    before :each do
+      InboundOpsTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+    end
+
+    before do
+      Timecop.freeze(Time.zone.local(2020, 5, 15))
+      5.times do
+        corres_array = (1..4).map { create(:correspondence) }
+        task_array = [ReassignPackageTask, RemovePackageTask, SplitPackageTask, MergePackageTask]
+
+        corres_array.each_with_index do |corres, index|
+          rpt = ReviewPackageTask.find_by(appeal_id: corres.id)
+          task_array[index].create!(
+            parent_id: rpt.id,
+            appeal_type: "Correspondence",
+            assigned_to: InboundOpsTeam.singleton,
+            appeal_id: corres.id,
+            assigned_by_id: rpt.assigned_to_id
+          )
+        end
+      end
+
+      # Used to mock a single task to compare task sorting
+      ReassignPackageTask.first.correspondence.update!(
+        va_date_of_receipt: Date.new(2000, 10, 10),
+        updated_by_id: current_user.id
+      )
+      ReassignPackageTask.last.correspondence.update!(
+        va_date_of_receipt: Date.new(2050, 10, 10),
+        updated_by_id: current_user.id
+      )
+      FeatureToggle.enable!(:correspondence_queue)
+    end
+
+    it "successfully loads the unassigned tab" do
+      visit "/queue/correspondence/team?tab=correspondence_unassigned"
+      expect(page).to have_content("Correspondence owned by the Mail team are unassigned to an individual:")
+      expect(page).to have_content("Assign to mail team user")
+      expect(page).to have_button("Assign")
+      expect(page).to have_button("Auto assign correspondence")
+    end
+
+    it "uses veteran details sort correctly." do
+      visit "/queue/correspondence/team?tab=correspondence_unassigned"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by Veteran Details']").click
+      first_vet_info = page.all("#task-link")[0].text
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by Veteran Details']").click
+      last_vet_info = page.all("#task-link")[0].text
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by Veteran Details']").click
+      expect(page.all("#task-link")[0].text == first_vet_info)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by Veteran Details']").click
+      expect(page.all("#task-link")[0].text == last_vet_info)
+    end
+
+    it "uses VA DOR sort correctly." do
+      visit "/queue/correspondence/team?tab=correspondence_unassigned"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by VA DOR']").click
+      first_date = find("tbody > tr:nth-child(1) > td:nth-child(2)")
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by VA DOR']").click
+      last_date = find("tbody > tr:nth-child(1) > td:nth-child(2)")
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by VA DOR']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == first_date)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by VA DOR']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == last_date)
+    end
+
+    it "uses days waiting sort correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_unassigned"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by Days Waiting']").click
+      first_day_amount = find("tbody > tr:nth-child(1) > td:nth-child(4)").text
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by Days Waiting']").click
+      second_day_amount = find("tbody > tr:nth-child(1) > td:nth-child(4)").text
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by Days Waiting']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(4)").text == first_day_amount)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by Days Waiting']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(4)").text == second_day_amount)
+    end
+
+    it "uses notes sort correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_unassigned"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by Notes']").click
+      first_note = find("tbody > tr:nth-child(1) > td:nth-child(5)").text
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by Notes']").click
+      second_note = find("tbody > tr:nth-child(1) > td:nth-child(5)").text
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by Notes']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(5)").text == first_note)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by Notes']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(5)").text == second_note)
+    end
+
+    it "uses receipt date between filter correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_unassigned"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-3-option-0").click
+      all("div.input-container > input")[0].fill_in(with: "10/09/2000")
+      all("div.input-container > input")[1].fill_in(with: "10/11/2000")
+      click_button("Apply Filter")
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+
+    it "uses receipt date before filter correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_unassigned"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-3-option-1").click
+      all("div.input-container > input")[0].fill_in(with: "10/01/2001")
+      click_button("Apply Filter")
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+
+    it "uses receipt date after filter correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_unassigned"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-3-option-2").click
+      all("div.input-container > input")[0].fill_in(with: "10/01/2024")
+      click_button("Apply Filter")
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+
+    it "uses receipt date on filter correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_unassigned"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-3-option-3").click
+      all("div.input-container > input")[0].fill_in(with: "10/10/2000")
+      click_button("Apply Filter")
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+  end
+
+  context "correspondence cases assigned tab" do
+    let(:current_user) { create(:user) }
+    before :each do
+      InboundOpsTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+    end
+
+    before do
+      Timecop.freeze(Time.zone.local(2020, 5, 15))
+      (1..10).map { create(:correspondence, :with_correspondence_intake_task) }
+      10.times do
+        review_correspondence = create(:correspondence)
+        rpt = ReviewPackageTask.find_by(appeal_id: review_correspondence.id)
+        rpt.update!(assigned_to: current_user, status: "assigned")
+        rpt.save!
+      end
+      10.times do
+        corr = create(:correspondence)
+
+        rpt = ReviewPackageTask.find_by(appeal_id: corr.id)
+
+        EfolderUploadFailedTask.create!(
+          parent_id: rpt.id,
+          appeal_id: corr.id,
+          appeal_type: "Correspondence",
+          assigned_to: current_user,
+          assigned_by_id: rpt.assigned_to_id
+        )
+      end
+
+      # Used to mock a single task to compare task sorting
+      EfolderUploadFailedTask.first.correspondence.update!(
+        va_date_of_receipt: Date.new(2000, 10, 10),
+        updated_by_id: current_user.id
+      )
+      EfolderUploadFailedTask.last.correspondence.update!(
+        va_date_of_receipt: Date.new(2050, 10, 10),
+        updated_by_id: current_user.id
+      )
+      FeatureToggle.enable!(:correspondence_queue)
+    end
+
+    it "successfully loads the assigned tab" do
+      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
+      expect(page).to have_content("Correspondence that is currently assigned to mail team users:")
+      expect(page).to have_content("Assign to mail team user")
+      expect(page).to have_button("Reassign", disabled: true)
+    end
+
+    it "uses veteran details sort correctly." do
+      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by Veteran Details']").click
+      first_vet_info = page.all("#task-link")[0].text
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by Veteran Details']").click
+      last_vet_info = page.all("#task-link")[0].text
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by Veteran Details']").click
+      expect(page.all("#task-link")[0].text == first_vet_info)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by Veteran Details']").click
+      expect(page.all("#task-link")[0].text == last_vet_info)
+    end
+
+    it "uses VA DOR sort correctly." do
+      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by VA DOR']").click
+      first_date = find("tbody > tr:nth-child(1) > td:nth-child(2)")
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by VA DOR']").click
+      last_date = find("tbody > tr:nth-child(1) > td:nth-child(2)")
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by VA DOR']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == first_date)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by VA DOR']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == last_date)
+    end
+
+    it "use tasks filter correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
+      find("[aria-label='Filter by task']").click
+      find("label", text: "Correspondence Intake Task (10)").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+
+    it "uses days waiting sort correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by Days Waiting']").click
+      first_day_amount = find("tbody > tr:nth-child(1) > td:nth-child(4)").text
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by Days Waiting']").click
+      second_day_amount = find("tbody > tr:nth-child(1) > td:nth-child(4)").text
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by Days Waiting']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(4)").text == first_day_amount)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by Days Waiting']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(4)").text == second_day_amount)
+    end
+
+    it "uses notes sort correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by Notes']").click
+      first_note = find("tbody > tr:nth-child(1) > td:nth-child(5)").text
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by Notes']").click
+      second_note = find("tbody > tr:nth-child(1) > td:nth-child(5)").text
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by Notes']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(5)").text == first_note)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by Notes']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(5)").text == second_note)
+    end
+
+    it "uses receipt date between filter correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-3-option-0").click
+      all("div.input-container > input")[0].fill_in(with: "10/09/2000")
+      all("div.input-container > input")[1].fill_in(with: "10/11/2000")
+      click_button("Apply Filter")
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+
+    it "uses receipt date before filter correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-3-option-1").click
+      all("div.input-container > input")[0].fill_in(with: "10/01/2001")
+      click_button("Apply Filter")
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+
+    it "uses receipt date after filter correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-3-option-2").click
+      all("div.input-container > input")[0].fill_in(with: "10/01/2024")
+      click_button("Apply Filter")
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+
+    it "uses receipt date on filter correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-3-option-3").click
+      all("div.input-container > input")[0].fill_in(with: "10/10/2000")
+      click_button("Apply Filter")
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+  end
+
+  context "Your Correspondence assigned tab" do
+    let(:current_user) { create(:user) }
+    before :each do
+      InboundOpsTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+    end
+
+    before do
+      Timecop.freeze(Time.zone.local(2020, 5, 15))
+      (1..10).map { create(:correspondence, :with_correspondence_intake_task) }
+      10.times do
+        review_correspondence = create(:correspondence)
+        rpt = ReviewPackageTask.find_by(appeal_id: review_correspondence.id)
+        rpt.update!(assigned_to: current_user, status: "assigned")
+        rpt.save!
+      end
+      10.times do
+        corr = create(:correspondence)
+
+        rpt = ReviewPackageTask.find_by(appeal_id: corr.id)
+
+        EfolderUploadFailedTask.create!(
+          parent_id: rpt.id,
+          appeal_id: corr.id,
+          appeal_type: "Correspondence",
+          assigned_to: current_user,
+          assigned_by_id: rpt.assigned_to_id
+        )
+      end
+
+      # Used to mock a single task to compare task sorting
+      EfolderUploadFailedTask.first.correspondence.update!(
+        va_date_of_receipt: Date.new(2000, 10, 10),
+        updated_by_id: current_user.id
+      )
+      EfolderUploadFailedTask.last.correspondence.update!(
+        va_date_of_receipt: Date.new(2050, 10, 10),
+        updated_by_id: current_user.id
+      )
+      FeatureToggle.enable!(:correspondence_queue)
+    end
+
+    it "successfully loads the assigned tab" do
+      visit "/queue/correspondence?tab=correspondence_assigned&page=1&sort_by=vaDor&order=asc"
+    end
+
+    it "uses VA DOR sort correctly." do
+      visit "/queue/correspondence?tab=correspondence_assigned&page=1&sort_by=vaDor&order=asc"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by VA DOR']").click
+      first_date = find("tbody > tr:nth-child(1) > td:nth-child(2)")
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by VA DOR']").click
+      last_date = find("tbody > tr:nth-child(1) > td:nth-child(2)")
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by VA DOR']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == first_date)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by VA DOR']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == last_date)
+    end
+
+    it "uses notes sort correctly" do
+      visit "/queue/correspondence?tab=correspondence_assigned&page=1&sort_by=vaDor&order=asc"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by Notes']").click
+      first_note = find("tbody > tr:nth-child(1) > td:nth-child(5)").text
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by Notes']").click
+      second_note = find("tbody > tr:nth-child(1) > td:nth-child(5)").text
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by Notes']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(5)").text == first_note)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by Notes']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(5)").text == second_note)
+    end
+  end
 end
diff --git a/spec/feature/queue/correspondence/correspondence_queue_task_link_spec.rb b/spec/feature/queue/correspondence/correspondence_queue_task_link_spec.rb
new file mode 100644
index 00000000000..73111655cd3
--- /dev/null
+++ b/spec/feature/queue/correspondence/correspondence_queue_task_link_spec.rb
@@ -0,0 +1,118 @@
+# frozen_string_literal: true
+
+RSpec.feature "Task Links on Your Correspondence and Correspondence Cases pages" do
+  include CorrespondenceTaskHelpers
+
+  describe "When a user clicks a task link in veterans details column" do
+    let(:current_user) { create(:user) }
+    before :each do
+      FeatureToggle.enable!(:correspondence_queue)
+      MailTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+    end
+
+    context "the task is an active CorrespondenceIntakeTask" do
+      it "routes to the Correspondence Intake page" do
+        correspondence = create(:correspondence)
+        create_correspondence_intake(correspondence, current_user)
+        visit "/queue/correspondence?tab=correspondence_assigned&page=1&sort_by=vaDor&order=asc"
+        find_all("#task-link").last.click
+        using_wait_time(10) do
+          expect(page).to have_content("Add Related Correspondence")
+        end
+      end
+    end
+
+    context "the task is an active ReviewPackageTask" do
+      it "routes to the Review Package page" do
+        correspondence = create(:correspondence)
+        assign_review_package_task(correspondence, current_user)
+        visit "/queue/correspondence?tab=correspondence_assigned&page=1&sort_by=vaDor&order=asc"
+        find_all("#task-link").last.click
+        using_wait_time(10) do
+          expect(page).to have_content("Review Package")
+        end
+      end
+    end
+
+    context "the task is an EfolderFailedUploadTask" do
+      context "with a parent task that is a ReviewPackageTask" do
+        it "routes to the Review Package page" do
+          correspondence = create(:correspondence)
+          assign_review_package_task(correspondence, current_user)
+          process_correspondence(correspondence, current_user)
+          parent_task = ReviewPackageTask.find_by(appeal_id: correspondence.id)
+          create_efolderupload_failed_task(correspondence, parent_task, user: current_user)
+          visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
+          find_all("#task-link").last.click
+          using_wait_time(10) do
+            expect(page).to have_content("Review Package")
+          end
+        end
+      end
+
+      context "with a parent task that is a CorrespondenceIntakeTask" do
+        it "routes to the Correspondence Intake page" do
+          correspondence = create(:correspondence)
+          parent_task = create_correspondence_intake(correspondence, current_user)
+          create_efolderupload_failed_task(correspondence, parent_task, user: current_user)
+          visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
+          find_all("#task-link").last.click
+          using_wait_time(10) do
+            expect(page).to have_content("Add Related Correspondence")
+          end
+        end
+      end
+    end
+
+    context "the task is a Package Action Task" do
+      context "type ReassignPackageTask" do
+        before do
+          correspondence = create(:correspondence)
+          parent_task = ReviewPackageTask.find_by(appeal_id: correspondence.id)
+          ReassignPackageTask.create!(
+            parent_id: parent_task&.id,
+            appeal_id: correspondence&.id,
+            appeal_type: "Correspondence",
+            assigned_to: InboundOpsTeam.singleton
+          )
+          InboundOpsTeam.singleton.add_user(current_user)
+          visit "/queue/correspondence/team?tab=correspondence_action_required&page=1&sort_by=vaDor&order=asc"
+          find_all("#task-link").last.click
+        end
+
+        it "user remains on Correspondence Cases" do
+          expect(page).to have_content("Correspondence cases")
+        end
+
+        it "a modal appears on the screen" do
+          expect(page).to have_css(".cf-modal-body")
+        end
+      end
+
+      context "type RemovePackageTask" do
+        before do
+          correspondence = create(:correspondence)
+          parent_task = ReviewPackageTask.find_by(appeal_id: correspondence.id)
+          RemovePackageTask.create!(
+            parent_id: parent_task&.id,
+            appeal_id: correspondence&.id,
+            appeal_type: "Correspondence",
+            assigned_to: InboundOpsTeam.singleton
+          )
+          InboundOpsTeam.singleton.add_user(current_user)
+          visit "/queue/correspondence/team?tab=correspondence_action_required&page=1&sort_by=vaDor&order=asc"
+          find_all("#task-link").last.click
+        end
+
+        it "user remains on Correspondence Cases" do
+          expect(page).to have_content("Correspondence cases")
+        end
+
+        it "a modal appears on the screen" do
+          expect(page).to have_css(".cf-modal-body")
+        end
+      end
+    end
+  end
+end
diff --git a/spec/feature/queue/correspondence/review_package_spec.rb b/spec/feature/queue/correspondence/review_package_spec.rb
index 129077f3ea9..487132719d3 100644
--- a/spec/feature/queue/correspondence/review_package_spec.rb
+++ b/spec/feature/queue/correspondence/review_package_spec.rb
@@ -109,7 +109,7 @@
         click_button "Review removal request"
         page.all(".cf-form-radio-option > label")[0].click
         click_button("Confirm")
-        using_wait_time(10) do
+        using_wait_time(20) do
           expect(page).to have_content("The package has been removed from Caseflow and must be manually uploaded again from the Centralized Mail Portal, if it needs to be processed.")
         end
       end
diff --git a/spec/models/correspondence_config_spec.rb b/spec/models/correspondence_config_spec.rb
new file mode 100644
index 00000000000..0a3bbd9a16c
--- /dev/null
+++ b/spec/models/correspondence_config_spec.rb
@@ -0,0 +1,106 @@
+# frozen_string_literal: true
+
+describe CorrespondenceConfig, :postgres do
+  before do
+    RequestStore[:current_user] = user
+  end
+
+  describe ".to_hash" do
+    let(:assignee) { create(:organization) }
+    let(:user) { create(:user) }
+
+    subject { CorrespondenceConfig.new(assignee: assignee).to_hash }
+
+    describe "shape of the returned hash" do
+      it "returns the correct top level keys in the response" do
+        expect(subject.keys).to match_array([:table_title, :active_tab, :tasks_per_page, :use_task_pages_api, :tabs])
+      end
+    end
+
+    describe "title" do
+      context "when assigned to an org" do
+        it "is formatted as expected" do
+          expect(subject[:table_title]).to eq("Correspondence cases")
+        end
+      end
+
+      context "when assigned to a user" do
+        let(:assignee) { user }
+
+        it "is formatted as expected" do
+          expect(subject[:table_title]).to eq("Your correspondence")
+        end
+      end
+    end
+
+    describe "active_tab" do
+      it "is the unassigned tab" do
+        expect(subject[:active_tab]).to eq("correspondence_unassigned")
+      end
+
+      context "when assigned to a user" do
+        let(:assignee) { user }
+
+        it "is the assigned tab" do
+          expect(subject[:active_tab]).to eq("correspondence_assigned")
+        end
+      end
+    end
+
+    describe "tabs array" do
+      context "when assigned to an organization" do
+        it "has the correct tabs" do
+          expect(subject[:tabs].map do |tab|
+            tab[:label]
+          end).to eq(%w[Unassigned Action\ Required Pending Assigned Completed])
+        end
+
+        it "tabs have the correct columns" do
+          expect(subject[:tabs].find { |tab| tab[:label] == "Unassigned" }[:columns]
+          .map { |column| column[:name] })
+            .to eq(%w[checkboxColumn veteranDetails vaDor daysWaitingCorrespondence notes])
+
+          expect(subject[:tabs].find { |tab| tab[:label] == "Action Required" }[:columns]
+          .map { |column| column[:name] })
+            .to eq(%w[veteranDetails vaDor daysWaitingCorrespondence assignedByColumn actionType notes])
+
+          expect(subject[:tabs].find { |tab| tab[:label] == "Pending" }[:columns]
+          .map { |column| column[:name] })
+            .to eq(%w[veteranDetails vaDor daysWaitingCorrespondence taskColumn assignedToColumn])
+
+          expect(subject[:tabs].find { |tab| tab[:label] == "Assigned" }[:columns]
+          .map { |column| column[:name] })
+            .to eq(%w[checkboxColumn veteranDetails vaDor daysWaitingCorrespondence taskColumn assignedToColumn notes])
+
+          expect(subject[:tabs].find { |tab| tab[:label] == "Completed" }[:columns]
+          .map { |column| column[:name] })
+            .to eq(%w[veteranDetails vaDor completedDateColumn notes])
+        end
+      end
+
+      context "when assigned to a user" do
+        let(:assignee) { user }
+
+        it "has the correct tabs" do
+          expect(subject[:tabs].map do |tab|
+            tab[:label]
+          end).to eq(%w[Assigned In\ Progress Completed])
+        end
+
+        it "tabs have the correct columns" do
+          expect(subject[:tabs].find { |tab| tab[:label] == "Assigned" }[:columns]
+          .map { |column| column[:name] })
+            .to eq(%w[veteranDetails vaDor daysWaitingCorrespondence notes])
+
+          expect(subject[:tabs].find { |tab| tab[:label] == "In Progress" }[:columns]
+          .map { |column| column[:name] })
+            .to eq(%w[veteranDetails vaDor taskColumn daysWaitingCorrespondence notes])
+
+          expect(subject[:tabs].find { |tab| tab[:label] == "Completed" }[:columns]
+          .map { |column| column[:name] })
+            .to eq(%w[veteranDetails vaDor completedDateColumn notes])
+        end
+      end
+    end
+  end
+end
diff --git a/spec/models/task_spec.rb b/spec/models/task_spec.rb
index 21bac51e3b6..4e5df7227ce 100644
--- a/spec/models/task_spec.rb
+++ b/spec/models/task_spec.rb
@@ -1997,4 +1997,126 @@ def next_assignee(_options = {})
       end
     end
   end
+
+  describe "Correspondence Tasks" do
+    context "Correspondence Intake Task" do
+      it "has a task_url" do
+        correspondence = create(:correspondence)
+        cit = create(
+          :correspondence_intake_task,
+          appeal: correspondence,
+          appeal_type: Correspondence.name,
+          assigned_to: create(:user)
+        )
+        expect(cit.task_url).to eq("/queue/correspondence/#{cit.correspondence.uuid}/intake")
+      end
+    end
+
+    context "Review Package Task" do
+      it "has a task_url" do
+        correspondence = create(:correspondence)
+        rpt = ReviewPackageTask.find_or_create_by(
+          appeal_id: correspondence.id,
+          assigned_to: InboundOpsTeam.singleton,
+          appeal_type: Correspondence.name
+        )
+
+        expect(rpt.task_url).to eq("/queue/correspondence/#{correspondence.uuid}/review_package")
+      end
+    end
+
+    context "eFolder Upload Failed Task" do
+      it "has a review_package task_url if parent is review package task" do
+        correspondence = create(:correspondence)
+        rpt = ReviewPackageTask.find_or_create_by(
+          appeal_id: correspondence.id,
+          assigned_to: InboundOpsTeam.singleton,
+          appeal_type: Correspondence.name
+        )
+
+        uft = EfolderUploadFailedTask.create(
+          appeal_id: correspondence.id,
+          assigned_to: InboundOpsTeam.singleton,
+          appeal_type: Correspondence.name,
+          parent_id: rpt.id
+        )
+
+        expect(uft.task_url).to eq("/queue/correspondence/#{correspondence.uuid}/review_package")
+      end
+
+      it "has an intake task_url if parent is correspondence intake task" do
+        correspondence = create(:correspondence)
+        cit = CorrespondenceIntakeTask.find_or_create_by(
+          appeal_id: correspondence.id,
+          assigned_to: InboundOpsTeam.singleton,
+          appeal_type: Correspondence.name
+        )
+
+        uft = EfolderUploadFailedTask.create(
+          appeal_id: correspondence.id,
+          assigned_to: InboundOpsTeam.singleton,
+          appeal_type: Correspondence.name,
+          parent_id: cit.id
+        )
+
+        expect(uft.task_url).to eq("/queue/correspondence/#{correspondence.uuid}/intake")
+      end
+    end
+
+    context "package action tasks" do
+      it "verifies no other open package action task on correspondence before creation" do
+        correspondence = create(:correspondence)
+        parent_task = ReviewPackageTask.find_by(appeal_id: correspondence.id)
+        reassign_pt = ReassignPackageTask.create!(
+          parent_id: parent_task&.id,
+          appeal_id: correspondence&.id,
+          appeal_type: Correspondence.name,
+          assigned_to: InboundOpsTeam.singleton
+        )
+
+        # creation ok with no pre-existing package action task
+        expect(reassign_pt).to be_a(ReassignPackageTask)
+
+        # creation fails due to pre-existing package action task
+        expect do
+          RemovePackageTask.create!(
+            parent_id: parent_task&.id,
+            appeal_id: correspondence&.id,
+            appeal_type: Correspondence.name,
+            assigned_to: InboundOpsTeam.singleton
+          )
+        end.to raise_error(Caseflow::Error::MultipleOpenTasksOfSameTypeError)
+
+        # creation fails due to pre-existing package action task
+        expect do
+          SplitPackageTask.create!(
+            parent_id: parent_task&.id,
+            appeal_id: correspondence&.id,
+            appeal_type: Correspondence.name,
+            assigned_to: InboundOpsTeam.singleton
+          )
+        end.to raise_error(Caseflow::Error::MultipleOpenTasksOfSameTypeError)
+
+        # creation fails due to pre-existing package action task
+        expect do
+          MergePackageTask.create!(
+            parent_id: parent_task&.id,
+            appeal_id: correspondence&.id,
+            appeal_type: Correspondence.name,
+            assigned_to: InboundOpsTeam.singleton
+          )
+        end.to raise_error(Caseflow::Error::MultipleOpenTasksOfSameTypeError)
+
+        reassign_pt.update!(status: Constants.TASK_STATUSES.completed)
+
+        # creation ok due to pre-existing package action task status update
+        expect(RemovePackageTask.create!(
+                 parent_id: parent_task&.id,
+                 appeal_id: correspondence&.id,
+                 appeal_type: Correspondence.name,
+                 assigned_to: InboundOpsTeam.singleton
+               )).to be_a(RemovePackageTask)
+      end
+    end
+  end
 end
diff --git a/spec/requests/correspondence_controller_spec.rb b/spec/requests/correspondence_controller_spec.rb
index be7746c1639..91bf09b67f4 100644
--- a/spec/requests/correspondence_controller_spec.rb
+++ b/spec/requests/correspondence_controller_spec.rb
@@ -62,6 +62,93 @@
     end
   end
 
+  describe "correspondence_cases" do
+    before do
+      get correspondence_path, as: :json
+    end
+
+    it "returns 200 status" do
+      expect(response).to have_http_status(:ok)
+    end
+
+    it "returns json in the expected shape for correspondence_cases" do
+      data = JSON.parse(response.body, symbolize_names: true)
+      expect(data[:correspondence_config][:table_title]).to be_a(String)
+      expect(data[:correspondence_config]).to be_a(Hash)
+      expect(data[:correspondence_config][:active_tab]).to be_a(String)
+      expect(data[:correspondence_config][:tasks_per_page]).to be_a(Integer)
+      expect(data[:correspondence_config][:use_task_pages_api?]).to eq(nil).or be_a(TrueClass || FalseClass)
+      expect(data[:correspondence_config][:tabs]).to be_a(Array)
+
+      data[:correspondence_config][:tabs].each do |tab|
+        expect(tab[:label]).to be_a(String)
+        expect(tab[:name]).to be_a(String)
+        expect(tab[:description]).to be_a(String)
+        expect(tab[:columns]).to be_a(Array)
+        expect(tab[:defaultSort]).to be_a(Hash)
+        expect(tab[:tasks]).to be_a(Array)
+
+        tab[:tasks]&.each do |task|
+          expect(task[:attributes]).to be_a(Hash)
+          expect(task[:attributes][:unique_id]).to be_a(String)
+          expect(task[:attributes][:instructions]).to be_a(Array)
+          expect(task[:attributes][:veteran_details]).to be_a(String)
+          expect(task[:attributes][:completion_date]).to eq(nil).or be_a(String)
+          expect(task[:attributes][:days_waiting]).to be_a(Integer)
+          expect(task[:attributes][:va_date_of_receipt]).to be_a(String)
+          expect(task[:attributes][:label]).to be_a(String)
+          expect(task[:attributes][:status]).to be_a(String)
+          expect(task[:attributes][:assigned_to]).to be_a(Hash)
+          expect(task[:attributes][:assigned_by]).to be_a(Hash)
+        end
+      end
+    end
+  end
+
+  describe "correspondence_team" do
+    before do
+      InboundOpsTeam.singleton.add_user(current_user)
+      get correspondence_team_path, as: :json
+    end
+
+    it "returns 200 status" do
+      expect(response).to have_http_status(:ok)
+    end
+
+    it "returns json in the expected shape correspondence_team" do
+      data = JSON.parse(response.body, symbolize_names: true)
+      expect(data[:correspondence_config][:table_title]).to be_a(String)
+      expect(data[:correspondence_config]).to be_a(Hash)
+      expect(data[:correspondence_config][:active_tab]).to be_a(String)
+      expect(data[:correspondence_config][:tasks_per_page]).to be_a(Integer)
+      expect(data[:correspondence_config][:use_task_pages_api?]).to eq(nil).or be_a(TrueClass || FalseClass)
+      expect(data[:correspondence_config][:tabs]).to be_a(Array)
+
+      data[:correspondence_config][:tabs].each do |tab|
+        expect(tab[:label]).to be_a(String)
+        expect(tab[:name]).to be_a(String)
+        expect(tab[:description]).to be_a(String)
+        expect(tab[:columns]).to be_a(Array)
+        expect(tab[:defaultSort]).to be_a(Hash)
+        expect(tab[:tasks]).to be_a(Array)
+
+        tab[:tasks]&.each do |task|
+          expect(task[:attributes]).to be_a(Hash)
+          expect(task[:attributes][:unique_id]).to be_a(String)
+          expect(task[:attributes][:instructions]).to be_a(Array)
+          expect(task[:attributes][:veteran_details]).to be_a(String)
+          expect(task[:attributes][:completion_date]).to eq(nil).or be_a(String)
+          expect(task[:attributes][:days_waiting]).to be_a(Integer)
+          expect(task[:attributes][:va_date_of_receipt]).to be_a(String)
+          expect(task[:attributes][:label]).to be_a(String)
+          expect(task[:attributes][:status]).to be_a(String)
+          expect(task[:attributes][:assigned_to]).to be_a(Hash)
+          expect(task[:attributes][:assigned_by]).to be_a(Hash)
+        end
+      end
+    end
+  end
+
   describe "#process_intake" do
     context "tasks_not_related_to_appeal" do
       shared_examples "successful unrelated task creation" do |klass_name, assignee|
diff --git a/spec/services/correspondence_documents_efolder_uploader_spec.rb b/spec/services/correspondence_documents_efolder_uploader_spec.rb
index 63b3f31bc48..2c38a8a2a72 100644
--- a/spec/services/correspondence_documents_efolder_uploader_spec.rb
+++ b/spec/services/correspondence_documents_efolder_uploader_spec.rb
@@ -52,8 +52,9 @@
       end
 
       context "with existing EfolderUploadFailedTask" do
-        let!(:existing_failed_task) { create(:efolder_upload_failed_task, appeal: correspondence) }
-
+        # rubocop:disable Layout/LineLength
+        let!(:existing_failed_task) { create(:efolder_upload_failed_task, appeal: correspondence, appeal_type: "Correspondence") }
+        # rubocop:enable Layout/LineLength
         it "does not create a new EfolderUploadFailedTask if one already exists" do
           expect do
             described.upload_documents_to_claim_evidence(correspondence, current_user, parent_task)
diff --git a/spec/support/correspondence_task_helpers.rb b/spec/support/correspondence_task_helpers.rb
new file mode 100644
index 00000000000..ccb0bc01e69
--- /dev/null
+++ b/spec/support/correspondence_task_helpers.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module CorrespondenceTaskHelpers
+  def create_correspondence_intake(correspondence, user)
+    parent = correspondence&.root_task
+    cit = CorrespondenceIntakeTask.create_from_params(parent, user)
+    cit
+  end
+
+  def assign_review_package_task(correspondence, user)
+    review_package_task = ReviewPackageTask.find_by(appeal_id: correspondence.id)
+    review_package_task.update!(assigned_to: user, status: Constants.TASK_STATUSES.assigned)
+  end
+
+  def create_efolderupload_failed_task(correspondence, parent, user:)
+    correspondence.update!(
+      va_date_of_receipt: rand(1.month.ago..1.day.ago),
+      notes: "ABCDEFG".split("").shuffle.join,
+      updated_by_id: user.id
+    )
+    EfolderUploadFailedTask.create!(
+      parent_id: parent.id,
+      appeal_id: correspondence.id,
+      appeal_type: "Correspondence",
+      assigned_to: parent.assigned_to,
+      status: Constants.TASK_STATUSES.in_progress
+    ).update!(assigned_at: rand(1.month.ago..1.day.ago))
+  end
+
+  def process_correspondence(correspondence, user)
+    rpt = ReviewPackageTask.find_by(appeal_id: correspondence.id)
+    rpt.update!(status: Constants.TASK_STATUSES.completed, completed_by_id: user.id)
+
+    cit = CorrespondenceIntakeTask.create_from_params(correspondence&.root_task, user)
+    cit.update!(status: Constants.TASK_STATUSES.completed, completed_by_id: user.id)
+  end
+end

From 3bd42dfac97b5427689fdf571146e7ac797a9b85 Mon Sep 17 00:00:00 2001
From: Dev-KRedd <134650238+Dev-KRedd@users.noreply.github.com>
Date: Wed, 6 Mar 2024 14:20:50 -0500
Subject: [PATCH 145/237] Khalin/APPEALS-35818 (#20986)

* WIP for new seeds file

* Updated query so data shows in table

* Revert "WIP for new seeds file"

This reverts commit ea1dd11d4b98da787a56917a299b4f871bd8c7d0.

* Updated query so data shows in table

* Your Correspondence completed tab completed test spec

---------

Co-authored-by: Jim Foley <james.foley4@va.gov>
---
 .../correspondence_completed_tasks_tab.rb     |   2 +-
 ...tion_correspondence_completed_tasks_tab.rb |   2 +-
 .../correspondence_cases_spec.rb              | 133 ++++++++++++++++++
 3 files changed, 135 insertions(+), 2 deletions(-)

diff --git a/app/models/queue_tabs/correspondence_completed_tasks_tab.rb b/app/models/queue_tabs/correspondence_completed_tasks_tab.rb
index 356a4f34ff9..b4f9458a715 100644
--- a/app/models/queue_tabs/correspondence_completed_tasks_tab.rb
+++ b/app/models/queue_tabs/correspondence_completed_tasks_tab.rb
@@ -31,7 +31,7 @@ def tasks
       .pluck(:id)
 
     CorrespondenceTask.includes(*task_includes)
-      .where(id: completed_root_tasks + tasks_with_completed_children).recently_completed
+      .where(id: completed_root_tasks + tasks_with_completed_children)
   end
 
   # :reek:UtilityFunction
diff --git a/app/models/queue_tabs/organization_correspondence_completed_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_completed_tasks_tab.rb
index f45f434eebe..fa1f48a0e84 100644
--- a/app/models/queue_tabs/organization_correspondence_completed_tasks_tab.rb
+++ b/app/models/queue_tabs/organization_correspondence_completed_tasks_tab.rb
@@ -30,7 +30,7 @@ def tasks
     end.pluck(:id)
 
     CorrespondenceTask.includes(*task_includes)
-      .where(id: completed_root_tasks + tasks_with_completed_children).recently_completed
+      .where(id: completed_root_tasks + tasks_with_completed_children)
   end
 
   # :reek:UtilityFunction
diff --git a/spec/feature/queue/correspondence/correspondence_cases_spec.rb b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
index cd74f35ec15..e00bcf6d505 100644
--- a/spec/feature/queue/correspondence/correspondence_cases_spec.rb
+++ b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
@@ -893,4 +893,137 @@
       expect(find("tbody > tr:nth-child(1) > td:nth-child(5)").text == second_note)
     end
   end
+
+  context "Your Correspondence completed tab" do
+    let(:current_user) { create(:user) }
+    before :each do
+      MailTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+    end
+
+    before do
+      Timecop.freeze(Time.zone.local(2020, 5, 15))
+      (1..10).map { create(:correspondence, :with_correspondence_intake_task) }
+      10.times do
+        review_correspondence = create(:correspondence)
+        rpt = ReviewPackageTask.find_by(appeal_id: review_correspondence.id)
+        rpt.update!(assigned_to: current_user, status: "completed")
+        rpt.save!
+      end
+      10.times do
+        corr = create(:correspondence)
+
+        rpt = ReviewPackageTask.find_by(appeal_id: corr.id)
+
+        EfolderUploadFailedTask.create!(
+          parent_id: rpt.id,
+          appeal_id: corr.id,
+          appeal_type: "Correspondence",
+          assigned_to: current_user,
+          assigned_by_id: rpt.assigned_to_id
+        )
+      end
+
+      # Used to mock a single task to compare task sorting
+      EfolderUploadFailedTask.first.correspondence.update!(
+        va_date_of_receipt: Date.new(2000, 10, 10),
+        updated_by_id: current_user.id
+      )
+      EfolderUploadFailedTask.last.correspondence.update!(
+        va_date_of_receipt: Date.new(2050, 10, 10),
+        updated_by_id: current_user.id
+      )
+      FeatureToggle.enable!(:correspondence_queue)
+    end
+
+    it "successfully loads the in progress tab" do
+      visit "/queue/correspondence?tab=correspondence_completed&page=1&sort_by=vaDor&order=asc"
+      expect(page).to have_content("Completed correspondence")
+    end
+
+    it "uses veteran details sort correctly." do
+      visit "/queue/correspondence?tab=correspondence_completed&page=1&sort_by=vaDor&order=asc"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by Veteran Details']").click
+      first_vet_info = page.all("#task-link")[0].text
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by Veteran Details']").click
+      last_vet_info = page.all("#task-link")[0].text
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by Veteran Details']").click
+      expect(page.all("#task-link")[0].text == first_vet_info)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by Veteran Details']").click
+      expect(page.all("#task-link")[0].text == last_vet_info)
+    end
+
+    it "uses VA DOR sort correctly." do
+      visit "/queue/correspondence?tab=correspondence_completed&page=1&sort_by=vaDor&order=asc"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by VA DOR']").click
+      first_date = find("tbody > tr:nth-child(1) > td:nth-child(2)")
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by VA DOR']").click
+      last_date = find("tbody > tr:nth-child(1) > td:nth-child(2)")
+      # return to A-Z, compare veteran details
+      find("[aria-label='Sort by VA DOR']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == first_date)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by VA DOR']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == last_date)
+    end
+
+    it "sorts by Notes column" do
+      visit "/queue/correspondence?tab=correspondence_completed&page=1&sort_by=vaDor&order=asc"
+      find("[aria-label='Sort by Notes']").click
+
+      notes = all("tbody > tr > td:nth-child(4)").map(&:text)
+      expect(notes).to eq(notes.sort.reverse)
+
+      find("[aria-label='Sort by Notes']").click
+      notes = all("tbody > tr > td:nth-child(4)").map(&:text)
+      expect(notes).to eq(notes.sort)
+    end
+
+    it "uses receipt date between filter correctly" do
+      visit "/queue/correspondence?tab=correspondence_completed&page=1&sort_by=vaDor&order=asc"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-2-option-0").click
+      all("div.input-container > input")[0].fill_in(with: "10/09/2000")
+      all("div.input-container > input")[1].fill_in(with: "10/11/2000")
+      find(".cf-submit").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+
+    it "uses receipt date before filter correctly" do
+      visit "/queue/correspondence?tab=correspondence_completed&page=1&sort_by=vaDor&order=asc"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-2-option-1").click
+      all("div.input-container > input")[0].fill_in(with: "10/01/2001")
+      find(".cf-submit").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+
+    it "uses receipt date after filter correctly" do
+      visit "/queue/correspondence?tab=correspondence_completed&page=1&sort_by=vaDor&order=asc"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-2-option-2").click
+      all("div.input-container > input")[0].fill_in(with: "10/01/2024")
+      find(".cf-submit").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+
+    it "uses receipt date on filter correctly" do
+      visit "/queue/correspondence?tab=correspondence_completed&page=1&sort_by=vaDor&order=asc"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-2-option-3").click
+      all("div.input-container > input")[0].fill_in(with: "10/10/2000")
+      find(".cf-submit").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+  end
 end

From cc0e922078daa741fd141e63ea50f4274d1107c1 Mon Sep 17 00:00:00 2001
From: Alex Smith <alex.smith.99@thunderyard.com>
Date: Wed, 6 Mar 2024 13:27:46 -0700
Subject: [PATCH 146/237] Fix Incorrect Error Banner Color (#21021)

* Fix Incorrect Error Banner Color

- Use copy error message to allow the frontend to correctly
identify error messages generated by feature toggle.

- Update controller and logging logic to ensure that errored
auto assignment attempts get updated with the correct status when
possible.

* Fix Conditional Check

---------

Co-authored-by: cacevesva <109166981+cacevesva@users.noreply.github.com>
---
 app/controllers/correspondence_controller.rb         | 10 +++++++---
 app/services/correspondence_auto_assign_logger.rb    | 12 ++++++++++++
 .../correspondence_auto_assign_run_verifier.rb       |  2 +-
 app/services/correspondence_auto_assigner.rb         |  4 ++++
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index 7a7d29cd9f3..ebd06f12acf 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -185,9 +185,13 @@ def auto_assign_correspondences
       batch_auto_assignment_attempt_id: batch.id
     }
 
-    perform_later_or_now(AutoAssignCorrespondenceJob, job_args)
-  ensure
-    render json: { batch_auto_assignment_attempt_id: batch&.id }, status: :ok
+    begin
+      perform_later_or_now(AutoAssignCorrespondenceJob, job_args)
+    rescue StandardError => error
+      Rails.logger.error(error.full_message)
+    ensure
+      render json: { batch_auto_assignment_attempt_id: batch&.id }, status: :ok
+    end
   end
 
   def auto_assign_status
diff --git a/app/services/correspondence_auto_assign_logger.rb b/app/services/correspondence_auto_assign_logger.rb
index 45298b7279e..6309ecebc8f 100644
--- a/app/services/correspondence_auto_assign_logger.rb
+++ b/app/services/correspondence_auto_assign_logger.rb
@@ -37,6 +37,18 @@ def error(msg:)
     save_run_statistics
   end
 
+  def fail_run_validation(batch_auto_assignment_attempt_id:, msg:)
+    failed_batch = BatchAutoAssignmentAttempt.find(batch_auto_assignment_attempt_id)
+
+    return if failed_batch.blank?
+
+    failed_batch.update!(
+      status: Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.error,
+      error_info: { message: msg },
+      errored_at: Time.current
+    )
+  end
+
   def assigned(task:, started_at:, assigned_to:)
     correspondence = task.correspondence
 
diff --git a/app/services/correspondence_auto_assign_run_verifier.rb b/app/services/correspondence_auto_assign_run_verifier.rb
index 11841ed5090..fe14d0b16d2 100644
--- a/app/services/correspondence_auto_assign_run_verifier.rb
+++ b/app/services/correspondence_auto_assign_run_verifier.rb
@@ -21,7 +21,7 @@ def min_minutes_elapsed_individual_attempt
 
   def verify_feature_toggles
     if !Rails.env.production? && FeatureToggle.enabled?(:auto_assign_banner_failure)
-      self.err_msg = "Failing due to feature toggle"
+      self.err_msg = "#{COPY::BAAA_ERROR_MESSAGE} (failure triggered via feature toggle)"
       return false
     end
 
diff --git a/app/services/correspondence_auto_assigner.rb b/app/services/correspondence_auto_assigner.rb
index bf57deab666..60ca520d174 100644
--- a/app/services/correspondence_auto_assigner.rb
+++ b/app/services/correspondence_auto_assigner.rb
@@ -78,6 +78,10 @@ def validate_run!(current_user_id, batch_auto_assignment_attempt_id)
       self.batch = run_verifier.verified_batch
       self.current_user = run_verifier.verified_user
     else
+      logger.fail_run_validation(
+        batch_auto_assignment_attempt_id: batch_auto_assignment_attempt_id,
+        msg: run_verifier.err_msg
+      )
       fail run_verifier.err_msg
     end
   end

From 18b68394843c4db03a42c8a1c55b12fe3b39b40a Mon Sep 17 00:00:00 2001
From: Alex Smith <alex.smith.99@thunderyard.com>
Date: Wed, 6 Mar 2024 16:03:29 -0700
Subject: [PATCH 147/237] Update Correspondence Auto Assign Banner (#21031)

* Fix Incorrect Error Banner Color

- Use copy error message to allow the frontend to correctly
identify error messages generated by feature toggle.

- Update controller and logging logic to ensure that errored
auto assignment attempts get updated with the correct status when
possible.

* Fix Conditional Check

* Update Correspondence Auto Assign Banner

- Update banner color to be the yellow warning color.

- Update title verbiage for unsuccessful auto assignment run
attempts.

---------

Co-authored-by: cacevesva <109166981+cacevesva@users.noreply.github.com>
---
 client/COPY.json                                           | 1 +
 .../correspondence/component/AutoAssignAlertBanner.jsx     | 7 ++++---
 .../queue/correspondences/AutoAssignAlertBanner.test.js    | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/client/COPY.json b/client/COPY.json
index ddcbb327aff..9bcaa9a2061 100644
--- a/client/COPY.json
+++ b/client/COPY.json
@@ -1456,6 +1456,7 @@
   "BAAA_USERS_MAX_QUEUE_REACHED": "Queues have reached maximum capacity for all team members",
   "BAAA_SUCCESS_MESSAGE": "Team members were assigned correspondences based on auto-assignment rules",
   "BAAA_FAILED_TITLE": "Auto-assignment for correspondence has failed",
+  "BAAA_UNSUCCESSFUL_TITLE": "Auto-assignment for correspondence could not be completed",
   "BAAA_ERROR_MESSAGE": "Please try again at a later time or contact the Help Desk",
   "CASE_DISTRIBUTION_TITLE": "Case Distribution Algorithm Values",
   "CASE_DISTRIBUTION_ALGORITHM_DESCRIPTION": "The Case Distribution Algorithm determines how cases are assigned to VLJs and their teams.  Current algorithm is \"Docket Date.\"",
diff --git a/client/app/queue/correspondence/component/AutoAssignAlertBanner.jsx b/client/app/queue/correspondence/component/AutoAssignAlertBanner.jsx
index 800a611c49c..dd6bbdd69b8 100644
--- a/client/app/queue/correspondence/component/AutoAssignAlertBanner.jsx
+++ b/client/app/queue/correspondence/component/AutoAssignAlertBanner.jsx
@@ -28,14 +28,15 @@ const AutoAssignAlertBanner = (props) => {
   const handleBatchAutoAssignmentBanner = async (response) => {
     if (response.status === CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.error) {
       const bannerPayload = {
-        title: COPY.BAAA_FAILED_TITLE,
-        message: response.error_message.message,
+        message: response.error_message.message
       };
 
       if (response.error_message.message.includes(COPY.BAAA_ERROR_MESSAGE)) {
         bannerPayload.type = 'error';
+        bannerPayload.title = COPY.BAAA_FAILED_TITLE;
       } else {
-        bannerPayload.type = 'info';
+        bannerPayload.type = 'warning';
+        bannerPayload.title = COPY.BAAA_UNSUCCESSFUL_TITLE;
       }
 
       props.setAutoAssignmentAlertBanner(bannerPayload);
diff --git a/client/test/app/queue/correspondences/AutoAssignAlertBanner.test.js b/client/test/app/queue/correspondences/AutoAssignAlertBanner.test.js
index d325d41e423..45819adb3bd 100644
--- a/client/test/app/queue/correspondences/AutoAssignAlertBanner.test.js
+++ b/client/test/app/queue/correspondences/AutoAssignAlertBanner.test.js
@@ -79,7 +79,7 @@ describe('AutoAssignAlertBanner', () => {
     );
 
     await waitFor(() => {
-      expect(getByText(COPY.BAAA_FAILED_TITLE)).toBeInTheDocument();
+      expect(getByText(COPY.BAAA_UNSUCCESSFUL_TITLE)).toBeInTheDocument();
     });
 
   });

From 3a6108d3001dd13c784e5cab978a7ab60d836842 Mon Sep 17 00:00:00 2001
From: Alex Smith <alex.smith.99@thunderyard.com>
Date: Wed, 6 Mar 2024 16:06:14 -0700
Subject: [PATCH 148/237] Allow Feature Flags to Work in Prod Env (#21052)

---
 app/services/auto_assignable_user_finder.rb             | 2 +-
 app/services/correspondence_auto_assign_run_verifier.rb | 2 +-
 app/services/correspondence_auto_assigner.rb            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/services/auto_assignable_user_finder.rb b/app/services/auto_assignable_user_finder.rb
index e40d7f7b67c..24956cb317a 100644
--- a/app/services/auto_assignable_user_finder.rb
+++ b/app/services/auto_assignable_user_finder.rb
@@ -5,7 +5,7 @@ class AutoAssignableUserFinder
   AssignableUser = Struct.new(:user_obj, :last_assigned_date, :num_assigned, :nod?, keyword_init: true)
 
   def assignable_users_exist?
-    return false if FeatureToggle.enabled?(:auto_assign_banner_max_queue) && !Rails.env.production?
+    return false if FeatureToggle.enabled?(:auto_assign_banner_max_queue)
 
     assignable_users.count.positive?
   end
diff --git a/app/services/correspondence_auto_assign_run_verifier.rb b/app/services/correspondence_auto_assign_run_verifier.rb
index fe14d0b16d2..6b1bfd2e00c 100644
--- a/app/services/correspondence_auto_assign_run_verifier.rb
+++ b/app/services/correspondence_auto_assign_run_verifier.rb
@@ -20,7 +20,7 @@ def min_minutes_elapsed_individual_attempt
   private
 
   def verify_feature_toggles
-    if !Rails.env.production? && FeatureToggle.enabled?(:auto_assign_banner_failure)
+    if FeatureToggle.enabled?(:auto_assign_banner_failure)
       self.err_msg = "#{COPY::BAAA_ERROR_MESSAGE} (failure triggered via feature toggle)"
       return false
     end
diff --git a/app/services/correspondence_auto_assigner.rb b/app/services/correspondence_auto_assigner.rb
index 60ca520d174..75bee260886 100644
--- a/app/services/correspondence_auto_assigner.rb
+++ b/app/services/correspondence_auto_assigner.rb
@@ -61,7 +61,7 @@ def assign_task_to_user(task, user)
   end
 
   def unassigned_review_package_tasks
-    return [] if !Rails.env.production? && FeatureToggle.enabled?(:auto_assign_banner_no_rpt)
+    return [] if FeatureToggle.enabled?(:auto_assign_banner_no_rpt)
 
     ReviewPackageTask
       .where(status: Constants.TASK_STATUSES.unassigned)

From 033c849b406144460481788f1f8d04cce7b9f218 Mon Sep 17 00:00:00 2001
From: Rnmarshall93 <110805785+Rnmarshall93@users.noreply.github.com>
Date: Wed, 6 Mar 2024 16:15:22 -0800
Subject: [PATCH 149/237] Correspondence Cases - Assigned Tab: Batch Assignment
 - hotfix (#21051)

* Changed to passdown isSupervisor and isSuperuser prop to correspondence table builder

* updated logic for displaing bulk assign area.
---
 app/controllers/correspondence_controller.rb  |  2 +
 .../correspondence_team.html.erb              |  2 +
 .../correspondence/CorrespondenceCases.jsx    |  9 +-
 .../CorrespondenceTableBuilder.jsx            | 87 +++++++++++--------
 4 files changed, 63 insertions(+), 37 deletions(-)

diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index b56feeafb49..1959ba5653e 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -202,6 +202,8 @@ def process_intake
 
   def handle_mail_superuser_or_supervisor
     @mail_team_users = User.mail_team_users.pluck(:css_id)
+    @is_superuser = current_user.mail_superuser?
+    @is_supervisor = current_user.mail_supervisor?
     mail_team_user = User.find_by(css_id: params[:user]) if params[:user].present?
     task_ids = params[:taskIds]&.split(",") if params[:taskIds].present?
     tab = params[:tab] if params[:tab].present?
diff --git a/app/views/correspondence/correspondence_team.html.erb b/app/views/correspondence/correspondence_team.html.erb
index a1eaf8a2983..5e19c27c837 100644
--- a/app/views/correspondence/correspondence_team.html.erb
+++ b/app/views/correspondence/correspondence_team.html.erb
@@ -11,6 +11,8 @@
     feedbackUrl: feedback_url,
     configUrl: '/queue/correspondence/team?json',
     flash: flash,
+    isSuperuser: @is_superuser,
+    isSupervisor: @is_supervisor,
     mailTeamUsers: @mail_team_users,
     responseType: @response_type,
     responseHeader: @response_header,
diff --git a/client/app/queue/correspondence/CorrespondenceCases.jsx b/client/app/queue/correspondence/CorrespondenceCases.jsx
index f8b2aee08d6..0cd4e03f9a4 100644
--- a/client/app/queue/correspondence/CorrespondenceCases.jsx
+++ b/client/app/queue/correspondence/CorrespondenceCases.jsx
@@ -70,7 +70,10 @@ const CorrespondenceCases = (props) => {
           />
         )}
         {config &&
-        <CorrespondenceTableBuilder mailTeamUsers={props.mailTeamUsers} />}
+        <CorrespondenceTableBuilder
+          mailTeamUsers={props.mailTeamUsers}
+          isSuperuser={props.isSuperuser}
+          isSupervisor={props.isSupervisor} />}
         {showReassignPackageModal &&
         <Modal
           title={COPY.CORRESPONDENCE_CASES_REASSIGN_PACKAGE_MODAL_TITLE}
@@ -99,7 +102,9 @@ CorrespondenceCases.propTypes = {
   responseType: PropTypes.string,
   responseHeader: PropTypes.string,
   responseMessage: PropTypes.string,
-  taskIds: PropTypes.array
+  taskIds: PropTypes.array,
+  isSuperuser: PropTypes.bool,
+  isSupervisor: PropTypes.bool
 
 };
 
diff --git a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
index 225a60314b4..0c1e2f5b2d8 100644
--- a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
+++ b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
@@ -62,8 +62,6 @@ const CorrespondenceTableBuilder = (props) => {
     querystring.parse(window.location.search.slice(1))
   );
 
-  const isInboundOpsTeam = props.organizations.find((org) => org.name === 'Inbound Ops Team');
-
   // Causes one additional rerender of the QueueTables/tabs but prevents saved pagination behavior
   // e.g. clearing filter in a tab, then swapping tabs, then swapping back and the filter will still be applied
   useEffect(() => {
@@ -167,31 +165,20 @@ const CorrespondenceTableBuilder = (props) => {
     // Setup default sorting.
     const defaultSort = {};
 
-    // If there is no sort by column in the pagination options, then use the tab config default sort
-    // eslint-disable-next-line camelcase
-    if (!savedPaginationOptions?.sort_by) {
-      Object.assign(defaultSort, tabConfig.defaultSort);
-    }
-
-    return {
-      label: sprintf(tabConfig.label, totalTaskCount),
-      page: (
-        <>
-          {isInboundOpsTeam &&
-            (tabConfig.name === 'correspondence_unassigned' || tabConfig.name === 'correspondence_team_assigned') &&
-            <>
-              <p className="cf-margin-bottom-0rem">Assign to mail team user</p>
-              <div style={{ display: 'flex', flexDirection: 'row' }}>
-                <SearchableDropdown
-                  className="cf-dropdown"
-                  name="Assign to mail team user"
-                  hideLabel
-                  styling={{ width: '200px', marginRight: '2rem' }}
-                  dropdownStyling={{ width: '200px' }}
-                  options={buildMailUserData(props.mailTeamUsers)}
-                  onChange={handleMailTeamUserChange}
-                />
-                {tabConfig.name === 'correspondence_unassigned' &&
+    const getBulkAssignArea = () => {
+      return (<>
+        <p className="cf-margin-bottom-0rem">Assign to mail team user</p>
+        <div style={{ display: 'flex', flexDirection: 'row' }}>
+          <SearchableDropdown
+            className="cf-dropdown"
+            name="Assign to mail team user"
+            hideLabel
+            styling={{ width: '200px', marginRight: '2rem' }}
+            dropdownStyling={{ width: '200px' }}
+            options={buildMailUserData(props.mailTeamUsers)}
+            onChange={handleMailTeamUserChange}
+          />
+          {tabConfig.name === 'correspondence_unassigned' &&
               <>
                 <Button
                   name="Assign"
@@ -201,20 +188,47 @@ const CorrespondenceTableBuilder = (props) => {
                 <span style={{ marginLeft: 'auto' }}>
                   <Button
                     name="Auto assign correspondence"
-                    />
-                  </span>
-                </>
-                }
-                {tabConfig.name === 'correspondence_team_assigned' &&
+                  />
+                </span>
+              </>
+          }
+          {tabConfig.name === 'correspondence_team_assigned' &&
             <Button
               name="Reassign"
               onClick={handleAssignButtonClick}
               disabled={!isDropdownItemSelected || !isAnyCheckboxSelected}
             />
-                }
-              </div>
-              <hr></hr>
+          }
+        </div>
+        <hr></hr>
+      </>);
+
+    };
+
+    // If there is no sort by column in the pagination options, then use the tab config default sort
+    // eslint-disable-next-line camelcase
+    if (!savedPaginationOptions?.sort_by) {
+      Object.assign(defaultSort, tabConfig.defaultSort);
+    }
+
+    return {
+      label: sprintf(tabConfig.label, totalTaskCount),
+      page: (
+        <>
+          {/* this setup should prevent a double render of the bulk assign area if a
+          user is a superuser and also a supervisor */}
+          {(props.isSupervisor || (props.isSupervisor && props.isSuperuser)) &&
+            (tabConfig.name === 'correspondence_unassigned' || tabConfig.name === 'correspondence_team_assigned') &&
+            <>
+              {getBulkAssignArea()}
             </>
+          }
+          {
+            (props.isSuperuser && !props.isSupervisor && tabConfig.name === 'correspondence_team_assigned') &&
+          <>
+            {getBulkAssignArea()}
+          </>
+
           }
           <p className="cf-margin-top-0">
             {noCasesMessage || tabConfig.description}
@@ -284,6 +298,9 @@ CorrespondenceTableBuilder.propTypes = {
   featureToggles: PropTypes.object,
   mailTeamUsers: PropTypes.array,
   selectedTasks: PropTypes.array,
+  isSuperuser: PropTypes.bool,
+  isSupervisor: PropTypes.bool
+
 };
 
 export default connect(mapStateToProps)(CorrespondenceTableBuilder);

From 9e2dd774e2600475509e44bbe356ee2f6ead88e8 Mon Sep 17 00:00:00 2001
From: Rnmarshall93 <110805785+Rnmarshall93@users.noreply.github.com>
Date: Thu, 7 Mar 2024 09:38:28 -0800
Subject: [PATCH 150/237] Correspondence Days Waiting Sort - hotfix (#21054)

* merge issue on activrecord

* Fixed tasks filter with multiple options

* refactored to be cleaner

* refactored CorrespondenceTaskFilter to be OOP best practices and added clarification comments.

* Made suggested changes and fixed efolder upload failed task link on the backend.

* Reversed the sort order for days waiting.

---------

Co-authored-by: Jim Foley <james.foley4@va.gov>
---
 app/models/task_sorter.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/models/task_sorter.rb b/app/models/task_sorter.rb
index 7b45cf6d11f..dcfbd643006 100644
--- a/app/models/task_sorter.rb
+++ b/app/models/task_sorter.rb
@@ -25,6 +25,9 @@ def initialize(args)
   def sorted_tasks
     return tasks unless tasks.any?
 
+    # used for when the logic on the sorting needs to be reversed
+    reverse_sort_order = sort_order == "asc" ? "desc" : "asc"
+
     # Always join to the CachedAppeal and users tables because we sometimes need it, joining does not slow down the
     # application, and conditional logic to only join sometimes adds unnecessary complexity.
     case column.name
@@ -35,7 +38,7 @@ def sorted_tasks
     when Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name
       tasks.joins(:appeal).order(va_date_of_receipt: sort_order.to_sym)
     when Constants.QUEUE_CONFIG.COLUMNS.DAYS_WAITING.name
-      tasks.joins(:appeal).order(assigned_at: sort_order.to_sym)
+      tasks.joins(:appeal).order(assigned_at: reverse_sort_order.to_sym)
     else
       tasks.with_assignees.with_assigners.with_cached_appeals.order(order_clause)
     end

From adfeb98d97988b01b1b4ff1f11fe08d45829c5ed Mon Sep 17 00:00:00 2001
From: sulak-j <95875751+sulak-j@users.noreply.github.com>
Date: Thu, 7 Mar 2024 16:08:22 -0600
Subject: [PATCH 151/237] Justin/APPEALS-35473 (#20870)

* initial commit with some setup

* fixing error in correspondence controller

* adding variables for step and redux store objects from database

* Working on resuming saved store

* Some testing in the AddAppealRelatedTaskView for fixing step 2

* somehow was not added to the merge

* removing reduxStore from previous attempt

* attempting fix for new correspondences looking for the saved intake

* running some tests

* cleaned up comments and set up pulled store to show on page 3 of intake

* current intake data is being stored in the session

* Bug when trying to edit the task the name should popup in the select box

* Feature testcases

* Lint fixes

* Fix for spec changes

* comment edits

* comment edits

* removing schema to match feature

* testing a spec change with page text

* testing with moving the post into the actions

* Changes to post method to actions

* removing current step from queue app

* linting fix

* removing extraneous code

* added .then to cancel POST and resolved linting complaints

* removed unused prop

---------

Co-authored-by: HunJerBAH <Jeremy.Hunton@va.gov>
Co-authored-by: divyadasari-va <divya.dasari@va.gov>
Co-authored-by: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
---
 app/controllers/correspondence_controller.rb  |  5 ++
 app/views/correspondence/intake.html.erb      |  1 +
 client/app/queue/QueueApp.jsx                 |  3 +-
 .../correspondenceActions.js                  | 29 +++++++++
 .../correspondenceConstants.js                |  2 +
 .../correspondenceReducer.js                  |  6 ++
 .../components/CorrespondenceIntake.jsx       | 55 +++++++++++------
 .../components/TasksAppeals/AddTaskView.jsx   |  2 +-
 .../queue/correspondence/intake_spec.rb       | 60 ++++++++++++++++++-
 9 files changed, 141 insertions(+), 22 deletions(-)

diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index 1959ba5653e..cef80367946 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -10,6 +10,11 @@ class CorrespondenceController < ApplicationController
   MAX_QUEUED_ITEMS = 60
 
   def intake
+    # If correspondence intake was started, json data from the database will
+    # be loaded into the page when user returns to intake
+    @redux_store ||= CorrespondenceIntake.find_by(user: current_user,
+                                                  correspondence: current_correspondence)&.redux_store
+
     respond_to do |format|
       format.html { return render "correspondence/intake" }
       format.json do
diff --git a/app/views/correspondence/intake.html.erb b/app/views/correspondence/intake.html.erb
index c43156efc74..ec17b4e0dcc 100644
--- a/app/views/correspondence/intake.html.erb
+++ b/app/views/correspondence/intake.html.erb
@@ -12,6 +12,7 @@
       correspondence_queue: FeatureToggle.enabled?(:correspondence_queue, user: current_user)
     },
     correspondence: @correspondence,
+    reduxStore: @redux_store,
     autoTexts: @auto_texts,
     veteranInformation: @veteran_information
   }) %>
diff --git a/client/app/queue/QueueApp.jsx b/client/app/queue/QueueApp.jsx
index c5fe8db1386..9e1a0a7582b 100644
--- a/client/app/queue/QueueApp.jsx
+++ b/client/app/queue/QueueApp.jsx
@@ -688,7 +688,7 @@ class QueueApp extends React.PureComponent {
   );
 
   routedCorrespondenceIntake = (props) => (
-    <CorrespondenceIntake autoTexts={this.props.autoTexts} {...props.match.params} veteranInformation={this.props.veteranInformation} />
+    <CorrespondenceIntake reduxStore={this.props.reduxStore} autoTexts={this.props.autoTexts} {...props.match.params} veteranInformation={this.props.veteranInformation} />
   );
 
   routedCorrespondenceCase = () => (
@@ -1538,6 +1538,7 @@ QueueApp.propTypes = {
   correspondence: PropTypes.object,
   autoTexts: PropTypes.array,
   veteranInformation: PropTypes.object,
+  reduxStore: PropTypes.object
 };
 
 const mapStateToProps = (state) => ({
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
index e66ac30e4da..3b1db6c6edc 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
@@ -21,6 +21,35 @@ export const loadCorrespondences = (correspondences) =>
     });
   };
 
+export const loadSavedIntake = (savedStore) =>
+  (dispatch) => {
+    dispatch({
+      type: ACTIONS.LOAD_SAVED_INTAKE,
+      payload: {
+        savedStore
+      }
+    });
+  };
+
+export const saveCurrentIntake = (currentIntake, data) => (dispatch) => {
+  ApiUtil.post(`/queue/correspondence/${data.correspondence_uuid}/current_step`, { data }).
+    then((response) => {
+      if (!response.ok) {
+        console.error(response);
+      }
+
+      dispatch({
+        type: ACTIONS.SAVE_CURRENT_INTAKE,
+        payload: {
+          currentIntake
+        }
+      });
+    }).
+    catch((err) => {
+      console.error(new Error(`Problem with GET ${currentIntake} ${err}`));
+    });
+};
+
 export const loadVeteranInformation = (veteranInformation) =>
   (dispatch) => {
     dispatch({
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
index bbfee2df05b..30d91e77638 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
@@ -1,6 +1,7 @@
 export const ACTIONS = {
   LOAD_CURRENT_CORRESPONDENCE: 'LOAD_CURRENT_CORRESPONDENCE',
   LOAD_CORRESPONDENCES: 'LOAD_CORRESPONDENCES',
+  LOAD_SAVED_INTAKE: 'LOAD_SAVED_INTAKE',
   LOAD_VETERAN_INFORMATION: 'LOAD_VETERAN_INFORMATION',
   LOAD_VET_CORRESPONDENCE: 'LOAD_VET_CORRESPONDENCE',
   LOAD_CORRESPONDENCE_CONFIG: 'LOAD_CORRESPONDENCE_CONFIG',
@@ -9,6 +10,7 @@ export const ACTIONS = {
   SAVE_CHECKBOX_STATE: 'SAVE_CHECKBOX_STATE',
   CLEAR_CHECKBOX_STATE: 'CLEAR_CHECKBOX_STATE',
   SAVE_MAIL_TASK_STATE: 'SAVE_MAIL_TASK_STATE',
+  SAVE_CURRENT_INTAKE: 'SAVE_CURRENT_INTAKE',
   SET_TASK_RELATED_APPEAL_IDS: 'SET_TASK_RELATED_APPEAL_IDS',
   SET_UNRELATED_TASKS: 'SET_UNRELATED_TASKS',
   SET_FETCHED_APPEALS: 'SET_FETCHED_APPEALS',
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
index e5f851abafb..e5efd191560 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
@@ -34,6 +34,12 @@ export const intakeCorrespondenceReducer = (state = initialState, action = {}) =
       }
     });
 
+  case ACTIONS.LOAD_SAVED_INTAKE:
+    return action.payload.savedStore;
+
+  case ACTIONS.SAVE_CURRENT_INTAKE:
+    return action.payload.currentIntake;
+
   case ACTIONS.LOAD_VETERAN_INFORMATION:
     return update(state, {
       veteranInformation: {
diff --git a/client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx b/client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx
index ec30502a4f9..39e5fdb94bf 100644
--- a/client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx
+++ b/client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx
@@ -6,12 +6,15 @@ import AddCorrespondenceView from './AddCorrespondence/AddCorrespondenceView';
 import { AddTasksAppealsView } from './TasksAppeals/AddTasksAppealsView';
 import { connect, useSelector } from 'react-redux';
 import { bindActionCreators } from 'redux';
-import { setUnrelatedTasks } from '../../correspondenceReducer/correspondenceActions';
+import {
+  loadSavedIntake,
+  setUnrelatedTasks,
+  saveCurrentIntake,
+} from '../../correspondenceReducer/correspondenceActions';
 import { useHistory } from 'react-router-dom';
 import { ConfirmCorrespondenceView } from './ConfirmCorrespondence/ConfirmCorrespondenceView';
 import { SubmitCorrespondenceModal } from './ConfirmCorrespondence/SubmitCorrespondenceModal';
 import Alert from 'app/components/Alert';
-import ApiUtil from '../../../../util/ApiUtil';
 import {
   CORRESPONDENCE_INTAKE_FORM_ERROR_BANNER_TITLE,
   CORRESPONDENCE_INTAKE_FORM_ERROR_BANNER_TEXT
@@ -41,6 +44,12 @@ export const CorrespondenceIntake = (props) => {
   const [errorBannerVisible, setErrorBannerVisible] = useState(false);
   const history = useHistory();
 
+  const exportStoredata = {
+    correspondence_uuid: props.correspondence_uuid,
+    current_step: currentStep,
+    redux_store: intakeCorrespondence
+  };
+
   const handleContinueStatusChange = (isEnabled) => {
     setContinueEnabled(isEnabled);
   };
@@ -49,6 +58,13 @@ export const CorrespondenceIntake = (props) => {
     setContinueEnabled(isSelected);
   };
 
+  const handleCancel = () => {
+    // Redirect the user to the previous page
+    // then needed to allow POST to complete first
+    props.saveCurrentIntake(intakeCorrespondence, exportStoredata).
+      then(history.goBack());
+  };
+
   const nextStep = () => {
     if (currentStep < 3) {
       setCurrentStep(currentStep + 1);
@@ -77,22 +93,17 @@ export const CorrespondenceIntake = (props) => {
   );
 
   useEffect(() => {
-    const data = {
-      correspondence_uuid: props.correspondence_uuid,
-      current_step: currentStep,
-      redux_store: intakeCorrespondence
-    };
-
-    ApiUtil.post(`/queue/correspondence/${props.correspondence_uuid}/current_step`, { data }).
-      then(
-        (response) => {
-          if (!response.ok) {
-            console.error(response);
-          }
-        }
-      );
+    props.saveCurrentIntake(intakeCorrespondence, exportStoredata);
   }, [currentStep]);
 
+  useEffect(() => {
+    // load previous correspondence intake from database (if any)
+    if (props.reduxStore !== null) {
+      setCurrentStep(3);
+      props.loadSavedIntake(props.reduxStore);
+    }
+  }, []);
+
   return <div>
     { errorBannerVisible &&
       <Alert title={CORRESPONDENCE_INTAKE_FORM_ERROR_BANNER_TITLE} type="error">
@@ -140,7 +151,8 @@ export const CorrespondenceIntake = (props) => {
           name="Cancel"
           styling={{ style: { paddingLeft: '0rem', paddingRight: '0rem' } }}
           href="/queue/correspondence"
-          classNames={['cf-btn-link', 'cf-left-side']} />
+          classNames={['cf-btn-link', 'cf-left-side']}
+          onClick={handleCancel} />
       </a>
       {currentStep < 3 &&
       <Button
@@ -186,7 +198,10 @@ CorrespondenceIntake.propTypes = {
   unrelatedTasks: PropTypes.arrayOf(Object),
   setUnrelatedTasks: PropTypes.func,
   mailTasks: PropTypes.arrayOf(PropTypes.string),
-  autoTexts: PropTypes.arrayOf(PropTypes.string)
+  autoTexts: PropTypes.arrayOf(PropTypes.string),
+  reduxStore: PropTypes.object,
+  loadSavedIntake: PropTypes.func,
+  saveCurrentIntake: PropTypes.func
 };
 
 const mapStateToProps = (state) => ({
@@ -198,7 +213,9 @@ const mapStateToProps = (state) => ({
 
 const mapDispatchToProps = (dispatch) => (
   bindActionCreators({
-    setUnrelatedTasks
+    setUnrelatedTasks,
+    loadSavedIntake,
+    saveCurrentIntake
   }, dispatch)
 );
 
diff --git a/client/app/queue/correspondence/intake/components/TasksAppeals/AddTaskView.jsx b/client/app/queue/correspondence/intake/components/TasksAppeals/AddTaskView.jsx
index 642dc1201a4..65072c0df0b 100644
--- a/client/app/queue/correspondence/intake/components/TasksAppeals/AddTaskView.jsx
+++ b/client/app/queue/correspondence/intake/components/TasksAppeals/AddTaskView.jsx
@@ -74,7 +74,7 @@ const AddTaskView = (props) => {
 
   const objectForSelectedTaskType = () => {
     return props.allTaskTypeOptions.find((option) => {
-      return option.value === task.type;
+      return option.value.assigned_to === task.type.assigned_to;
     });
   };
 
diff --git a/spec/feature/queue/correspondence/intake_spec.rb b/spec/feature/queue/correspondence/intake_spec.rb
index 0fb5e021d3d..e714b9d8a4a 100644
--- a/spec/feature/queue/correspondence/intake_spec.rb
+++ b/spec/feature/queue/correspondence/intake_spec.rb
@@ -2,6 +2,9 @@
 
 RSpec.feature("The Correspondence Intake page") do
   include CorrespondenceHelpers
+  include CorrespondenceTaskHelpers
+  alias_method :create_efolderupload_task, :create_efolderupload_failed_task
+
   let(:organization) { MailTeam.singleton }
   let(:mail_user) { User.authenticate!(roles: ["Mail Team"]) }
   let(:unauthorized_user) { create(:user) }
@@ -69,7 +72,7 @@
 
     it "successfully navigates on cancel link click" do
       click_on("button-Cancel")
-      expect(page).to have_current_path("/queue/correspondence")
+      expect(page).to have_content("Correspondence assigned to you:")
     end
 
     it "successfully advances to the second step" do
@@ -342,4 +345,59 @@
       expect(find_by_id("content").text).to eq checkbox_text
     end
   end
+
+  context "correspondence tasks in-progress tab and  navigate to step 3 when we click on intake task" do
+    let(:current_user) { create(:user) }
+    before :each do
+      MailTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+    end
+
+    before do
+      Timecop.freeze(Time.zone.local(2020, 5, 15))
+      @last_correspondence_uuid = nil
+      20.times do
+        correspondence = create(:correspondence)
+        parent_task = create_correspondence_intake(correspondence, current_user)
+        create_efolderupload_task(correspondence, parent_task, user: current_user)
+        @last_correspondence_uuid = EfolderUploadFailedTask.first.correspondence.uuid
+      end
+      puts "Last correspondence UUID: #{@last_correspondence_uuid}"
+
+      # Used to mock a single task to compare task sorting
+      EfolderUploadFailedTask.first.update!(type: "CorrespondenceIntakeTask")
+      EfolderUploadFailedTask.first.correspondence.update!(
+        va_date_of_receipt: Date.new(2000, 10, 10),
+        updated_by_id: current_user.id
+      )
+      EfolderUploadFailedTask.last.correspondence.update!(
+        va_date_of_receipt: Date.new(2024, 10, 10),
+        updated_by_id: current_user.id
+      )
+      FeatureToggle.enable!(:correspondence_queue)
+    end
+
+    it "successfully loads the in progress tab" do
+      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
+      expect(page).to have_content("Correspondence in progress")
+    end
+
+    it "navigates to intake form from in-progress tab to step 3" do
+      visit "/queue/correspondence?tab=correspondence_in_progress"
+      expect(page).to have_content("Correspondence in progress that are assigned to you:")
+      find("tbody > tr:last-child > td:nth-child(1)").click
+      expect(page).to have_current_path("/queue/correspondence/#{@last_correspondence_uuid}/intake")
+      expect(page).to have_content("Add Related Correspondence")
+      expect(page).to have_button("Continue")
+      click_on("button-continue")
+      expect(page).to have_content("Review Tasks & Appeals")
+      click_on("button-continue")
+      expect(page).to have_content("Review and Confirm Correspondence")
+      click_on("button-Cancel")
+      visit "/queue/correspondence?tab=correspondence_in_progress"
+      find("tbody > tr:last-child > td:nth-child(1)").click
+      expect(page).to have_current_path("/queue/correspondence/#{@last_correspondence_uuid}/intake")
+      expect(page).to have_content("Review and Confirm Correspondence")
+    end
+  end
 end

From e0ccb0d7500f2ec70def81de03260008741415c9 Mon Sep 17 00:00:00 2001
From: Kamala Madamanchi <110078646+kamala-07@users.noreply.github.com>
Date: Thu, 7 Mar 2024 16:17:10 -0600
Subject: [PATCH 152/237] Correspondence type in general info review package
 and step 3 intake fixes (#21047)

Co-authored-by: cacevesva <109166981+cacevesva@users.noreply.github.com>
---
 app/controllers/correspondence_controller.rb         |  7 +++++++
 .../correspondenceReducer/correspondenceActions.js   | 12 +++++++++++-
 .../correspondenceReducer/correspondenceConstants.js |  3 ++-
 .../correspondenceReducer/correspondenceReducer.js   |  8 ++++++++
 .../AddCorrespondence/AddCorrespondenceView.jsx      |  5 +++++
 .../CorrespondenceDetailsTable.jsx                   |  3 ++-
 .../review_package/CorrespondenceReviewPackage.jsx   |  1 +
 .../correspondence/review_package/ReviewForm.jsx     |  4 +++-
 8 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index 65789ba7360..819f70eaa96 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -15,6 +15,7 @@ def intake
         render json: {
           currentCorrespondence: current_correspondence,
           correspondence: correspondence_load,
+          correspondenceInformation: correspondence_information,
           veteranInformation: veteran_information,
           responseLetters: 0
         }
@@ -253,6 +254,12 @@ def correspondence_load
     Correspondence.where(veteran_id: veteran_by_correspondence.id).where.not(uuid: params[:correspondence_uuid])
   end
 
+  def correspondence_information
+    return nil if correspondence&.correspondence_type_id.blank?
+
+    @correspondence_information ||= CorrespondenceType.find_by(id: correspondence&.correspondence_type_id)
+  end
+
   def veteran_by_correspondence
     return nil if correspondence&.veteran_id.blank?
 
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
index 66f3eea9b46..fa13e04df27 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
@@ -20,6 +20,16 @@ export const loadCorrespondences = (correspondences) =>
     });
   };
 
+export const loadCorrespondenceInformation = (correspondenceInformation) =>
+  (dispatch) => {
+    dispatch({
+      type: ACTIONS.LOAD_CORRESPONDENCE_INFORMATION,
+      payload: {
+        correspondenceInformation
+      }
+    });
+  };
+
 export const loadVeteranInformation = (veteranInformation) =>
   (dispatch) => {
     dispatch({
@@ -142,4 +152,4 @@ export const removeResponseLetters = (index) =>
         index
       }
     });
-  };
\ No newline at end of file
+  };
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
index 88637ce5a6d..501eee7f70b 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
@@ -13,5 +13,6 @@ export const ACTIONS = {
   SET_NEW_APPEAL_RELATED_TASKS: 'SET_NEW_APPEAL_RELATED_TASKS',
   SET_WAIVED_EVIDENCE_TASKS: 'SET_WAIVED_EVIDENCE_TASKS',
   SET_RESPONSE_LETTERS: 'SET_RESPONSE_LETTERS',
-  REMOVE_RESPONSE_LETTERS: 'REMOVE_RESPONSE_LETTERS'    
+  REMOVE_RESPONSE_LETTERS: 'REMOVE_RESPONSE_LETTERS',
+  LOAD_CORRESPONDENCE_INFORMATION: 'LOAD_CORRESPONDENCE_INFORMATION'
 };
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
index b37743d031e..d199e6dc9f4 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
@@ -14,6 +14,7 @@ export const initialState = {
   veteranInformation: [],
   waivedEvidenceTasks: [],
   responseLetters: {},
+  correspondenceInformation: {}
 };
 
 export const intakeCorrespondenceReducer = (state = initialState, action = {}) => {
@@ -32,6 +33,13 @@ export const intakeCorrespondenceReducer = (state = initialState, action = {}) =
       }
     });
 
+  case ACTIONS.LOAD_CORRESPONDENCE_INFORMATION:
+    return update(state, {
+      correspondenceInformation: {
+        $set: action.payload.correspondenceInformation
+      }
+    });
+
   case ACTIONS.LOAD_VETERAN_INFORMATION:
     return update(state, {
       veteranInformation: {
diff --git a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx
index 56fec8f769c..5ff3a86bbaa 100644
--- a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx
+++ b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx
@@ -12,6 +12,7 @@ import {
   loadCurrentCorrespondence,
   loadCorrespondences,
   loadVeteranInformation,
+  loadCorrespondenceInformation,
   updateRadioValue,
   saveCheckboxState,
   clearCheckboxState,
@@ -46,6 +47,7 @@ class AddCorrespondenceView extends React.Component {
       this.props.loadCurrentCorrespondence(currentCorrespondence);
       this.props.loadCorrespondences(correspondences);
       this.props.loadVeteranInformation(veteranInformation);
+      this.props.loadCorrespondenceInformation(returnedObject.correspondenceInformation);
     }).
       catch((err) => {
         // allow HTTP errors to fall on the floor via the console.
@@ -240,6 +242,7 @@ AddCorrespondenceView.propTypes = {
   featureToggles: PropTypes.object,
   correspondenceUuid: PropTypes.string,
   loadVeteranInformation: PropTypes.func,
+  loadCorrespondenceInformation: PropTypes.func,
   loadCurrentCorrespondence: PropTypes.func,
   loadCorrespondences: PropTypes.func,
   updateRadioValue: PropTypes.func,
@@ -257,6 +260,7 @@ AddCorrespondenceView.propTypes = {
 const mapStateToProps = (state) => ({
   currentCorrespondence: state.intakeCorrespondence.currentCorrespondence,
   veteranInformation: state.intakeCorrespondence.veteranInformation,
+  correspondenceInformation: state.intakeCorrespondence.correspondenceInformation,
   correspondences: state.intakeCorrespondence.correspondences,
   radioValue: state.intakeCorrespondence.radioValue,
   checkboxes: state.intakeCorrespondence.relatedCorrespondences,
@@ -268,6 +272,7 @@ const mapDispatchToProps = (dispatch) => (
     loadCurrentCorrespondence,
     loadCorrespondences,
     loadVeteranInformation,
+    loadCorrespondenceInformation,
     updateRadioValue,
     saveCheckboxState,
     clearCheckboxState,
diff --git a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/CorrespondenceDetailsTable.jsx b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/CorrespondenceDetailsTable.jsx
index 4e65d28a620..a8cecb4c0bf 100644
--- a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/CorrespondenceDetailsTable.jsx
+++ b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/CorrespondenceDetailsTable.jsx
@@ -6,6 +6,7 @@ export const CorrespondenceDetailsTable = () => {
 
   const currentCorrespondence = useSelector((state) => state.intakeCorrespondence.currentCorrespondence);
   const veteranInformation = useSelector((state) => state.intakeCorrespondence.veteranInformation);
+  const correspondenceInformation = useSelector((state) => state.intakeCorrespondence.correspondenceInformation);
 
   return (
     <div>
@@ -36,7 +37,7 @@ export const CorrespondenceDetailsTable = () => {
             <td colSpan={2}>
               {veteranInformation.first_name} {veteranInformation.last_name} ({veteranInformation.file_number})
             </td>
-            <td>{currentCorrespondence.correspondence_type_id}</td>
+            <td>{correspondenceInformation.name}</td>
           </tr>
           <tr>
             <th colSpan={6}><strong>Notes</strong></th>
diff --git a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
index d4d141da5ef..10b29f27f1c 100644
--- a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
+++ b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
@@ -73,6 +73,7 @@ export const CorrespondenceReviewPackage = (props) => {
       setReviewDetails({
         veteran_name: data.veteran_name || {},
         dropdown_values: data.correspondence_types || [],
+        correspondence_type_id: data.correspondence_type_id
       });
 
       setEditableData({
diff --git a/client/app/queue/correspondence/review_package/ReviewForm.jsx b/client/app/queue/correspondence/review_package/ReviewForm.jsx
index 38c169c9f64..6042174b61a 100644
--- a/client/app/queue/correspondence/review_package/ReviewForm.jsx
+++ b/client/app/queue/correspondence/review_package/ReviewForm.jsx
@@ -110,7 +110,7 @@ export const ReviewForm = (props) => {
 
   const generateOptions = (options) =>
     options.map((option) => ({
-      value: option.name,
+      value: option.id,
       label: option.name,
       id: option.id,
     }));
@@ -213,6 +213,7 @@ export const ReviewForm = (props) => {
                 name="correspondence-dropdown"
                 label="Correspondence type"
                 styling={tagStyling}
+                value={props.reviewDetails.correspondence_type_id}
                 options={generateOptions(props.reviewDetails.dropdown_values)}
                 onChange={handleSelect}
                 readOnly={props.isReadOnly}
@@ -267,6 +268,7 @@ ReviewForm.propTypes = {
       last_name: PropTypes.string,
     }),
     dropdown_values: PropTypes.array,
+    correspondence_type_id: PropTypes.number
   }),
   editableData: PropTypes.shape({
     notes: PropTypes.string,

From 1ea88d68f5b0dbee58ede43eecfae052eae0a827 Mon Sep 17 00:00:00 2001
From: Ki Mau <ki.mau@va.gov>
Date: Thu, 7 Mar 2024 20:49:43 -0500
Subject: [PATCH 153/237] Ki/APPEALS-35480 - Correspondence Cases - Pending Tab
 (#21060)

* fix error processing intake

* Add models for tasks not related to appeal

* sub models for tasks not related to appeal

* allow intake processor to create new models

* add scope for tasks not related to appeal

* write query for pending tab tasks

* update seeds to create updated models

* update task not related to appeal craetion at the end of intake

* merge issue on activrecord

* Fixed tasks filter with multiple options

* refactored to be cleaner

* refactored CorrespondenceTaskFilter to be OOP best practices and added clarification comments.

* APPEALS-35480 - Filter Updates

* Add new correspondence tasks not related to appeal

* Fix error when submitting correspondence intake

* Add scope tasks_not_related_to_appeal

* Change intake processor to create new correspondence tasks

* Refactor to have new Correspondence task class names

* Refactor to simplify and be less flaky

* Refactor with the updated class names

* APPEALS-35480 - Pending Rspec Tests

* Merge Conflict updates

* add veteran full name

* create abstract base class for tasks not related to an appeal

* remove task not related to appeal scope

* move correspondence mail tasks to folder

* correspondence mail tasks inherit from CorrespondenceMailTask

* remove hard coded true return for task creation verification

* abstract class and create child class override

* replace deleted verification bypass

* revert task creation refactor

* Spec Inbound update

* Remove old tasks

* Fix Task Call, Remove unneeded old code

* current_user

* merge conflicts

* Remap Pending RSpec Tests

* Reverting filter change

---------

Co-authored-by: William Medders <medders_william@bah.com>
Co-authored-by: Ryan Marshall <rnmarshall1993@gmail.com>
Co-authored-by: Jim Foley <james.foley4@va.gov>
---
 ...zation_correspondence_pending_tasks_tab.rb |   7 +-
 .../tasks/correspondence_task_filter.rb       |   6 +-
 .../CorrespondenceTableBuilder.jsx            |   5 +-
 db/seeds/helpers/queue_helpers.rb             |  10 +-
 .../correspondence_cases_spec.rb              | 172 ++++++++++++++++++
 5 files changed, 184 insertions(+), 16 deletions(-)

diff --git a/app/models/queue_tabs/organization_correspondence_pending_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_pending_tasks_tab.rb
index 085e0fc01cb..19f06462b8e 100644
--- a/app/models/queue_tabs/organization_correspondence_pending_tasks_tab.rb
+++ b/app/models/queue_tabs/organization_correspondence_pending_tasks_tab.rb
@@ -19,12 +19,7 @@ def description
 
   # :reek:UtilityFunction
   def tasks
-    Task.none
-    # CorrespondenceTask
-    # .where(status: "on_hold")
-    # .find(
-    #   MailTask.active.where(appeal_type: "Correspondence").pluck(:parent_id)
-    # )
+    CorrespondenceMailTask.includes(*task_includes).active
   end
 
   # :reek:UtilityFunction
diff --git a/app/models/tasks/correspondence_task_filter.rb b/app/models/tasks/correspondence_task_filter.rb
index 306ce4fba4d..c2ec6f09963 100644
--- a/app/models/tasks/correspondence_task_filter.rb
+++ b/app/models/tasks/correspondence_task_filter.rb
@@ -57,11 +57,11 @@ def filter_by_va_dor(date_info)
   end
 
   def filter_by_task(task_types)
-    # Initialize collection to an empty scope
-    collection = Task.none
+    # used to store the results of each task query
+    collection = nil
     task_types.each do |task_type|
       t = tasks.where(type: task_type)
-      collection = collection.or(t)
+      collection = collection.nil? ? tasks.merge(t) : collection.or(tasks.merge(t))
     end
     collection
   end
diff --git a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
index 0c1e2f5b2d8..41c694d0dfb 100644
--- a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
+++ b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
@@ -117,10 +117,7 @@ const CorrespondenceTableBuilder = (props) => {
     const filterOptions = filterValuesForColumn(column);
     const functionForColumn = {
       [QUEUE_CONFIG.COLUMNS.DAYS_WAITING_CORRESPONDENCE.name]: daysWaitingCorrespondence(),
-      [QUEUE_CONFIG.COLUMNS.TASK_ASSIGNEE.name]: assignedToColumn(
-        tasks,
-        filterOptions
-      ),
+      [QUEUE_CONFIG.COLUMNS.TASK_ASSIGNEE.name]: assignedToColumn(),
       [QUEUE_CONFIG.COLUMNS.TASK_ASSIGNED_BY.name]: assignedByColumn(),
       [QUEUE_CONFIG.COLUMNS.TASK_CLOSED_DATE.name]: taskCompletedDateColumn(),
       [QUEUE_CONFIG.COLUMNS.TASK_TYPE.name]: taskColumn(tasks, filterOptions),
diff --git a/db/seeds/helpers/queue_helpers.rb b/db/seeds/helpers/queue_helpers.rb
index 98ef609a66c..211ed4eb2d7 100644
--- a/db/seeds/helpers/queue_helpers.rb
+++ b/db/seeds/helpers/queue_helpers.rb
@@ -96,7 +96,7 @@ def create_action_required_tasks(correspondence, status:, parent_task:, task_typ
   def create_and_complete_mail_task(correspondence, user)
     process_correspondence(correspondence, user)
     assigned_by = CorrespondenceIntakeTask.find_by(appeal_id: correspondence.id).completed_by
-    cavct = CavcCorrespondenceMailTask.find_or_create_by!(
+    cavct = CavcCorrespondenceCorrespondenceTask.find_or_create_by!(
       parent_id: correspondence&.root_task&.id,
       appeal_id: correspondence.id,
       appeal_type: "Correspondence",
@@ -111,19 +111,21 @@ def create_and_complete_mail_task(correspondence, user)
   def create_cavc_mailtask(correspondence, user)
     process_correspondence(correspondence, user)
     assigned_by = CorrespondenceIntakeTask.find_by(appeal_id: correspondence.id).completed_by
-    CavcCorrespondenceMailTask.create!(
+    task = CavcCorrespondenceCorrespondenceTask.create!(
       appeal_id: correspondence.id,
       appeal_type: "Correspondence",
       assigned_by: assigned_by,
       assigned_to: CavcLitigationSupport.singleton,
       status: Constants.TASK_STATUSES.assigned
     )
+    randomize_days_waiting_value(task)
+    task
   end
   # :reek:FeatureEnvy
   def create_congress_interest_mailtask(correspondence, user)
     process_correspondence(correspondence, user)
     assigned_by = CorrespondenceIntakeTask.find_by(appeal_id: correspondence.id).completed_by
-    CongressionalInterestMailTask.create!(
+    task = CongressionalInterestCorrespondenceTask.create!(
       appeal_id: correspondence.id,
       appeal_type: "Correspondence",
       assigned_by: assigned_by,
@@ -131,6 +133,8 @@ def create_congress_interest_mailtask(correspondence, user)
       status: Constants.TASK_STATUSES.assigned,
       parent_id: correspondence&.root_task&.id
     )
+    randomize_days_waiting_value(task)
+    task
   end
 
   # :reek:UtilityFunction
diff --git a/spec/feature/queue/correspondence/correspondence_cases_spec.rb b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
index e00bcf6d505..b52647a7f96 100644
--- a/spec/feature/queue/correspondence/correspondence_cases_spec.rb
+++ b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
@@ -1026,4 +1026,176 @@
       expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
     end
   end
+
+  context "correspondence cases pending tab" do
+    let(:current_user) { create(:user) }
+    before :each do
+      InboundOpsTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+    end
+
+    before do
+      Timecop.freeze(Time.zone.local(2020, 5, 15))
+      5.times do
+        corres_array = (1..4).map { create(:correspondence) }
+        task_array = [CavcCorrespondenceCorrespondenceTask,
+                      CongressionalInterestCorrespondenceTask,
+                      DeathCertificateCorrespondenceTask,
+                      PrivacyActRequestCorrespondenceTask]
+
+        corres_array.each_with_index do |corres, index|
+          task_array[index].create!(
+            appeal_id: corres.id,
+            appeal_type: "Correspondence",
+            assigned_to: InboundOpsTeam.singleton
+          )
+        end
+      end
+
+      # Used to mock a single task to compare task sorting
+      PrivacyActRequestCorrespondenceTask.first.correspondence.update!(
+        va_date_of_receipt: Date.new(2000, 10, 10),
+        updated_by_id: current_user.id
+      )
+      PrivacyActRequestCorrespondenceTask.last.correspondence.update!(
+        va_date_of_receipt: Date.new(2050, 10, 10),
+        updated_by_id: current_user.id
+      )
+      FeatureToggle.enable!(:correspondence_queue)
+    end
+
+    it "successfully loads the pending tab" do
+      visit "/queue/correspondence/team?tab=correspondence_pending"
+      expect(page).to have_content("Correspondence that is currently assigned to non-mail team users:")
+    end
+
+    it "uses veteran details sort correctly." do
+      visit "/queue/correspondence/team?tab=correspondence_pending"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by Veteran Details']").click
+      first_vet_info = page.all("#task-link")[0].text
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by Veteran Details']").click
+      last_vet_info = page.all("#task-link")[0].text
+      # return to A-Z, compare details
+      find("[aria-label='Sort by Veteran Details']").click
+      expect(page.all("#task-link")[0].text == first_vet_info)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by Veteran Details']").click
+      expect(page.all("#task-link")[0].text == last_vet_info)
+    end
+
+    it "uses VA DOR sort correctly." do
+      visit "/queue/correspondence/team?tab=correspondence_pending"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by VA DOR']").click
+      first_date = find("tbody > tr:nth-child(1) > td:nth-child(2)")
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by VA DOR']").click
+      last_date = find("tbody > tr:nth-child(1) > td:nth-child(2)")
+      # return to A-Z, compare details
+      find("[aria-label='Sort by VA DOR']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == first_date)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by VA DOR']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == last_date)
+    end
+
+    it "uses receipt date between filter correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_pending"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-2-option-0").click
+      all("div.input-container > input")[0].fill_in(with: "10/09/2000")
+      all("div.input-container > input")[1].fill_in(with: "10/11/2000")
+      find(".cf-submit").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+
+    it "uses receipt date before filter correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_pending"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-2-option-1").click
+      all("div.input-container > input")[0].fill_in(with: "10/01/2001")
+      find(".cf-submit").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+
+    it "uses receipt date after filter correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_pending"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-2-option-2").click
+      all("div.input-container > input")[0].fill_in(with: "10/01/2024")
+      find(".cf-submit").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+
+    it "uses receipt date on filter correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_pending"
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-2-option-3").click
+      all("div.input-container > input")[0].fill_in(with: "10/10/2000")
+      find(".cf-submit").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+
+    it "uses days waiting sort correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_pending"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by Days Waiting']").click
+      first_day_amount = find("tbody > tr:nth-child(1) > td:nth-child(4)").text
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by Days Waiting']").click
+      second_day_amount = find("tbody > tr:nth-child(1) > td:nth-child(4)").text
+      # return to A-Z, compare details
+      find("[aria-label='Sort by Days Waiting']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(4)").text == first_day_amount)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by Days Waiting']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(4)").text == second_day_amount)
+    end
+
+    it "uses tasks sort correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_pending"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by Tasks']").click
+      first_task = find("tbody > tr:nth-child(1) > td:nth-child(2)")
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by Tasks']").click
+      last_task = find("tbody > tr:nth-child(1) > td:nth-child(2)")
+      # return to A-Z, compare details
+      find("[aria-label='Sort by Tasks']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == first_task)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by Tasks']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == last_task)
+    end
+
+    it "uses tasks filter correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_pending"
+      all(".unselected-filter-icon")[1].click
+      all(".cf-filter-option-row")[1].click
+      # find_by_id("0-CavcCorrespondenceCorrespondenceTask").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 5)
+    end
+
+    it "uses assigned to sort correctly" do
+      visit "/queue/correspondence/team?tab=correspondence_pending"
+      # put page in the sorted A-Z state
+      find("[aria-label='Sort by Assigned To']").click
+      first_assignee = find("tbody > tr:nth-child(1) > td:nth-child(2)")
+      # put page in the sorted Z-A state
+      find("[aria-label='Sort by Assigned To']").click
+      last_assignee = find("tbody > tr:nth-child(1) > td:nth-child(2)")
+      # return to A-Z, compare details
+      find("[aria-label='Sort by Assigned To']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == first_assignee)
+      # return to Z-A, compare details again
+      find("[aria-label='Sort by Assigned To']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == last_assignee)
+    end
+  end
 end

From 6736ceeb58d5f36835fff6ebeb309cae63f98aca Mon Sep 17 00:00:00 2001
From: IsaiahBar <107133331+IsaiahBar@users.noreply.github.com>
Date: Fri, 8 Mar 2024 21:34:50 -0500
Subject: [PATCH 154/237] Hot fix to remove Intake from Veterans Details
 (#21087)

* fix feature test

* Revert "fix feature test"

This reverts commit 948d6374e1f9b548277da1fe5e0851942a5825d8.

* pushing up tests for ryan to run

* feature tests

* remove Intake from Veteran Details

* resolve pr conflicts

---------

Co-authored-by: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
---
 app/models/queue_tabs/correspondence_assigned_tasks_tab.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/queue_tabs/correspondence_assigned_tasks_tab.rb b/app/models/queue_tabs/correspondence_assigned_tasks_tab.rb
index a1074835cfd..084abd93293 100644
--- a/app/models/queue_tabs/correspondence_assigned_tasks_tab.rb
+++ b/app/models/queue_tabs/correspondence_assigned_tasks_tab.rb
@@ -18,7 +18,7 @@ def description
   end
 
   def tasks
-    CorrespondenceTask.where(assigned_to_id: assignee.id)
+    ReviewPackageTask.includes(*task_includes).where(assigned_to: assignee, status: Constants.TASK_STATUSES.assigned)
   end
 
   # :reek:UtilityFunction

From c46619fd7d3447b9c4ca1bb0ee2969d52236d4bc Mon Sep 17 00:00:00 2001
From: Dev-KRedd <134650238+Dev-KRedd@users.noreply.github.com>
Date: Fri, 8 Mar 2024 21:37:03 -0500
Subject: [PATCH 155/237] Khalin/appeals 35818 - Bug Fix (#21091)

* WIP for new seeds file

* Updated query so data shows in table

* Revert "WIP for new seeds file"

This reverts commit ea1dd11d4b98da787a56917a299b4f871bd8c7d0.

* Updated query so data shows in table

* Your Correspondence completed tab completed test spec

* The completed tab now showing dates

* Bug Fix
---
 .../work_queue/correspondence_task_column_serializer.rb         | 2 +-
 client/app/queue/utils.js                                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/serializers/work_queue/correspondence_task_column_serializer.rb b/app/models/serializers/work_queue/correspondence_task_column_serializer.rb
index 4e7f87f53be..bdefa9d71f3 100644
--- a/app/models/serializers/work_queue/correspondence_task_column_serializer.rb
+++ b/app/models/serializers/work_queue/correspondence_task_column_serializer.rb
@@ -22,7 +22,7 @@ class WorkQueue::CorrespondenceTaskColumnSerializer
     object.correspondence.cmp_packet_number
   end
 
-  attribute(:completion_date, &:closed_at)
+  attribute :closed_at
 
   attribute :days_waiting
 
diff --git a/client/app/queue/utils.js b/client/app/queue/utils.js
index 625bb96b172..f8839de4b90 100644
--- a/client/app/queue/utils.js
+++ b/client/app/queue/utils.js
@@ -81,7 +81,7 @@ const correspondenceTaskAttributesFromRawTask = (task) => {
     instructions: task.attributes.instructions,
     veteranDetails: task.attributes.veteran_details,
     notes: task.attributes.notes,
-    closedAt: task.attributes.completion_date,
+    closedAt: task.attributes.closed_at,
     daysWaiting: task.attributes.days_waiting,
     vaDor: task.attributes.va_date_of_receipt,
     label: task.attributes.label,

From 4bc858dc799867cbeabe2dc96bcb17a81fef3da2 Mon Sep 17 00:00:00 2001
From: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
Date: Mon, 11 Mar 2024 14:52:40 -0400
Subject: [PATCH 156/237] created completed_by_date and added business logic to
 root task (#21103)

---
 .../work_queue/correspondence_task_column_serializer.rb  | 2 +-
 app/models/tasks/correspondence_root_task.rb             | 9 +++++++++
 app/models/tasks/correspondence_task.rb                  | 4 ++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/models/serializers/work_queue/correspondence_task_column_serializer.rb b/app/models/serializers/work_queue/correspondence_task_column_serializer.rb
index bdefa9d71f3..0ae1627dff3 100644
--- a/app/models/serializers/work_queue/correspondence_task_column_serializer.rb
+++ b/app/models/serializers/work_queue/correspondence_task_column_serializer.rb
@@ -22,7 +22,7 @@ class WorkQueue::CorrespondenceTaskColumnSerializer
     object.correspondence.cmp_packet_number
   end
 
-  attribute :closed_at
+  attribute :closed_at, &:completed_by_date
 
   attribute :days_waiting
 
diff --git a/app/models/tasks/correspondence_root_task.rb b/app/models/tasks/correspondence_root_task.rb
index 5552936aa0e..aaf6cb8905d 100644
--- a/app/models/tasks/correspondence_root_task.rb
+++ b/app/models/tasks/correspondence_root_task.rb
@@ -1,4 +1,13 @@
 # frozen_string_literal: true
 
 class CorrespondenceRootTask < CorrespondenceTask
+  # a correspondence root task is considered closed if it has a closed at
+  # date OR all children tasks are completed.
+  def completed_by_date
+    return closed_at unless closed_at.nil?
+
+    if children&.all?(&:completed?)
+      children.maximum(:closed_at)
+    end
+  end
 end
diff --git a/app/models/tasks/correspondence_task.rb b/app/models/tasks/correspondence_task.rb
index c8082867d98..53c33508797 100644
--- a/app/models/tasks/correspondence_task.rb
+++ b/app/models/tasks/correspondence_task.rb
@@ -67,6 +67,10 @@ def correspondence
     appeal
   end
 
+  def completed_by_date
+    closed_at
+  end
+
   def task_url
     "/under_construction"
   end

From 03ab5760ac92cb67e78255f2d25bcadc91d180b2 Mon Sep 17 00:00:00 2001
From: Alex Smith <alex.smith.99@thunderyard.com>
Date: Mon, 11 Mar 2024 15:49:20 -0600
Subject: [PATCH 157/237] Fix Misc. Auto Assign Correspondence Regressions
 (#21098)

* Restore Code Deleted During Merge

* Fix Misc. Issues

- Add eager loading to various finder queries.

- Fix spec failures.
---
 app/models/organizations/inbound_ops_team.rb  | 22 ++++++++++++++++---
 app/services/auto_assignable_user_finder.rb   |  4 ++--
 app/services/correspondence_auto_assigner.rb  |  5 +++--
 .../correspondence_auto_assigner_spec.rb      |  2 +-
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/app/models/organizations/inbound_ops_team.rb b/app/models/organizations/inbound_ops_team.rb
index e0c3a99290d..cac267dd5c3 100644
--- a/app/models/organizations/inbound_ops_team.rb
+++ b/app/models/organizations/inbound_ops_team.rb
@@ -1,9 +1,25 @@
 # frozen_string_literal: true
 
 class InboundOpsTeam < Organization
-  def self.singleton
-    InboundOpsTeam.first ||
-      InboundOpsTeam.create(name: "Inbound Ops Team", url: "inbound-ops-team")
+  class << self
+    def singleton
+      InboundOpsTeam.first ||
+        InboundOpsTeam.create(name: "Inbound Ops Team", url: "inbound-ops-team")
+    end
+
+    def super_users
+      super_users = []
+
+      OrganizationsUser.includes(:user).where(organization: InboundOpsTeam.singleton).find_each do |org_user|
+        user = org_user.user
+
+        if user.inbound_ops_team_superuser?
+          super_users.push(user)
+        end
+      end
+
+      super_users
+    end
   end
 
   # :reek:UtilityFunction
diff --git a/app/services/auto_assignable_user_finder.rb b/app/services/auto_assignable_user_finder.rb
index 24956cb317a..c3c5db63e26 100644
--- a/app/services/auto_assignable_user_finder.rb
+++ b/app/services/auto_assignable_user_finder.rb
@@ -105,14 +105,14 @@ def user_review_package_tasks(user)
   def find_users
     # Do NOT use manual caching here!!!
     # Other processes may update data, so always use the DB as the source of truth and let Rails handle any caching
-    InboundOpsTeam.singleton.users.includes(:tasks, :organization_user_permissions)
+    InboundOpsTeam.singleton.users.includes(:tasks, :organizations, :organization_user_permissions)
       .where(
         organization_user_permissions: {
           organization_permission: OrganizationPermission.auto_assign(InboundOpsTeam.singleton),
           permitted: true
         }
       )
-      .references(:tasks, :organization_user_permissions)
+      .references(:tasks, :organizations, :organization_user_permissions)
   end
 
   def sensitivity_checker
diff --git a/app/services/correspondence_auto_assigner.rb b/app/services/correspondence_auto_assigner.rb
index 75bee260886..d220a355762 100644
--- a/app/services/correspondence_auto_assigner.rb
+++ b/app/services/correspondence_auto_assigner.rb
@@ -65,8 +65,9 @@ def unassigned_review_package_tasks
 
     ReviewPackageTask
       .where(status: Constants.TASK_STATUSES.unassigned)
-      .includes(:correspondence)
-      .references(:correspondence)
+      .preload(:appeal, :assigned_by, :assigned_to, :parent)
+      .includes(:correspondence, correspondence: :veteran)
+      .references(:correspondence, correspondence: :veteran)
       .merge(Correspondence.order(va_date_of_receipt: :desc))
   end
 
diff --git a/spec/services/correspondence_auto_assigner_spec.rb b/spec/services/correspondence_auto_assigner_spec.rb
index 7a50e56b2ce..34c0a2f84ed 100644
--- a/spec/services/correspondence_auto_assigner_spec.rb
+++ b/spec/services/correspondence_auto_assigner_spec.rb
@@ -83,7 +83,7 @@
     context "when a run is NOT permitted" do
       before do
         expect(mock_run_verifier).to receive(:can_run_auto_assign?).and_return(false)
-        expect(mock_run_verifier).to receive(:err_msg).and_return("Test error")
+        expect(mock_run_verifier).to receive(:err_msg).twice.and_return("Test error")
       end
 
       it "raises an error" do

From 8c0ab3124c7c8ddc46c3ed9a9ae6399792bcdacc Mon Sep 17 00:00:00 2001
From: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
Date: Thu, 14 Mar 2024 12:07:47 -0400
Subject: [PATCH 158/237] APPEALS-35488: Update UAT Seed Scripts for
 Correspondence (#21129)

* refactored correspondence seeds to accept vet and user. refactored create_correspondence.

* refactored seed to create intake correspondence with upload failed task

* updated seed to create correspondence with intake task

* refactored rest of queue correspondence seed to be able to accept a user and veteran.

* lowered count for correspondence seeds

* refactored multi_correspondences to create review package tasks, handle user input, and use queue helpers

* disabled linting check

* added multi correspondence and queue correspondence seeds to rake task

* cleaned up correspondence rake to be more DRY
---
 app/models/task_sorter.rb         |   4 +-
 db/seeds/helpers/queue_helpers.rb |  10 +-
 db/seeds/multi_correspondences.rb | 132 ++-----
 db/seeds/queue_correspondences.rb | 135 ++++----
 lib/tasks/correspondence.rake     | 554 +++---------------------------
 5 files changed, 161 insertions(+), 674 deletions(-)

diff --git a/app/models/task_sorter.rb b/app/models/task_sorter.rb
index dcfbd643006..0ff1b0cd1ba 100644
--- a/app/models/task_sorter.rb
+++ b/app/models/task_sorter.rb
@@ -21,7 +21,7 @@ def initialize(args)
     fail(Caseflow::Error::MissingRequiredProperty, message: errors.full_messages.join(", ")) unless valid?
   end
 
-  # rubocop:disable Metrics/AbcSize
+  # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
   def sorted_tasks
     return tasks unless tasks.any?
 
@@ -43,7 +43,7 @@ def sorted_tasks
       tasks.with_assignees.with_assigners.with_cached_appeals.order(order_clause)
     end
   end
-  # rubocop:enable Metrics/AbcSize
+  # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
 
   private
 
diff --git a/db/seeds/helpers/queue_helpers.rb b/db/seeds/helpers/queue_helpers.rb
index 211ed4eb2d7..58100d45275 100644
--- a/db/seeds/helpers/queue_helpers.rb
+++ b/db/seeds/helpers/queue_helpers.rb
@@ -18,8 +18,10 @@ def create_veteran(options = {})
     veteran
   end
 
-  def create_correspondence
-    vet = create_veteran
+  # create correspondence for given veteran/user, or create one
+  def create_correspondence(user = {}, veteran = {})
+    vet = veteran.blank? ? create_veteran : veteran
+    user = user.blank? ? User.find_by_css_id("CAVC_LIT_SUPPORT_USER6") : user
     ::Correspondence.create!(
       uuid: SecureRandom.uuid,
       portal_entry_date: Time.zone.now,
@@ -30,8 +32,8 @@ def create_correspondence
       cmp_packet_number: @cmp_packet_number,
       va_date_of_receipt: rand(1.month.ago..1.day.ago),
       notes: "Notes from CMP - Queue Correspondence Seed".split(" ").shuffle.join,
-      assigned_by_id: 81,
-      updated_by_id: 81,
+      assigned_by_id: user.id,
+      updated_by_id: user.id,
       veteran_id: vet.id
     ).tap { @cmp_packet_number += 1 }
   end
diff --git a/db/seeds/multi_correspondences.rb b/db/seeds/multi_correspondences.rb
index e29e25e0cda..98cb8c37115 100644
--- a/db/seeds/multi_correspondences.rb
+++ b/db/seeds/multi_correspondences.rb
@@ -1,21 +1,23 @@
 # frozen_string_literal: true
 
 # create correspondence seeds
-require_relative "./helpers/seed_helpers"
+require_relative "./helpers/queue_helpers"
 
 module Seeds
   # :reek:InstanceVariableAssumption
   class MultiCorrespondences < Base
 
-    include SeedHelpers
+    include QueueHelpers
 
     def initialize
       initial_id_values
-      RequestStore[:current_user] = User.find_by_css_id("BVADWISE")
+      RequestStore[:current_user] = User.find_by_css_id("BVADWISE") if RequestStore[:current_user].blank?
     end
 
-    def seed!
-      create_multi_correspondences
+    # seed with values for UAT rake task correspondence.rake
+    # seed without values for Demo (default)
+    def seed!(user = {}, veteran = {})
+      create_multi_correspondences(user, veteran)
     end
 
     private
@@ -32,52 +34,31 @@ def initial_id_values
       @cmp_packet_number += 10_000 while ::Correspondence.find_by(cmp_packet_number: @cmp_packet_number + 1)
     end
 
+    # creates correspondences for given vet (UAT)
+    # default, creates Batman vets to assign cases to (demo)
     # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-    def create_multi_correspondences
-      veteran = create_veteran(first_name: "Adam", last_name: "West")
-      5.times do
-        appeal = create(
-          :appeal,
-          veteran_file_number: veteran.file_number
-        )
-        InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
-      end
-      5.times do
-        appeal = create(
-          :appeal,
-          veteran_file_number: veteran.file_number,
-          docket_type: Constants.AMA_DOCKETS.direct_review
-        )
-        InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
-      end
-      21.times do
-        corres = ::Correspondence.create!(
-          uuid: SecureRandom.uuid,
-          portal_entry_date: Time.zone.now,
-          source_type: "Mail",
-          package_document_type_id: (1..20).to_a.sample,
-          correspondence_type_id: 4,
-          cmp_queue_id: 1,
-          cmp_packet_number: @cmp_packet_number,
-          va_date_of_receipt: Time.zone.yesterday,
-          notes: "Notes from CMP - Multi Correspondence Seed",
-          assigned_by_id: 81,
-          updated_by_id: 81,
-          veteran_id: veteran.id,
-        )
-        CorrespondenceDocument.find_or_create_by(
-          document_file_number: veteran.file_number,
-          uuid: SecureRandom.uuid,
-          vbms_document_type_id: 1250,
-          document_type: 1250,
-          pages: 30,
-          correspondence_id: corres.id
-        )
-        @cmp_packet_number += 1
+    def create_multi_correspondences(user = {}, veteran = {})
+      if user.blank?
+        user = User.find_by_css_id("JOLLY_POSTMAN")
+        # create veterans
+        west = create_veteran(first_name: "Adam", last_name: "West")
+        bale = create_veteran(first_name: "Christian", last_name: "Bale")
+        keaton = create_veteran(first_name: "Michael", last_name: "Keaton")
+
+        # build correspondences
+        build_correspondences(west, user, 5)
+        build_correspondences(bale, user, 10)
+        build_correspondences(keaton, user, 20)
+        return
       end
 
-      veteran = create_veteran(first_name: "Michael", last_name: "Keaton")
-      2.times do
+      # used for UAT correspondence.rake
+      build_correspondences(veteran, user, 20)
+    end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+
+    def build_correspondences(veteran, user, iterations = 10)
+      5.times do
         appeal = create(
           :appeal,
           veteran_file_number: veteran.file_number
@@ -92,19 +73,19 @@ def create_multi_correspondences
         )
         InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
       end
-      31.times do
+      iterations.times do
         corres = ::Correspondence.create!(
           uuid: SecureRandom.uuid,
           portal_entry_date: Time.zone.now,
           source_type: "Mail",
-          package_document_type_id: (1..20).to_a.sample,
-          correspondence_type_id: 4,
+          package_document_type_id: PackageDocumentType.all.sample.id,
+          correspondence_type_id: CorrespondenceType.all.sample&.id,
           cmp_queue_id: 1,
           cmp_packet_number: @cmp_packet_number,
-          va_date_of_receipt: Time.zone.yesterday,
+          va_date_of_receipt: rand(1.month.ago..1.day.ago),
           notes: "Notes from CMP - Multi Correspondence Seed",
-          assigned_by_id: 81,
-          updated_by_id: 81,
+          assigned_by_id: user.id,
+          updated_by_id: user.id,
           veteran_id: veteran.id,
         )
         CorrespondenceDocument.find_or_create_by(
@@ -116,50 +97,9 @@ def create_multi_correspondences
           correspondence_id: corres.id
         )
         @cmp_packet_number += 1
-      end
 
-      veteran = create_veteran(first_name: "Christian", last_name: "Bale")
-      1.times do
-        appeal = create(
-          :appeal,
-          veteran_file_number: veteran.file_number
-        )
-        InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
-      end
-      10.times do
-        appeal = create(
-          :appeal,
-          veteran_file_number: veteran.file_number,
-          docket_type: Constants.AMA_DOCKETS.direct_review
-        )
-        InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
-      end
-      101.times do
-        corres = ::Correspondence.create!(
-          uuid: SecureRandom.uuid,
-          portal_entry_date: Time.zone.now,
-          source_type: "Mail",
-          package_document_type_id: (1..20).to_a.sample,
-          correspondence_type_id: 4,
-          cmp_queue_id: 1,
-          cmp_packet_number: @cmp_packet_number,
-          va_date_of_receipt: Time.zone.yesterday,
-          notes: "Notes from CMP - Multi Correspondence Seed",
-          assigned_by_id: 81,
-          updated_by_id: 81,
-          veteran_id: veteran.id,
-        )
-        CorrespondenceDocument.find_or_create_by(
-          document_file_number: veteran.file_number,
-          uuid: SecureRandom.uuid,
-          vbms_document_type_id: 1250,
-          document_type: 1250,
-          pages: 30,
-          correspondence_id: corres.id
-        )
-        @cmp_packet_number += 1
+        assign_review_package_task(corres, user)
       end
     end
-    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
   end
 end
diff --git a/db/seeds/queue_correspondences.rb b/db/seeds/queue_correspondences.rb
index 09cf711eeba..f092c3b269e 100644
--- a/db/seeds/queue_correspondences.rb
+++ b/db/seeds/queue_correspondences.rb
@@ -10,7 +10,7 @@ class QueueCorrespondences < Base
 
     def initialize
       initial_id_values
-      RequestStore[:current_user] = User.find_by_css_id("JOLLY_POSTMAN")
+      RequestStore[:current_user] = User.find_by_css_id("JOLLY_POSTMAN") if RequestStore[:current_user].blank?
     end
 
     def mail_team_user
@@ -21,8 +21,14 @@ def mail_team_superuser
       @mail_team_superuser ||= User.find_by_css_id("AMBRISVACO")
     end
 
-    def seed!
-      create_queue_correspondences
+    # seed with values for UAT rake task correspondence.rake
+    # seed without values for Demo (default)
+    def seed!(user = {}, veteran = {})
+
+      return create_queue_correspondences(user, veteran) unless user.blank? && veteran.blank?
+
+      create_queue_correspondences(mail_team_user)
+      create_queue_correspondences(mail_team_superuser)
     end
 
     private
@@ -40,137 +46,128 @@ def initial_id_values
     end
 
     # rubocop:disable Metrics/MethodLength
-    def create_queue_correspondences
-      # 20 Correspondences with unassigned ReviewPackageTask
-      20.times do
-        create_correspondence_with_unassigned_review_package_task
+    def create_queue_correspondences(user, veteran = {})
+      # 15 Correspondences with unassigned ReviewPackageTask
+      15.times do
+        create_correspondence_with_unassigned_review_package_task(user, veteran)
       end
 
-      # 20 Correspondences with eFolderFailedUploadTask with a parent CorrespondenceIntakeTask
-      20.times do
-        create_correspondence_with_intake_and_failed_upload_task(mail_team_user)
-        create_correspondence_with_intake_and_failed_upload_task(mail_team_superuser)
+      # 15 Correspondences with eFolderFailedUploadTask with a parent CorrespondenceIntakeTask
+      15.times do
+        create_correspondence_with_intake_and_failed_upload_task(user, veteran)
       end
 
-      # 20 Correspondences with CorrespondenceIntakeTask with a status of in_progress
-      20.times do
-        create_correspondence_with_intake_task(mail_team_user)
-        create_correspondence_with_intake_task(mail_team_superuser)
+      # 15 Correspondences with CorrespondenceIntakeTask with a status of in_progress
+      15.times do
+        create_correspondence_with_intake_task(user, veteran)
       end
 
-      # 20 Correspondences with eFolderFailedUploadTask with a parent ReviewPackageTask
-      20.times do
-        create_correspondence_with_review_package_and_failed_upload_task(mail_team_user)
-        create_correspondence_with_review_package_and_failed_upload_task(mail_team_superuser)
+      # 15 Correspondences with eFolderFailedUploadTask with a parent ReviewPackageTask
+      15.times do
+        create_correspondence_with_review_package_and_failed_upload_task(user, veteran)
       end
 
-      # 20 Correspondences with the CorrespondenceRootTask with the status of completed
-      20.times do
-        create_correspondence_with_completed_root_task
+      # 15 Correspondences with the CorrespondenceRootTask with the status of completed
+      15.times do
+        create_correspondence_with_completed_root_task(user, veteran)
       end
 
-      # 20 Correspondences with ReviewPackageTask in progress
-      20.times do
-        create_correspondence_with_review_package_task(mail_team_user)
-        create_correspondence_with_review_package_task(mail_team_superuser)
+      # 15 Correspondences with ReviewPackageTask in progress
+      15.times do
+        create_correspondence_with_review_package_task(user, veteran)
       end
 
-      # 20 Correspondences with the tasks for Action Required tab and an on_hold ReviewPackageTask as their parent
+      # 15 Correspondences with the tasks for Action Required tab and an on_hold ReviewPackageTask as their parent
       5.times do
         # below method creates 4 correspondence records
-        create_correspondence_with_action_required_tasks
+        create_correspondence_with_action_required_tasks(user, veteran)
       end
 
-      # 10 Correspondences with in-progress CorrespondenceRootTask and completed Mail Task
-      10.times do
-        create_correspondence_with_completed_mail_task(mail_team_user)
-        create_correspondence_with_completed_mail_task(mail_team_superuser)
+      # 15 Correspondences with in-progress CorrespondenceRootTask and completed Mail Task
+      15.times do
+        create_correspondence_with_completed_mail_task(user, veteran)
       end
 
       # 5 Correspondences with the CorrespondenceRootTask with the status of canceled
       5.times do
-        create_correspondence_with_canceled_root_task
+        create_correspondence_with_canceled_root_task(user, veteran)
       end
 
-      # 20 Correspondences with the tasks for CAVC and Congress Interest
-      20.times do
-        create_cavc_mailtask(create_correspondence, mail_team_user)
-        create_cavc_mailtask(create_correspondence, mail_team_superuser)
+      # 15 Correspondences with the tasks for CAVC and Congress Interest
+      15.times do
+        create_cavc_mailtask(create_correspondence, user)
       end
 
-      20.times do
-        create_congress_interest_mailtask(create_correspondence, mail_team_user)
-        create_congress_interest_mailtask(create_correspondence, mail_team_superuser)
+      15.times do
+        create_congress_interest_mailtask(create_correspondence, user)
       end
 
-      10.times do
-        create_correspondence_with_in_progress_review_package_task(mail_team_user)
-        create_correspondence_with_in_progress_review_package_task(mail_team_superuser)
+      15.times do
+        create_correspondence_with_in_progress_review_package_task(user, veteran)
       end
 
-      10.times do
-        create_correspondence_with_in_progress_intake_task(mail_team_user)
-        create_correspondence_with_in_progress_intake_task(mail_team_superuser)
+      15.times do
+        create_correspondence_with_in_progress_intake_task(user, veteran)
       end
     end
     # rubocop:enable Metrics/MethodLength
 
-    def create_correspondence_with_intake_and_failed_upload_task(user)
-      corres = create_correspondence
+    def create_correspondence_with_intake_and_failed_upload_task(user, veteran = {})
+      corres = create_correspondence(user,veteran)
       parent_task = create_correspondence_intake(corres, user)
       create_efolderupload_failed_task(corres, parent_task)
     end
 
-    def create_correspondence_with_intake_task(user)
-      corres = create_correspondence
+    def create_correspondence_with_intake_task(user, veteran = {})
+      corres = create_correspondence(user, veteran)
       create_correspondence_intake(corres, user)
     end
 
-    def create_correspondence_with_in_progress_intake_task(user)
-      corres = create_correspondence
+    def create_correspondence_with_in_progress_intake_task(user, veteran = {})
+      corres = create_correspondence(user, veteran)
       cit = create_correspondence_intake(corres, user)
       cit.update!(status: Constants.TASK_STATUSES.in_progress)
     end
 
-    def create_correspondence_with_unassigned_review_package_task
-      corres = create_correspondence
+    def create_correspondence_with_unassigned_review_package_task(user = {}, veteran = {})
+      corres = create_correspondence(user, veteran)
       # vary days waiting to be able to test column sorting
       rpt = ReviewPackageTask.find_by(appeal_id: corres.id)
       rpt.update(assigned_at: corres.va_date_of_receipt)
     end
 
-    def create_correspondence_with_review_package_task(user)
-      corres = create_correspondence
+    def create_correspondence_with_review_package_task(user, veteran = {})
+      corres = create_correspondence(user, veteran)
       assign_review_package_task(corres, user)
     end
 
-    def create_correspondence_with_in_progress_review_package_task(user)
-      corres = create_correspondence
+    def create_correspondence_with_in_progress_review_package_task(user, veteran = {})
+      corres = create_correspondence(user, veteran)
       assign_review_package_task(corres, user)
       rpt = ReviewPackageTask.find_by(appeal_id: corres.id)
       rpt.update!(status: Constants.TASK_STATUSES.in_progress)
     end
 
-    def create_correspondence_with_review_package_and_failed_upload_task(user)
-      corres = create_correspondence
+    def create_correspondence_with_review_package_and_failed_upload_task(user, veteran = {})
+      corres = create_correspondence(user, veteran)
       assign_review_package_task(corres, user)
       parent_task = ReviewPackageTask.find_by(appeal_id: corres.id, type: ReviewPackageTask.name)
       create_efolderupload_failed_task(corres, parent_task)
     end
 
-    def create_correspondence_with_completed_root_task
-      corres = create_correspondence
+    def create_correspondence_with_completed_root_task(user = {}, veteran = {})
+      corres = create_correspondence(user, veteran)
       corres.root_task.update!(status: Constants.TASK_STATUSES.completed)
       corres.root_task.update!(closed_at: rand(1.month.ago..1.day.ago))
     end
 
-    def create_correspondence_with_action_required_tasks
-      corres_array = (1..4).map { create_correspondence }
+    def create_correspondence_with_action_required_tasks(user = {}, veteran = {})
+      corres_array = (1..4).map { create_correspondence(user, veteran) }
       task_array = [ReassignPackageTask, RemovePackageTask, SplitPackageTask, MergePackageTask]
 
       corres_array.each_with_index do |corres, index|
         rpt = ReviewPackageTask.find_by(appeal_id: corres.id)
-        rpt.update(assigned_to_id: mail_team_superuser.id) if index.even?
+        rpt.update(assigned_to_id: InboundOpsTeam.singleton.users.first.id) if index.even?
         pat = task_array[index].create!(
           parent_id: rpt.id,
           appeal_id: corres.id,
@@ -182,13 +179,13 @@ def create_correspondence_with_action_required_tasks
       end
     end
 
-    def create_correspondence_with_completed_mail_task(user)
-      correspondence = create_correspondence
+    def create_correspondence_with_completed_mail_task(user, veteran = {})
+      correspondence = create_correspondence(user, veteran)
       create_and_complete_mail_task(correspondence, user)
     end
 
-    def create_correspondence_with_canceled_root_task
-      corres = create_correspondence
+    def create_correspondence_with_canceled_root_task(user, veteran = {})
+      corres = create_correspondence(user, veteran)
       corres.root_task.update!(status: Constants.TASK_STATUSES.cancelled)
     end
   end
diff --git a/lib/tasks/correspondence.rake b/lib/tasks/correspondence.rake
index 92b16bfb203..f9f3bcd986b 100644
--- a/lib/tasks/correspondence.rake
+++ b/lib/tasks/correspondence.rake
@@ -11,368 +11,71 @@ require_relative "../../db/seeds/queue_correspondences"
 namespace :correspondence do
   desc "setup data for intake correspondence (autotext and correspondence type)in UAT/PROD"
   task :setup_correspondence_data, [] => :environment do |_|
-    STDOUT.puts("Creating data for Auto Text Tables")
-    # creates intiial values for auto text table
-    auto_texts_values = [
-      "Address updated in VACOLS",
-      "Decision sent to Senator or Congressman mm/dd/yy",
-      "Interest noted in telephone call of mm/dd/yy",
-      "Interest noted in evidence file regarding current appeal",
-      "Email - responded via email on mm/dd/yy",
-      "Email - written response req; confirmed receipt via email to Congress office on mm/dd/yy",
-      "Possible motion pursuant to BVA decision dated mm/dd/yy",
-      "Motion pursuant to BVA decision dated mm/dd/yy",
-      "Statement in support of appeal by appellant",
-      "Statement in support of appeal by rep",
-      "Medical evidence X-Rays submitted or referred by",
-      "Medical evidence clinical reports submitted or referred by",
-      "Medical evidence examination reports submitted or referred by",
-      "Medical evidence progress notes submitted or referred by",
-      "Medical evidence physician's medical statement submitted or referred by",
-      "C&P exam report",
-      "Consent form (specify)",
-      "Withdrawal of issues",
-      "Response to BVA solicitation letter dated mm/dd/yy",
-      "VAF 9 (specify)"
-    ]
-
-    auto_texts_values.each do |text|
-      AutoText.find_or_create_by(name: text)
-    end
-
-    correspondence_types_list = [
-      "Abeyance",
-      "Attorney Inquiry",
-      "CAVC Correspondence",
-      "Change of address",
-      "Congressional interest",
-      "CUE related",
-      "Death certificate",
-      "Evidence or argument",
-      "Extension request",
-      "FOIA request",
-      "Hearing Postponement Request",
-      "Hearing related",
-      "Hearing Withdrawal Request",
-      "Advance on docket",
-      "Motion for reconsideration",
-      "Motion to vacate",
-      "Other motions",
-      "Power of attorney related",
-      "Privacy Act complaints",
-      "Privacy Act request",
-      "Returned as undeliverable mail",
-      "Status Inquiry",
-      "Thurber",
-      "Withdrawal of appeal"
-    ]
-
-    correspondence_types_list.each do |type|
-      CorrespondenceType.find_or_create_by(name: type)
-    end
-  end
-
-  task :correspondences_with_multiple_documents, [] => :environment do |_|
-    @file_number ||= 500_000_000
-    @participant_id ||= 850_000_000
-    while Veteran.find_by(file_number: format("%<n>09d", n: @file_number + 1))
-      @file_number += 100
-      @participant_id += 100
-    end
-
-    @cmp_packet_number ||= 1_000_000_000
-    @cmp_packet_number += 10_000 while ::Correspondence.find_by(cmp_packet_number: @cmp_packet_number + 1)
-    create_correspondences_with_documents
-  end
-
-  task :vbms_document_types, [] => :environment do |_|
+    STDOUT.puts("Creating data for Auto Text Table")
+    create_auto_text_table
+    STDOUT.puts("Creating data for VBMS Document Types Table")
     create_document_types
-  end
-
-  task :correspondence_types, [] => :environment do |_|
+    STDOUT.puts("Creating data for Correspondence Types Table")
     create_correspondence_types
-  end
-
-  task :package_document_types, [] => :environment do |_|
+    STDOUT.puts("Creating data for Package Document Types Table")
     create_package_document_types
   end
 
-  task :multi_correspondences, [] => :environment do |_|
-    @file_number ||= 550_000_000
-    @participant_id ||= 650_000_000
-    while Veteran.find_by(file_number: format("%<n>09d", n: @file_number + 1))
-      @file_number += 100
-      @participant_id += 100
-    end
+  desc "create correspondence test data in UAT given a veteran file number"
+  task :create_correspondence_test_data, [] => :environment do |_|
+    catch(:error) do
+      throw :error, STDOUT.puts("Please add a user to the request store") if RequestStore[:current_user].blank?
+      STDOUT.puts("This script will create correspondences from queue_correspondences.rb and\n
+        multi_correspondences.rb for a veteran based off their file number\n
+        These will be assigned to RequstStore[:current_user] (currently
+          #{RequestStore[:current_user].css_id})")
+      STDOUT.puts("Enter the veteran's file number")
+      veteran_file_number = STDIN.gets.chomp
 
-    @cmp_packet_number ||= 2_000_000_000
-    @cmp_packet_number += 10_000 while ::Correspondence.find_by(cmp_packet_number: @cmp_packet_number + 1)
-    RequestStore[:current_user] = User.find_by_css_id("BVADWISE")
-    create_multi_correspondences
-  end
-
-  desc "creates a 20 correspondence and correspondence_document for a veteran"
-  task :create_correspondence, [:veteran_file_number] => :environment do |_, args|
-    veteran = Veteran.find_by(file_number: args[:veteran_file_number].to_i)
-
-    (1..20).each do |package_doc_id|
-      corres = ::Correspondence.create!(
-        uuid: SecureRandom.uuid,
-        portal_entry_date: Time.zone.now,
-        source_type: "Mail",
-        package_document_type_id: package_doc_id,
-        correspondence_type_id: 4,
-        cmp_queue_id: 1,
-        cmp_packet_number: rand(2_000_000..2_999_999),
-        va_date_of_receipt: Time.zone.yesterday,
-        notes: "Notes from CMP - Multi Correspondence Seed",
-        assigned_by_id: 81,
-        updated_by_id: 81,
-        veteran_id: veteran.id
-      )
-      CorrespondenceDocument.find_or_create_by(
-        document_file_number: veteran.file_number,
-        uuid: SecureRandom.uuid,
-        vbms_document_type_id: 1250,
-        document_type: 1250,
-        pages: 30,
-        correspondence_id: corres.id
-      )
-    end
-  end
+      vet = Veteran.find_by_file_number_or_ssn(veteran_file_number)
+      throw :error, STDOUT.puts("Veteran cannot be found") if vet.blank?
 
-  desc "create correspondence data in UAT given a veteran file number"
-  task :create_correspondence_data, [] => :environment do |_|
-    STDOUT.puts("This script will create 20 new correspondence and
-      correspondence_document for a veteran based off their file number")
-    STDOUT.puts("Enter the veteran's file number")
-    veteran_file_number = STDIN.gets.chomp
+      STDOUT.puts("Running multi_correspondences.rb")
+      Seeds::MultiCorrespondences.new.seed!(RequestStore[:current_user], vet)
 
-    if veteran_file_number.to_i.is_a? Integer
-      STDOUT.puts("Creating correspondences")
-      Rake.application.invoke_task("correspondence:create_correspondence[#{veteran_file_number}]")
-      Rake::Task["correspondence:create_correspondence"].reenable
-      STDOUT.puts("Correspondences created!")
-    else
-      STDOUT.puts("Improper input...")
+      STDOUT.puts("Running queue_correspondences.rb")
+      Seeds::QueueCorrespondences.new.seed!(RequestStore[:current_user], vet)
+      STDOUT.puts("Success!! Correspondences have been seeded. Well done friend!")
     end
   end
-
-  desc "creates 10 appeals for a vetean: 5 with evidence submission tasks and 5 without"
-  task :create_test_appeals, [] => :environment do |_|
-    STDOUT.puts("This script will create 5 evidence appeals and 5 direct review appeals for a veteran.")
-    STDOUT.puts("Enter the veteran's file number")
-    veteran_file_number = STDIN.gets.chomp
-
-    if veteran_file_number.to_i.is_a? Integer
-      veteran = Veteran.find_by(file_number: veteran_file_number.to_i)
-      # evidence appeals
-      5.times do
-        appeal = Appeal.create!(
-          veteran_file_number: veteran.file_number,
-          receipt_date: Time.zone.now,
-          established_at: Time.zone.now,
-          docket_type: Constants.AMA_DOCKETS.evidence_submission
-        )
-        InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
-      end
-
-      # direct review appeals.
-      5.times do
-        appeal = Appeal.create!(
-          veteran_file_number: veteran.file_number,
-          receipt_date: Time.zone.now,
-          established_at: Time.zone.now,
-          docket_type: Constants.AMA_DOCKETS.direct_review
-        )
-        InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
-      end
-    else
-      STDOUT.puts("Improper input...")
-    end
-  end
-end
-
-def initial_id_values
-  @file_number ||= 500_000_000
-  @participant_id ||= 850_000_000
-  while Veteran.find_by(file_number: format("%<n>09d", n: @file_number + 1))
-    @file_number += 100
-    @participant_id += 100
-  end
-
-  @cmp_packet_number ||= 1_000_000_000
-  @cmp_packet_number += 10_000 while ::Correspondence.find_by(cmp_packet_number: @cmp_packet_number + 1)
-end
-
-def create_veteran(options = {})
-  @file_number += 1
-  @participant_id += 1
-  params = {
-    file_number: format("%<n>09d", n: @file_number),
-    participant_id: format("%<n>09d", n: @participant_id),
-    ssn: Generators::Random.unique_ssn
-  }
-  veteran = Generators::Veteran.build(params.merge(options))
-  veteran.save!
-  veteran.update!(params)
-  5.times do
-    Appeal.create!(
-      veteran_file_number: veteran.file_number,
-      receipt_date: Time.zone.now,
-      established_at: Time.zone.now,
-      docket_type: Constants.AMA_DOCKETS.evidence_submission
-    )
-  end
-  veteran
 end
 
-# rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-def create_correspondences_with_documents
-  # correspondences with multiple documents
-  10.times do
-    veteran = create_veteran
-    corres = ::Correspondence.create!(
-      uuid: SecureRandom.uuid,
-      portal_entry_date: Time.zone.now,
-      source_type: "Mail",
-      package_document_type_id: 15,
-      correspondence_type_id: 8,
-      cmp_queue_id: 1,
-      cmp_packet_number: @cmp_packet_number,
-      va_date_of_receipt: Time.zone.yesterday,
-      notes: "This is a note from CMP.",
-      assigned_by_id: 81,
-      updated_by_id: 81,
-      veteran_id: veteran.id
-    )
-    create_multiple_docs(corres, veteran)
-    @cmp_packet_number += 1
-  end
-
-  (1..77).each do |package_doc_id|
-    veteran = create_veteran
-    corres = ::Correspondence.create!(
-      uuid: SecureRandom.uuid,
-      portal_entry_date: Time.zone.now,
-      source_type: "Mail",
-      package_document_type_id: package_doc_id,
-      correspondence_type_id: 8,
-      cmp_queue_id: 1,
-      cmp_packet_number: @cmp_packet_number,
-      va_date_of_receipt: Time.zone.yesterday,
-      notes: "This is a note from CMP.",
-      assigned_by_id: 81,
-      updated_by_id: 81,
-      veteran_id: veteran.id
-    )
-    CorrespondenceDocument.find_or_create_by(
-      document_file_number: veteran.file_number,
-      uuid: SecureRandom.uuid,
-      vbms_document_type_id: 1250,
-      document_type: 1250,
-      pages: 30,
-      correspondence_id: corres.id
-    )
-    @cmp_packet_number += 1
-  end
-
-  (1..24).each do |corres_type_id|
-    veteran = create_veteran
-    corres = ::Correspondence.create!(
-      uuid: SecureRandom.uuid,
-      portal_entry_date: Time.zone.now,
-      source_type: "Mail",
-      package_document_type_id: 15,
-      correspondence_type_id: corres_type_id,
-      cmp_queue_id: 1,
-      cmp_packet_number: @cmp_packet_number,
-      va_date_of_receipt: Time.zone.yesterday,
-      notes: "This is a note from CMP.",
-      assigned_by_id: 81,
-      updated_by_id: 81,
-      veteran_id: veteran.id
-    )
-    CorrespondenceDocument.find_or_create_by(
-      document_file_number: veteran.file_number,
-      uuid: SecureRandom.uuid,
-      vbms_document_type_id: 1250,
-      document_type: 1250,
-      pages: 30,
-      correspondence_id: corres.id
-    )
-    @cmp_packet_number += 1
-  end
-
-  (1..17).each do |cmp_queue_id|
-    veteran = create_veteran
-    corres = ::Correspondence.create!(
-      uuid: SecureRandom.uuid,
-      portal_entry_date: Time.zone.now,
-      source_type: "Mail",
-      package_document_type_id: 15,
-      correspondence_type_id: 8,
-      cmp_queue_id: cmp_queue_id,
-      cmp_packet_number: @cmp_packet_number,
-      va_date_of_receipt: Time.zone.yesterday,
-      notes: "This is a note from CMP.",
-      assigned_by_id: 81,
-      updated_by_id: 81,
-      veteran_id: veteran.id
-    )
-    CorrespondenceDocument.find_or_create_by(
-      document_file_number: veteran.file_number,
-      uuid: SecureRandom.uuid,
-      vbms_document_type_id: 1250,
-      document_type: 1250,
-      pages: 30,
-      correspondence_id: corres.id
-    )
-    @cmp_packet_number += 1
+# rubocop:disable Metrics/MethodLength
+def create_auto_text_table
+  # creates intiial values for auto text table
+  auto_texts_values = [
+    "Address updated in VACOLS",
+    "Decision sent to Senator or Congressman mm/dd/yy",
+    "Interest noted in telephone call of mm/dd/yy",
+    "Interest noted in evidence file regarding current appeal",
+    "Email - responded via email on mm/dd/yy",
+    "Email - written response req; confirmed receipt via email to Congress office on mm/dd/yy",
+    "Possible motion pursuant to BVA decision dated mm/dd/yy",
+    "Motion pursuant to BVA decision dated mm/dd/yy",
+    "Statement in support of appeal by appellant",
+    "Statement in support of appeal by rep",
+    "Medical evidence X-Rays submitted or referred by",
+    "Medical evidence clinical reports submitted or referred by",
+    "Medical evidence examination reports submitted or referred by",
+    "Medical evidence progress notes submitted or referred by",
+    "Medical evidence physician's medical statement submitted or referred by",
+    "C&P exam report",
+    "Consent form (specify)",
+    "Withdrawal of issues",
+    "Response to BVA solicitation letter dated mm/dd/yy",
+    "VAF 9 (specify)"
+  ]
+
+  auto_texts_values.each do |text|
+    AutoText.find_or_create_by(name: text)
   end
 end
-
-def create_multiple_docs(corres, veteran)
-  CorrespondenceDocument.find_or_create_by(
-    document_file_number: veteran.file_number,
-    uuid: SecureRandom.uuid,
-    correspondence_id: corres.id,
-    document_type: 1250,
-    pages: 30,
-    vbms_document_type_id: 1250
-  )
-  CorrespondenceDocument.find_or_create_by(
-    document_file_number: veteran.file_number,
-    uuid: SecureRandom.uuid,
-    correspondence_id: corres.id,
-    document_type: 719,
-    pages: 20,
-    vbms_document_type_id: 719
-  )
-  CorrespondenceDocument.find_or_create_by(
-    document_file_number: veteran.file_number,
-    uuid: SecureRandom.uuid,
-    correspondence_id: corres.id,
-    document_type: 672,
-    pages: 10,
-    vbms_document_type_id: 672
-  )
-  CorrespondenceDocument.find_or_create_by(
-    document_file_number: veteran.file_number,
-    uuid: SecureRandom.uuid,
-    correspondence_id: corres.id,
-    document_type: 18,
-    pages: 5,
-    vbms_document_type_id: 18
-  )
-end
-# rubocop:enable Metrics/AbcSize, Metrics/MethodLength
-
-# Note: Remove after document controller is implemented
-def create_static_documents
-  Document.create!(vbms_document_id: 3)
-  Document.create!(vbms_document_id: 4)
-end
+# rubocop:enable Metrics/MethodLength
 
 def create_document_types
   # Caseflow keeps track of VBMS Document Types at Caseflow::DocumentTypes::TYPES
@@ -441,158 +144,3 @@ def create_package_document_types
     PackageDocumentType.find_or_create_by(name: package_document_type)
   end
 end
-
-def create_correspondence_veteran(options = {})
-  @file_number += 1
-  @participant_id += 1
-  params = {
-    file_number: format("%<n>09d", n: @file_number),
-    participant_id: format("%<n>09d", n: @participant_id),
-    ssn: Generators::Random.unique_ssn
-  }
-  veteran = Generators::Veteran.build(params.merge(options))
-  veteran.save!
-  veteran.update!(params)
-  veteran
-end
-
-# rubocop:disable Metrics/MethodLength
-# rubocop:disable Metrics/AbcSize
-def create_multi_correspondences
-  veteran = create_correspondence_veteran(first_name: "Adam", last_name: "West")
-  5.times do
-    appeal = Appeal.create!(
-      veteran_file_number: veteran.file_number,
-      receipt_date: Time.zone.now,
-      established_at: Time.zone.now,
-      docket_type: Constants.AMA_DOCKETS.evidence_submission
-    )
-    InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
-  end
-  5.times do
-    appeal = Appeal.create!(
-      veteran_file_number: veteran.file_number,
-      receipt_date: Time.zone.now,
-      established_at: Time.zone.now,
-      docket_type: Constants.AMA_DOCKETS.evidence_submission
-    )
-    InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
-  end
-  21.times do
-    corres = ::Correspondence.create!(
-      uuid: SecureRandom.uuid,
-      portal_entry_date: Time.zone.now,
-      source_type: "Mail",
-      package_document_type_id: (1..20).to_a.sample,
-      correspondence_type_id: 4,
-      cmp_queue_id: 1,
-      cmp_packet_number: @cmp_packet_number,
-      va_date_of_receipt: Time.zone.yesterday,
-      notes: "Notes from CMP - Multi Correspondence Seed",
-      assigned_by_id: 81,
-      updated_by_id: 81,
-      veteran_id: veteran.id
-    )
-    CorrespondenceDocument.find_or_create_by(
-      document_file_number: veteran.file_number,
-      uuid: SecureRandom.uuid,
-      vbms_document_type_id: 1250,
-      document_type: 1250,
-      pages: 30,
-      correspondence_id: corres.id
-    )
-    @cmp_packet_number += 1
-  end
-
-  veteran = create_correspondence_veteran(first_name: "Michael", last_name: "Keaton")
-  2.times do
-    appeal = Appeal.create!(
-      veteran_file_number: veteran.file_number,
-      receipt_date: Time.zone.now,
-      established_at: Time.zone.now,
-      docket_type: Constants.AMA_DOCKETS.evidence_submission
-    )
-    InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
-  end
-  5.times do
-    appeal = Appeal.create!(
-      veteran_file_number: veteran.file_number,
-      receipt_date: Time.zone.now,
-      established_at: Time.zone.now,
-      docket_type: Constants.AMA_DOCKETS.evidence_submission
-    )
-    InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
-  end
-  31.times do
-    corres = ::Correspondence.create!(
-      uuid: SecureRandom.uuid,
-      portal_entry_date: Time.zone.now,
-      source_type: "Mail",
-      package_document_type_id: (1..20).to_a.sample,
-      correspondence_type_id: 4,
-      cmp_queue_id: 1,
-      cmp_packet_number: @cmp_packet_number,
-      va_date_of_receipt: Time.zone.yesterday,
-      notes: "Notes from CMP - Multi Correspondence Seed",
-      assigned_by_id: 81,
-      updated_by_id: 81,
-      veteran_id: veteran.id
-    )
-    CorrespondenceDocument.find_or_create_by(
-      document_file_number: veteran.file_number,
-      uuid: SecureRandom.uuid,
-      vbms_document_type_id: 1250,
-      document_type: 1250,
-      pages: 30,
-      correspondence_id: corres.id
-    )
-    @cmp_packet_number += 1
-  end
-
-  veteran = create_correspondence_veteran(first_name: "Christian", last_name: "Bale")
-  1.times do
-    appeal = Appeal.create!(
-      veteran_file_number: veteran.file_number,
-      receipt_date: Time.zone.now,
-      established_at: Time.zone.now,
-      docket_type: Constants.AMA_DOCKETS.evidence_submission
-    )
-    InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
-  end
-  10.times do
-    appeal = Appeal.create!(
-      veteran_file_number: veteran.file_number,
-      receipt_date: Time.zone.now,
-      established_at: Time.zone.now,
-      docket_type: Constants.AMA_DOCKETS.evidence_submission
-    )
-    InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
-  end
-  101.times do
-    corres = ::Correspondence.create!(
-      uuid: SecureRandom.uuid,
-      portal_entry_date: Time.zone.now,
-      source_type: "Mail",
-      package_document_type_id: (1..20).to_a.sample,
-      correspondence_type_id: 4,
-      cmp_queue_id: 1,
-      cmp_packet_number: @cmp_packet_number,
-      va_date_of_receipt: Time.zone.yesterday,
-      notes: "Notes from CMP - Multi Correspondence Seed",
-      assigned_by_id: 81,
-      updated_by_id: 81,
-      veteran_id: veteran.id
-    )
-    CorrespondenceDocument.find_or_create_by(
-      document_file_number: veteran.file_number,
-      uuid: SecureRandom.uuid,
-      vbms_document_type_id: 1250,
-      document_type: 1250,
-      pages: 30,
-      correspondence_id: corres.id
-    )
-    @cmp_packet_number += 1
-  end
-end
-# rubocop:enable Metrics/MethodLength
-# rubocop:enable Metrics/AbcSize

From c43ac713a987df781cca5795b6e18ca2683dc18b Mon Sep 17 00:00:00 2001
From: Kamala Madamanchi <110078646+kamala-07@users.noreply.github.com>
Date: Thu, 14 Mar 2024 14:01:23 -0500
Subject: [PATCH 159/237] Edit VA DOR access for InboundOpsTeamAdmin user
 (#21150)

---
 app/controllers/correspondence_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index 1d36aacae74..7ae4d437a66 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -94,7 +94,7 @@ def show
       correspondence: correspondence,
       package_document_type: correspondence&.package_document_type,
       general_information: general_information,
-      user_can_edit_vador: InboundOpsTeam.singleton.user_has_access?(current_user),
+      user_can_edit_vador: InboundOpsTeam.singleton.user_is_admin?(current_user),
       correspondence_documents: corres_docs.map do |doc|
         WorkQueue::CorrespondenceDocumentSerializer.new(doc).serializable_hash[:data][:attributes]
       end,

From c711a6ce18c1540510556815a7dc380e301456a0 Mon Sep 17 00:00:00 2001
From: Alex Smith <alex.smith.99@thunderyard.com>
Date: Thu, 14 Mar 2024 13:13:14 -0600
Subject: [PATCH 160/237] Update Sensitivity Check (#21152)

* Update Sensitivity Check

- Generate a new BGS Client for each user whose sensitivity level
is being inspected.

- Update specs and supporting files.

* Remove Unneeded Return
---
 app/services/auto_assignable_user_finder.rb   | 31 +++++-----------
 app/services/external_api/bgs_service.rb      | 35 +++++++++++++------
 lib/fakes/bgs_service.rb                      | 11 +++---
 .../auto_assignable_user_finder_spec.rb       | 17 ++++++---
 4 files changed, 54 insertions(+), 40 deletions(-)

diff --git a/app/services/auto_assignable_user_finder.rb b/app/services/auto_assignable_user_finder.rb
index c3c5db63e26..18da3f7fdf7 100644
--- a/app/services/auto_assignable_user_finder.rb
+++ b/app/services/auto_assignable_user_finder.rb
@@ -19,23 +19,13 @@ def get_first_assignable_user(correspondence:)
   private
 
   def run_auto_assign_algorithm(correspondence, vbms_id)
-    return auto_assign_nod(vbms_id) if correspondence.nod
-
     assignable_users.each do |user|
-      if sensitivity_checker.user_can_access?(vbms_id: vbms_id, user_to_check: user.user_obj)
-        return user.user_obj
-      end
-    end
+      next if correspondence.nod && !user.nod?
 
-    nil
-  end
-
-  def auto_assign_nod(vbms_id)
-    assignable_users.each do |user|
-      next if !user.nod?
+      user_obj = user.user_obj
 
-      if sensitivity_checker.user_can_access?(vbms_id: vbms_id, user_to_check: user.user_obj)
-        return user.user_obj
+      if sensitivity_checker(user_obj).can_access?(vbms_id, user_to_check: user_obj)
+        return user_obj
       end
     end
 
@@ -115,17 +105,14 @@ def find_users
       .references(:tasks, :organizations, :organization_user_permissions)
   end
 
-  def sensitivity_checker
-    return @sensitivity_checker if @sensitivity_checker.present?
+  def sensitivity_checker(user)
+    @sensitivity_checker ||= ActiveSupport::HashWithIndifferentAccess.new
 
-    @sensitivity_checker = BGSService.new
+    return @sensitivity_checker[user.css_id] if @sensitivity_checker.key?(user.css_id)
 
-    # TODO: Create seed data for this, add vbms_id here
-    # if !Rails.env.production
-    #   BGSService.mark_veteran_not_accessible()
-    # end
+    @sensitivity_checker[user.css_id] = BGSService.new(client: BGSService.init_client_for_user(user: user))
 
-    @sensitivity_checker
+    @sensitivity_checker[user.css_id]
   end
 
   def permission_checker
diff --git a/app/services/external_api/bgs_service.rb b/app/services/external_api/bgs_service.rb
index 3b09903280a..b87b0ea7c89 100644
--- a/app/services/external_api/bgs_service.rb
+++ b/app/services/external_api/bgs_service.rb
@@ -10,7 +10,15 @@ class ExternalApi::BGSService
 
   attr_reader :client
 
-  def initialize(client: init_client)
+  class << self
+    def init_client_for_user(user:)
+      fail "User required" if user.blank?
+
+      BGS::Services.new(**init_client_params(user: user))
+    end
+  end
+
+  def initialize(client: init_default_client)
     @client = client
 
     # These instance variables are used for caching their
@@ -279,10 +287,6 @@ def find_address_by_participant_id(participant_id)
   # We cache at 2 levels: the boolean check per user, and the veteran record itself.
   # The veteran record is so that subsequent calls to fetch_veteran_info can read from cache.
   def can_access?(vbms_id, user_to_check: current_user)
-    user_can_access?(vbms_id: vbms_id, user_to_check: user_to_check)
-  end
-
-  def user_can_access?(vbms_id:, user_to_check:)
     Rails.cache.fetch(can_access_cache_key(user_to_check, vbms_id), expires_in: 2.hours) do
       DBService.release_db_connections
 
@@ -520,15 +524,26 @@ def fetch_veteran_info_cache_key(vbms_id)
     "bgs_veteran_info_#{vbms_id}"
   end
 
-  def init_client
+  def init_default_client
+    BGS::Services.new(**init_client_params(user: current_user))
+  end
+
+  # These are the params for initializing a BGS client;
+  # this method sets the passed user's data in the request header,
+  # and as a result the passed users permissions are what get
+  # checked by the BGS service when determining permissions for BGS
+  # resource access.
+  #
+  # If no user param is passed, the current user is used
+  def init_client_params(user:)
     forward_proxy_url = FeatureToggle.enabled?(:bgs_forward_proxy) ? ENV["RUBY_BGS_PROXY_BASE_URL"] : nil
 
-    BGS::Services.new(
+    {
       env: Rails.application.config.bgs_environment,
       application: "CASEFLOW",
       client_ip: ENV.fetch("USER_IP_ADDRESS", Rails.application.secrets.user_ip_address),
-      client_station_id: current_user.station_id,
-      client_username: current_user.css_id,
+      client_station_id: user.station_id,
+      client_username: user.css_id,
       ssl_cert_key_file: ENV["BGS_KEY_LOCATION"],
       ssl_cert_file: ENV["BGS_CERT_LOCATION"],
       ssl_ca_cert: ENV["BGS_CA_CERT_LOCATION"],
@@ -536,7 +551,7 @@ def init_client
       jumpbox_url: ENV["RUBY_BGS_JUMPBOX_URL"],
       log: true,
       logger: Rails.logger
-    )
+    }
   end
 
   def formatted_start_and_end_dates(start_date, end_date)
diff --git a/lib/fakes/bgs_service.rb b/lib/fakes/bgs_service.rb
index 392e3ddaa0c..77a652427fd 100644
--- a/lib/fakes/bgs_service.rb
+++ b/lib/fakes/bgs_service.rb
@@ -118,6 +118,13 @@ def edit_veteran_record(file_number, attr, new_value)
       vet_record[attr] = new_value
       store_veteran_record(file_number, vet_record)
     end
+
+    def init_client_for_user(user:)
+      {}
+    end
+  end
+
+  def initialize(client: nil)
   end
 
   def get_end_products(file_number)
@@ -598,10 +605,6 @@ def station_conflict?(vbms_id, _veteran_participant_id)
   end
 
   def can_access?(vbms_id, user_to_check: current_user)
-    user_can_access?(vbms_id: vbms_id, user_to_check: user_to_check)
-  end
-
-  def user_can_access?(vbms_id:, user_to_check:)
     is_accessible = !(self.class.inaccessible_appeal_vbms_ids || []).include?(vbms_id)
 
     if user_to_check
diff --git a/spec/services/auto_assignable_user_finder_spec.rb b/spec/services/auto_assignable_user_finder_spec.rb
index 73e8045ec22..99fe2421cc5 100644
--- a/spec/services/auto_assignable_user_finder_spec.rb
+++ b/spec/services/auto_assignable_user_finder_spec.rb
@@ -5,10 +5,19 @@
 
   let(:veteran) { create(:veteran) }
 
-  let(:mock_sensitivity_checker) { instance_double(ExternalApi::BGSService, user_can_access?: true) }
+  let!(:bgs) { BGSService.new }
+  let(:mock_sensitivity_checker) { instance_double(BGSService, can_access?: true) }
 
   before do
-    allow(ExternalApi::BGSService).to receive(:new).and_return(mock_sensitivity_checker)
+    allow(BGSService).to receive(:new).and_return(mock_sensitivity_checker)
+
+    allow(mock_sensitivity_checker).to receive(:fetch_person_info) do |vbms_id|
+      bgs.fetch_person_info(vbms_id)
+    end
+
+    allow(mock_sensitivity_checker).to receive(:fetch_veteran_info) do |vbms_id|
+      bgs.fetch_veteran_info(vbms_id)
+    end
   end
 
   def generate_assigned_review_package_tasks(amount:, user:)
@@ -183,11 +192,11 @@ def generate_assigned_review_package_tasks(amount:, user:)
       let!(:user_2) { create(:correspondence_auto_assignable_user) }
 
       before do
-        allow(mock_sensitivity_checker).to receive(:user_can_access?).and_return(false)
+        expect(mock_sensitivity_checker).to receive(:can_access?).twice.and_return(false)
+        expect(BGSService).to receive(:new).twice.and_return(mock_sensitivity_checker)
       end
 
       it "does not allow access for users without the correct sensitivity level" do
-        allow_any_instance_of(BGSService).to receive(:user_can_access?).and_return(nil)
         expect(described.get_first_assignable_user(correspondence: correspondence)).to be nil
       end
     end

From 47d8e837065a25e03106d4895e14a51ed6da481e Mon Sep 17 00:00:00 2001
From: Dev-KRedd <134650238+Dev-KRedd@users.noreply.github.com>
Date: Thu, 14 Mar 2024 21:07:08 -0400
Subject: [PATCH 161/237] Khalin/appeals 35818 Date Completed Column Filtering
 Bug Fix (#21134)

* WIP for new seeds file

* Updated query so data shows in table

* Revert "WIP for new seeds file"

This reverts commit ea1dd11d4b98da787a56917a299b4f871bd8c7d0.

* Updated query so data shows in table

* Your Correspondence completed tab completed test spec

* The completed tab now showing dates

* Bug Fix

* Date Completed Filtering Fixed

* Updated changes

* Fixing Failing test

---------

Co-authored-by: Jim Foley <james.foley4@va.gov>
---
 .../tasks/correspondence_task_filter.rb       | 40 +++++++++++++++++++
 .../correspondence_cases_spec.rb              |  3 +-
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/app/models/tasks/correspondence_task_filter.rb b/app/models/tasks/correspondence_task_filter.rb
index c2ec6f09963..38acee8e4f7 100644
--- a/app/models/tasks/correspondence_task_filter.rb
+++ b/app/models/tasks/correspondence_task_filter.rb
@@ -3,6 +3,7 @@
 class CorrespondenceTaskFilter < TaskFilter
   def filtered_tasks
     va_dor_params = filter_params.select { |param| param.include?("col=vaDor") }
+    date_completed_params = filter_params.select { |param| param.include?("col=completedDateColumn") }
     task_column_params = filter_params.select { |param| param.include?("col=taskColumn") }
 
     # task_column_params comes in as a single string, delimited by |. Updates task_column_params
@@ -21,6 +22,11 @@ def filtered_tasks
     unless task_column_params.empty?
       result = result.merge(filter_by_task(task_column_params))
     end
+
+    unless date_completed_params.empty?
+      date_completed_params[0].slice!("col=completedDateColumn&val=")
+      result = result.merge(filter_by_date_completed(date_completed_params[0]))
+    end
     result
   end
 
@@ -56,6 +62,21 @@ def filter_by_va_dor(date_info)
     end
   end
 
+  def filter_by_date_completed(date_info)
+    date_type, first_date, second_date = date_info.split(",")
+
+    case date_type
+    when "0"
+      date_completed_filter_between_dates(first_date, second_date)
+    when "1"
+      date_completed_filter_before_date(first_date)
+    when "2"
+      date_completed_filter_after_date(first_date)
+    when "3"
+      date_completed_filter_on_date(first_date)
+    end
+  end
+
   def filter_by_task(task_types)
     # used to store the results of each task query
     collection = nil
@@ -84,4 +105,23 @@ def filter_after_date(date)
   def filter_on_date(date)
     tasks.joins(:appeal).where("DATE(correspondences.va_date_of_receipt) = (?)", Time.zone.parse(date))
   end
+
+  def date_completed_filter_between_dates(start_date, end_date)
+
+    tasks.where("assigned_at > ? AND assigned_at < ?",
+             Time.zone.parse(start_date),
+             Time.zone.parse(end_date))
+  end
+
+  def date_completed_filter_before_date(date)
+    tasks.where("assigned_at < ?", Time.zone.parse(date))
+  end
+
+  def date_completed_filter_after_date(date)
+    tasks.where("assigned_at > ?", Time.zone.parse(date))
+  end
+
+  def date_completed_filter_on_date(date)
+    tasks.where("DATE(assigned_at) = (?)", Time.zone.parse(date))
+  end
 end
diff --git a/spec/feature/queue/correspondence/correspondence_cases_spec.rb b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
index b52647a7f96..88610516f9e 100644
--- a/spec/feature/queue/correspondence/correspondence_cases_spec.rb
+++ b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
@@ -266,7 +266,6 @@
 
     it "filters date column with 'before' this date" do
       visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=completedDateColumn&order=asc"
-
       find("[aria-label='Filter by date completed']").click
       expect(page).to have_content("Date filter parameters")
       expect(page).to have_button("Apply filter", disabled: true)
@@ -274,7 +273,7 @@
       find("#reactSelectContainer").click
       find("#react-select-2-option-1").click
       current_date = Time.zone.today
-      start_date = (current_date - 1).strftime("%m/%d/%Y")
+      start_date = (current_date + 1).strftime("%m/%d/%Y")
 
       all("div.input-container > input")[0].fill_in(with: start_date)
       expect(page).to have_button("Apply filter", disabled: false)

From 33aae985ac19135e531c2044b4edc0d6aeed80ba Mon Sep 17 00:00:00 2001
From: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
Date: Fri, 15 Mar 2024 11:53:01 -0400
Subject: [PATCH 162/237] updated completed filter to filter on closed_at value
 (#21166)

---
 app/models/tasks/correspondence_task_filter.rb | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/models/tasks/correspondence_task_filter.rb b/app/models/tasks/correspondence_task_filter.rb
index 38acee8e4f7..31d03401d4b 100644
--- a/app/models/tasks/correspondence_task_filter.rb
+++ b/app/models/tasks/correspondence_task_filter.rb
@@ -107,21 +107,20 @@ def filter_on_date(date)
   end
 
   def date_completed_filter_between_dates(start_date, end_date)
-
-    tasks.where("assigned_at > ? AND assigned_at < ?",
-             Time.zone.parse(start_date),
-             Time.zone.parse(end_date))
+    tasks.where("closed_at > ? AND closed_at < ?",
+                Time.zone.parse(start_date),
+                Time.zone.parse(end_date))
   end
 
   def date_completed_filter_before_date(date)
-    tasks.where("assigned_at < ?", Time.zone.parse(date))
+    tasks.where("closed_at < ?", Time.zone.parse(date))
   end
 
   def date_completed_filter_after_date(date)
-    tasks.where("assigned_at > ?", Time.zone.parse(date))
+    tasks.where("closed_at > ?", Time.zone.parse(date))
   end
 
   def date_completed_filter_on_date(date)
-    tasks.where("DATE(assigned_at) = (?)", Time.zone.parse(date))
+    tasks.where("DATE(closed_at) = (?)", Time.zone.parse(date))
   end
 end

From 7017522db4540d1903c185d0a439218382bbec3d Mon Sep 17 00:00:00 2001
From: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
Date: Fri, 15 Mar 2024 15:05:12 -0400
Subject: [PATCH 163/237] refactored seed scripts for correspondence to have
 more detailed notes (#21170)

---
 db/seeds/helpers/queue_helpers.rb | 33 +++++++++++++++++++++++++++----
 db/seeds/multi_correspondences.rb | 28 +++-----------------------
 2 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/db/seeds/helpers/queue_helpers.rb b/db/seeds/helpers/queue_helpers.rb
index 58100d45275..ef60cb33720 100644
--- a/db/seeds/helpers/queue_helpers.rb
+++ b/db/seeds/helpers/queue_helpers.rb
@@ -22,22 +22,47 @@ def create_veteran(options = {})
   def create_correspondence(user = {}, veteran = {})
     vet = veteran.blank? ? create_veteran : veteran
     user = user.blank? ? User.find_by_css_id("CAVC_LIT_SUPPORT_USER6") : user
+    package_doc_type = PackageDocumentType.all.sample
+    corr_type = CorrespondenceType.all.sample
+    receipt_date = rand(1.month.ago..1.day.ago)
+
     ::Correspondence.create!(
       uuid: SecureRandom.uuid,
       portal_entry_date: Time.zone.now,
       source_type: "Mail",
-      package_document_type_id: (1..20).to_a.sample,
-      correspondence_type_id: CorrespondenceType.all.sample&.id,
+      package_document_type_id: package_doc_type&.id,
+      correspondence_type_id: corr_type&.id,
       cmp_queue_id: 1,
       cmp_packet_number: @cmp_packet_number,
-      va_date_of_receipt: rand(1.month.ago..1.day.ago),
-      notes: "Notes from CMP - Queue Correspondence Seed".split(" ").shuffle.join,
+      va_date_of_receipt: receipt_date,
+      notes: generate_notes([package_doc_type, corr_type, receipt_date, user]),
       assigned_by_id: user.id,
       updated_by_id: user.id,
       veteran_id: vet.id
     ).tap { @cmp_packet_number += 1 }
   end
 
+  # randomly generates notes for the correspondence
+  def generate_notes(params)
+    note_type = params.sample
+
+    note = ""
+    # generate note from value pulled
+    case note_type
+    when PackageDocumentType
+      note = "Package Document Type is #{note_type&.name}"
+    when CorrespondenceType
+      note = "Correspondence Type is #{note_type&.name}"
+    when ActiveSupport::TimeWithZone
+      note = "Correspondence added to Caseflow on #{note_type&.strftime("%m/%d/%y")}"
+
+    when User
+      note = "This correspondence was originally assigned to and updated by #{note_type&.css_id}."
+    end
+
+    note
+  end
+
   # :reek:UtilityFunction
   def create_correspondence_document(correspondence, veteran)
     CorrespondenceDocument.find_or_create_by!(
diff --git a/db/seeds/multi_correspondences.rb b/db/seeds/multi_correspondences.rb
index 98cb8c37115..20fd5d66203 100644
--- a/db/seeds/multi_correspondences.rb
+++ b/db/seeds/multi_correspondences.rb
@@ -74,31 +74,9 @@ def build_correspondences(veteran, user, iterations = 10)
         InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
       end
       iterations.times do
-        corres = ::Correspondence.create!(
-          uuid: SecureRandom.uuid,
-          portal_entry_date: Time.zone.now,
-          source_type: "Mail",
-          package_document_type_id: PackageDocumentType.all.sample.id,
-          correspondence_type_id: CorrespondenceType.all.sample&.id,
-          cmp_queue_id: 1,
-          cmp_packet_number: @cmp_packet_number,
-          va_date_of_receipt: rand(1.month.ago..1.day.ago),
-          notes: "Notes from CMP - Multi Correspondence Seed",
-          assigned_by_id: user.id,
-          updated_by_id: user.id,
-          veteran_id: veteran.id,
-        )
-        CorrespondenceDocument.find_or_create_by(
-          document_file_number: veteran.file_number,
-          uuid: SecureRandom.uuid,
-          vbms_document_type_id: 1250,
-          document_type: 1250,
-          pages: 30,
-          correspondence_id: corres.id
-        )
-        @cmp_packet_number += 1
-
-        assign_review_package_task(corres, user)
+        corr = create_correspondence(user, veteran)
+        create_correspondence_document(corr, veteran)
+        assign_review_package_task(corr, user)
       end
     end
   end

From 6ea083e07f4fabd04385f4ebf001931d0ba6aaaa Mon Sep 17 00:00:00 2001
From: Will Medders <93014155+wmedders21@users.noreply.github.com>
Date: Mon, 18 Mar 2024 10:19:15 -0500
Subject: [PATCH 164/237] Wmedders21/appeals 41493 (#21162)

* remove unused route and fix typo

* standardize prop names

* use standardized prop names

* use standardized prop names and abstract magic strings

* remove unnecessary scoping

* CorrespondenceIntakeTask status in_progress on create

* update spec for changes

* update helper to reflect workflow

* correspondence intake task status in progress on creation

* efolder upload failed task no longer needs task url since its not displayed on the table

* rubocop style fix

* rubocop fix extra blank line
---
 .../correspondence_in_progress_tasks_tab.rb   |  4 +--
 .../tasks/correspondence_intake_task.rb       | 18 ++++++++-----
 .../tasks/efolder_upload_failed_task.rb       |  3 ---
 app/models/user.rb                            |  1 -
 .../correspondence_cases.html.erb             |  3 +++
 .../correspondence_team.html.erb              |  5 ++--
 client/app/queue/QueueApp.jsx                 | 10 +++----
 .../correspondence/CorrespondenceCases.jsx    | 10 ++++---
 .../CorrespondenceTableBuilder.jsx            | 26 ++++++++++++-------
 .../correspondence_tasks_controller_spec.rb   |  2 +-
 .../correspondence_queue_task_link_spec.rb    |  3 +--
 spec/models/task_spec.rb                      | 17 ++++++------
 spec/support/correspondence_task_helpers.rb   |  4 ++-
 13 files changed, 59 insertions(+), 47 deletions(-)

diff --git a/app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb b/app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb
index 1cf5e82b6b9..70d91fb3afc 100644
--- a/app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb
+++ b/app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb
@@ -19,8 +19,8 @@ def description
 
   def tasks
     CorrespondenceTask.where(assigned_to: assignee)
-      .where.not(type: "EfolderUploadFailedTask")
-      .where(status: ["in_progress", "on_hold"]).in_progress
+      .where.not(type: EfolderUploadFailedTask.name)
+      .where(status: [Constants.TASK_STATUSES.in_progress, Constants.TASK_STATUSES.on_hold])
   end
 
   # :reek:UtilityFunction
diff --git a/app/models/tasks/correspondence_intake_task.rb b/app/models/tasks/correspondence_intake_task.rb
index 952b88e3a04..29bf762ecb9 100644
--- a/app/models/tasks/correspondence_intake_task.rb
+++ b/app/models/tasks/correspondence_intake_task.rb
@@ -2,23 +2,29 @@
 
 class CorrespondenceIntakeTask < CorrespondenceTask
   class << self
-    def create_from_params(params, user)
-      parent_task = params
+    def create_from_params(parent_task, user)
       params = {
         instructions: [],
         assigned_to: user,
         appeal_id: parent_task.appeal_id,
-        appeal_type: "Correspondence",
+        appeal_type: Correspondence.name,
         status: Constants.TASK_STATUSES.in_progress,
-        type: "CorrespondenceIntakeTask"
+        type: name
       }
       fail Caseflow::Error::ChildTaskAssignedToSameUser if parent_of_same_type_has_same_assignee(parent_task, params)
 
       verify_current_user_can_create!(user)
 
       current_params = modify_params_for_create(params)
-      child = create_child_task(parent_task, user, current_params)
-      child
+      CorrespondenceIntakeTask.create!(
+        appeal_type: Correspondence.name,
+        appeal_id: current_params[:appeal_id],
+        assigned_by_id: child_assigned_by_id(parent_task, user),
+        parent_id: parent_task.id,
+        assigned_to: current_params[:assigned_to],
+        instructions: current_params[:instructions],
+        status: current_params[:status]
+      )
     end
 
     private
diff --git a/app/models/tasks/efolder_upload_failed_task.rb b/app/models/tasks/efolder_upload_failed_task.rb
index 8fccff6545e..3cfae9fd4ae 100644
--- a/app/models/tasks/efolder_upload_failed_task.rb
+++ b/app/models/tasks/efolder_upload_failed_task.rb
@@ -1,7 +1,4 @@
 # frozen_string_literal: true
 
 class EfolderUploadFailedTask < CorrespondenceTask
-  def task_url
-    Constants.CORRESPONDENCE_TASK_URL.REVIEW_PACKAGE_TASK_URL.sub("uuid", correspondence.uuid)
-  end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index e2a64407587..b4901a4be70 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -23,7 +23,6 @@ class User < CaseflowRecord # rubocop:disable Metrics/ClassLength
   scope :with_role, ->(role) { where("? = ANY(roles)", role) }
   scope :mail_team_users, -> { joins(:organizations).where(organizations: { type: MailTeam.name }) }
 
-
   BOARD_STATION_ID = "101"
   LAST_LOGIN_PRECISION = 5.minutes
 
diff --git a/app/views/correspondence/correspondence_cases.html.erb b/app/views/correspondence/correspondence_cases.html.erb
index 6feaf79a547..14f74e14e4d 100644
--- a/app/views/correspondence/correspondence_cases.html.erb
+++ b/app/views/correspondence/correspondence_cases.html.erb
@@ -4,6 +4,9 @@
     userId: current_user.id,
     userRole: (current_user.vacols_roles.first || "").capitalize,
     userCssId: current_user.css_id,
+    isMailTeamUser: current_user.mail_team_user?,
+    isMailSupervisor: current_user.mail_supervisor?,
+    isMailSuperUser: current_user.mail_superuser?,
     organizations: current_user.selectable_organizations.map {|o| o.slice(:name, :url)},
     caseSearchHomePage: case_search_home_page,
     dropdownUrls: dropdown_urls,
diff --git a/app/views/correspondence/correspondence_team.html.erb b/app/views/correspondence/correspondence_team.html.erb
index 5e19c27c837..51d203ebb99 100644
--- a/app/views/correspondence/correspondence_team.html.erb
+++ b/app/views/correspondence/correspondence_team.html.erb
@@ -11,8 +11,9 @@
     feedbackUrl: feedback_url,
     configUrl: '/queue/correspondence/team?json',
     flash: flash,
-    isSuperuser: @is_superuser,
-    isSupervisor: @is_supervisor,
+    isMailTeamUser: current_user.mail_team_user?,
+    isMailSupervisor: current_user.mail_supervisor?,
+    isMailSuperUser: current_user.mail_superuser?,
     mailTeamUsers: @mail_team_users,
     responseType: @response_type,
     responseHeader: @response_header,
diff --git a/client/app/queue/QueueApp.jsx b/client/app/queue/QueueApp.jsx
index 9e1a0a7582b..b457defbe28 100644
--- a/client/app/queue/QueueApp.jsx
+++ b/client/app/queue/QueueApp.jsx
@@ -691,11 +691,7 @@ class QueueApp extends React.PureComponent {
     <CorrespondenceIntake reduxStore={this.props.reduxStore} autoTexts={this.props.autoTexts} {...props.match.params} veteranInformation={this.props.veteranInformation} />
   );
 
-  routedCorrespondenceCase = () => (
-    <CorrespondenceCases {...this.props} />
-  );
-
-  routedCorrespondenceTeam = () => (
+  routedCorrespondenceCases = () => (
     <CorrespondenceCases {...this.props} />
   );
 
@@ -761,14 +757,14 @@ class QueueApp extends React.PureComponent {
               exact
               path="/queue/correspondence/team"
               title={`${QUEUE_CONFIG.CORRESPONDENCE_ORG_TABLE_TITLE}`}
-              render={this.routedCorrespondenceCase}
+              render={this.routedCorrespondenceCases}
             />
 
             <PageRoute
               exact
               path="/queue/correspondence"
               title={`${QUEUE_CONFIG.CORRESPONDENCE_USER_TABLE_TITLE}`}
-              render={this.routedCorrespondenceCase}
+              render={this.routedCorrespondenceCases}
             />
 
             <PageRoute
diff --git a/client/app/queue/correspondence/CorrespondenceCases.jsx b/client/app/queue/correspondence/CorrespondenceCases.jsx
index 0cd4e03f9a4..8c0c2dd77d6 100644
--- a/client/app/queue/correspondence/CorrespondenceCases.jsx
+++ b/client/app/queue/correspondence/CorrespondenceCases.jsx
@@ -72,8 +72,9 @@ const CorrespondenceCases = (props) => {
         {config &&
         <CorrespondenceTableBuilder
           mailTeamUsers={props.mailTeamUsers}
-          isSuperuser={props.isSuperuser}
-          isSupervisor={props.isSupervisor} />}
+          isMailTeamUser={props.isMailTeamUser}
+          isMailSuperUser={props.isMailSuperUser}
+          isMailSupervisor={props.isMailSupervisor} />}
         {showReassignPackageModal &&
         <Modal
           title={COPY.CORRESPONDENCE_CASES_REASSIGN_PACKAGE_MODAL_TITLE}
@@ -103,8 +104,9 @@ CorrespondenceCases.propTypes = {
   responseHeader: PropTypes.string,
   responseMessage: PropTypes.string,
   taskIds: PropTypes.array,
-  isSuperuser: PropTypes.bool,
-  isSupervisor: PropTypes.bool
+  isMailTeamUser: PropTypes.bool,
+  isMailSuperUser: PropTypes.bool,
+  isMailSupervisor: PropTypes.bool
 
 };
 
diff --git a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
index 41c694d0dfb..a941b5699ec 100644
--- a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
+++ b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
@@ -175,7 +175,7 @@ const CorrespondenceTableBuilder = (props) => {
             options={buildMailUserData(props.mailTeamUsers)}
             onChange={handleMailTeamUserChange}
           />
-          {tabConfig.name === 'correspondence_unassigned' &&
+          {tabConfig.name === QUEUE_CONFIG.CORRESPONDENCE_UNASSIGNED_TASKS_TAB_NAME &&
               <>
                 <Button
                   name="Assign"
@@ -189,7 +189,7 @@ const CorrespondenceTableBuilder = (props) => {
                 </span>
               </>
           }
-          {tabConfig.name === 'correspondence_team_assigned' &&
+          {tabConfig.name === QUEUE_CONFIG.CORRESPONDENCE_TEAM_ASSIGNED_TASKS_TAB_NAME &&
             <Button
               name="Reassign"
               onClick={handleAssignButtonClick}
@@ -214,14 +214,16 @@ const CorrespondenceTableBuilder = (props) => {
         <>
           {/* this setup should prevent a double render of the bulk assign area if a
           user is a superuser and also a supervisor */}
-          {(props.isSupervisor || (props.isSupervisor && props.isSuperuser)) &&
-            (tabConfig.name === 'correspondence_unassigned' || tabConfig.name === 'correspondence_team_assigned') &&
+          {(props.isMailSupervisor || (props.isMailSupervisor && props.isMailSuperUser)) &&
+            (tabConfig.name === QUEUE_CONFIG.CORRESPONDENCE_UNASSIGNED_TASKS_TAB_NAME ||
+              tabConfig.name === QUEUE_CONFIG.CORRESPONDENCE_TEAM_ASSIGNED_TASKS_TAB_NAME) &&
             <>
               {getBulkAssignArea()}
             </>
           }
           {
-            (props.isSuperuser && !props.isSupervisor && tabConfig.name === 'correspondence_team_assigned') &&
+            (props.isMailSuperUser && !props.isMailSupervisor &&
+              tabConfig.name === QUEUE_CONFIG.CORRESPONDENCE_TEAM_ASSIGNED_TASKS_TAB_NAME) &&
           <>
             {getBulkAssignArea()}
           </>
@@ -265,7 +267,13 @@ const CorrespondenceTableBuilder = (props) => {
 
   return <div className={rootStyles}>
     <h1 {...css({ display: 'inline-block' })}>{config.table_title}</h1>
-    <QueueOrganizationDropdown organizations={props.organizations} featureToggles = {props.featureToggles} />
+    <QueueOrganizationDropdown
+      isMailTeamUser={props.isMailTeamUser}
+      isMailSupervisor={props.isMailSupervisor}
+      isMailSuperUser={props.isMailSuperUser}
+      organizations={props.organizations}
+      featureToggles={props.featureToggles}
+    />
     <TabWindow
       name="tasks-tabwindow"
       tabs={tabsFromConfig(config)}
@@ -295,9 +303,9 @@ CorrespondenceTableBuilder.propTypes = {
   featureToggles: PropTypes.object,
   mailTeamUsers: PropTypes.array,
   selectedTasks: PropTypes.array,
-  isSuperuser: PropTypes.bool,
-  isSupervisor: PropTypes.bool
-
+  isMailTeamUser: PropTypes.bool,
+  isMailSuperUser: PropTypes.bool,
+  isMailSupervisor: PropTypes.bool
 };
 
 export default connect(mapStateToProps)(CorrespondenceTableBuilder);
diff --git a/spec/controllers/correspondence_tasks_controller_spec.rb b/spec/controllers/correspondence_tasks_controller_spec.rb
index 252490f5745..badbc4f47a2 100644
--- a/spec/controllers/correspondence_tasks_controller_spec.rb
+++ b/spec/controllers/correspondence_tasks_controller_spec.rb
@@ -81,7 +81,7 @@
         cit = CorrespondenceIntakeTask.find_by(appeal_id: correspondence.id, type: CorrespondenceIntakeTask.name)
         review_package_task = ReviewPackageTask.find_by(appeal_id: correspondence.id, type: ReviewPackageTask.name)
         parent = cit.parent
-        expect(cit.status).to eq(Constants.TASK_STATUSES.assigned)
+        expect(cit.status).to eq(Constants.TASK_STATUSES.in_progress)
         expect(cit.parent_id).to eq(parent.id)
         expect(review_package_task.status).to eq(Constants.TASK_STATUSES.completed)
         expect(review_package_task.parent_id).to eq(parent.id)
diff --git a/spec/feature/queue/correspondence/correspondence_queue_task_link_spec.rb b/spec/feature/queue/correspondence/correspondence_queue_task_link_spec.rb
index 73111655cd3..e3e1d9c4a72 100644
--- a/spec/feature/queue/correspondence/correspondence_queue_task_link_spec.rb
+++ b/spec/feature/queue/correspondence/correspondence_queue_task_link_spec.rb
@@ -15,7 +15,7 @@
       it "routes to the Correspondence Intake page" do
         correspondence = create(:correspondence)
         create_correspondence_intake(correspondence, current_user)
-        visit "/queue/correspondence?tab=correspondence_assigned&page=1&sort_by=vaDor&order=asc"
+        visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
         find_all("#task-link").last.click
         using_wait_time(10) do
           expect(page).to have_content("Add Related Correspondence")
@@ -40,7 +40,6 @@
         it "routes to the Review Package page" do
           correspondence = create(:correspondence)
           assign_review_package_task(correspondence, current_user)
-          process_correspondence(correspondence, current_user)
           parent_task = ReviewPackageTask.find_by(appeal_id: correspondence.id)
           create_efolderupload_failed_task(correspondence, parent_task, user: current_user)
           visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
diff --git a/spec/models/task_spec.rb b/spec/models/task_spec.rb
index 49a48d6acd9..320407f47b1 100644
--- a/spec/models/task_spec.rb
+++ b/spec/models/task_spec.rb
@@ -2031,7 +2031,7 @@ def next_assignee(_options = {})
     end
 
     context "eFolder Upload Failed Task" do
-      it "has a review_package task_url if parent is review package task" do
+      it "can have a parent review package task" do
         correspondence = create(:correspondence)
         rpt = ReviewPackageTask.find_or_create_by(
           appeal_id: correspondence.id,
@@ -2046,16 +2046,14 @@ def next_assignee(_options = {})
           parent_id: rpt.id
         )
 
-        expect(uft.task_url).to eq("/queue/correspondence/#{correspondence.uuid}/review_package")
+        expect(uft).to be_a(EfolderUploadFailedTask)
+        expect(uft.parent).to be_a(ReviewPackageTask)
       end
 
-      it "has an intake task_url if parent is correspondence intake task" do
+      it "can have a parent correspondence intake task" do
         correspondence = create(:correspondence)
-        cit = CorrespondenceIntakeTask.find_or_create_by(
-          appeal_id: correspondence.id,
-          assigned_to: InboundOpsTeam.singleton,
-          appeal_type: Correspondence.name
-        )
+        user = create(:user)
+        cit = CorrespondenceIntakeTask.create_from_params(correspondence.root_task, user)
 
         uft = EfolderUploadFailedTask.create(
           appeal_id: correspondence.id,
@@ -2064,7 +2062,8 @@ def next_assignee(_options = {})
           parent_id: cit.id
         )
 
-        expect(uft.task_url).to eq("/queue/correspondence/#{correspondence.uuid}/intake")
+        expect(uft).to be_a(EfolderUploadFailedTask)
+        expect(uft.parent).to be_a(CorrespondenceIntakeTask)
       end
     end
 
diff --git a/spec/support/correspondence_task_helpers.rb b/spec/support/correspondence_task_helpers.rb
index ccb0bc01e69..cefddcd10f4 100644
--- a/spec/support/correspondence_task_helpers.rb
+++ b/spec/support/correspondence_task_helpers.rb
@@ -18,10 +18,12 @@ def create_efolderupload_failed_task(correspondence, parent, user:)
       notes: "ABCDEFG".split("").shuffle.join,
       updated_by_id: user.id
     )
+
+    parent.update!(status: Constants.TASK_STATUSES.on_hold)
     EfolderUploadFailedTask.create!(
       parent_id: parent.id,
       appeal_id: correspondence.id,
-      appeal_type: "Correspondence",
+      appeal_type: Correspondence.name,
       assigned_to: parent.assigned_to,
       status: Constants.TASK_STATUSES.in_progress
     ).update!(assigned_at: rand(1.month.ago..1.day.ago))

From a41331786e6034a8b52b8a0bf11aff9cdf884fec Mon Sep 17 00:00:00 2001
From: Alex Smith <alex.smith.99@thunderyard.com>
Date: Tue, 19 Mar 2024 15:43:25 -0600
Subject: [PATCH 165/237] Improve Code & Fix Linting Issues (#21193)

* Fix Code Climate Issues

* Improve Code

- Add class comments to service files.

- Add underscores to unused method params in the fake BGS Service.

* Fix Bad Method Invocation

* Fix Param Causing Spec Failures
---
 app/services/auto_assignable_user_finder.rb   |  3 ++
 .../correspondence_auto_assign_logger.rb      | 30 +++++++-----
 ...correspondence_auto_assign_run_verifier.rb | 20 ++++----
 app/services/correspondence_auto_assigner.rb  |  5 +-
 lib/fakes/bgs_service.rb                      |  3 +-
 .../correspondence_auto_assign_logger_spec.rb | 13 +++++
 ...spondence_auto_assign_run_verifier_spec.rb | 47 ++++++++++++++-----
 7 files changed, 86 insertions(+), 35 deletions(-)

diff --git a/app/services/auto_assignable_user_finder.rb b/app/services/auto_assignable_user_finder.rb
index 18da3f7fdf7..28c48f343fa 100644
--- a/app/services/auto_assignable_user_finder.rb
+++ b/app/services/auto_assignable_user_finder.rb
@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+# For correspondence auto assignment, determines whether any assignable users exist as well as returns the first
+# assignable user for a given correspondence
+
 # :reek:FeatureEnvy
 class AutoAssignableUserFinder
   AssignableUser = Struct.new(:user_obj, :last_assigned_date, :num_assigned, :nod?, keyword_init: true)
diff --git a/app/services/correspondence_auto_assign_logger.rb b/app/services/correspondence_auto_assign_logger.rb
index 6309ecebc8f..11d077bd648 100644
--- a/app/services/correspondence_auto_assign_logger.rb
+++ b/app/services/correspondence_auto_assign_logger.rb
@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+# For correspondence auto assignment, creates records of assignment attempts.
+# A log for the entire auto assignment run is stored to BatchAutoAssignmentAttempt.
+# Logs for reach assignment attempt are stroed to IndividualAutoAssignmentAttempt.
+
 # :reek:FeatureEnvy
 class CorrespondenceAutoAssignLogger
   def initialize(current_user, batch)
@@ -7,6 +11,20 @@ def initialize(current_user, batch)
     self.batch = batch
   end
 
+  class << self
+    def fail_run_validation(batch_auto_assignment_attempt_id:, msg:)
+      failed_batch = BatchAutoAssignmentAttempt.find(batch_auto_assignment_attempt_id)
+
+      return if failed_batch.blank?
+
+      failed_batch.update!(
+        status: Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.error,
+        error_info: { message: msg },
+        errored_at: Time.current
+      )
+    end
+  end
+
   def begin
     batch.update!(
       started_at: Time.current,
@@ -37,18 +55,6 @@ def error(msg:)
     save_run_statistics
   end
 
-  def fail_run_validation(batch_auto_assignment_attempt_id:, msg:)
-    failed_batch = BatchAutoAssignmentAttempt.find(batch_auto_assignment_attempt_id)
-
-    return if failed_batch.blank?
-
-    failed_batch.update!(
-      status: Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.error,
-      error_info: { message: msg },
-      errored_at: Time.current
-    )
-  end
-
   def assigned(task:, started_at:, assigned_to:)
     correspondence = task.correspondence
 
diff --git a/app/services/correspondence_auto_assign_run_verifier.rb b/app/services/correspondence_auto_assign_run_verifier.rb
index 6b1bfd2e00c..11f2715366f 100644
--- a/app/services/correspondence_auto_assign_run_verifier.rb
+++ b/app/services/correspondence_auto_assign_run_verifier.rb
@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+# For correspondence auto assignment, determines whether or not an auto assign job can be run.
+# In order to prevent race conditions and inconsistent data, only one correspondence auto assignment can be run
+# at a time.
+
 class CorrespondenceAutoAssignRunVerifier
   attr_accessor :verified_batch, :verified_user, :err_msg
 
@@ -9,14 +13,6 @@ def can_run_auto_assign?(current_user_id:, batch_auto_assignment_attempt_id:)
       verify_no_other_jobs_running
   end
 
-  def min_minutes_elapsed_batch_attempt
-    Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.timing.min_minutes_elapsed_batch_attempt
-  end
-
-  def min_minutes_elapsed_individual_attempt
-    Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.timing.min_minutes_elapsed_individual_attempt
-  end
-
   private
 
   def verify_feature_toggles
@@ -56,9 +52,15 @@ def verify_no_other_jobs_running
   def assignment_already_running?
     last_assignment = IndividualAutoAssignmentAttempt.last
 
+    min_minutes_elapsed_individual_attempt =
+      Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.timing.min_minutes_elapsed_individual_attempt
+
     # Safe to move forward if we haven't seen any assignment attempts for the past X minutes
     return true if last_assignment&.created_at.present? &&
-                   ((Time.current - last_assignment.created_at)/60) < min_minutes_elapsed_individual_attempt
+                   ((Time.current - last_assignment.created_at) / 60) < min_minutes_elapsed_individual_attempt
+
+    min_minutes_elapsed_batch_attempt =
+      Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.timing.min_minutes_elapsed_batch_attempt
 
     # Safe to move forward if the last batch was started more than Y minutes ago
     BatchAutoAssignmentAttempt
diff --git a/app/services/correspondence_auto_assigner.rb b/app/services/correspondence_auto_assigner.rb
index d220a355762..973cbf34ee6 100644
--- a/app/services/correspondence_auto_assigner.rb
+++ b/app/services/correspondence_auto_assigner.rb
@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+# Assigns Correspondence ReviewPackageTasks to eligible InboundOpsTeam users.
+# (Assigning the Correspondence's ReviewPackageTask is considered assigning the Correspondence.)
+
 class CorrespondenceAutoAssigner
   def perform(current_user_id:, batch_auto_assignment_attempt_id:)
     # Don't catch these exceptions here so that if we're being called by a job
@@ -79,7 +82,7 @@ def validate_run!(current_user_id, batch_auto_assignment_attempt_id)
       self.batch = run_verifier.verified_batch
       self.current_user = run_verifier.verified_user
     else
-      logger.fail_run_validation(
+      CorrespondenceAutoAssignLogger.fail_run_validation(
         batch_auto_assignment_attempt_id: batch_auto_assignment_attempt_id,
         msg: run_verifier.err_msg
       )
diff --git a/lib/fakes/bgs_service.rb b/lib/fakes/bgs_service.rb
index 77a652427fd..91811e58d18 100644
--- a/lib/fakes/bgs_service.rb
+++ b/lib/fakes/bgs_service.rb
@@ -120,11 +120,12 @@ def edit_veteran_record(file_number, attr, new_value)
     end
 
     def init_client_for_user(user:)
-      {}
+      user
     end
   end
 
   def initialize(client: nil)
+    client
   end
 
   def get_end_products(file_number)
diff --git a/spec/services/correspondence_auto_assign_logger_spec.rb b/spec/services/correspondence_auto_assign_logger_spec.rb
index e1d7c80685d..7a51d66a57d 100644
--- a/spec/services/correspondence_auto_assign_logger_spec.rb
+++ b/spec/services/correspondence_auto_assign_logger_spec.rb
@@ -10,6 +10,19 @@
   let!(:correspondence) { create(:correspondence) }
   let(:task) { correspondence.review_package_task }
 
+  describe ".fail_run_validation" do
+    it "updates the BatchAutoAssignmentAttempt record to a failed state" do
+      described_class.fail_run_validation(
+        batch_auto_assignment_attempt_id: batch_auto_assignment_attempt.id,
+        msg: "Test error"
+      )
+
+      batch = BatchAutoAssignmentAttempt.first
+      expect(batch.status).to eq("error")
+      expect(batch.error_info["message"]).to eq("Test error")
+    end
+  end
+
   describe "#begin" do
     it "creates a BatchAutoAssignmentAttempt record" do
       expect do
diff --git a/spec/services/correspondence_auto_assign_run_verifier_spec.rb b/spec/services/correspondence_auto_assign_run_verifier_spec.rb
index a160edb8a70..e75ebcb65cf 100644
--- a/spec/services/correspondence_auto_assign_run_verifier_spec.rb
+++ b/spec/services/correspondence_auto_assign_run_verifier_spec.rb
@@ -4,13 +4,19 @@
   subject(:described) { described_class.new }
 
   let(:current_user) { create(:user) }
+  let(:min_minutes_elapsed_batch_attempt) do
+    Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.timing.min_minutes_elapsed_batch_attempt
+  end
+  let(:min_minutes_elapsed_individual_attempt) do
+    Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.timing.min_minutes_elapsed_individual_attempt
+  end
 
   describe "#can_run_auto_assign?" do
     let!(:valid_batch) do
       create(
         :batch_auto_assignment_attempt,
         user: current_user,
-        started_at: (described.min_minutes_elapsed_batch_attempt + 1).minutes.ago
+        started_at: (min_minutes_elapsed_batch_attempt + 1).minutes.ago
       )
     end
 
@@ -19,7 +25,7 @@
         :batch_auto_assignment_attempt,
         user: current_user,
         status: Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.completed,
-        started_at: (described.min_minutes_elapsed_batch_attempt - 1).minutes.ago
+        started_at: (min_minutes_elapsed_batch_attempt - 1).minutes.ago
       )
     end
 
@@ -29,13 +35,16 @@
           create(
             :individual_auto_assignment_attempt,
             batch_auto_assignment_attempt: valid_batch,
-            created_at: (described.min_minutes_elapsed_individual_attempt + 1).minutes.ago
+            created_at: (min_minutes_elapsed_individual_attempt + 1).minutes.ago
           )
         end
 
         it "returns true" do
           expect(
-            described.can_run_auto_assign?(current_user_id: current_user.id, batch_auto_assignment_attempt_id: valid_batch.id)
+            described.can_run_auto_assign?(
+              current_user_id: current_user.id,
+              batch_auto_assignment_attempt_id: valid_batch.id
+            )
           ).to eq(true)
         end
       end
@@ -43,7 +52,10 @@
       context "with completed BatchAutoAssignmentAttempt" do
         it "returns true" do
           expect(
-            described.can_run_auto_assign?(current_user_id: current_user.id, batch_auto_assignment_attempt_id: valid_batch.id)
+            described.can_run_auto_assign?(
+              current_user_id: current_user.id,
+              batch_auto_assignment_attempt_id: valid_batch.id
+            )
           ).to eq(true)
         end
       end
@@ -57,7 +69,10 @@
 
         it "returns false" do
           expect(
-            described.can_run_auto_assign?(current_user_id: current_user.id, batch_auto_assignment_attempt_id: valid_batch.id)
+            described.can_run_auto_assign?(
+              current_user_id: current_user.id,
+              batch_auto_assignment_attempt_id: valid_batch.id
+            )
           ).to eq(false)
         end
       end
@@ -84,19 +99,24 @@
             create(
               :individual_auto_assignment_attempt,
               batch_auto_assignment_attempt: valid_batch,
-              created_at: 1.minutes.ago
+              created_at: 1.minute.ago
             )
           end
 
           before do
-            batch_stubbed = class_double(BatchAutoAssignmentAttempt).as_stubbed_const(:transfer_nested_constants => true)
-            expect(batch_stubbed).to receive(:find_by).with(user: current_user, id: valid_batch.id).and_return(valid_batch)
+            batch_stubbed = class_double(BatchAutoAssignmentAttempt)
+              .as_stubbed_const(transfer_nested_constants: true)
+            expect(batch_stubbed).to receive(:find_by)
+              .with(user: current_user, id: valid_batch.id).and_return(valid_batch)
             expect(batch_stubbed).not_to receive(:where)
           end
 
           it "returns false" do
             expect(
-              described.can_run_auto_assign?(current_user_id: current_user.id, batch_auto_assignment_attempt_id: valid_batch.id)
+              described.can_run_auto_assign?(
+                current_user_id: current_user.id,
+                batch_auto_assignment_attempt_id: valid_batch.id
+              )
             ).to eq(false)
           end
         end
@@ -106,13 +126,16 @@
             create(
               :batch_auto_assignment_attempt,
               user: current_user,
-              started_at: (described.min_minutes_elapsed_batch_attempt - 1).minutes.ago
+              started_at: (min_minutes_elapsed_batch_attempt - 1).minutes.ago
             )
           end
 
           it "returns false" do
             expect(
-              described.can_run_auto_assign?(current_user_id: current_user.id, batch_auto_assignment_attempt_id: recent_batch.id)
+              described.can_run_auto_assign?(
+                current_user_id: current_user.id,
+                batch_auto_assignment_attempt_id: recent_batch.id
+              )
             ).to eq(false)
           end
         end

From f7cbc316135288444719ef553884004b66e72d1b Mon Sep 17 00:00:00 2001
From: Alex Smith <alex.smith.99@thunderyard.com>
Date: Wed, 20 Mar 2024 11:47:36 -0600
Subject: [PATCH 166/237] Asmith/appeals 34964 fix code issues (#21219)

* Fix Code Climate Issues

* Improve Code

- Add class comments to service files.

- Add underscores to unused method params in the fake BGS Service.

* Fix Bad Method Invocation

* Fix Param Causing Spec Failures

* Make BGS Service Method Static

- This will allow the other static methods to use the init_client_params
method.
---
 app/services/external_api/bgs_service.rb | 56 ++++++++++++------------
 lib/fakes/bgs_service.rb                 |  6 ++-
 2 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/app/services/external_api/bgs_service.rb b/app/services/external_api/bgs_service.rb
index b87b0ea7c89..a62800a4edf 100644
--- a/app/services/external_api/bgs_service.rb
+++ b/app/services/external_api/bgs_service.rb
@@ -14,7 +14,33 @@ class << self
     def init_client_for_user(user:)
       fail "User required" if user.blank?
 
-      BGS::Services.new(**init_client_params(user: user))
+      BGS::Services.new(**BGSService.init_client_params(user: user))
+    end
+
+    # These are the params for initializing a BGS client;
+    # this method sets the passed user's data in the request header,
+    # and as a result the passed users permissions are what get
+    # checked by the BGS service when determining permissions for BGS
+    # resource access.
+    #
+    # If no user param is passed, the current user is used
+    def init_client_params(user:)
+      forward_proxy_url = FeatureToggle.enabled?(:bgs_forward_proxy) ? ENV["RUBY_BGS_PROXY_BASE_URL"] : nil
+
+      {
+        env: Rails.application.config.bgs_environment,
+        application: "CASEFLOW",
+        client_ip: ENV.fetch("USER_IP_ADDRESS", Rails.application.secrets.user_ip_address),
+        client_station_id: user.station_id,
+        client_username: user.css_id,
+        ssl_cert_key_file: ENV["BGS_KEY_LOCATION"],
+        ssl_cert_file: ENV["BGS_CERT_LOCATION"],
+        ssl_ca_cert: ENV["BGS_CA_CERT_LOCATION"],
+        forward_proxy_url: forward_proxy_url,
+        jumpbox_url: ENV["RUBY_BGS_JUMPBOX_URL"],
+        log: true,
+        logger: Rails.logger
+      }
     end
   end
 
@@ -525,33 +551,7 @@ def fetch_veteran_info_cache_key(vbms_id)
   end
 
   def init_default_client
-    BGS::Services.new(**init_client_params(user: current_user))
-  end
-
-  # These are the params for initializing a BGS client;
-  # this method sets the passed user's data in the request header,
-  # and as a result the passed users permissions are what get
-  # checked by the BGS service when determining permissions for BGS
-  # resource access.
-  #
-  # If no user param is passed, the current user is used
-  def init_client_params(user:)
-    forward_proxy_url = FeatureToggle.enabled?(:bgs_forward_proxy) ? ENV["RUBY_BGS_PROXY_BASE_URL"] : nil
-
-    {
-      env: Rails.application.config.bgs_environment,
-      application: "CASEFLOW",
-      client_ip: ENV.fetch("USER_IP_ADDRESS", Rails.application.secrets.user_ip_address),
-      client_station_id: user.station_id,
-      client_username: user.css_id,
-      ssl_cert_key_file: ENV["BGS_KEY_LOCATION"],
-      ssl_cert_file: ENV["BGS_CERT_LOCATION"],
-      ssl_ca_cert: ENV["BGS_CA_CERT_LOCATION"],
-      forward_proxy_url: forward_proxy_url,
-      jumpbox_url: ENV["RUBY_BGS_JUMPBOX_URL"],
-      log: true,
-      logger: Rails.logger
-    }
+    BGS::Services.new(**BGSService.init_client_params(user: current_user))
   end
 
   def formatted_start_and_end_dates(start_date, end_date)
diff --git a/lib/fakes/bgs_service.rb b/lib/fakes/bgs_service.rb
index 91811e58d18..aa5525ad223 100644
--- a/lib/fakes/bgs_service.rb
+++ b/lib/fakes/bgs_service.rb
@@ -120,7 +120,11 @@ def edit_veteran_record(file_number, attr, new_value)
     end
 
     def init_client_for_user(user:)
-      user
+      BGSService.init_client_params(user: user)
+    end
+
+    def init_client_params(user:)
+      { user: user } if user.is_a?(User)
     end
   end
 

From c12d947d9eba103bc5fe38a5c10d55e072f179cb Mon Sep 17 00:00:00 2001
From: sulak-j <95875751+sulak-j@users.noreply.github.com>
Date: Wed, 20 Mar 2024 13:27:40 -0500
Subject: [PATCH 167/237] Justin/APPEALS-42009 (#21118)

* adding correspondence intake controller

* moving methods that seem to be suited for the intake-specific controller

* refactor conditional

* updating the routes

* Updating the remainder of intake routes

* removing a repeated method found

* moving intake specs to new intake controller spec

* fixing file for failing tests

* Fixing failing specs

---------

Co-authored-by: William Medders <medders_william@bah.com>
Co-authored-by: Jim Foley <james.foley4@va.gov>
---
 app/controllers/correspondence_controller.rb  |  58 ----------
 .../correspondence_intake_controller.rb       |  61 +++++++++++
 config/routes.rb                              |   9 +-
 .../correspondence_controller_spec.rb         |  62 -----------
 .../correspondence_intake_controller_spec.rb  | 100 ++++++++++++++++++
 spec/support/correspondence_helpers.rb        |   6 +-
 6 files changed, 168 insertions(+), 128 deletions(-)
 create mode 100644 app/controllers/correspondence_intake_controller.rb
 create mode 100644 spec/controllers/correspondence_intake_controller_spec.rb

diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index 7ae4d437a66..c877d17520d 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -8,37 +8,6 @@ class CorrespondenceController < ApplicationController
   before_action :auto_texts
   before_action :veteran_information
 
-  def intake
-    respond_to do |format|
-      format.html { return render "correspondence/intake" }
-      format.json do
-        render json: {
-          currentCorrespondence: current_correspondence,
-          correspondence: correspondence_load,
-          veteranInformation: veteran_information
-        }
-      end
-    end
-  end
-
-  def current_step
-    intake = CorrespondenceIntake.find_by(user: current_user, correspondence: current_correspondence) ||
-             CorrespondenceIntake.new(user: current_user, correspondence: current_correspondence)
-
-    intake.update(
-      current_step: params[:current_step],
-      redux_store: params[:redux_store]
-    )
-
-    if intake.valid?
-      intake.save!
-
-      render(json: {}, status: :ok) && return
-    else
-      render(json: intake.errors.full_messages, status: :unprocessable_entity) && return
-    end
-  end
-
   def correspondence_cases
     respond_to do |format|
       format.html { "correspondence_cases" }
@@ -52,20 +21,6 @@ def review_package
     render "correspondence/review_package"
   end
 
-  def intake_update
-    begin
-      intake_appeal_update_tasks
-      if FeatureToggle.enabled?(:ce_api_demo_toggle)
-        upload_documents_to_claim_evidence
-      end
-      render json: { correspondence: correspondence }
-    rescue StandardError => error
-      Rails.logger.error(error.to_s)
-      Raven.capture_exception(error)
-      render json: {}, status: :bad_request
-    end
-  end
-
   def veteran
     render json: { veteran_id: veteran_by_correspondence&.id, file_number: veteran_by_correspondence&.file_number }
   end
@@ -163,15 +118,6 @@ def pdf
     )
   end
 
-  def process_intake
-    if correspondence_intake_processor.process_intake(params, current_user)
-      set_flash_intake_success_message
-      render json: {}, status: :created
-    else
-      render json: { error: "Failed to update records" }, status: :bad_request
-    end
-  end
-
   private
 
   # :reek:FeatureEnvy
@@ -248,10 +194,6 @@ def correspondence
     @correspondence
   end
 
-  def correspondence_load
-    Correspondence.where(veteran_id: veteran_by_correspondence.id).where.not(uuid: params[:correspondence_uuid])
-  end
-
   def veteran_by_correspondence
     return nil if correspondence&.veteran_id.blank?
 
diff --git a/app/controllers/correspondence_intake_controller.rb b/app/controllers/correspondence_intake_controller.rb
new file mode 100644
index 00000000000..3f2d52c48f1
--- /dev/null
+++ b/app/controllers/correspondence_intake_controller.rb
@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+class CorrespondenceIntakeController < CorrespondenceController
+  def intake
+    respond_to do |format|
+      format.html { return render "correspondence/intake" }
+      format.json do
+        render json: {
+          currentCorrespondence: current_correspondence,
+          correspondence: correspondence_load,
+          veteranInformation: veteran_information
+        }
+      end
+    end
+  end
+
+  def current_step
+    intake = CorrespondenceIntake.find_by(user: current_user, correspondence: current_correspondence) ||
+             CorrespondenceIntake.new(user: current_user, correspondence: current_correspondence)
+
+    intake.update(
+      current_step: params[:current_step],
+      redux_store: params[:redux_store]
+    )
+
+    if intake.valid?
+      intake.save!
+
+      render(json: {}, status: :ok) && return
+    else
+      render(json: intake.errors.full_messages, status: :unprocessable_entity) && return
+    end
+  end
+
+  def intake_update
+    begin
+      intake_appeal_update_tasks
+      upload_documents_to_claim_evidence if FeatureToggle.enabled?(:ce_api_demo_toggle)
+      render json: { correspondence: correspondence }
+    rescue StandardError => error
+      Rails.logger.error(error.to_s)
+      Raven.capture_exception(error)
+      render json: {}, status: :bad_request
+    end
+  end
+
+  def process_intake
+    if correspondence_intake_processor.process_intake(params, current_user)
+      set_flash_intake_success_message
+      render json: {}, status: :created
+    else
+      render json: { error: "Failed to update records" }, status: :bad_request
+    end
+  end
+
+  private
+
+  def correspondence_load
+    Correspondence.where(veteran_id: veteran_by_correspondence.id).where.not(uuid: params[:correspondence_uuid])
+  end
+end
diff --git a/config/routes.rb b/config/routes.rb
index fbd453b7247..7542bb2f658 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -323,15 +323,14 @@
   scope path: '/queue' do
     get '/', to: 'queue#index'
     get '/correspondence', to: 'correspondence#correspondence_cases'
-    get '/correspondence/:correspondence_uuid/intake', to: 'correspondence#intake', as: :queue_correspondence_intake
-    post '/correspondence/:correspondence_uuid/current_step', to: 'correspondence#current_step', as: :queue_correspondence_intake_current_step
+    get '/correspondence/:correspondence_uuid/intake', to: 'correspondence_intake#intake', as: :queue_correspondence_intake
+    post '/correspondence/:correspondence_uuid/current_step', to: 'correspondence_intake#current_step', as: :queue_correspondence_intake_current_step
     post '/correspondence/:correspondence_uuid/correspondence_intake_task', to: 'correspondence_tasks#create_correspondence_intake_task'
     post '/correspondence/:id/remove_package', to: 'correspondence_tasks#remove_package'
     post '/correspondence/:id/completed_package', to: 'correspondence_tasks#completed_package'
-    get '/correspondence/:correspondence_uuid/intake', to: 'correspondence#intake'
     get '/correspondence/:correspondence_uuid/review_package', to: 'correspondence#review_package'
     get '/correspondence/edit_document_type_correspondence', to: 'correspondence#document_type_correspondence'
-    patch '/correspondence/:correspondence_uuid/intake_update', to: 'correspondence#intake_update'
+    patch '/correspondence/:correspondence_uuid/intake_update', to: 'correspondence_intake#intake_update'
     get '/correspondence/:correspondence_uuid/veteran', to: 'correspondence#veteran'
     put '/correspondence/:correspondence_uuid/update_cmp', to: 'correspondence#update_cmp'
     get '/correspondence/packages', to: 'correspondence#package_documents'
@@ -339,7 +338,7 @@
     get '/correspondence/:pdf_id/pdf', to: 'correspondence#pdf'
     patch '/correspondence/:correspondence_uuid', to: 'correspondence#update'
     patch '/correspondence/:id/update_document', to: 'correspondence_document#update_document'
-    post '/correspondence/:correspondence_uuid', to: 'correspondence#process_intake', as: :queue_correspondence_intake_process_intake
+    post '/correspondence/:correspondence_uuid', to: 'correspondence_intake#process_intake', as: :queue_correspondence_intake_process_intake
     post "/correspondence/:correspondence_uuid/task", to: "correspondence_tasks#create_package_action_task"
     get '/appeals/:vacols_id', to: 'queue#index'
     get '/appeals/:appealId/notifications', to: 'queue#index'
diff --git a/spec/controllers/correspondence_controller_spec.rb b/spec/controllers/correspondence_controller_spec.rb
index a3b0cf07a33..d3d0ce65104 100644
--- a/spec/controllers/correspondence_controller_spec.rb
+++ b/spec/controllers/correspondence_controller_spec.rb
@@ -72,68 +72,6 @@
     end
   end
 
-  describe "POST #process_intake" do
-    before do
-      MailTeam.singleton.add_user(current_user)
-      User.authenticate!(user: current_user)
-      correspondence.update(veteran: veteran)
-      appeal_ids = esw_tasks.map { |task| Task.find(task[:task_id]).appeal.id }
-      post :process_intake, params: {
-        correspondence_uuid: correspondence.uuid,
-        related_correspondence_uuids: related_correspondence_uuids,
-        waived_evidence_submission_window_tasks: esw_tasks,
-        related_appeal_ids: appeal_ids
-      }
-    end
-    it "responds with created status" do
-      expect(response).to have_http_status(:created)
-    end
-
-    it "relates the correspondence to related correpondences" do
-      rcs = related_correspondence_uuids.map do |uuid|
-        Correspondence.find_by(uuid: uuid)
-      end
-      expect(correspondence.related_correspondences).to eq(rcs)
-
-      rcs.each do |corr|
-        expect(corr.related_correspondences).to eq([correspondence])
-      end
-    end
-
-    it "completes evidence window submission tasks" do
-      esw_tasks.each do |esw_task|
-        task = Task.find(esw_task[:task_id])
-        expect(task.status).to eq("completed")
-        expect(task.instructions.include?("This is a waive reason.")).to eq(true)
-        expect(task.appeal.correspondences).to eq([correspondence])
-      end
-    end
-  end
-
-  describe "POST #process_intake sad path" do
-    before do
-      MailTeam.singleton.add_user(current_user)
-      User.authenticate!(user: current_user)
-      correspondence.update(veteran: veteran)
-    end
-
-    it "Rolls back db changes if there is an error" do
-      post :process_intake, params: {
-        correspondence_uuid: correspondence.uuid,
-        related_correspondence_uuids: (related_correspondence_uuids + [3])
-      }
-      expect(correspondence.related_correspondences.empty?).to be(true)
-    end
-
-    it "gives a 400 status if there is an error" do
-      post :process_intake, params: {
-        correspondence_uuid: correspondence.uuid,
-        related_correspondence_uuids: (related_correspondence_uuids + [3])
-      }
-      expect(response.status).to eq(400)
-    end
-  end
-
   describe "PATCH #update" do
     let(:veteran) { create(:veteran, file_number: new_file_number) }
     before do
diff --git a/spec/controllers/correspondence_intake_controller_spec.rb b/spec/controllers/correspondence_intake_controller_spec.rb
new file mode 100644
index 00000000000..648f56101a2
--- /dev/null
+++ b/spec/controllers/correspondence_intake_controller_spec.rb
@@ -0,0 +1,100 @@
+# frozen_string_literal: true
+
+RSpec.describe CorrespondenceIntakeController, :all_dbs, type: :controller do
+  let(:veteran) { create(:veteran) }
+  let(:correspondence_type) { create(:correspondence_type) }
+  let(:correspondence) { create(:correspondence, veteran: veteran) }
+
+  let(:related_correspondence_uuids) do
+    (1..3).map { create(:correspondence) }.pluck(:uuid)
+  end
+  let(:esw_tasks) do
+    (1..3).map do
+      appeal = create(:appeal)
+      InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
+      {
+        task_id: EvidenceSubmissionWindowTask.find_by(appeal: appeal).id,
+        waive_reason: "This is a waive reason."
+      }
+    end
+  end
+  let(:veteran) { create(:veteran) }
+  let(:valid_params) { { notes: "Updated notes", correspondence_type_id: correspondence_type.id } }
+  let(:new_file_number) { "50000005" }
+  let(:current_user) { create(:user) }
+  let!(:parent_task) { create(:correspondence_intake_task, appeal: correspondence, assigned_to: current_user) }
+
+  let(:mock_doc_uploader) { instance_double(CorrespondenceDocumentsEfolderUploader) }
+
+  before do
+    Fakes::Initializer.load!
+    FeatureToggle.enable!(:correspondence_queue)
+    User.authenticate!(roles: ["Mail Intake"])
+    correspondence.update(veteran: veteran)
+
+    allow(CorrespondenceDocumentsEfolderUploader).to receive(:new).and_return(mock_doc_uploader)
+    allow(mock_doc_uploader).to receive(:upload_documents_to_claim_evidence).and_return(true)
+  end
+
+  describe "POST #process_intake" do
+    before do
+      MailTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+      correspondence.update(veteran: veteran)
+      appeal_ids = esw_tasks.map { |task| Task.find(task[:task_id]).appeal.id }
+      post :process_intake, params: {
+        correspondence_uuid: correspondence.uuid,
+        related_correspondence_uuids: related_correspondence_uuids,
+        waived_evidence_submission_window_tasks: esw_tasks,
+        related_appeal_ids: appeal_ids
+      }
+    end
+    it "responds with created status" do
+      expect(response).to have_http_status(:created)
+    end
+
+    it "relates the correspondence to related correpondences" do
+      rcs = related_correspondence_uuids.map do |uuid|
+        Correspondence.find_by(uuid: uuid)
+      end
+      expect(correspondence.related_correspondences).to eq(rcs)
+
+      rcs.each do |corr|
+        expect(corr.related_correspondences).to eq([correspondence])
+      end
+    end
+
+    it "completes evidence window submission tasks" do
+      esw_tasks.each do |esw_task|
+        task = Task.find(esw_task[:task_id])
+        expect(task.status).to eq("completed")
+        expect(task.instructions.include?("This is a waive reason.")).to eq(true)
+        expect(task.appeal.correspondences).to eq([correspondence])
+      end
+    end
+  end
+
+  describe "POST #process_intake sad path" do
+    before do
+      MailTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+      correspondence.update(veteran: veteran)
+    end
+
+    it "Rolls back db changes if there is an error" do
+      post :process_intake, params: {
+        correspondence_uuid: correspondence.uuid,
+        related_correspondence_uuids: (related_correspondence_uuids + [3])
+      }
+      expect(correspondence.related_correspondences.empty?).to be(true)
+    end
+
+    it "gives a 400 status if there is an error" do
+      post :process_intake, params: {
+        correspondence_uuid: correspondence.uuid,
+        related_correspondence_uuids: (related_correspondence_uuids + [3])
+      }
+      expect(response.status).to eq(400)
+    end
+  end
+end
diff --git a/spec/support/correspondence_helpers.rb b/spec/support/correspondence_helpers.rb
index 2e1254fc296..389452e3de2 100644
--- a/spec/support/correspondence_helpers.rb
+++ b/spec/support/correspondence_helpers.rb
@@ -36,7 +36,7 @@ def visit_intake_form_with_correspondence_load
         va_date_of_receipt: Time.zone.local(2023, 1, 1)
       )
     end
-    allow_any_instance_of(CorrespondenceController).to receive(:correspondence_load).and_return(Correspondence.all)
+    allow_any_instance_of(CorrespondenceIntakeController).to receive(:correspondence_load).and_return(Correspondence.all)
 
     visit "/queue/correspondence/#{Correspondence.first.uuid}/intake"
   end
@@ -64,7 +64,7 @@ def visit_intake_form_step_2_with_appeals
         va_date_of_receipt: Time.zone.local(2023, 1, 1)
       )
     end
-    allow_any_instance_of(CorrespondenceController).to receive(:correspondence_load).and_return(Correspondence.all)
+    allow_any_instance_of(CorrespondenceIntakeController).to receive(:correspondence_load).and_return(Correspondence.all)
 
     visit "/queue/correspondence/#{Correspondence.first.uuid}/intake"
 
@@ -85,7 +85,7 @@ def visit_intake_form_step_2_with_appeals_without_initial_tasks
         va_date_of_receipt: Time.zone.local(2023, 1, 1)
       )
     end
-    allow_any_instance_of(CorrespondenceController).to receive(:correspondence_load).and_return(Correspondence.all)
+    allow_any_instance_of(CorrespondenceIntakeController).to receive(:correspondence_load).and_return(Correspondence.all)
 
     visit "/queue/correspondence/#{Correspondence.first.uuid}/intake"
 

From cb5872178d598754f51cbf79d5eb0d208406d5e6 Mon Sep 17 00:00:00 2001
From: piedram <110848569+piedram@users.noreply.github.com>
Date: Wed, 20 Mar 2024 16:03:24 -0400
Subject: [PATCH 168/237] Piedram/appeals 41494 (#21196)

* modified to show error in date filter

* modified datecomplete

* change name in header

* fix style issue

* Fix spec file

* Add new test in spec file
---
 client/app/components/ReceiptDatePicker.jsx   |  44 ++++-
 .../components/TaskCompletedDatePicker.jsx    |  54 +++++-
 client/app/queue/QueueDropdownFilter.jsx      |  85 +++++++++-
 client/constants/QUEUE_CONFIG.json            |   4 +-
 .../correspondence_cases_spec.rb              | 159 ++++++++++++++++--
 5 files changed, 319 insertions(+), 27 deletions(-)

diff --git a/client/app/components/ReceiptDatePicker.jsx b/client/app/components/ReceiptDatePicker.jsx
index c9dd4dfdd86..8e58f9f29d1 100644
--- a/client/app/components/ReceiptDatePicker.jsx
+++ b/client/app/components/ReceiptDatePicker.jsx
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import ReactSelectDropdown from '../../../client/app/components/ReactSelectDropdown';
 import DateSelector from './DateSelector';
 import Button from './Button';
+import { style } from 'glamor';
 
 const dateDropdownMap = [
   { value: 0, label: 'Between these dates' },
@@ -13,8 +14,24 @@ const dateDropdownMap = [
 
 const receiptDatePicker = (props) => {
 
+  const errorMessagesNode = (errors, errType) => {
+    if (errors.length) {
+      return (
+        errors.map((error, index) =>
+          (errType === error.key) &&
+            <p id={`${errType}Err${index}`} key={index}
+              style={{ color: 'red', fontSize: '13px', fontWeight: '900', marginBottom: '0px' }}>
+              {error.message}
+            </p>
+        )
+      );
+    }
+  };
+
   const getDatePickerElements = () => {
     const receiptDateFilterStates = props.receiptDateFilterStates;
+    const dateErrorsFrom = props.dateErrorsFrom;
+    const dateErrorsTo = props.dateErrorsTo;
 
     switch (props.receiptDateState) {
     case receiptDateFilterStates.BETWEEN: return (
@@ -22,31 +39,44 @@ const receiptDatePicker = (props) => {
         <DateSelector
           onChange={props.handleDateChange}
           label="From"
-          type="date" />
+          type="date"
+          errorMessage={errorMessagesNode(dateErrorsFrom, 'fromDate')}
+        />
         <DateSelector
           onChange={props.handleSecondaryDateChange}
           label="To"
-          type="date" />
+          type="date"
+          errorMessage={errorMessagesNode(dateErrorsTo, 'toDate')}
+        />
       </div>);
     case receiptDateFilterStates.BEFORE: return (
       <div style={{ marginLeft: '5%', marginRight: '5%' }}>
         <DateSelector
           onChange={(value) => props.handleDateChange(value)}
-          type="date" />
+          label = "Receipt date"
+          type="date"
+          errorMessage={errorMessagesNode(dateErrorsFrom, 'fromDate')}
+        />
       </div>
     );
     case receiptDateFilterStates.AFTER: return (
       <div style={{ marginLeft: '5%', marginRight: '5%' }}>
         <DateSelector
           onChange={(value) => props.handleDateChange(value)}
-          type="date" />
+          label = "Receipt date"
+          type="date"
+          errorMessage={errorMessagesNode(dateErrorsFrom, 'fromDate')}
+        />
       </div>
     );
     case receiptDateFilterStates.ON: return (
       <div style={{ marginLeft: '5%', marginRight: '5%' }}>
         <DateSelector
           onChange={(value) => props.handleDateChange(value)}
-          type="date" />
+          label = "Receipt date"
+          type="date"
+          errorMessage={errorMessagesNode(dateErrorsFrom, 'fromDate')}
+        />
       </div>
     );
 
@@ -94,7 +124,9 @@ receiptDatePicker.propTypes = {
   onChangeMethod: PropTypes.func,
   className: PropTypes.string,
   disabled: PropTypes.bool,
-  customPlaceholder: PropTypes.string
+  customPlaceholder: PropTypes.string,
+  dateErrorsFrom: PropTypes.array,
+  dateErrorsTo: PropTypes.array
 };
 
 export default receiptDatePicker;
diff --git a/client/app/components/TaskCompletedDatePicker.jsx b/client/app/components/TaskCompletedDatePicker.jsx
index 962d1929dfb..111a16b85ed 100644
--- a/client/app/components/TaskCompletedDatePicker.jsx
+++ b/client/app/components/TaskCompletedDatePicker.jsx
@@ -14,6 +14,8 @@ const dateDropdownMap = [
 const TaskCompletedDatePicker = (props) => {
   const [isDateSelected, setDateSelected] = useState(false);
   const [isSecondaryDateSelected, setSecondaryDateSelected] = useState(false);
+  const dateErrorsFrom = props.dateErrorsFrom;
+  const dateErrorsTo = props.dateErrorsTo;
 
   const handleDateChange = (value) => {
     props.handleTaskCompletedDateChange(value);
@@ -29,33 +31,67 @@ const TaskCompletedDatePicker = (props) => {
     props.handleTaskCompletedApplyFilter();
   };
 
+  const errorMessagesNode = (errors, errType) => {
+    if (errors.length) {
+      return (
+        errors.map((error, index) =>
+          (errType === error.key) &&
+            <p id={`${errType}Err${index}`} key={index}
+              style={{ color: 'red', fontSize: '13px', fontWeight: '900', marginBottom: '0px' }}>
+              {error.message}
+            </p>
+        )
+      );
+    }
+  };
+
   const taskCompletedDateFilterStates = props.taskCompletedDateFilterStates;
   const isApplyFilterButtonDisabled =
     props.taskCompletedDateState === taskCompletedDateFilterStates.BETWEEN ?
-      !(isDateSelected && isSecondaryDateSelected) :
-      !isDateSelected;
+      !((isDateSelected && isSecondaryDateSelected) && (dateErrorsFrom.length <= 0 && dateErrorsTo.length <= 0)) :
+      !(isDateSelected && dateErrorsFrom.length <= 0);
 
   const getDatePickerElements = () => {
 
     switch (props.taskCompletedDateState) {
     case taskCompletedDateFilterStates.BETWEEN: return (
       <div style={{ margin: '5% 5%' }}>
-        <DateSelector onChange={handleDateChange} label="From" type="date" />
-        <DateSelector onChange={handleSecondaryDateChange} label="To" type="date" />
+        <DateSelector
+          onChange={handleDateChange}
+          label="From"
+          type="date"
+          errorMessage={errorMessagesNode(dateErrorsFrom, 'fromDate')} />
+        <DateSelector
+          onChange={handleSecondaryDateChange}
+          label="To"
+          type="date"
+          errorMessage={errorMessagesNode(dateErrorsTo, 'toDate')} />
       </div>);
     case taskCompletedDateFilterStates.BEFORE: return (
       <div style={{ margin: '5% 5%' }}>
-        <DateSelector onChange={handleDateChange} label="To" type="date" />
+        <DateSelector
+          onChange={handleDateChange}
+          label="Date Completed"
+          type="date"
+          errorMessage={errorMessagesNode(dateErrorsFrom, 'fromDate')} />
       </div>
     );
     case taskCompletedDateFilterStates.AFTER: return (
       <div style={{ margin: '5% 5%' }}>
-        <DateSelector onChange={handleDateChange} type="date" />
+        <DateSelector
+          onChange={handleDateChange}
+          label="Date Completed"
+          type="date"
+          errorMessage={errorMessagesNode(dateErrorsFrom, 'fromDate')} />
       </div>
     );
     case taskCompletedDateFilterStates.ON: return (
       <div style={{ margin: '5% 5%' }}>
-        <DateSelector onChange={handleDateChange} label="Date Completed" type="date" />
+        <DateSelector
+          onChange={handleDateChange}
+          label="Date Completed"
+          type="date"
+          errorMessage={errorMessagesNode(dateErrorsFrom, 'fromDate')} />
       </div>
     );
 
@@ -98,7 +134,9 @@ TaskCompletedDatePicker.propTypes = {
   onChangeMethod: PropTypes.func,
   className: PropTypes.string,
   disabled: PropTypes.bool,
-  customPlaceholder: PropTypes.string
+  customPlaceholder: PropTypes.string,
+  dateErrorsFrom: PropTypes.array,
+  dateErrorsTo: PropTypes.array
 };
 
 export default TaskCompletedDatePicker;
diff --git a/client/app/queue/QueueDropdownFilter.jsx b/client/app/queue/QueueDropdownFilter.jsx
index de7b217e111..a5d07c07f2b 100644
--- a/client/app/queue/QueueDropdownFilter.jsx
+++ b/client/app/queue/QueueDropdownFilter.jsx
@@ -36,6 +36,19 @@ const taskCompletedDateFilterStates = {
   ON: 3
 };
 
+const convertStringToDate = (stringDate) => {
+  const date = new Date();
+  const splitVals = stringDate.split('-');
+
+  date.setFullYear(Number(splitVals[0]));
+  // the datepicker component returns months from 1-12. Javascript dates count months from 0-11
+  // this offsets it so they match.
+  date.setMonth(Number(splitVals[1] - 1));
+  date.setDate(Number(splitVals[2]));
+
+  return date;
+};
+
 class QueueDropdownFilter extends React.PureComponent {
   constructor() {
     super();
@@ -46,7 +59,9 @@ class QueueDropdownFilter extends React.PureComponent {
       receiptDateSecondaryValue: '',
       taskCompletedDateState: -1,
       taskCompletedDatePrimaryValue: '',
-      taskCompletedDateSecondaryValue: ''
+      taskCompletedDateSecondaryValue: '',
+      dateErrorsFrom: [],
+      dateErrorsTo: [],
     };
   }
 
@@ -54,24 +69,81 @@ class QueueDropdownFilter extends React.PureComponent {
     this.setState({ receiptDateState: value.value });
   };
 
+  validateDate = (date, type, filterType) => {
+    let foundErrors = [];
+    let primaryDate = '';
+    let secondaryDate = '';
+    let currentSelector = '';
+    let messageText = '';
+
+    if (filterType === 'VADOR') {
+      currentSelector = this.state.receiptDateState;
+      primaryDate = this.state.receiptDatePrimaryValue;
+      secondaryDate = this.state.receiptDateSecondaryValue;
+      messageText = 'Receipt date';
+    } else {
+      currentSelector = this.state.taskCompletedDateState;
+      primaryDate = this.state.taskCompletedDatePrimaryValue;
+      secondaryDate = this.state.taskCompletedDateSecondaryValue;
+      messageText = 'Date completed';
+    }
+
+    if (currentSelector === 0) {
+      if (type === 'fromDate') {
+        if (secondaryDate !== '' && date > secondaryDate) {
+          foundErrors = [...foundErrors, { key: type, message: 'Start date must be less than the end date' }];
+        }
+      } else if (date < primaryDate) {
+        foundErrors = [...foundErrors, { key: type, message: 'End date must be greater than the start date' }];
+      }
+    }
+
+    // Prevent the date from being picked past the current day.
+    if (convertStringToDate(date) > new Date()) {
+      foundErrors = [...foundErrors, { key: type, message: `${messageText} cannot be in the future.` }];
+    }
+
+    if (type === 'fromDate') {
+      this.setState({ dateErrorsFrom: foundErrors });
+      if (secondaryDate !== '' &&
+      date <= secondaryDate &&
+      convertStringToDate(secondaryDate) <= new Date()) {
+        this.setState({ dateErrorsTo: foundErrors });
+      }
+    } else {
+      this.setState({ dateErrorsTo: foundErrors });
+      if (primaryDate !== '' &&
+      date >= primaryDate &&
+      convertStringToDate(primaryDate) <= new Date()) {
+        this.setState({ dateErrorsFrom: [] });
+      }
+    }
+
+    return foundErrors;
+  };
+
   setTaskCompletedDateState = (value) => {
     this.setState({ taskCompletedDateState: value.value });
   };
 
   handleDateChange = (value) => {
+    this.validateDate(value, 'fromDate', 'VADOR');
     this.setState({ receiptDatePrimaryValue: value });
   }
 
   handleTaskCompletedDateChange = (value) => {
+    this.validateDate(value, 'fromDate', 'FDATE');
     this.setState({ taskCompletedDatePrimaryValue: value });
   }
 
   // Used when the between dates option is selected to store the second date.
   handleSecondaryDateChange = (value) => {
+    this.validateDate(value, 'toDate', 'VADOR');
     this.setState({ receiptDateSecondaryValue: value });
   }
 
   handleTaskCompletedSecondaryDateChange = (value) => {
+    this.validateDate(value, 'toDate', 'FDATE');
     this.setState({ taskCompletedDateSecondaryValue: value });
   }
 
@@ -89,9 +161,14 @@ class QueueDropdownFilter extends React.PureComponent {
   }
 
   isApplyButtonEnabled = () => {
+
+    if (this.state.dateErrorsFrom.length > 0 || this.state.dateErrorsTo.length > 0) {
+      return true;
+    }
     if (this.state.receiptDateState >= 1 && this.state.receiptDatePrimaryValue !== '') {
       return false;
     }
+
     if (this.state.receiptDateState === 0 &&
       this.state.receiptDatePrimaryValue.length > 0 &&
       this.state.receiptDateSecondaryValue.length > 0) {
@@ -108,6 +185,8 @@ class QueueDropdownFilter extends React.PureComponent {
     this.setTaskCompletedDateState(-1);
     this.setState({ taskCompletedDatePrimaryValue: '' });
     this.setState({ taskCompletedDateSecondaryValue: '' });
+    this.setState({ dateErrorsFrom: [] });
+    this.setState({ dateErrorsTo: [] });
     this.props.clearFilters();
 
   }
@@ -161,6 +240,8 @@ class QueueDropdownFilter extends React.PureComponent {
           receiptDateValues={this.state.receiptDateValues}
           receiptDateFilterStates={receiptDateFilterStates}
           isApplyButtonEnabled={this.isApplyButtonEnabled()}
+          dateErrorsFrom = {this.state.dateErrorsFrom}
+          dateErrorsTo = {this.state.dateErrorsTo}
         />}
         {this.props.isTaskCompletedDateFilter && <TaskCompletedDatePicker
           handleTaskCompletedDateChange={this.handleTaskCompletedDateChange}
@@ -171,6 +252,8 @@ class QueueDropdownFilter extends React.PureComponent {
           taskCompletedDateState={this.state.taskCompletedDateState}
           taskCompletedDateValues={this.state.taskCompletedDateValues}
           taskCompletedDateFilterStates={taskCompletedDateFilterStates}
+          dateErrorsFrom = {this.state.dateErrorsFrom}
+          dateErrorsTo = {this.state.dateErrorsTo}
         />
 
         }
diff --git a/client/constants/QUEUE_CONFIG.json b/client/constants/QUEUE_CONFIG.json
index 0dd27fc682a..026f219b69b 100644
--- a/client/constants/QUEUE_CONFIG.json
+++ b/client/constants/QUEUE_CONFIG.json
@@ -67,8 +67,8 @@
   "CORRESPONDENCE_PENDING_TASKS_DESCRIPTION": "Correspondence that is currently assigned to non-mail team users:",
   "CORRESPONDENCE_UNASSIGNED_TASKS_DESCRIPTION": "Correspondence owned by the Mail team are unassigned to an individual:",
 
-  "CORRESPONDENCE_ORG_TABLE_TITLE": "Correspondence cases",
-  "CORRESPONDENCE_USER_TABLE_TITLE": "Your correspondence",
+  "CORRESPONDENCE_ORG_TABLE_TITLE": "Correspondence Cases",
+  "CORRESPONDENCE_USER_TABLE_TITLE": "Your Correspondence",
 
 
   "COLUMNS": {
diff --git a/spec/feature/queue/correspondence/correspondence_cases_spec.rb b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
index 88610516f9e..f197febf244 100644
--- a/spec/feature/queue/correspondence/correspondence_cases_spec.rb
+++ b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
@@ -172,7 +172,9 @@
       all(".unselected-filter-icon")[0].click
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-2-option-2").click
-      all("div.input-container > input")[0].fill_in(with: "10/01/2024")
+      current_date = Time.zone.today
+      myDate = current_date.strftime("%m/%d/%Y")
+      all("div.input-container > input")[0].fill_in(with: myDate)
       find(".cf-submit").click
       expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
     end
@@ -253,8 +255,8 @@
       find("#reactSelectContainer").click
       find("#react-select-2-option-0").click
       current_date = Time.zone.today
-      start_date = current_date.strftime("%m/%d/%Y")
-      end_date = (current_date + 1).strftime("%m/%d/%Y")
+      start_date = (current_date - 1).strftime("%m/%d/%Y")
+      end_date = (current_date).strftime("%m/%d/%Y")
 
       all("div.input-container > input")[0].fill_in(with: start_date)
       all("div.input-container > input")[1].fill_in(with: end_date)
@@ -273,7 +275,7 @@
       find("#reactSelectContainer").click
       find("#react-select-2-option-1").click
       current_date = Time.zone.today
-      start_date = (current_date + 1).strftime("%m/%d/%Y")
+      start_date = (current_date -3).strftime("%m/%d/%Y")
 
       all("div.input-container > input")[0].fill_in(with: start_date)
       expect(page).to have_button("Apply filter", disabled: false)
@@ -485,7 +487,9 @@
       all(".unselected-filter-icon")[0].click
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-2-option-2").click
-      all("div.input-container > input")[0].fill_in(with: "10/01/2024")
+      current_date = Time.zone.today
+      myDate = (current_date - 4).strftime("%m/%d/%Y")
+      all("div.input-container > input")[0].fill_in(with: myDate)
       find(".cf-submit").click
       expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
     end
@@ -636,7 +640,9 @@
       all(".unselected-filter-icon")[0].click
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-3-option-2").click
-      all("div.input-container > input")[0].fill_in(with: "10/01/2024")
+      current_date = Time.zone.today
+      myDate = (current_date - 5).strftime("%m/%d/%Y")
+      all("div.input-container > input")[0].fill_in(with: myDate)
       click_button("Apply Filter")
       expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
     end
@@ -788,7 +794,9 @@
       all(".unselected-filter-icon")[0].click
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-3-option-1").click
-      all("div.input-container > input")[0].fill_in(with: "10/01/2001")
+      current_date = Time.zone.today
+      myDate = (current_date - 5).strftime("%m/%d/%Y")
+      all("div.input-container > input")[0].fill_in(with: myDate)
       click_button("Apply Filter")
       expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
     end
@@ -798,7 +806,9 @@
       all(".unselected-filter-icon")[0].click
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-3-option-2").click
-      all("div.input-container > input")[0].fill_in(with: "10/01/2024")
+      current_date = Time.zone.today
+      myDate = (current_date - 5).strftime("%m/%d/%Y")
+      all("div.input-container > input")[0].fill_in(with: myDate)
       click_button("Apply Filter")
       expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
     end
@@ -1010,7 +1020,9 @@
       all(".unselected-filter-icon")[0].click
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-2-option-2").click
-      all("div.input-container > input")[0].fill_in(with: "10/01/2024")
+      current_date = Time.zone.today
+      myDate = current_date.strftime("%m/%d/%Y")
+      all("div.input-container > input")[0].fill_in(with: myDate)
       find(".cf-submit").click
       expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
     end
@@ -1126,7 +1138,9 @@
       all(".unselected-filter-icon")[0].click
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-2-option-2").click
-      all("div.input-container > input")[0].fill_in(with: "10/01/2024")
+      current_date = Time.zone.today
+      myDate = (current_date -3).strftime("%m/%d/%Y")
+      all("div.input-container > input")[0].fill_in(with: myDate)
       find(".cf-submit").click
       expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
     end
@@ -1197,4 +1211,129 @@
       expect(find("tbody > tr:nth-child(1) > td:nth-child(2)").text == last_assignee)
     end
   end
+
+  context "correspondence tasks completed tab testing filters date " do
+    let(:current_user) { create(:user) }
+    before :each do
+      InboundOpsTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+    end
+
+    before do
+      20.times do
+        correspondence = create(:correspondence)
+        correspondence.root_task.update!(status: Constants.TASK_STATUSES.completed,
+                                         closed_at: rand(6 * 24 * 60).minutes.ago)
+      end
+    end
+
+    before :each do
+      FeatureToggle.enable!(:correspondence_queue)
+      FeatureToggle.enable!(:user_queue_pagination)
+    end
+
+    it "filters date column with 'between' the date is older than today in 'from' field" do
+      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=completedDateColumn&order=asc"
+
+      find("[aria-label='Filter by date completed']").click
+      expect(page).to have_content("Date filter parameters")
+      expect(page).to have_button("Apply filter", disabled: true)
+
+      find("#reactSelectContainer").click
+      find("#react-select-2-option-0").click
+      current_date = Time.zone.today
+      start_date = (current_date + 1).strftime("%m/%d/%Y")
+
+      all("div.input-container > input")[0].fill_in(with: start_date)
+
+      expect(page).to have_button("Apply filter", disabled: true)
+      expect(page).to have_content("Date completed cannot be in the future.")
+    end
+
+    it "filters date column with 'between' the date is older than today in 'to' field" do
+      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=completedDateColumn&order=asc"
+
+      find("[aria-label='Filter by date completed']").click
+      expect(page).to have_content("Date filter parameters")
+      expect(page).to have_button("Apply filter", disabled: true)
+
+      find("#reactSelectContainer").click
+      find("#react-select-2-option-0").click
+      current_date = Time.zone.today
+      end_date = (current_date + 1).strftime("%m/%d/%Y")
+
+      all("div.input-container > input")[1].fill_in(with: end_date)
+
+      expect(page).to have_button("Apply filter", disabled: true)
+      expect(page).to have_content("Date completed cannot be in the future.")
+    end
+
+    it "filters date column with 'between' the date in 'to' is older than 'from' field" do
+      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=completedDateColumn&order=asc"
+
+      find("[aria-label='Filter by date completed']").click
+      expect(page).to have_content("Date filter parameters")
+      expect(page).to have_button("Apply filter", disabled: true)
+
+      find("#reactSelectContainer").click
+      find("#react-select-2-option-0").click
+      current_date = Time.zone.today
+      start_date = (current_date - 1).strftime("%m/%d/%Y")
+      end_date = (current_date - 3).strftime("%m/%d/%Y")
+
+      all("div.input-container > input")[0].fill_in(with: start_date)
+      all("div.input-container > input")[1].fill_in(with: end_date)
+
+      expect(page).to have_button("Apply filter", disabled: true)
+      expect(page).to have_content("End date must be greater than the start date")
+    end
+
+    it "filters date column with 'before' this date" do
+      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=completedDateColumn&order=asc"
+      find("[aria-label='Filter by date completed']").click
+      expect(page).to have_content("Date filter parameters")
+      expect(page).to have_button("Apply filter", disabled: true)
+
+      find("#reactSelectContainer").click
+      find("#react-select-2-option-1").click
+      current_date = Time.zone.today
+      start_date = (current_date + 3).strftime("%m/%d/%Y")
+
+      all("div.input-container > input")[0].fill_in(with: start_date)
+      expect(page).to have_button("Apply filter", disabled: true)
+      expect(page).to have_content("Date completed cannot be in the future.")
+    end
+
+    it "filters date column with 'after' this date" do
+      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=completedDateColumn&order=asc"
+
+      find("[aria-label='Filter by date completed']").click
+      expect(page).to have_content("Date filter parameters")
+      expect(page).to have_button("Apply filter", disabled: true)
+
+      find("#reactSelectContainer").click
+      find("#react-select-2-option-2").click
+      current_date = Time.zone.yesterday
+      after_date = (current_date + 3).strftime("%m/%d/%Y")
+      all("div.input-container > input")[0].fill_in(with: after_date)
+      expect(page).to have_button("Apply filter", disabled: true)
+      expect(page).to have_content("Date completed cannot be in the future.")
+    end
+
+    it "filters date column with 'on' this date" do
+      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=completedDateColumn&order=asc"
+
+      find("[aria-label='Filter by date completed']").click
+      expect(page).to have_content("Date filter parameters")
+      expect(page).to have_button("Apply filter", disabled: true)
+
+      find("#reactSelectContainer").click
+      find("#react-select-2-option-3").click
+      current_date = Time.zone.today
+      on_this_date = (current_date + 1).strftime("%m/%d/%Y")
+      all("div.input-container > input")[0].fill_in(with: on_this_date)
+      expect(page).to have_button("Apply filter", disabled: true)
+      expect(page).to have_content("Date completed cannot be in the future.")
+    end
+  end
 end

From f8b0516e22776b3eb1007e78f25fb958b1734c5d Mon Sep 17 00:00:00 2001
From: Dev-KRedd <134650238+Dev-KRedd@users.noreply.github.com>
Date: Wed, 20 Mar 2024 16:04:43 -0400
Subject: [PATCH 169/237] Error banner now working as intended (#21206)

Co-authored-by: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
---
 .../correspondenceActions.js                  |  9 +++
 .../correspondenceConstants.js                |  1 +
 .../correspondenceReducer.js                  |  8 +++
 .../components/CorrespondenceIntake.jsx       | 14 +++--
 .../queue/correspondence/intake_spec.rb       | 57 +++++++++++++++++++
 5 files changed, 85 insertions(+), 4 deletions(-)

diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
index 3b1db6c6edc..bb794e17edc 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
@@ -201,3 +201,12 @@ export const setShowRemovePackageModal = (isVisible) => (dispatch) => {
     }
   });
 };
+
+export const setErrorBanner = (isVisible) => (dispatch) => {
+  dispatch({
+    type: ACTIONS.SET_SHOW_CORRESPONDENCE_INTAKE_FORM_ERROR_BANNER,
+    payload: {
+      isVisible
+    }
+  });
+};
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
index 30d91e77638..156ae2a7556 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
@@ -18,5 +18,6 @@ export const ACTIONS = {
   SET_WAIVED_EVIDENCE_TASKS: 'SET_WAIVED_EVIDENCE_TASKS',
   SET_SHOW_REASSIGN_PACKAGE_MODAL: 'SET_SHOW_REASSIGN_PACKAGE_MODAL',
   SET_SHOW_REMOVE_PACKAGE_MODAL: 'SET_SHOW_REMOVE_PACKAGE_MODAL',
+  SET_SHOW_CORRESPONDENCE_INTAKE_FORM_ERROR_BANNER: 'SET_SHOW_CORRESPONDENCE_INTAKE_FORM_ERROR_BANNER',
   SET_SELECTED_TASKS: 'SET_SELECTED_TASKS'
 };
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
index e5efd191560..3d6f63d71fb 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
@@ -16,6 +16,7 @@ export const initialState = {
   waivedEvidenceTasks: [],
   showReassignPackageModal: false,
   showRemovePackageModal: false,
+  showErrorBanner: false
 };
 
 export const intakeCorrespondenceReducer = (state = initialState, action = {}) => {
@@ -161,6 +162,13 @@ export const intakeCorrespondenceReducer = (state = initialState, action = {}) =
       }
     });
 
+  case ACTIONS.SET_SHOW_CORRESPONDENCE_INTAKE_FORM_ERROR_BANNER:
+    return update(state, {
+      showErrorBanner: {
+        $set: action.payload.isVisible
+      }
+    });
+
   default:
     return state;
   }
diff --git a/client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx b/client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx
index 39e5fdb94bf..116d98aa1a9 100644
--- a/client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx
+++ b/client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx
@@ -4,12 +4,13 @@ import Button from '../../../../components/Button';
 import PropTypes from 'prop-types';
 import AddCorrespondenceView from './AddCorrespondence/AddCorrespondenceView';
 import { AddTasksAppealsView } from './TasksAppeals/AddTasksAppealsView';
-import { connect, useSelector } from 'react-redux';
+import { connect, useDispatch, useSelector } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import {
   loadSavedIntake,
   setUnrelatedTasks,
   saveCurrentIntake,
+  setErrorBanner
 } from '../../correspondenceReducer/correspondenceActions';
 import { useHistory } from 'react-router-dom';
 import { ConfirmCorrespondenceView } from './ConfirmCorrespondence/ConfirmCorrespondenceView';
@@ -36,14 +37,19 @@ const progressBarSections = [
 ];
 
 export const CorrespondenceIntake = (props) => {
+  const dispatch = useDispatch();
   const intakeCorrespondence = useSelector((state) => state.intakeCorrespondence);
+  const showErrorBanner = useSelector((state) => state.intakeCorrespondence.showErrorBanner);
   const [currentStep, setCurrentStep] = useState(1);
   const [isContinueEnabled, setContinueEnabled] = useState(true);
   const [addTasksVisible, setAddTasksVisible] = useState(false);
   const [submitCorrespondenceModalVisible, setSubmitCorrespondenceModalVisible] = useState(false);
-  const [errorBannerVisible, setErrorBannerVisible] = useState(false);
   const history = useHistory();
 
+  const handleBannerState = (bannerState) => {
+    dispatch(setErrorBanner(bannerState));
+  };
+
   const exportStoredata = {
     correspondence_uuid: props.correspondence_uuid,
     current_step: currentStep,
@@ -105,7 +111,7 @@ export const CorrespondenceIntake = (props) => {
   }, []);
 
   return <div>
-    { errorBannerVisible &&
+    { showErrorBanner &&
       <Alert title={CORRESPONDENCE_INTAKE_FORM_ERROR_BANNER_TITLE} type="error">
         {CORRESPONDENCE_INTAKE_FORM_ERROR_BANNER_TEXT}
       </Alert>
@@ -182,7 +188,7 @@ export const CorrespondenceIntake = (props) => {
       {currentStep === 3 && submitCorrespondenceModalVisible &&
         <SubmitCorrespondenceModal
           setSubmitCorrespondenceModalVisible={setSubmitCorrespondenceModalVisible}
-          setErrorBannerVisible={setErrorBannerVisible}
+          setErrorBannerVisible={handleBannerState}
         />
       }
     </div>
diff --git a/spec/feature/queue/correspondence/intake_spec.rb b/spec/feature/queue/correspondence/intake_spec.rb
index e714b9d8a4a..48c7a4cdbc4 100644
--- a/spec/feature/queue/correspondence/intake_spec.rb
+++ b/spec/feature/queue/correspondence/intake_spec.rb
@@ -400,4 +400,61 @@
       expect(page).to have_content("Review and Confirm Correspondence")
     end
   end
+
+  context "checks for failed to upload to the eFolder banner after navigating away from page" do
+    let(:current_user) { create(:user) }
+    before :each do
+      MailTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+    end
+
+    before do
+      Timecop.freeze(Time.zone.local(2020, 5, 15))
+      @last_correspondence_uuid = nil
+      20.times do
+        correspondence = create(:correspondence)
+        parent_task = create_correspondence_intake(correspondence, current_user)
+        create_efolderupload_task(correspondence, parent_task, user: current_user)
+        @last_correspondence_uuid = EfolderUploadFailedTask.first.correspondence.uuid
+      end
+      puts "Last correspondence UUID: #{@last_correspondence_uuid}"
+
+      # Used to mock a single task to compare task sorting
+      EfolderUploadFailedTask.first.update!(type: "CorrespondenceIntakeTask")
+      EfolderUploadFailedTask.first.correspondence.update!(
+        va_date_of_receipt: Date.new(2000, 10, 10),
+        updated_by_id: current_user.id
+      )
+      EfolderUploadFailedTask.last.correspondence.update!(
+        va_date_of_receipt: Date.new(2024, 10, 10),
+        updated_by_id: current_user.id
+      )
+      FeatureToggle.enable!(:correspondence_queue)
+    end
+
+
+    it "successfully loads the in progress tab" do
+      visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
+      expect(page).to have_content("Correspondence in progress")
+    end
+
+    it "navigates to intake form from in-progress tab to step 3 and checks for failed to upload to the eFolder banner" do
+      visit "/queue/correspondence?tab=correspondence_in_progress"
+      expect(page).to have_content("Correspondence in progress that are assigned to you:")
+      find("tbody > tr:last-child > td:nth-child(1)").click
+      expect(page).to have_current_path("/queue/correspondence/#{@last_correspondence_uuid}/intake")
+      expect(page).to have_content("Add Related Correspondence")
+      expect(page).to have_button("Continue")
+      click_on("button-continue")
+      expect(page).to have_content("Review Tasks & Appeals")
+      click_on("button-continue")
+      expect(page).to have_content("Review and Confirm Correspondence")
+      click_on("Submit")
+      click_on("Confirm")
+      expect(page).to have_content("The correspondence's documents have failed to upload to the eFolder")
+      click_on("button-Cancel")
+      visit "/queue/correspondence/#{@last_correspondence_uuid}/intake"
+      expect(page).to have_content("The correspondence's documents have failed to upload to the eFolder")
+    end
+  end
 end

From da29b1d226b51ef7d7f4e7ec4ae1a928f2d27a77 Mon Sep 17 00:00:00 2001
From: Will Medders <93014155+wmedders21@users.noreply.github.com>
Date: Wed, 20 Mar 2024 16:15:48 -0500
Subject: [PATCH 170/237] Wmedders21/appeals 42552 (#21209)

* sorting query for date completed column on correspondence tables

* optimize task query for your correspondence completed tab

* optimize task query for corresepondence cases completed tab

* update correspondence task filter for new column name

* add name props to avoid console errors

* correct prop types

* update with new column name

* update seeds to reflect expected workflow

* update broken tests

* remove unnecessarily bloated test case setup

* update broken test expectation
---
 .../correspondence_completed_tasks_tab.rb     | 26 +++++++--------
 ...tion_correspondence_completed_tasks_tab.rb | 28 ++++++++--------
 app/models/task_sorter.rb                     |  7 ++--
 .../tasks/correspondence_task_filter.rb       |  4 +--
 client/app/queue/QueueDropdownFilter.jsx      |  4 +--
 client/app/queue/QueueTable.jsx               |  2 +-
 .../app/queue/components/TaskTableColumns.jsx | 16 ++++++++++
 .../CorrespondenceTableBuilder.jsx            |  4 +--
 client/constants/QUEUE_CONFIG.json            |  5 +++
 db/seeds/helpers/queue_helpers.rb             |  1 +
 db/seeds/queue_correspondences.rb             |  3 ++
 .../correspondence_cases_spec.rb              | 32 ++++++++++---------
 .../queue/correspondence/intake_spec.rb       | 31 ++++--------------
 spec/models/correspondence_config_spec.rb     |  4 +--
 14 files changed, 88 insertions(+), 79 deletions(-)

diff --git a/app/models/queue_tabs/correspondence_completed_tasks_tab.rb b/app/models/queue_tabs/correspondence_completed_tasks_tab.rb
index b4f9458a715..fddeef7ce2b 100644
--- a/app/models/queue_tabs/correspondence_completed_tasks_tab.rb
+++ b/app/models/queue_tabs/correspondence_completed_tasks_tab.rb
@@ -18,20 +18,16 @@ def description
   end
 
   def tasks
-    completed_root_tasks = CorrespondenceRootTask.includes(:children).where(
-      status: Constants.TASK_STATUSES.completed,
-      assigned_to: assignee
-    ).pluck(:id)
-
-    tasks_with_completed_children = CorrespondenceRootTask.includes(:children)
-      .where.not(status: Constants.TASK_STATUSES.completed)
-      .filter do |task|
-        task.children.all?(&:completed?) && task.children.any? { |child| child.assigned_to == assignee }
-      end
-      .pluck(:id)
-
-    CorrespondenceTask.includes(*task_includes)
-      .where(id: completed_root_tasks + tasks_with_completed_children)
+    # root task ids for all the assignee's tasks
+    potential_root_task_ids = assignee.tasks.select(:parent_id)
+      .where(status: Constants.TASK_STATUSES.completed).distinct.pluck(:parent_id)
+
+    # root task ids within the subset created above with open child tasks
+    ids_to_exclude = CorrespondenceTask.select(:parent_id)
+      .where(parent_id: potential_root_task_ids)
+      .open.distinct.pluck(:parent_id)
+
+    CorrespondenceRootTask.includes(*task_includes).where(id: potential_root_task_ids - ids_to_exclude)
   end
 
   # :reek:UtilityFunction
@@ -39,7 +35,7 @@ def column_names
     [
       Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
       Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
-      Constants.QUEUE_CONFIG.COLUMNS.TASK_CLOSED_DATE.name,
+      Constants.QUEUE_CONFIG.COLUMNS.CORRESPONDENCE_TASK_CLOSED_DATE.name,
       Constants.QUEUE_CONFIG.COLUMNS.NOTES.name
     ]
   end
diff --git a/app/models/queue_tabs/organization_correspondence_completed_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_completed_tasks_tab.rb
index fa1f48a0e84..bbcc01327e2 100644
--- a/app/models/queue_tabs/organization_correspondence_completed_tasks_tab.rb
+++ b/app/models/queue_tabs/organization_correspondence_completed_tasks_tab.rb
@@ -18,19 +18,19 @@ def description
   end
 
   def tasks
-    completed_root_tasks = CorrespondenceRootTask.includes(:children).where(
-      status: Constants.TASK_STATUSES.completed,
-      assigned_to: assignee
-    ).pluck(:id)
-
-    tasks_with_completed_children = CorrespondenceRootTask.includes(:children).where.not(
-      status: Constants.TASK_STATUSES.completed
-    ).select do |task|
-      task.children.all?(&:completed?)
-    end.pluck(:id)
-
-    CorrespondenceTask.includes(*task_includes)
-      .where(id: completed_root_tasks + tasks_with_completed_children)
+    completed_root_task_ids = CorrespondenceRootTask.select(:id)
+      .where(status: Constants.TASK_STATUSES.completed).pluck(:id)
+
+    ids_with_completed_child_tasks = CorrespondenceTask.select(:parent_id)
+      .where(status: Constants.TASK_STATUSES.completed)
+      .where.not(type: CorrespondenceRootTask.name).distinct.pluck(:parent_id)
+
+    ids_to_exclude = CorrespondenceTask.select(:parent_id)
+      .where(parent_id: ids_with_completed_child_tasks)
+      .open.distinct.pluck(:parent_id)
+
+    CorrespondenceRootTask.includes(*task_includes)
+      .where(id: completed_root_task_ids + ids_with_completed_child_tasks - ids_to_exclude)
   end
 
   # :reek:UtilityFunction
@@ -38,7 +38,7 @@ def column_names
     [
       Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
       Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
-      Constants.QUEUE_CONFIG.COLUMNS.TASK_CLOSED_DATE.name,
+      Constants.QUEUE_CONFIG.COLUMNS.CORRESPONDENCE_TASK_CLOSED_DATE.name,
       Constants.QUEUE_CONFIG.COLUMNS.NOTES.name
     ]
   end
diff --git a/app/models/task_sorter.rb b/app/models/task_sorter.rb
index 0ff1b0cd1ba..f6e2173fa25 100644
--- a/app/models/task_sorter.rb
+++ b/app/models/task_sorter.rb
@@ -28,8 +28,7 @@ def sorted_tasks
     # used for when the logic on the sorting needs to be reversed
     reverse_sort_order = sort_order == "asc" ? "desc" : "asc"
 
-    # Always join to the CachedAppeal and users tables because we sometimes need it, joining does not slow down the
-    # application, and conditional logic to only join sometimes adds unnecessary complexity.
+    # The following cases are used for Correspondence Queue tables
     case column.name
     when Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name
       tasks.joins(appeal: :veteran).order(last_name: sort_order.to_sym, first_name: sort_order.to_sym)
@@ -39,7 +38,11 @@ def sorted_tasks
       tasks.joins(:appeal).order(va_date_of_receipt: sort_order.to_sym)
     when Constants.QUEUE_CONFIG.COLUMNS.DAYS_WAITING.name
       tasks.joins(:appeal).order(assigned_at: reverse_sort_order.to_sym)
+    when Constants.QUEUE_CONFIG.COLUMNS.CORRESPONDENCE_TASK_CLOSED_DATE.name
+      tasks.joins(:appeal).order(closed_at: sort_order.to_sym)
     else
+      # Always join to the CachedAppeal and users tables because we sometimes need it, joining does not slow down the
+      # application, and conditional logic to only join sometimes adds unnecessary complexity.
       tasks.with_assignees.with_assigners.with_cached_appeals.order(order_clause)
     end
   end
diff --git a/app/models/tasks/correspondence_task_filter.rb b/app/models/tasks/correspondence_task_filter.rb
index 31d03401d4b..6030b8f16aa 100644
--- a/app/models/tasks/correspondence_task_filter.rb
+++ b/app/models/tasks/correspondence_task_filter.rb
@@ -3,7 +3,7 @@
 class CorrespondenceTaskFilter < TaskFilter
   def filtered_tasks
     va_dor_params = filter_params.select { |param| param.include?("col=vaDor") }
-    date_completed_params = filter_params.select { |param| param.include?("col=completedDateColumn") }
+    date_completed_params = filter_params.select { |param| param.include?("col=correspondenceCompletedDateColumn") }
     task_column_params = filter_params.select { |param| param.include?("col=taskColumn") }
 
     # task_column_params comes in as a single string, delimited by |. Updates task_column_params
@@ -24,7 +24,7 @@ def filtered_tasks
     end
 
     unless date_completed_params.empty?
-      date_completed_params[0].slice!("col=completedDateColumn&val=")
+      date_completed_params[0].slice!("col=correspondenceCompletedDateColumn&val=")
       result = result.merge(filter_by_date_completed(date_completed_params[0]))
     end
     result
diff --git a/client/app/queue/QueueDropdownFilter.jsx b/client/app/queue/QueueDropdownFilter.jsx
index a5d07c07f2b..f5fa3dddac9 100644
--- a/client/app/queue/QueueDropdownFilter.jsx
+++ b/client/app/queue/QueueDropdownFilter.jsx
@@ -295,8 +295,8 @@ QueueDropdownFilter.propTypes = {
   addClearFiltersRow: PropTypes.bool,
   name: PropTypes.string,
   setSelectedValue: PropTypes.func.isRequired,
-  isReceiptDateFilter: PropTypes.func.isRequired,
-  isTaskCompletedDateFilter: PropTypes.func.isRequired
+  isReceiptDateFilter: PropTypes.bool,
+  isTaskCompletedDateFilter: PropTypes.bool,
 };
 
 export default QueueDropdownFilter;
diff --git a/client/app/queue/QueueTable.jsx b/client/app/queue/QueueTable.jsx
index d0b040a145c..b87e6c38636 100644
--- a/client/app/queue/QueueTable.jsx
+++ b/client/app/queue/QueueTable.jsx
@@ -172,7 +172,7 @@ export const HeaderRow = (props) => {
                 updateFilters={(newFilters) => props.updateFilteredByList(newFilters)}
                 filteredByList={props.filteredByList}
                 isReceiptDateFilter={column.name === QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name}
-                isTaskCompletedDateFilter={column.name === QUEUE_CONFIG.COLUMNS.TASK_CLOSED_DATE.name}
+                isTaskCompletedDateFilter={column.name === QUEUE_CONFIG.COLUMNS.CORRESPONDENCE_TASK_CLOSED_DATE.name}
               />
             );
           }
diff --git a/client/app/queue/components/TaskTableColumns.jsx b/client/app/queue/components/TaskTableColumns.jsx
index ef381858f36..fe6378cce3a 100644
--- a/client/app/queue/components/TaskTableColumns.jsx
+++ b/client/app/queue/components/TaskTableColumns.jsx
@@ -620,3 +620,19 @@ export const taskCompletedDateColumn = () => {
     getSortValue: (task) => task.closedAt ? new Date(task.closedAt) : null
   };
 };
+
+export const correspondenceCompletedDateColumn = () => {
+  return {
+    header: COPY.CASE_LIST_TABLE_COMPLETED_ON_DATE_COLUMN_TITLE,
+    name: QUEUE_CONFIG.COLUMNS.CORRESPONDENCE_TASK_CLOSED_DATE.name,
+    filterOptions: [],
+    label: 'Filter by date completed',
+    columnName: 'Date Completed',
+    backendCanSort: true,
+    enableFilter: true,
+    valueFunction: (task) => {
+      return moment(task.closedAt).format('MM/DD/YYYY');
+    },
+    getSortValue: (task) => new Date(task.closedAt)
+  };
+};
diff --git a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
index a941b5699ec..f85738d5eb2 100644
--- a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
+++ b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
@@ -18,7 +18,7 @@ import {
   daysWaitingCorrespondence,
   notes,
   taskColumn,
-  taskCompletedDateColumn,
+  correspondenceCompletedDateColumn,
   vaDor,
   veteranDetails
 } from '../components/TaskTableColumns';
@@ -119,7 +119,7 @@ const CorrespondenceTableBuilder = (props) => {
       [QUEUE_CONFIG.COLUMNS.DAYS_WAITING_CORRESPONDENCE.name]: daysWaitingCorrespondence(),
       [QUEUE_CONFIG.COLUMNS.TASK_ASSIGNEE.name]: assignedToColumn(),
       [QUEUE_CONFIG.COLUMNS.TASK_ASSIGNED_BY.name]: assignedByColumn(),
-      [QUEUE_CONFIG.COLUMNS.TASK_CLOSED_DATE.name]: taskCompletedDateColumn(),
+      [QUEUE_CONFIG.COLUMNS.CORRESPONDENCE_TASK_CLOSED_DATE.name]: correspondenceCompletedDateColumn(),
       [QUEUE_CONFIG.COLUMNS.TASK_TYPE.name]: taskColumn(tasks, filterOptions),
       [QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name]: veteranDetails(),
       [QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name]: vaDor(tasks, filterOptions),
diff --git a/client/constants/QUEUE_CONFIG.json b/client/constants/QUEUE_CONFIG.json
index 026f219b69b..36ef3de8a39 100644
--- a/client/constants/QUEUE_CONFIG.json
+++ b/client/constants/QUEUE_CONFIG.json
@@ -195,6 +195,11 @@
       "sorting_table": "tasks",
       "sorting_columns": ["closed_at"]
     },
+    "CORRESPONDENCE_TASK_CLOSED_DATE": {
+      "name": "correspondenceCompletedDateColumn",
+      "sorting_table": "tasks",
+      "sorting_columns": ["closed_at"]
+    },
     "TASK_CREATED_AT": {
       "name": "createdDateColumn",
       "sorting_table": "tasks",
diff --git a/db/seeds/helpers/queue_helpers.rb b/db/seeds/helpers/queue_helpers.rb
index ef60cb33720..af2174400bd 100644
--- a/db/seeds/helpers/queue_helpers.rb
+++ b/db/seeds/helpers/queue_helpers.rb
@@ -139,6 +139,7 @@ def create_cavc_mailtask(correspondence, user)
     process_correspondence(correspondence, user)
     assigned_by = CorrespondenceIntakeTask.find_by(appeal_id: correspondence.id).completed_by
     task = CavcCorrespondenceCorrespondenceTask.create!(
+      parent_id: correspondence&.root_task&.id,
       appeal_id: correspondence.id,
       appeal_type: "Correspondence",
       assigned_by: assigned_by,
diff --git a/db/seeds/queue_correspondences.rb b/db/seeds/queue_correspondences.rb
index f092c3b269e..c30c2002f7b 100644
--- a/db/seeds/queue_correspondences.rb
+++ b/db/seeds/queue_correspondences.rb
@@ -157,6 +157,9 @@ def create_correspondence_with_review_package_and_failed_upload_task(user, veter
 
     def create_correspondence_with_completed_root_task(user = {}, veteran = {})
       corres = create_correspondence(user, veteran)
+      assign_review_package_task(corres, user)
+      rpt = ReviewPackageTask.find_by(appeal_id: corres.id, type: ReviewPackageTask.name)
+      rpt.update!(status: Constants.TASK_STATUSES.completed)
       corres.root_task.update!(status: Constants.TASK_STATUSES.completed)
       corres.root_task.update!(closed_at: rand(1.month.ago..1.day.ago))
     end
diff --git a/spec/feature/queue/correspondence/correspondence_cases_spec.rb b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
index f197febf244..12c941acf9a 100644
--- a/spec/feature/queue/correspondence/correspondence_cases_spec.rb
+++ b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
@@ -22,7 +22,7 @@
     it "routes to correspondence cases if feature toggle is enabled" do
       FeatureToggle.enable!(:correspondence_queue)
       visit "/queue/correspondence"
-      expect(page).to have_current_path("/queue/correspondence")
+      expect(current_path.include?("/queue/correspondence")).to eq true
     end
   end
 
@@ -214,11 +214,10 @@
 
     before :each do
       FeatureToggle.enable!(:correspondence_queue)
-      FeatureToggle.enable!(:user_queue_pagination)
     end
 
     it "displays all completed correspondence tasks" do
-      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=completedDateColumn&order=asc"
+      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=vaDor&order=asc"
       expect(page).to have_content("Completed correspondence:")
       expect(page).to have_content("Viewing 1-15 of 20 total")
       expect(page).to have_button("Next")
@@ -234,7 +233,7 @@
     end
 
     it "displays all correspondence tasks sorted by date completed" do
-      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=completedDateColumn&order=asc"
+      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=vaDor&order=asc"
       find("[aria-label='Sort by Date Completed']").click
 
       dates = all("tbody > tr > td:nth-child(3)").map(&:text)
@@ -246,7 +245,7 @@
     end
 
     it "filters date column with 'between' the dates" do
-      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=completedDateColumn&order=asc"
+      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=vaDor&order=asc"
 
       find("[aria-label='Filter by date completed']").click
       expect(page).to have_content("Date filter parameters")
@@ -267,7 +266,7 @@
     end
 
     it "filters date column with 'before' this date" do
-      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=completedDateColumn&order=asc"
+      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=vaDor&order=asc"
       find("[aria-label='Filter by date completed']").click
       expect(page).to have_content("Date filter parameters")
       expect(page).to have_button("Apply filter", disabled: true)
@@ -284,7 +283,7 @@
     end
 
     it "filters date column with 'after' this date" do
-      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=completedDateColumn&order=asc"
+      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=vaDor&order=asc"
 
       find("[aria-label='Filter by date completed']").click
       expect(page).to have_content("Date filter parameters")
@@ -301,7 +300,7 @@
     end
 
     it "filters date column with 'on' this date" do
-      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=completedDateColumn&order=asc"
+      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=vaDor&order=asc"
 
       find("[aria-label='Filter by date completed']").click
       expect(page).to have_content("Date filter parameters")
@@ -317,19 +316,22 @@
     end
 
     it "sorts by Veteran Details column" do
-      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=veteranDetailsColumn&order=asc"
+      CorrespondenceRootTask.all.limit(5).each { |crt| crt.update(status: "assigned") }
+      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=vaDor&order=asc"
+      unsorted_veterans = all("#task-link").map(&:text)
       find("[aria-label='Sort by Veteran Details']").click
+      sorted_veterans = all("#task-link").map(&:text)
 
-      veterans = all("#task-link").map(&:text)
-      expect(veterans).to eq(veterans.sort.reverse)
+      expect(sorted_veterans).to eq(unsorted_veterans.sort.reverse)
 
       find("[aria-label='Sort by Veteran Details']").click
-      veterans = all("#task-link").map(&:text)
-      expect(veterans).to eq(veterans.sort)
+      sorted_veterans = all("#task-link").map(&:text)
+
+      expect(sorted_veterans).to eq(unsorted_veterans.sort)
     end
 
     it "sorts by Notes column" do
-      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=notes&order=asc"
+      visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=vaDor&order=asc"
       find("[aria-label='Sort by Notes']").click
 
       notes = all("tbody > tr > td:nth-child(4)").map(&:text)
@@ -945,7 +947,7 @@
       FeatureToggle.enable!(:correspondence_queue)
     end
 
-    it "successfully loads the in progress tab" do
+    it "successfully loads the completed tab" do
       visit "/queue/correspondence?tab=correspondence_completed&page=1&sort_by=vaDor&order=asc"
       expect(page).to have_content("Completed correspondence")
     end
diff --git a/spec/feature/queue/correspondence/intake_spec.rb b/spec/feature/queue/correspondence/intake_spec.rb
index 48c7a4cdbc4..b9e32f61e9a 100644
--- a/spec/feature/queue/correspondence/intake_spec.rb
+++ b/spec/feature/queue/correspondence/intake_spec.rb
@@ -346,7 +346,7 @@
     end
   end
 
-  context "correspondence tasks in-progress tab and  navigate to step 3 when we click on intake task" do
+  context "correspondence tasks in-progress tab and navigate to step 3 when we click on intake task" do
     let(:current_user) { create(:user) }
     before :each do
       MailTeam.singleton.add_user(current_user)
@@ -354,27 +354,11 @@
     end
 
     before do
-      Timecop.freeze(Time.zone.local(2020, 5, 15))
-      @last_correspondence_uuid = nil
-      20.times do
-        correspondence = create(:correspondence)
-        parent_task = create_correspondence_intake(correspondence, current_user)
-        create_efolderupload_task(correspondence, parent_task, user: current_user)
-        @last_correspondence_uuid = EfolderUploadFailedTask.first.correspondence.uuid
-      end
-      puts "Last correspondence UUID: #{@last_correspondence_uuid}"
-
-      # Used to mock a single task to compare task sorting
-      EfolderUploadFailedTask.first.update!(type: "CorrespondenceIntakeTask")
-      EfolderUploadFailedTask.first.correspondence.update!(
-        va_date_of_receipt: Date.new(2000, 10, 10),
-        updated_by_id: current_user.id
-      )
-      EfolderUploadFailedTask.last.correspondence.update!(
-        va_date_of_receipt: Date.new(2024, 10, 10),
-        updated_by_id: current_user.id
-      )
       FeatureToggle.enable!(:correspondence_queue)
+
+      correspondence = create(:correspondence)
+      parent_task = create_correspondence_intake(correspondence, current_user)
+      @correspondence_uuid = correspondence.uuid
     end
 
     it "successfully loads the in progress tab" do
@@ -384,9 +368,8 @@
 
     it "navigates to intake form from in-progress tab to step 3" do
       visit "/queue/correspondence?tab=correspondence_in_progress"
-      expect(page).to have_content("Correspondence in progress that are assigned to you:")
       find("tbody > tr:last-child > td:nth-child(1)").click
-      expect(page).to have_current_path("/queue/correspondence/#{@last_correspondence_uuid}/intake")
+      expect(page).to have_current_path("/queue/correspondence/#{@correspondence_uuid}/intake")
       expect(page).to have_content("Add Related Correspondence")
       expect(page).to have_button("Continue")
       click_on("button-continue")
@@ -396,7 +379,7 @@
       click_on("button-Cancel")
       visit "/queue/correspondence?tab=correspondence_in_progress"
       find("tbody > tr:last-child > td:nth-child(1)").click
-      expect(page).to have_current_path("/queue/correspondence/#{@last_correspondence_uuid}/intake")
+      expect(page).to have_current_path("/queue/correspondence/#{@correspondence_uuid}/intake")
       expect(page).to have_content("Review and Confirm Correspondence")
     end
   end
diff --git a/spec/models/correspondence_config_spec.rb b/spec/models/correspondence_config_spec.rb
index 0a3bbd9a16c..87b8e9b3ddd 100644
--- a/spec/models/correspondence_config_spec.rb
+++ b/spec/models/correspondence_config_spec.rb
@@ -74,7 +74,7 @@
 
           expect(subject[:tabs].find { |tab| tab[:label] == "Completed" }[:columns]
           .map { |column| column[:name] })
-            .to eq(%w[veteranDetails vaDor completedDateColumn notes])
+            .to eq(%w[veteranDetails vaDor correspondenceCompletedDateColumn notes])
         end
       end
 
@@ -98,7 +98,7 @@
 
           expect(subject[:tabs].find { |tab| tab[:label] == "Completed" }[:columns]
           .map { |column| column[:name] })
-            .to eq(%w[veteranDetails vaDor completedDateColumn notes])
+            .to eq(%w[veteranDetails vaDor correspondenceCompletedDateColumn notes])
         end
       end
     end

From d56f8fa786e786bd9c992ea3ff6cfbeb381b5320 Mon Sep 17 00:00:00 2001
From: Alex Smith <alex.smith.99@thunderyard.com>
Date: Wed, 20 Mar 2024 17:23:27 -0600
Subject: [PATCH 171/237] Fix Misc. UAT Issues (#21223)

* Fix Code Climate Issues

* Improve Code

- Add class comments to service files.

- Add underscores to unused method params in the fake BGS Service.

* Fix Bad Method Invocation

* Fix Param Causing Spec Failures

* Make BGS Service Method Static

- This will allow the other static methods to use the init_client_params
method.

* Fix Misc. UAT Issues

- Handle errors raised by the BGS service.

- Update the auto assign status ping to include the correct
assigned count.

- Fix bug that caused CorrespondenceAutoAssignRunVerifier to
incorrectly report that runs are OK.

* Fix Incorrect Field Checked for Run Verification
---
 app/controllers/correspondence_controller.rb  | 11 ++-
 app/services/auto_assignable_user_finder.rb   | 11 ++-
 ...correspondence_auto_assign_run_verifier.rb |  2 +-
 .../correspondence_controller_spec.rb         |  6 +-
 .../auto_assignable_user_finder_spec.rb       | 24 ++++--
 ...spondence_auto_assign_run_verifier_spec.rb | 78 ++++++++++++-------
 6 files changed, 92 insertions(+), 40 deletions(-)

diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index a45812153ac..d131fdfd36a 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -195,12 +195,19 @@ def auto_assign_correspondences
   end
 
   def auto_assign_status
-    batch = BatchAutoAssignmentAttempt.find_by!(user: current_user, id: params["batch_auto_assignment_attempt_id"])
+    batch = BatchAutoAssignmentAttempt.includes(:individual_auto_assignment_attempts)
+      .find_by!(user: current_user, id: params["batch_auto_assignment_attempt_id"])
+
+    num_assigned = batch.individual_auto_assignment_attempts
+      .where(status: Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.completed).count
+
     status_details = {
       error_message: batch.error_info,
       status: batch.status,
-      number_assigned: batch.num_packages_assigned
+      number_assigned: num_assigned,
+      number_attempted: batch.individual_auto_assignment_attempts.count
     }
+
     render json: status_details, status: :ok
   end
 
diff --git a/app/services/auto_assignable_user_finder.rb b/app/services/auto_assignable_user_finder.rb
index 28c48f343fa..60dbc39d447 100644
--- a/app/services/auto_assignable_user_finder.rb
+++ b/app/services/auto_assignable_user_finder.rb
@@ -27,8 +27,15 @@ def run_auto_assign_algorithm(correspondence, vbms_id)
 
       user_obj = user.user_obj
 
-      if sensitivity_checker(user_obj).can_access?(vbms_id, user_to_check: user_obj)
-        return user_obj
+      begin
+        if sensitivity_checker(user_obj).can_access?(vbms_id, user_to_check: user_obj)
+          return user_obj
+        end
+      rescue StandardError => error
+        error_uuid = SecureRandom.uuid
+        Raven.capture_exception(error, extra: { error_uuid: error_uuid })
+
+        next
       end
     end
 
diff --git a/app/services/correspondence_auto_assign_run_verifier.rb b/app/services/correspondence_auto_assign_run_verifier.rb
index 11f2715366f..27d94a9426d 100644
--- a/app/services/correspondence_auto_assign_run_verifier.rb
+++ b/app/services/correspondence_auto_assign_run_verifier.rb
@@ -66,6 +66,6 @@ def assignment_already_running?
     BatchAutoAssignmentAttempt
       .where.not(id: verified_batch.id)
       .where(status: Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.started)
-      .exists?(["started_at < ?", min_minutes_elapsed_batch_attempt.minutes.ago])
+      .exists?(["created_at >= ?", min_minutes_elapsed_batch_attempt.minutes.ago])
   end
 end
diff --git a/spec/controllers/correspondence_controller_spec.rb b/spec/controllers/correspondence_controller_spec.rb
index 4da9c19f39f..e505772602e 100644
--- a/spec/controllers/correspondence_controller_spec.rb
+++ b/spec/controllers/correspondence_controller_spec.rb
@@ -230,6 +230,9 @@
     end
 
     before do
+      8.times do
+        create(:individual_auto_assignment_attempt, batch_auto_assignment_attempt: error_baaa, status: "completed")
+      end
       InboundOpsTeam.singleton.add_user(current_user)
       User.authenticate!(user: current_user)
     end
@@ -239,7 +242,8 @@
       expect(response).to have_http_status(:ok)
       body = JSON.parse(response.body)
       expect(body["status"]).to eq(error_baaa.status)
-      expect(body["number_assigned"]).to eq(error_baaa.num_packages_assigned)
+      expect(body["number_assigned"]).to eq(8)
+      expect(body["number_attempted"]).to eq(8)
       expect(body["error_message"]).to eq(error_baaa.error_info)
     end
   end
diff --git a/spec/services/auto_assignable_user_finder_spec.rb b/spec/services/auto_assignable_user_finder_spec.rb
index 99fe2421cc5..fdf4b34d9e3 100644
--- a/spec/services/auto_assignable_user_finder_spec.rb
+++ b/spec/services/auto_assignable_user_finder_spec.rb
@@ -191,13 +191,27 @@ def generate_assigned_review_package_tasks(amount:, user:)
       let!(:user_1) { create(:correspondence_auto_assignable_user) }
       let!(:user_2) { create(:correspondence_auto_assignable_user) }
 
-      before do
-        expect(mock_sensitivity_checker).to receive(:can_access?).twice.and_return(false)
-        expect(BGSService).to receive(:new).twice.and_return(mock_sensitivity_checker)
+      context "with no BGSService errors" do
+        before do
+          expect(mock_sensitivity_checker).to receive(:can_access?).twice.and_return(false)
+          expect(BGSService).to receive(:new).twice.and_return(mock_sensitivity_checker)
+        end
+
+        it "does not allow access for users without the correct sensitivity level" do
+          expect(described.get_first_assignable_user(correspondence: correspondence)).to be nil
+        end
       end
 
-      it "does not allow access for users without the correct sensitivity level" do
-        expect(described.get_first_assignable_user(correspondence: correspondence)).to be nil
+      context "when the BGSService raises an error" do
+        before do
+          expect(mock_sensitivity_checker).to receive(:can_access?).once.and_raise("Test BGS error")
+          expect(mock_sensitivity_checker).to receive(:can_access?).once.and_return(true)
+          expect(BGSService).to receive(:new).twice.and_return(mock_sensitivity_checker)
+        end
+
+        it "continues iterating through all assignable users" do
+          expect(described.get_first_assignable_user(correspondence: correspondence)).to eq(user_2)
+        end
       end
     end
   end
diff --git a/spec/services/correspondence_auto_assign_run_verifier_spec.rb b/spec/services/correspondence_auto_assign_run_verifier_spec.rb
index e75ebcb65cf..1a575b7081c 100644
--- a/spec/services/correspondence_auto_assign_run_verifier_spec.rb
+++ b/spec/services/correspondence_auto_assign_run_verifier_spec.rb
@@ -11,30 +11,28 @@
     Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.timing.min_minutes_elapsed_individual_attempt
   end
 
-  describe "#can_run_auto_assign?" do
-    let!(:valid_batch) do
-      create(
-        :batch_auto_assignment_attempt,
-        user: current_user,
-        started_at: (min_minutes_elapsed_batch_attempt + 1).minutes.ago
-      )
-    end
-
-    let!(:valid_batch_recent) do
-      create(
-        :batch_auto_assignment_attempt,
-        user: current_user,
-        status: Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.completed,
-        started_at: (min_minutes_elapsed_batch_attempt - 1).minutes.ago
-      )
-    end
+  let(:batch_for_verification) do
+    create(
+      :batch_auto_assignment_attempt,
+      user: current_user
+    )
+  end
 
+  describe "#can_run_auto_assign?" do
     context "when true" do
-      context "with completed IndividualAutoAssignmentAttempt" do
+      context "when an IndividualAutoAssignmentAttempt exists" do
+        let!(:batch) do
+          create(
+            :batch_auto_assignment_attempt,
+            user: current_user,
+            created_at: (min_minutes_elapsed_batch_attempt + 1).minutes.ago
+          )
+        end
+
         let!(:individual) do
           create(
             :individual_auto_assignment_attempt,
-            batch_auto_assignment_attempt: valid_batch,
+            batch_auto_assignment_attempt: batch,
             created_at: (min_minutes_elapsed_individual_attempt + 1).minutes.ago
           )
         end
@@ -43,18 +41,27 @@
           expect(
             described.can_run_auto_assign?(
               current_user_id: current_user.id,
-              batch_auto_assignment_attempt_id: valid_batch.id
+              batch_auto_assignment_attempt_id: batch_for_verification.id
             )
           ).to eq(true)
         end
       end
 
-      context "with completed BatchAutoAssignmentAttempt" do
+      context "when a completed BatchAutoAssignmentAttempt exists" do
+        let!(:completed_batch) do
+          create(
+            :batch_auto_assignment_attempt,
+            user: current_user,
+            created_at: (min_minutes_elapsed_batch_attempt - 1).minutes.ago,
+            status: Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.completed
+          )
+        end
+
         it "returns true" do
           expect(
             described.can_run_auto_assign?(
               current_user_id: current_user.id,
-              batch_auto_assignment_attempt_id: valid_batch.id
+              batch_auto_assignment_attempt_id: batch_for_verification.id
             )
           ).to eq(true)
         end
@@ -63,6 +70,8 @@
 
     context "when false" do
       context "with feature toggles enabled" do
+        let(:batch) { create(:batch_auto_assignment_attempt) }
+
         before do
           FeatureToggle.enable!(:auto_assign_banner_failure)
         end
@@ -71,16 +80,18 @@
           expect(
             described.can_run_auto_assign?(
               current_user_id: current_user.id,
-              batch_auto_assignment_attempt_id: valid_batch.id
+              batch_auto_assignment_attempt_id: batch.id
             )
           ).to eq(false)
         end
       end
 
       context "with invalid current_user_id" do
+        let(:batch) { create(:batch_auto_assignment_attempt) }
+
         it "returns false" do
           expect(
-            described.can_run_auto_assign?(current_user_id: 0, batch_auto_assignment_attempt_id: valid_batch.id)
+            described.can_run_auto_assign?(current_user_id: 0, batch_auto_assignment_attempt_id: batch.id)
           ).to eq(false)
         end
       end
@@ -95,19 +106,27 @@
 
       context "when checking for concurrent runs" do
         context "when the latest IndividualAutoAssignmentAttempt occurred too recently" do
+          let!(:batch) do
+            create(
+              :batch_auto_assignment_attempt,
+              user: current_user,
+              created_at: (min_minutes_elapsed_batch_attempt + 1).minutes.ago
+            )
+          end
           let!(:invalid_individual) do
             create(
               :individual_auto_assignment_attempt,
-              batch_auto_assignment_attempt: valid_batch,
+              batch_auto_assignment_attempt: batch,
               created_at: 1.minute.ago
             )
           end
 
           before do
+            # Ensure that we don't hit this code block
             batch_stubbed = class_double(BatchAutoAssignmentAttempt)
               .as_stubbed_const(transfer_nested_constants: true)
             expect(batch_stubbed).to receive(:find_by)
-              .with(user: current_user, id: valid_batch.id).and_return(valid_batch)
+              .with(user: current_user, id: batch.id).and_return(batch)
             expect(batch_stubbed).not_to receive(:where)
           end
 
@@ -115,18 +134,19 @@
             expect(
               described.can_run_auto_assign?(
                 current_user_id: current_user.id,
-                batch_auto_assignment_attempt_id: valid_batch.id
+                batch_auto_assignment_attempt_id: batch.id
               )
             ).to eq(false)
           end
         end
 
         context "when the latest BatchAutoAssignmentAttempt occurred too recently" do
+          let(:batch) { create(:batch_auto_assignment_attempt) }
           let!(:recent_batch) do
             create(
               :batch_auto_assignment_attempt,
               user: current_user,
-              started_at: (min_minutes_elapsed_batch_attempt - 1).minutes.ago
+              created_at: (min_minutes_elapsed_batch_attempt - 1).minutes.ago
             )
           end
 
@@ -134,7 +154,7 @@
             expect(
               described.can_run_auto_assign?(
                 current_user_id: current_user.id,
-                batch_auto_assignment_attempt_id: recent_batch.id
+                batch_auto_assignment_attempt_id: batch.id
               )
             ).to eq(false)
           end

From 3f5d8663c49ab2a92141f07434125b871ec094c9 Mon Sep 17 00:00:00 2001
From: Rnmarshall93 <110805785+Rnmarshall93@users.noreply.github.com>
Date: Thu, 21 Mar 2024 07:53:49 -0700
Subject: [PATCH 172/237] Correspondence Cases - Action Required Tab: Remove /
 Reassign Modal (#21202)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* mostly finished modal

* added conditional rendering of textarea

* updated RadioField name

* added redux setup for selected veteran details.

* added RadioFieldWithChildren component.

* Added complete modal for reassign

* stored veteran details on click

* added diasbled button logic for confirm

* wired button for remove package task.

* Wired banner message prototype

* fixed crash

* task now reassigns properly

* implemented failure banner and reject option

* fixed banner messages.

* fixed sizing issue and added textarea to reject

* fixed frontend css

* improved backend logic.

* fixed modal closing X button

* fixed error in method call, commented data changing code

* backbone for reassign and remove modal tests

* added parent_task_url

* Implemented taskurl for remove/ reassign task

* delete binding pry

* tests suite for correspondence cases

* refactored logic

* data seeding and minor refactors

* fix test suit

* uncommented experimental code

* added remove modal

* cleaned up controller logic

* final AC work in progress

* Fixes for linting and update reviewpackagetask error

* futher reduced code climate issues

* mode code climate fixes

* fixed more code climate issues

* fixed linting errors. fixed submit disable logic

* refined logic for cleaner user experience

* added seed data for reassign / remove package task

* fixed bug on buildMailUserData

* swapped mismatched messages

* finished spec tests

* Hot fix to remove Intake from Veterans Details (#21087)

* fix feature test

* Revert "fix feature test"

This reverts commit 948d6374e1f9b548277da1fe5e0851942a5825d8.

* pushing up tests for ryan to run

* feature tests

* remove Intake from Veteran Details

* resolve pr conflicts

---------

Co-authored-by: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>

* Khalin/appeals 35818 - Bug Fix (#21091)

* WIP for new seeds file

* Updated query so data shows in table

* Revert "WIP for new seeds file"

This reverts commit ea1dd11d4b98da787a56917a299b4f871bd8c7d0.

* Updated query so data shows in table

* Your Correspondence completed tab completed test spec

* The completed tab now showing dates

* Bug Fix

* created completed_by_date and added business logic to root task (#21103)

* APPEALS-35488: Update UAT Seed Scripts for Correspondence (#21129)

* refactored correspondence seeds to accept vet and user. refactored create_correspondence.

* refactored seed to create intake correspondence with upload failed task

* updated seed to create correspondence with intake task

* refactored rest of queue correspondence seed to be able to accept a user and veteran.

* lowered count for correspondence seeds

* refactored multi_correspondences to create review package tasks, handle user input, and use queue helpers

* disabled linting check

* added multi correspondence and queue correspondence seeds to rake task

* cleaned up correspondence rake to be more DRY

* Khalin/appeals 35818 Date Completed Column Filtering Bug Fix (#21134)

* WIP for new seeds file

* Updated query so data shows in table

* Revert "WIP for new seeds file"

This reverts commit ea1dd11d4b98da787a56917a299b4f871bd8c7d0.

* Updated query so data shows in table

* Your Correspondence completed tab completed test spec

* The completed tab now showing dates

* Bug Fix

* Date Completed Filtering Fixed

* Updated changes

* Fixing Failing test

---------

Co-authored-by: Jim Foley <james.foley4@va.gov>

* updated completed filter to filter on closed_at value (#21166)

* Edit VA DOR access for InboundOpsTeamAdmin user (#21150)

* 🔀 jcroteau/APPEALS-38492 - Fix duplicate results from joins on certain AR associations (#21097)

* refactored seed scripts for correspondence to have more detailed notes (#21170)

* Wmedders21/appeals 41493 (#21162)

* remove unused route and fix typo

* standardize prop names

* use standardized prop names

* use standardized prop names and abstract magic strings

* remove unnecessary scoping

* CorrespondenceIntakeTask status in_progress on create

* update spec for changes

* update helper to reflect workflow

* correspondence intake task status in progress on creation

* efolder upload failed task no longer needs task url since its not displayed on the table

* rubocop style fix

* rubocop fix extra blank line

* updated props to new branch props

* sanitized string with react

* fixed missing end in queue_correspondence

* sanitize newUrl attempt #2

* fixed buildMailUserData

* added missing end statement

* fixed linting

* modified per github feedback

* refactored redundant code

* linting fix. refactored correspondence_controller logic

* linting fix

* partial refactor with code migrated to correspondence_controller_util

* refactored a very large amount of code to the CorrespondenceControlletUtil

* Justin/APPEALS-42009 (#21118)

* adding correspondence intake controller

* moving methods that seem to be suited for the intake-specific controller

* refactor conditional

* updating the routes

* Updating the remainder of intake routes

* removing a repeated method found

* moving intake specs to new intake controller spec

* fixing file for failing tests

* Fixing failing specs

---------

Co-authored-by: William Medders <medders_william@bah.com>
Co-authored-by: Jim Foley <james.foley4@va.gov>

* Piedram/appeals 41494 (#21196)

* modified to show error in date filter

* modified datecomplete

* change name in header

* fix style issue

* Fix spec file

* Add new test in spec file

* Error banner now working as intended (#21206)

Co-authored-by: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>

* added comment

* Justin/APPEALS-42009 (#21118)

* adding correspondence intake controller

* moving methods that seem to be suited for the intake-specific controller

* refactor conditional

* updating the routes

* Updating the remainder of intake routes

* removing a repeated method found

* moving intake specs to new intake controller spec

* fixing file for failing tests

* Fixing failing specs

---------

Co-authored-by: William Medders <medders_william@bah.com>
Co-authored-by: Jim Foley <james.foley4@va.gov>

* Piedram/appeals 41494 (#21196)

* modified to show error in date filter

* modified datecomplete

* change name in header

* fix style issue

* Fix spec file

* Add new test in spec file

* Wmedders21/appeals 42552 (#21209)

* sorting query for date completed column on correspondence tables

* optimize task query for your correspondence completed tab

* optimize task query for corresepondence cases completed tab

* update correspondence task filter for new column name

* add name props to avoid console errors

* correct prop types

* update with new column name

* update seeds to reflect expected workflow

* update broken tests

* remove unnecessarily bloated test case setup

* update broken test expectation

* updated linting

* fixed linting issues

---------

Co-authored-by: IsaiahBar <isaiah.barnett@va.gov>
Co-authored-by: IsaiahBar <107133331+IsaiahBar@users.noreply.github.com>
Co-authored-by: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
Co-authored-by: Dev-KRedd <134650238+Dev-KRedd@users.noreply.github.com>
Co-authored-by: Jim Foley <james.foley4@va.gov>
Co-authored-by: Kamala Madamanchi <110078646+kamala-07@users.noreply.github.com>
Co-authored-by: Jeremy Croteau <jcroteau@users.noreply.github.com>
Co-authored-by: Will Medders <93014155+wmedders21@users.noreply.github.com>
Co-authored-by: sulak-j <95875751+sulak-j@users.noreply.github.com>
Co-authored-by: William Medders <medders_william@bah.com>
Co-authored-by: piedram <110848569+piedram@users.noreply.github.com>
---
 app/controllers/correspondence_controller.rb  | 210 +--------
 .../correspondence_controller_util.rb         | 401 ++++++++++++++++++
 ...orrespondence_action_required_tasks_tab.rb |  10 +-
 .../correspondence_task_column_serializer.rb  |   8 +
 app/models/tasks/correspondence_task.rb       |   2 +-
 .../app/components/RadioFieldWithChildren.jsx | 195 +++++++++
 .../app/queue/components/TaskTableColumns.jsx |  17 +-
 .../correspondence/CorrespondenceCases.jsx    | 209 ++++++++-
 .../correspondenceActions.js                  |   8 +
 .../correspondenceConstants.js                |   3 +-
 .../correspondenceReducer.js                  |   8 +
 client/app/queue/utils.js                     |   1 +
 db/seeds/queue_correspondences.rb             |  27 +-
 .../correspondence_cases_spec.rb              |  72 ++++
 14 files changed, 945 insertions(+), 226 deletions(-)
 create mode 100644 app/models/concerns/correspondence_controller_util.rb
 create mode 100644 client/app/components/RadioFieldWithChildren.jsx

diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index 9f884e48c31..e6f16fcdde5 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -2,12 +2,12 @@
 
 # :reek:RepeatedConditional
 class CorrespondenceController < ApplicationController
+  include CorrespondenceControllerUtil
   before_action :verify_correspondence_access
   before_action :verify_feature_toggle
   before_action :correspondence
   before_action :auto_texts
   before_action :veteran_information
-  MAX_QUEUED_ITEMS = 60
 
   def correspondence_cases
     if current_user.mail_supervisor?
@@ -33,16 +33,6 @@ def mail_team_users
     end
   end
 
-  def correspondence_team
-    if current_user.mail_superuser? || current_user.mail_supervisor?
-      handle_mail_superuser_or_supervisor
-    elsif current_user.mail_team_user?
-      redirect_to "/queue/correspondence"
-    else
-      redirect_to "/unauthorized"
-    end
-  end
-
   def review_package
     render "correspondence/review_package"
   end
@@ -56,14 +46,6 @@ def package_documents
     render json: { package_document_types: packages }
   end
 
-  def current_correspondence
-    @current_correspondence ||= correspondence
-  end
-
-  def veteran_information
-    @veteran_information ||= veteran_by_correspondence
-  end
-
   def show
     corres_docs = correspondence.correspondence_documents
     reason_remove = if RemovePackageTask.find_by(appeal_id: correspondence.id, type: RemovePackageTask.name).nil?
@@ -126,31 +108,11 @@ def document_type_correspondence
     render json: { data: data }
   end
 
-  def pdf
-    # Hard-coding Document access until CorrespondenceDocuments are uploaded to S3Bucket
-    document = Document.limit(200)[params[:pdf_id].to_i]
-
-    document_disposition = "inline"
-    if params[:download]
-      document_disposition = "attachment; filename='#{params[:type]}-#{params[:id]}.pdf'"
-    end
-
-    # The line below enables document caching for a month.
-    expires_in 30.days, public: true
-    send_file(
-      document.serve,
-      type: "application/pdf",
-      disposition: document_disposition
-    )
-  end
-
   private
 
   def handle_mail_superuser_or_supervisor
-    @mail_team_users = User.mail_team_users.pluck(:css_id)
-    @is_superuser = current_user.mail_superuser?
-    @is_supervisor = current_user.mail_supervisor?
-    mail_team_user = User.find_by(css_id: params[:user]) if params[:user].present?
+    set_handle_mail_superuser_or_supervisor_params(current_user, params)
+    mail_team_user = User.find_by(css_id: params[:user].strip) if params[:user].present?
     task_ids = params[:taskIds]&.split(",") if params[:taskIds].present?
     tab = params[:tab] if params[:tab].present?
 
@@ -160,11 +122,13 @@ def handle_mail_superuser_or_supervisor
     end
   end
 
-  def handle_html_response(mail_team_user, task_ids, tab)
-    if mail_team_user && task_ids.present?
-      set_banner_params(mail_team_user, task_ids.count, tab)
-      update_tasks(mail_team_user, task_ids)
-    end
+  def handle_reassign_or_remove_task(mail_team_user)
+    return unless @reassign_remove_task_id.present? && @action_type.present?
+
+    task = Task.find(@reassign_remove_task_id)
+    mail_team_user ||= task.assigned_by
+
+    reassign_remove_banner_action(mail_team_user)
     render "correspondence_team"
   end
 
@@ -176,71 +140,6 @@ def handle_json_response(mail_team_user, task_ids, tab)
     end
   end
 
-  def update_tasks(mail_team_user, task_ids)
-    return unless @response_type == "success"
-
-    tasks = Task.where(id: task_ids)
-    tasks.update_all(assigned_to_id: mail_team_user.id, assigned_to_type: "User", status: "assigned")
-  end
-
-  def set_banner_params(user, task_count, tab)
-    template = message_template(user, task_count, tab)
-    response_type(user)
-    @response_header = template[:header]
-    @response_message = template[:message]
-  end
-
-  def message_template(user, task_count, tab)
-    success_header_unassigned = "You have successfully assigned #{task_count} Correspondence to #{user.css_id}."
-    success_header_assigned = "You have successfully reassigned #{task_count} Correspondence to #{user.css_id}."
-    success_message = "Please go to your individual queue to see any self-assigned correspondence."
-    failure_header_unassigned = "Correspondence assignment to #{user.css_id} has failed"
-    failure_header_assigned = "Correspondence reassignment to #{user.css_id} has failed"
-    failure_message = "Queue volume has reached maximum capacity for this user."
-
-    case tab
-    when "correspondence_unassigned"
-      {
-        header: (user.tasks.length < MAX_QUEUED_ITEMS) ? success_header_unassigned : failure_header_unassigned,
-        message: (user.tasks.length < MAX_QUEUED_ITEMS) ? success_message : failure_message
-      }
-    when "correspondence_team_assigned"
-      {
-        header: (user.tasks.length < MAX_QUEUED_ITEMS) ? success_header_assigned : failure_header_assigned,
-        message: (user.tasks.length < MAX_QUEUED_ITEMS) ? success_message : failure_message
-      }
-    end
-  end
-
-  def response_type(user)
-    @response_type = (user.tasks.length < MAX_QUEUED_ITEMS) ? "success" : "warning"
-  end
-
-  # :reek:FeatureEnvy
-  def vbms_document_types
-    begin
-      data = ExternalApi::ClaimEvidenceService.document_types
-    rescue StandardError => error
-      Rails.logger.error(error.full_message)
-      data ||= demo_data
-    end
-    data.map { |document_type| { id: document_type["id"], name: document_type["description"] } }
-  end
-
-  def demo_data
-    json_file_path = "vbms doc types.json"
-    JSON.parse(File.read(json_file_path))
-  end
-
-  def set_flash_intake_success_message
-    # intake error message is handled in client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx
-    vet = veteran_by_correspondence
-    flash[:correspondence_intake_success] = [
-      "You have successfully submitted a correspondence record for #{vet.name}(#{vet.file_number})",
-      "The mail package has been uploaded to the Veteran's eFolder as well."
-    ]
-  end
-
   def verify_correspondence_access
     return true if InboundOpsTeam.singleton.user_has_access?(current_user) ||
                    MailTeam.singleton.user_has_access?(current_user) ||
@@ -250,28 +149,6 @@ def verify_correspondence_access
     redirect_to "/unauthorized"
   end
 
-  def general_information
-    vet = veteran_by_correspondence
-    {
-      notes: correspondence.notes,
-      file_number: vet.file_number,
-      veteran_name: vet.name,
-      correspondence_type_id: correspondence.correspondence_type_id,
-      correspondence_types: CorrespondenceType.all,
-      correspondence_tasks: correspondence.tasks.map do |task|
-        WorkQueue::CorrespondenceTaskSerializer.new(task).serializable_hash[:data][:attributes]
-      end
-    }
-  end
-
-  def correspondence_params
-    params.require(:correspondence).permit(:notes, :correspondence_type_id)
-  end
-
-  def veteran_params
-    params.require(:veteran).permit(:file_number)
-  end
-
   def verify_feature_toggle
     if !FeatureToggle.enabled?(:correspondence_queue) && verify_correspondence_access
       redirect_to "/under_construction"
@@ -279,69 +156,4 @@ def verify_feature_toggle
       redirect_to "/unauthorized"
     end
   end
-
-  def correspondence
-    return @correspondence if @correspondence.present?
-
-    if params[:id].present?
-      @correspondence = Correspondence.find(params[:id])
-    elsif params[:correspondence_uuid].present?
-      @correspondence = Correspondence.find_by(uuid: params[:correspondence_uuid])
-    end
-
-    @correspondence
-  end
-
-  def veteran_by_correspondence
-    return nil if correspondence&.veteran_id.blank?
-
-    @veteran_by_correspondence ||= Veteran.find_by(id: correspondence.veteran_id)
-  end
-
-  def veterans_with_correspondences
-    veterans = Veteran.includes(:correspondences).where(correspondences: { id: Correspondence.select(:id) })
-    veterans.map { |veteran| vet_info_serializer(veteran, veteran.correspondences.last) }
-  end
-
-  def auto_texts
-    @auto_texts ||= AutoText.all.pluck(:name)
-  end
-
-  def vet_info_serializer(veteran, correspondence)
-    {
-      firstName: veteran.first_name,
-      lastName: veteran.last_name,
-      fileNumber: veteran.file_number,
-      cmPacketNumber: correspondence.cmp_packet_number,
-      correspondenceUuid: correspondence.uuid,
-      packageDocumentType: correspondence.correspondence_type_id
-    }
-  end
-
-  def correspondence_intake_processor
-    @correspondence_intake_processor ||= CorrespondenceIntakeProcessor.new
-  end
-
-  def correspondence_documents_efolder_uploader
-    @correspondence_documents_efolder_uploader ||= CorrespondenceDocumentsEfolderUploader.new
-  end
-
-  # :reek:FeatureEnvy
-  def intake_appeal_update_tasks
-    tasks = Task.where("appeal_id = ? and appeal_type = ?", correspondence.id, "Correspondence")
-    tasks.map do |task|
-      if task.type == "ReviewPackageTask"
-        task.instructions.push("An appeal intake was started because this Correspondence is a 10182")
-        task.assigned_to_id = correspondence.assigned_by_id
-        task.assigned_to = User.find(correspondence.assigned_by_id)
-      end
-      task.status = "cancelled"
-      task.save
-    end
-  end
-
-  def upload_documents_to_claim_evidence
-    rpt = ReviewPackageTask.find_by(appeal_id: correspondence.id, type: ReviewPackageTask.name)
-    correspondence_documents_efolder_uploader.upload_documents_to_claim_evidence(correspondence, current_user, rpt)
-  end
-end
+end
\ No newline at end of file
diff --git a/app/models/concerns/correspondence_controller_util.rb b/app/models/concerns/correspondence_controller_util.rb
new file mode 100644
index 00000000000..f33e66944ca
--- /dev/null
+++ b/app/models/concerns/correspondence_controller_util.rb
@@ -0,0 +1,401 @@
+# frozen_string_literal: true
+
+# rubocop:disable Metrics/ModuleLength
+
+# Contains most of the logic inside of CorrespondenceController
+module CorrespondenceControllerUtil
+  def current_correspondence
+    @current_correspondence ||= correspondence
+  end
+
+  def veteran_information
+    @veteran_information ||= veteran_by_correspondence
+  end
+
+  def pdf
+    # Hard-coding Document access until CorrespondenceDocuments are uploaded to S3Bucket
+    document = Document.limit(200)[params[:pdf_id].to_i]
+
+    document_disposition = "inline"
+    if params[:download]
+      document_disposition = "attachment; filename='#{params[:type]}-#{params[:id]}.pdf'"
+    end
+
+    # The line below enables document caching for a month.
+    expires_in 30.days, public: true
+    send_file(
+      document.serve,
+      type: "application/pdf",
+      disposition: document_disposition
+    )
+  end
+
+  def set_handle_mail_superuser_or_supervisor_params(current_user, params)
+    @mail_team_users = User.mail_team_users.pluck(:css_id)
+    @is_superuser = current_user.mail_superuser?
+    @is_supervisor = current_user.mail_supervisor?
+    @reassign_remove_task_id = params[:taskId].strip if params[:taskId].present?
+    @action_type = params[:userAction].strip if params[:userAction].present?
+  end
+
+  def correspondence_team
+    if current_user.mail_superuser? || current_user.mail_supervisor?
+      handle_mail_superuser_or_supervisor
+    elsif current_user.mail_team_user?
+      redirect_to "/queue/correspondence"
+    else
+      redirect_to "/unauthorized"
+    end
+  end
+
+  private
+
+  def reassign_remove_banner_action(mail_team_user)
+    operation_type = params[:operation]
+    begin
+      case operation_type
+      when "reassign"
+        update_reassign_task(mail_team_user)
+      when "remove"
+        update_remove_task(mail_team_user)
+      end
+      set_reassign_remove_banner_params(mail_team_user, operation_type)
+    rescue StandardError
+      set_error_banner_params(operation_type, mail_team_user)
+    end
+  end
+
+  def reassign_remove_task_id_and_action_type_present?
+    if @reassign_remove_task_id.present? && @action_type.present?
+      return true
+    end
+
+    false
+  end
+
+  def handle_html_response(mail_team_user, task_ids, tab)
+    if reassign_remove_task_id_and_action_type_present?
+      task = Task.find(@reassign_remove_task_id)
+      if mail_team_user.nil?
+        mail_team_user = task.assigned_by
+      end
+    end
+
+    if mail_team_user && (task_ids.present? || @reassign_remove_task_id.present?)
+      process_tasks_if_applicable(mail_team_user, task_ids, tab)
+      handle_reassign_or_remove_task(mail_team_user)
+    end
+  end
+
+  def process_tasks_if_applicable(mail_team_user, task_ids, tab)
+    return unless mail_team_user && task_ids.present?
+
+    set_banner_params(mail_team_user, task_ids.count, tab)
+    update_tasks(mail_team_user, task_ids)
+  end
+
+  def update_tasks(mail_team_user, task_ids)
+    return unless @response_type == "success"
+
+    tasks = Task.where(id: task_ids)
+    tasks.update_all(assigned_to_id: mail_team_user.id, assigned_to_type: "User", status: "assigned")
+  end
+
+  def approve_reassign_task(task, current_user, mail_team_user)
+    task.update!(
+      completed_by: current_user,
+      assigned_to_id: current_user,
+      assigned_to: current_user,
+      closed_at: Time.zone.now,
+      status: "completed"
+    )
+    parent_task = ReviewPackageTask.find(task.parent_id)
+    parent_task.update!(
+      status: "completed",
+      closed_at: Time.zone.now,
+      completed_by: current_user
+    )
+    ReviewPackageTask.create!(
+      assigned_to: mail_team_user,
+      assigned_to_id: mail_team_user.id,
+      status: "assigned",
+      appeal_id: task.appeal_id,
+      appeal_type: "Correspondence"
+    )
+  end
+
+  def approve_remove_task(task_id, current_user, mail_team_user)
+    Task.find_by(id: task_id).update!(
+      completed_by_id: current_user,
+      assigned_to_id: mail_team_user,
+      assigned_to: mail_team_user,
+      status: "cancelled"
+    )
+  end
+
+  def reject_remove_task(task_id, current_user, decision_reason)
+    Task.find_by(id: task_id).update!(
+      completed_by_id: current_user,
+      closed_at: Time.zone.now,
+      status: "completed",
+      instructions: decision_reason
+    )
+    ReviewPackageTask.find(Task.find_by(id: task_id).parent_id).update!(status: "in_progress")
+  end
+
+  def reject_reassign_task(task, current_user)
+    decision_reason = params[:decisionReason].strip
+    task.update(
+      completed_by_id: current_user,
+      closed_at: Time.zone.now,
+      status: "completed",
+      instructions: decision_reason
+    )
+    parent_task = ReviewPackageTask.find(task.parent_id)
+    parent_task.update(assigned_to_type: "User", status: "in_progress")
+  end
+
+  def update_reassign_task(mail_team_user)
+    task_id = params[:taskId].strip
+
+    task = Task.find_by(id: task_id)
+    case @action_type
+    when "approve"
+      approve_reassign_task(task, current_user, mail_team_user)
+    when "reject"
+      reject_reassign_task(task, current_user)
+    end
+  end
+
+  def update_remove_task(mail_team_user)
+    task_id = params[:taskId].strip
+    decision_reason = params[:decisionReason].strip
+    case @action_type
+    when "approve"
+      approve_remove_task(task_id, current_user, mail_team_user)
+    when "reject"
+      reject_remove_task(task_id, current_user, decision_reason)
+    end
+  end
+
+  def set_banner_params(user, task_count, tab)
+    template = message_template(user, task_count, tab)
+    response_type(user)
+    @response_header = template[:header]
+    @response_message = template[:message]
+  end
+
+  def set_reassign_remove_banner_params(user, operation_type)
+    case operation_type
+    when "remove"
+      template = remove_message_template(user)
+      @response_header = template[:header]
+      @response_message = template[:message]
+      @response_type = "success"
+    when "reassign"
+      template = reassign_message_template(user)
+      @response_header = template[:header]
+      @response_message = template[:message]
+      @response_type = "success"
+    end
+  end
+
+  def set_error_banner_params(operation_type, mail_team_user)
+    operation_verb = operation_type == "approve" ? "approved" : "rejected"
+    @response_header = "Package request for #{mail_team_user.css_id} could not be #{operation_verb}"
+    @response_message = "Please try again at a later time or contact the Help Desk."
+    @response_type = "error"
+  end
+
+  def handle_correspondence_unassigned_response(user, task_count)
+    success_header_unassigned = "You have successfully assigned #{task_count} Correspondence to #{user.css_id}."
+    failure_header_unassigned = "Correspondence assignment to #{user.css_id} has failed"
+    success_message = "Please go to your individual queue to see any self-assigned correspondence."
+    failure_message = "Queue volume has reached maximum capacity for this user."
+    {
+      header: (user.tasks.length < MAX_QUEUED_ITEMS) ? success_header_unassigned : failure_header_unassigned,
+      message: (user.tasks.length < MAX_QUEUED_ITEMS) ? success_message : failure_message
+    }
+  end
+
+  def handle_correspondence_assigned_response(user, task_count)
+    success_header_assigned = "You have successfully reassigned #{task_count} Correspondence to #{user.css_id}."
+    failure_header_assigned = "Correspondence reassignment to #{user.css_id} has failed"
+    success_message = "Please go to your individual queue to see any self-assigned correspondence."
+    failure_message = "Queue volume has reached maximum capacity for this user."
+    {
+      header: (user.tasks.length < MAX_QUEUED_ITEMS) ? success_header_assigned : failure_header_assigned,
+      message: (user.tasks.length < MAX_QUEUED_ITEMS) ? success_message : failure_message
+    }
+  end
+
+  def message_template(user, task_count, tab)
+    case tab
+    when "correspondence_unassigned"
+      handle_correspondence_unassigned_response(user, task_count)
+    when "correspondence_team_assigned"
+      handle_correspondence_assigned_response
+    end
+  end
+
+  def reassign_message_template(user)
+    success_header_reassigned = "You have successfully reassigned a mail record for #{user.css_id}"
+    success_message_reassigned = "Please go to your individual queue to see any self assigned correspondence."
+    success_header_rejected = "You have successfully rejected a package request for #{user.css_id}"
+    success_message_rejected = "The package will be re-assigned to the user that sent the request."
+    case @action_type
+    when "approve"
+      {
+        header: success_header_reassigned,
+        message: success_message_reassigned
+      }
+    when "reject"
+      {
+        header: success_header_rejected,
+        message: success_message_rejected
+      }
+    end
+  end
+
+  def remove_message_template(user)
+    success_header_approved = "You have successfully removed a mail package for #{user.css_id}"
+    success_message_approved = "The package has been removed from Caseflow and must be manually uploaded again
+     from the Centralized Mail Portal, if it needs to be processed."
+    success_header_rejected = "You have successfully rejected a package request for #{user.css_id}"
+    success_message_rejected = "The package will be re-assigned to the user that sent the request."
+
+    case @action_type
+    when "approve"
+      {
+        header: success_header_approved,
+        message: success_message_approved
+      }
+    when "reject"
+      {
+        header: success_header_rejected,
+        message: success_message_rejected
+      }
+    end
+  end
+
+  def response_type(user)
+    @response_type = (user.tasks.length < MAX_QUEUED_ITEMS) ? "success" : "warning"
+  end
+
+  # :reek:FeatureEnvy
+  def vbms_document_types
+    begin
+      data = ExternalApi::ClaimEvidenceService.document_types
+    rescue StandardError => error
+      Rails.logger.error(error.full_message)
+      data ||= demo_data
+    end
+    data.map { |document_type| { id: document_type["id"], name: document_type["description"] } }
+  end
+
+  def demo_data
+    json_file_path = "vbms doc types.json"
+    JSON.parse(File.read(json_file_path))
+  end
+
+  def set_flash_intake_success_message
+    # intake error message is handled in client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx
+    vet = veteran_by_correspondence
+    flash[:correspondence_intake_success] = [
+      "You have successfully submitted a correspondence record for #{vet.name}(#{vet.file_number})",
+      "The mail package has been uploaded to the Veteran's eFolder as well."
+    ]
+  end
+
+  def general_information
+    vet = veteran_by_correspondence
+    {
+      notes: correspondence.notes,
+      file_number: vet.file_number,
+      veteran_name: vet.name,
+      correspondence_type_id: correspondence.correspondence_type_id,
+      correspondence_types: CorrespondenceType.all,
+      correspondence_tasks: correspondence.tasks.map do |task|
+        WorkQueue::CorrespondenceTaskSerializer.new(task).serializable_hash[:data][:attributes]
+      end
+    }
+  end
+
+  def correspondence_params
+    params.require(:correspondence).permit(:notes, :correspondence_type_id)
+  end
+
+  def veteran_params
+    params.require(:veteran).permit(:file_number)
+  end
+
+  def correspondence
+    return @correspondence if @correspondence.present?
+
+    if params[:id].present?
+      @correspondence = Correspondence.find(params[:id])
+    elsif params[:correspondence_uuid].present?
+      @correspondence = Correspondence.find_by(uuid: params[:correspondence_uuid])
+    end
+
+    @correspondence
+  end
+
+  def correspondence_load
+    Correspondence.where(veteran_id: veteran_by_correspondence.id).where.not(uuid: params[:correspondence_uuid])
+  end
+
+  def veteran_by_correspondence
+    return nil if correspondence&.veteran_id.blank?
+
+    @veteran_by_correspondence ||= Veteran.find_by(id: correspondence.veteran_id)
+  end
+
+  def veterans_with_correspondences
+    veterans = Veteran.includes(:correspondences).where(correspondences: { id: Correspondence.select(:id) })
+    veterans.map { |veteran| vet_info_serializer(veteran, veteran.correspondences.last) }
+  end
+
+  def auto_texts
+    @auto_texts ||= AutoText.all.pluck(:name)
+  end
+
+  def vet_info_serializer(veteran, correspondence)
+    {
+      firstName: veteran.first_name,
+      lastName: veteran.last_name,
+      fileNumber: veteran.file_number,
+      cmPacketNumber: correspondence.cmp_packet_number,
+      correspondenceUuid: correspondence.uuid,
+      packageDocumentType: correspondence.correspondence_type_id
+    }
+  end
+
+  def correspondence_intake_processor
+    @correspondence_intake_processor ||= CorrespondenceIntakeProcessor.new
+  end
+
+  def correspondence_documents_efolder_uploader
+    @correspondence_documents_efolder_uploader ||= CorrespondenceDocumentsEfolderUploader.new
+  end
+
+  # :reek:FeatureEnvy
+  def intake_appeal_update_tasks
+    tasks = Task.where("appeal_id = ? and appeal_type = ?", correspondence.id, "Correspondence")
+    tasks.map do |task|
+      if task.type == "ReviewPackageTask"
+        task.instructions.push("An appeal intake was started because this Correspondence is a 10182")
+        task.assigned_to_id = correspondence.assigned_by_id
+        task.assigned_to = User.find(correspondence.assigned_by_id)
+      end
+      task.status = "cancelled"
+      task.save
+    end
+  end
+
+  def upload_documents_to_claim_evidence
+    rpt = ReviewPackageTask.find_by(appeal_id: correspondence.id, type: ReviewPackageTask.name)
+    correspondence_documents_efolder_uploader.upload_documents_to_claim_evidence(correspondence, current_user, rpt)
+  end
+end
+# rubocop:enable Metrics/ModuleLength
diff --git a/app/models/queue_tabs/organization_correspondence_action_required_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_action_required_tasks_tab.rb
index d4481cd2507..0fb6a305525 100644
--- a/app/models/queue_tabs/organization_correspondence_action_required_tasks_tab.rb
+++ b/app/models/queue_tabs/organization_correspondence_action_required_tasks_tab.rb
@@ -20,11 +20,11 @@ def description
   def tasks
     tasks = CorrespondenceTask.includes(*task_includes).package_action_tasks
 
-    tasks = if RequestStore[:current_user].mail_supervisor?
-              tasks.where(assigned_to: assignee).active
-            else
-              tasks.where.not(type: RemovePackageTask.name).where(assigned_to: assignee).active
-            end
+    if RequestStore[:current_user].mail_supervisor?
+      tasks.where(assigned_to: assignee).active
+    else
+      tasks.where.not(type: RemovePackageTask.name).where(assigned_to: assignee).active
+    end
   end
 
   # :reek:UtilityFunction
diff --git a/app/models/serializers/work_queue/correspondence_task_column_serializer.rb b/app/models/serializers/work_queue/correspondence_task_column_serializer.rb
index 0ae1627dff3..52dffb2a2c8 100644
--- a/app/models/serializers/work_queue/correspondence_task_column_serializer.rb
+++ b/app/models/serializers/work_queue/correspondence_task_column_serializer.rb
@@ -38,6 +38,14 @@ class WorkQueue::CorrespondenceTaskColumnSerializer
 
   attribute :task_url
 
+  attribute :parent_task_url do |object|
+    if object.is_a?(ReassignPackageTask) || object.is_a?(RemovePackageTask)
+      { parent_task_url: object.parent.task_url }
+    else
+      { parent_task_url: "" }
+    end
+  end
+
   attribute :assigned_to do |object|
     assignee = object.assigned_to
     {
diff --git a/app/models/tasks/correspondence_task.rb b/app/models/tasks/correspondence_task.rb
index 53c33508797..01252d77a6c 100644
--- a/app/models/tasks/correspondence_task.rb
+++ b/app/models/tasks/correspondence_task.rb
@@ -24,7 +24,7 @@ def verify_org_task_unique
       appeal_id: appeal_id,
       appeal_type: appeal_type,
       type: type
-    ).any?
+    ).open.any?
       fail(
         Caseflow::Error::DuplicateOrgTask,
         task_type: self.class.name,
diff --git a/client/app/components/RadioFieldWithChildren.jsx b/client/app/components/RadioFieldWithChildren.jsx
new file mode 100644
index 00000000000..0870618127f
--- /dev/null
+++ b/client/app/components/RadioFieldWithChildren.jsx
@@ -0,0 +1,195 @@
+import React, { useMemo } from 'react';
+import PropTypes from 'prop-types';
+import classNames from 'classnames';
+
+import RequiredIndicator from './RequiredIndicator';
+import StringUtil from '../util/StringUtil';
+import Tooltip from './Tooltip';
+
+import ACD_LEVERS from '../../constants/ACD_LEVERS';
+
+import { helpText } from './RadioField.module.scss';
+
+const RadioFieldHelpText = ({ help, className }) => {
+  const helpClasses = classNames('cf-form-radio-help', helpText, className);
+
+  return <div className={helpClasses}>{help}</div>;
+};
+
+RadioFieldHelpText.propTypes = {
+  help: PropTypes.string.isRequired,
+  className: PropTypes.string,
+};
+
+/**
+ * Clone of RadioField button component that allows children objects .
+ * See StyleGuideRadioField.jsx for usage examples.
+ */
+
+export const RadioFieldWithChildren = (props) => {
+  const {
+    id,
+    className,
+    label,
+    inputRef,
+    inputProps,
+    name,
+    options,
+    value,
+    onChange,
+    required,
+    errorMessage,
+    strongLabel,
+    hideLabel,
+    styling,
+    vertical,
+    optionsStyling
+  } = props;
+
+  const isVertical = useMemo(() => props.vertical || props.options.length > 2, [
+    vertical,
+    options,
+  ]);
+
+  const radioClass = className.
+    concat(isVertical ? 'cf-form-radio' : 'cf-form-radio-inline').
+    concat(errorMessage ? 'usa-input-error' : '');
+
+  const labelClass = hideLabel ? 'usa-sr-only' : '';
+
+  // Since HTML5 IDs should not contain spaces...
+  const idPart = StringUtil.html5CompliantId(id || name);
+
+  const labelContents = (
+    <span>
+      {label || name} {required && <RequiredIndicator />}
+    </span>
+  );
+
+  const maybeAddTooltip = (option, radioField) => {
+    if (option.tooltipText) {
+      const keyId = `tooltip-${option.value}`;
+
+      return <Tooltip
+        key={keyId}
+        id={keyId}
+        text={option.tooltipText}
+        position="right"
+        className="cf-radio-option-tooltip"
+        offset={{ right: 15 }}
+      >
+        {radioField}
+      </Tooltip>;
+    }
+
+    return radioField;
+  };
+
+  const isDisabled = (option) => Boolean(option.disabled);
+
+  const handleChange = (event) => onChange?.(event.target.value);
+  const controlled = useMemo(() => typeof value !== 'undefined', [value]);
+
+  return (
+    <fieldset className={radioClass.join(' ')} {...styling}>
+      <legend className={labelClass}>
+        {strongLabel ? <strong>{labelContents}</strong> : labelContents}
+      </legend>
+
+      {errorMessage && (
+        <span className="usa-input-error-message" tabIndex={0}>{errorMessage}</span>
+      )}
+
+      <div className="cf-form-radio-options" style={optionsStyling}>
+        {options.map((option, i) => {
+          const optionDisabled = isDisabled(option);
+          const radioField = (<div
+            className="cf-form-radio-option"
+            key={`${idPart}-${option.value}-${i}`}
+          >
+            <input
+              onChange={handleChange}
+              name={name}
+              type={ACD_LEVERS.data_types.radio}
+              id={`${idPart}_${option.value}`}
+              value={option.value}
+              // eslint-disable-next-line no-undefined
+              checked={controlled ? value === option.value : undefined}
+              disabled={optionDisabled}
+              ref={inputRef}
+              {...inputProps}
+            />
+            <label
+              className={optionDisabled ? 'disabled' : ''}
+              htmlFor={`${idPart}_${option.value}`}
+            >
+              {option.displayText || option.displayElem}
+            </label>
+            {option.displayElement && option.element}
+            {option.help && <RadioFieldHelpText help={option.help} />}
+          </div>
+          );
+
+          return maybeAddTooltip(option, radioField);
+        })}
+      </div>
+    </fieldset>
+  );
+};
+
+RadioFieldWithChildren.defaultProps = {
+  required: false,
+  displayElement: false,
+  className: ['usa-fieldset-inputs'],
+};
+
+RadioFieldWithChildren.propTypes = {
+  id: PropTypes.string,
+  className: PropTypes.arrayOf(PropTypes.string),
+  required: PropTypes.bool,
+  // Pass a ref to the `input` element
+  inputRef: PropTypes.oneOfType([
+    // Either a function
+    PropTypes.func,
+    // Or the instance of a DOM native element (see the note about SSR)
+    PropTypes.shape({ current: PropTypes.instanceOf(Element) }),
+  ]),
+  // Props to be applied to the `input` element
+  inputProps: PropTypes.object,
+  // Text to display in a `legend` element for the radio group fieldset
+  label: PropTypes.node,
+  // String to be applied to the `name` attribute of all the `input` elements
+  name: PropTypes.string.isRequired,
+
+  /**
+   * Callback fired when value is changed
+   * @param {string} value The current value of the component
+   */
+  onChange: PropTypes.func,
+  // an array of options used to define individual radio inputs
+  options: PropTypes.arrayOf(
+    PropTypes.shape({
+    // Text to be used as label for individual radio input
+      displayText: PropTypes.node,
+      // The `value` attribute for the radio input
+      value: PropTypes.string,
+      // Help text to be displayed below the label
+      help: PropTypes.string,
+      // The child element to display under the radiofield option
+      element: PropTypes.element,
+      // Used to control visibility of child element
+      displayElement: PropTypes.bool
+    })
+  ),
+  // The value of the named `input` element(s); required for a controlled component
+  value: PropTypes.oneOfType([PropTypes.string, PropTypes.bool]),
+  // Stack `input` elements vertically (automatic for more than two options)
+  vertical: PropTypes.bool,
+  errorMessage: PropTypes.string,
+  strongLabel: PropTypes.bool,
+  hideLabel: PropTypes.bool,
+  styling: PropTypes.object,
+  optionsStyling: PropTypes.object
+};
+
+export default RadioFieldWithChildren;
diff --git a/client/app/queue/components/TaskTableColumns.jsx b/client/app/queue/components/TaskTableColumns.jsx
index fe6378cce3a..2385d718c8f 100644
--- a/client/app/queue/components/TaskTableColumns.jsx
+++ b/client/app/queue/components/TaskTableColumns.jsx
@@ -18,7 +18,8 @@ import { useDispatch, useSelector } from 'react-redux';
 import {
   setShowReassignPackageModal,
   setShowRemovePackageModal,
-  setSelectedTasks
+  setSelectedTasks,
+  setSelectedVeteranDetails
 } from 'app/queue/correspondence/correspondenceReducer/correspondenceActions';
 
 import { taskHasCompletedHold, hasDASRecord, collapseColumn, regionalOfficeCity, renderAppealType } from '../utils';
@@ -232,12 +233,14 @@ export const assignedByColumn = () => {
 export const veteranDetails = () => {
   const dispatch = useDispatch();
 
-  const showReassignPackageModal = () => {
-    dispatch(setShowReassignPackageModal(true));
+  const handleRemoveClick = (task) => {
+    dispatch(setSelectedVeteranDetails(task));
+    dispatch(setShowRemovePackageModal(true));
   };
 
-  const showRemovePackageModal = () => {
-    dispatch(setShowRemovePackageModal(true));
+  const handleReassignClick = (task) => {
+    dispatch(setSelectedVeteranDetails(task));
+    dispatch(setShowReassignPackageModal(true));
   };
 
   return {
@@ -250,7 +253,7 @@ export const veteranDetails = () => {
       if (task.taskUrl === '/modal/reassign_package') {
         return <a
           href="#"
-          onClick={showReassignPackageModal}
+          onClick={() => handleReassignClick(task)}
           aria-label={`${task.label } Link`}
           id="task-link"
         >
@@ -259,7 +262,7 @@ export const veteranDetails = () => {
       } else if (task.taskUrl === '/modal/remove_package') {
         return <a
           href="#"
-          onClick={showRemovePackageModal}
+          onClick={() => handleRemoveClick(task)}
           aria-label={`${task.label } Link`}
           id="task-link"
         >
diff --git a/client/app/queue/correspondence/CorrespondenceCases.jsx b/client/app/queue/correspondence/CorrespondenceCases.jsx
index 8c0c2dd77d6..778f907d88e 100644
--- a/client/app/queue/correspondence/CorrespondenceCases.jsx
+++ b/client/app/queue/correspondence/CorrespondenceCases.jsx
@@ -12,7 +12,9 @@ import { sprintf } from 'sprintf-js';
 import CorrespondenceTableBuilder from './CorrespondenceTableBuilder';
 import Alert from '../../components/Alert';
 import Modal from 'app/components/Modal';
-import Button from '../../components/Button';
+import RadioFieldWithChildren from '../../components/RadioFieldWithChildren';
+import ReactSelectDropdown from '../../components/ReactSelectDropdown';
+import TextareaField from '../../components/TextareaField';
 
 const CorrespondenceCases = (props) => {
   const dispatch = useDispatch();
@@ -20,8 +22,87 @@ const CorrespondenceCases = (props) => {
 
   const currentAction = useSelector((state) => state.reviewPackage.lastAction);
   const veteranInformation = useSelector((state) => state.reviewPackage.veteranInformation);
+  const currentSelectedVeteran = useSelector((state) => state.intakeCorrespondence.selectedVeteranDetails);
+  const reassignModalVisible = useSelector((state) => state.intakeCorrespondence.showReassignPackageModal);
 
   const [vetName, setVetName] = useState('');
+  const [selectedMailTeamUser, setSelectedMailTeamUser] = useState('');
+  const [selectedRequestChoice, setSelectedRequestChoice] = useState('');
+  const [decisionReason, setDecisionReason] = useState('');
+
+  const buildMailUserData = (data) => {
+
+    if (typeof data === 'undefined') {
+      return [];
+    }
+
+    return data.map((user) => {
+      return {
+        value: user,
+        label: user
+      };
+    });
+  };
+
+  const handleDecisionReasonInput = (value) => {
+    setDecisionReason(value);
+  };
+
+  const handleViewPackage = () => {
+    let url = window.location.href;
+    const index = url.indexOf('/team');
+
+    url = url.slice(0, index);
+    const parentUrlArray = (currentSelectedVeteran.parentTaskUrl.split('/'));
+
+    window.location.href = (`${url }/${parentUrlArray[3]}/${parentUrlArray[4]}`);
+  };
+
+  const resetState = () => {
+    setSelectedMailTeamUser('');
+    setSelectedRequestChoice('');
+    setDecisionReason('');
+  };
+
+  const handleReassignClose = () => {
+    resetState();
+    dispatch(setShowReassignPackageModal(false));
+  };
+
+  const handleRemoveClose = () => {
+    resetState();
+    dispatch(setShowRemovePackageModal(false));
+  };
+
+  const confirmButtonDisabled = () => {
+    if (selectedRequestChoice === 'approve' && selectedMailTeamUser === '' && reassignModalVisible) {
+      return true;
+    }
+
+    if (selectedRequestChoice === 'reject' && decisionReason === '') {
+      return true;
+    }
+
+    if (selectedRequestChoice === '') {
+      return true;
+    }
+
+    return false;
+  };
+
+  const approveElement = (<div style={{ width: '28vw' }}>
+    <ReactSelectDropdown
+      className="cf-margin-left-2rem img"
+      label="Assign to person"
+      onChangeMethod={(val) => setSelectedMailTeamUser(val.value)}
+      options={buildMailUserData(props.mailTeamUsers)}
+    />
+  </div>);
+
+  const textAreaElement = (
+    <div style={{ width: '280%' }}>
+      <TextareaField onChange={handleDecisionReasonInput} value={decisionReason} />
+    </div>);
 
   useEffect(() => {
     dispatch(loadCorrespondenceConfig(configUrl));
@@ -31,14 +112,93 @@ const CorrespondenceCases = (props) => {
   const showReassignPackageModal = useSelector((state) => state.intakeCorrespondence.showReassignPackageModal);
   const showRemovePackageModal = useSelector((state) => state.intakeCorrespondence.showRemovePackageModal);
 
-  const closeReassignPackageModal = () => {
-    dispatch(setShowReassignPackageModal(false));
-  };
+  const reassignOptions = [
+    { displayText: 'Approve request',
+      value: 'approve',
+      element: approveElement,
+      displayElement: selectedRequestChoice === 'approve'
+    },
+    { displayText: 'Reject request',
+      value: 'reject',
+      element: textAreaElement,
+      displayElement: selectedRequestChoice === 'reject'
+    }
+  ];
 
-  const closeRemovePackageModal = () => {
-    dispatch(setShowRemovePackageModal(false));
+  const removeOptions = [
+    { displayText: 'Approve request',
+      value: 'approve',
+      displayElement: selectedRequestChoice === 'approve'
+    },
+    { displayText: 'Reject request',
+      value: 'reject',
+      element: textAreaElement,
+      displayElement: selectedRequestChoice === 'reject'
+    }
+  ];
+
+  const handleConfirmReassignRemoveClick = (operation) => {
+    const newUrl = new URL(window.location.href);
+    const searchParams = new URLSearchParams(newUrl.search);
+
+    // Encode and set the query parameters
+    searchParams.set('user', encodeURIComponent(selectedMailTeamUser));
+    searchParams.set('taskId', encodeURIComponent(currentSelectedVeteran.uniqueId));
+    searchParams.set('userAction', encodeURIComponent(selectedRequestChoice));
+    searchParams.set('decisionReason', encodeURIComponent(decisionReason));
+    searchParams.set('operation', encodeURIComponent(operation));
+
+    // Construct the new URL with encoded query parameters
+    newUrl.search = searchParams.toString();
+    window.location.href = newUrl.href;
   };
 
+  const reassignModalButtons = [
+    {
+      classNames: ['cf-modal-link', 'cf-btn-link'],
+      name: 'Cancel',
+      onClick: handleReassignClose,
+      disabled: false
+    },
+    {
+      id: '#confirm-button',
+      classNames: ['usa-button', 'usa-button-primary', 'cf-margin-left-2rem'],
+      name: 'Confirm',
+      onClick: () => handleConfirmReassignRemoveClick('reassign'),
+      disabled: confirmButtonDisabled()
+    },
+    {
+      id: '#view-package-button',
+      classNames: ['usa-button', 'usa-button-secondary'],
+      name: 'View package',
+      onClick: handleViewPackage,
+      disabled: false
+    }
+  ];
+
+  const removeModalButtons = [
+    {
+      classNames: ['cf-modal-link', 'cf-btn-link'],
+      name: 'Cancel',
+      onClick: handleRemoveClose,
+      disabled: false
+    },
+    {
+      id: '#confirm-button',
+      classNames: ['usa-button', 'usa-button-primary', 'cf-margin-left-2rem'],
+      name: 'Confirm',
+      onClick: () => handleConfirmReassignRemoveClick('remove'),
+      disabled: confirmButtonDisabled()
+    },
+    {
+      id: '#view-package-button',
+      classNames: ['usa-button', 'usa-button-secondary'],
+      name: 'View package',
+      onClick: handleViewPackage,
+      disabled: false
+    }
+  ];
+
   useEffect(() => {
     if (
       veteranInformation?.veteranName?.firstName &&
@@ -77,16 +237,41 @@ const CorrespondenceCases = (props) => {
           isMailSupervisor={props.isMailSupervisor} />}
         {showReassignPackageModal &&
         <Modal
+          closeHandler={handleReassignClose}
+          buttons={reassignModalButtons}
           title={COPY.CORRESPONDENCE_CASES_REASSIGN_PACKAGE_MODAL_TITLE}
-          closeHandler={closeReassignPackageModal}
-          cancelButton={<Button linkStyling onClick={closeReassignPackageModal}>Cancel</Button>}
-        />}
+        >
+          <b>Reason for reassignment:</b>
+          <p>{currentSelectedVeteran.instructions}</p>
+          <div>
+            <RadioFieldWithChildren
+              name="actionRequiredRadioField"
+              id="vertical-radio"
+              label="Choose whether to approve the request for removal or reject it."
+              options={reassignOptions}
+              onChange={(val) => setSelectedRequestChoice(val)}
+              value={selectedRequestChoice}
+              optionsStyling={{ width: '180px' }}
+            />
+          </div>
+        </Modal>}
         {showRemovePackageModal &&
         <Modal
           title={COPY.CORRESPONDENCE_CASES_REMOVE_PACKAGE_MODAL_TITLE}
-          closeHandler={closeRemovePackageModal}
-          cancelButton={<Button linkStyling onClick={closeRemovePackageModal}>Cancel</Button>}
-        />}
+          buttons={removeModalButtons}
+          closeHandler={handleRemoveClose}>
+          <b>Reason for removal:</b>
+          <p>{currentSelectedVeteran.instructions}</p>
+          <RadioFieldWithChildren
+            name="actionRequiredRadioField"
+            id="vertical-radio"
+            label="Choose whether to approve the request for removal or reject it."
+            options={removeOptions}
+            onChange={(val) => setSelectedRequestChoice(val)}
+            value={selectedRequestChoice}
+            optionsStyling={{ width: '180px' }}
+          />
+        </Modal>}
       </AppSegment>
     </>
   );
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
index bb794e17edc..f8be4a41710 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
@@ -202,6 +202,14 @@ export const setShowRemovePackageModal = (isVisible) => (dispatch) => {
   });
 };
 
+export const setSelectedVeteranDetails = (selectedVeteranDetails) => (dispatch) => {
+  dispatch({
+    type: ACTIONS.SET_SELECTED_VETERAN_DETAILS,
+    payload: {
+      selectedVeteranDetails
+    }
+  });
+}
 export const setErrorBanner = (isVisible) => (dispatch) => {
   dispatch({
     type: ACTIONS.SET_SHOW_CORRESPONDENCE_INTAKE_FORM_ERROR_BANNER,
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
index 156ae2a7556..e23300cd886 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
@@ -18,6 +18,7 @@ export const ACTIONS = {
   SET_WAIVED_EVIDENCE_TASKS: 'SET_WAIVED_EVIDENCE_TASKS',
   SET_SHOW_REASSIGN_PACKAGE_MODAL: 'SET_SHOW_REASSIGN_PACKAGE_MODAL',
   SET_SHOW_REMOVE_PACKAGE_MODAL: 'SET_SHOW_REMOVE_PACKAGE_MODAL',
+  SET_SELECTED_TASKS: 'SET_SELECTED_TASKS',
+  SET_SELECTED_VETERAN_DETAILS: 'SET_SELECTED_VETERAN_DETAILS',
   SET_SHOW_CORRESPONDENCE_INTAKE_FORM_ERROR_BANNER: 'SET_SHOW_CORRESPONDENCE_INTAKE_FORM_ERROR_BANNER',
-  SET_SELECTED_TASKS: 'SET_SELECTED_TASKS'
 };
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
index 3d6f63d71fb..f4f98cfc095 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
@@ -14,6 +14,7 @@ export const initialState = {
   currentCorrespondence: [],
   veteranInformation: [],
   waivedEvidenceTasks: [],
+  selectedVeteranDetails: {},
   showReassignPackageModal: false,
   showRemovePackageModal: false,
   showErrorBanner: false
@@ -162,6 +163,13 @@ export const intakeCorrespondenceReducer = (state = initialState, action = {}) =
       }
     });
 
+  case ACTIONS.SET_SELECTED_VETERAN_DETAILS:
+    return update(state, {
+      selectedVeteranDetails: {
+        $set: action.payload.selectedVeteranDetails
+      }
+    });
+
   case ACTIONS.SET_SHOW_CORRESPONDENCE_INTAKE_FORM_ERROR_BANNER:
     return update(state, {
       showErrorBanner: {
diff --git a/client/app/queue/utils.js b/client/app/queue/utils.js
index f8839de4b90..187095c6585 100644
--- a/client/app/queue/utils.js
+++ b/client/app/queue/utils.js
@@ -86,6 +86,7 @@ const correspondenceTaskAttributesFromRawTask = (task) => {
     vaDor: task.attributes.va_date_of_receipt,
     label: task.attributes.label,
     taskUrl: task.attributes.task_url,
+    parentTaskUrl: task.attributes.parent_task_url.parent_task_url,
     status: task.attributes.status,
     assignedAt: task.attributes.assigned_at,
     assignedTo: {
diff --git a/db/seeds/queue_correspondences.rb b/db/seeds/queue_correspondences.rb
index c30c2002f7b..8b9cbb2694a 100644
--- a/db/seeds/queue_correspondences.rb
+++ b/db/seeds/queue_correspondences.rb
@@ -83,6 +83,15 @@ def create_queue_correspondences(user, veteran = {})
         create_correspondence_with_action_required_tasks(user, veteran)
       end
 
+      # 20 correspondences with reassign / remove task for action required
+      20.times do
+        create_correspondences_with_review_remove_package_tasks
+      end
+
+      # 15 Correspondences with in-progress CorrespondenceRootTask and completed Mail Task
+      15.times do
+        create_correspondence_with_completed_mail_task(user, veteran)
+      end
       # 15 Correspondences with in-progress CorrespondenceRootTask and completed Mail Task
       15.times do
         create_correspondence_with_completed_mail_task(user, veteran)
@@ -182,6 +191,22 @@ def create_correspondence_with_action_required_tasks(user = {}, veteran = {})
       end
     end
 
+    def create_correspondences_with_review_remove_package_tasks
+        corres_array = (1..2).map { create(:correspondence) }
+        task_array = [ReassignPackageTask, RemovePackageTask]
+
+        corres_array.each_with_index do |corres, index|
+          rpt = ReviewPackageTask.find_by(appeal_id: corres.id)
+          task_array[index].create!(
+            parent_id: rpt.id,
+            appeal_type: "Correspondence",
+            appeal_id: corres.id,
+            assigned_to: InboundOpsTeam.singleton,
+            assigned_by_id: rpt.assigned_to_id
+          )
+        end
+    end
+
     def create_correspondence_with_completed_mail_task(user, veteran = {})
       correspondence = create_correspondence(user, veteran)
       create_and_complete_mail_task(correspondence, user)
@@ -191,5 +216,5 @@ def create_correspondence_with_canceled_root_task(user, veteran = {})
       corres = create_correspondence(user, veteran)
       corres.root_task.update!(status: Constants.TASK_STATUSES.cancelled)
     end
-  end
+end
 end
diff --git a/spec/feature/queue/correspondence/correspondence_cases_spec.rb b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
index 12c941acf9a..440717db6c6 100644
--- a/spec/feature/queue/correspondence/correspondence_cases_spec.rb
+++ b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
@@ -1214,6 +1214,78 @@
     end
   end
 
+  context "Banner alert for approval and reject request" do
+    let(:current_user) { create(:user) }
+    let(:mail_team_user) { create(:user) }
+    before :each do
+      MailTeam.singleton.add_user(current_user)
+      InboundOpsTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+      FeatureToggle.enable!(:correspondence_queue)
+    end
+
+    before do
+      5.times do
+        corres_array = (1..2).map { create(:correspondence) }
+        task_array = [ReassignPackageTask, RemovePackageTask]
+
+        corres_array.each_with_index do |corres, index|
+          rpt = ReviewPackageTask.find_by(appeal_id: corres.id)
+          task_array[index].create!(
+            parent_id: rpt.id,
+            appeal_type: "Correspondence",
+            appeal_id: corres.id,
+            assigned_to: InboundOpsTeam.singleton,
+            instructions: ["This was the default"],
+            assigned_by_id: rpt.assigned_to_id
+          )
+        end
+      end
+    end
+
+    it "approve request to reassign" do
+      visit "queue/correspondence/team?tab=correspondence_action_required&page=1&sort_by=vaDor&order=asc"
+      all("[aria-label='Reassign Package Task Link']")[0].click
+      find('[for="vertical-radio_approve"]').click
+      find("#react-select-2-input").find(:xpath, "..").find(:xpath, "..").find(:xpath, "..").click
+      find("#react-select-2-option-0").click
+      find("#Review-request-button-id-1").click
+      expect(page).to have_content("You have successfully reassigned a mail record for")
+    end
+
+    it "deny request to reassign" do
+      visit "queue/correspondence/team?tab=correspondence_action_required&page=1&sort_by=vaDor&order=asc"
+      all("[aria-label='Reassign Package Task Link']")[0].click
+      find('[for="vertical-radio_reject"]').click
+      find(".cf-form-textarea", visible: false).find(:xpath, "./*").fill_in with: "this is a rejection reason"
+      find("#Review-request-button-id-1").click
+      expect(page).to have_content("You have successfully rejected a package request for")
+    end
+
+    it "approve request to remove" do
+      visit "queue/correspondence/team?tab=correspondence_action_required&page=1&sort_by=vaDor&order=asc"
+      all("[aria-label='Remove Package Task Link']")[0].click
+      find('[for="vertical-radio_approve"]').click
+      find("#Review-request-button-id-1").click
+      expect(page).to have_content("You have successfully removed a mail package for")
+    end
+
+    it "deny request to remove" do
+      visit "queue/correspondence/team?tab=correspondence_action_required&page=1&sort_by=vaDor&order=asc"
+      all("[aria-label='Remove Package Task Link']")[0].click
+      find('[for="vertical-radio_reject"]').click
+      find(".cf-form-textarea", visible: false).find(:xpath, "./*").fill_in with: "this is a rejection reason"
+      find("#Review-request-button-id-1").click
+      expect(page).to have_content("You have successfully rejected a package request")
+    end
+
+    it "goes to Task Package" do
+      visit "queue/correspondence/team?tab=correspondence_action_required&page=1&sort_by=vaDor&order=asc"
+      all("[aria-label='Reassign Package Task Link']")[0].click
+      find("[id='Review-request-button-id-2']").click
+      expect(page).to have_content("Review the mail package details below.")
+    end
+  end
   context "correspondence tasks completed tab testing filters date " do
     let(:current_user) { create(:user) }
     before :each do

From 424d92ba1d60ff93c006d1e2ba55e7ab34f44c28 Mon Sep 17 00:00:00 2001
From: HunJerBAH <Jeremy.Hunton@va.gov>
Date: Thu, 21 Mar 2024 13:49:38 -0400
Subject: [PATCH 173/237] added back in redux store value on intake load.

---
 app/controllers/correspondence_intake_controller.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/controllers/correspondence_intake_controller.rb b/app/controllers/correspondence_intake_controller.rb
index 3f2d52c48f1..afbe86182ab 100644
--- a/app/controllers/correspondence_intake_controller.rb
+++ b/app/controllers/correspondence_intake_controller.rb
@@ -2,6 +2,11 @@
 
 class CorrespondenceIntakeController < CorrespondenceController
   def intake
+    # If correspondence intake was started, json data from the database will
+    # be loaded into the page when user returns to intake
+    @redux_store ||= CorrespondenceIntake.find_by(user: current_user,
+                                                  correspondence: current_correspondence)&.redux_store
+
     respond_to do |format|
       format.html { return render "correspondence/intake" }
       format.json do

From 645614c919f44c5414f94275b1f5ff2440c00b9f Mon Sep 17 00:00:00 2001
From: divyadasari-va <135847343+divyadasari-va@users.noreply.github.com>
Date: Thu, 21 Mar 2024 14:01:29 -0600
Subject: [PATCH 174/237] Div/appeals 38964 (#21099)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Initial commit for search bar

* Search bar chnages and removed post request

* Modified the search results display

* Removed unused code

* Removed searchValue from unnecessary places

* Search results on page load

* APPEALS-38964 - Search criteria for all columns

* moved search logic from table builder into queue table

* Removed unused method

* Made the changes back for tabPaginationOptions

* Remove Console Log

* Feature test cases for Search bar

* Added few more feature test cases for Search bar

* Added pagination spec

* Failing spec

* Added few more test cases

* APPEALS-38964 - Additioanl RSpec tests, Fixed page visits

* Edit VA DOR access for InboundOpsTeamAdmin user (#21150)

* 🔀 jcroteau/APPEALS-38492 - Fix duplicate results from joins on certain AR associations (#21097)

* refactored seed scripts for correspondence to have more detailed notes (#21170)

* Modified the test spec for sorted by veteran details

* APPEALS-38964 - Updated Flaky Test

* APPEALS-38964 - Notes Update

* Added serializer for few more columns

* Added serializer for label and closed_at columns

* APPEALS-38964 - Linting, Assigned_By

* Sort and pagination column fix

* Removed logic for sort and pagination fix

* Modified column_names with self class in all the tab class

* DRY all the tabs

* Extra Linting and Test Updates

* Can able to search with number

* Updates for tabs and linting

* Linting

* fix for completed date serializer

* Reverting Conditional for VetDetails and VADOR

---------

Co-authored-by: KiMauVA <Ki.Mau@va.gov>
Co-authored-by: HunJerBAH <Jeremy.Hunton@va.gov>
Co-authored-by: Kamala Madamanchi <110078646+kamala-07@users.noreply.github.com>
Co-authored-by: Jeremy Croteau <jcroteau@users.noreply.github.com>
Co-authored-by: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
---
 .../concerns/task_pagination_concern.rb       |   5 +-
 app/models/correspondence_queue_tab.rb        |   4 +
 .../correspondence_assigned_tasks_tab.rb      |   2 +-
 .../correspondence_completed_tasks_tab.rb     |   2 +-
 .../correspondence_in_progress_tasks_tab.rb   |   2 +-
 ...orrespondence_action_required_tasks_tab.rb |   2 +-
 ...ation_correspondence_assigned_tasks_tab.rb |   2 +-
 ...tion_correspondence_completed_tasks_tab.rb |   2 +-
 ...zation_correspondence_pending_tasks_tab.rb |   2 +-
 ...ion_correspondence_unassigned_tasks_tab.rb |   2 +-
 .../correspondence_task_column_serializer.rb  |  97 ++++++--
 client/app/queue/QueueTable.jsx               |  13 +-
 .../CorrespondenceTableBuilder.jsx            |  70 +++++-
 .../correspondence_search_bar_spec.rb         | 223 ++++++++++++++++++
 .../correspondence_controller_spec.rb         |   2 +-
 15 files changed, 392 insertions(+), 38 deletions(-)
 create mode 100644 spec/feature/queue/correspondence/correspondence_search_bar_spec.rb

diff --git a/app/controllers/concerns/task_pagination_concern.rb b/app/controllers/concerns/task_pagination_concern.rb
index b3c61cef704..e162a59bf1d 100644
--- a/app/controllers/concerns/task_pagination_concern.rb
+++ b/app/controllers/concerns/task_pagination_concern.rb
@@ -51,9 +51,12 @@ def task_pager
   end
 
   def correspondence_json_tasks(tasks)
+    tab = CorrespondenceQueueTab.from_name(params[Constants.QUEUE_CONFIG.TAB_NAME_REQUEST_PARAM.to_sym])
+
     { data: WorkQueue::CorrespondenceTaskColumnSerializer.new(
       tasks,
-      is_collection: true
+      is_collection: true,
+      params: { columns: tab.column_names }
     ).serializable_hash[:data] }
   end
 
diff --git a/app/models/correspondence_queue_tab.rb b/app/models/correspondence_queue_tab.rb
index fee50b3bd03..f9d078fa422 100644
--- a/app/models/correspondence_queue_tab.rb
+++ b/app/models/correspondence_queue_tab.rb
@@ -27,4 +27,8 @@ def self.from_name(tab_name)
 
     tab
   end
+
+  def column_names
+    self.class.column_names
+  end
 end
diff --git a/app/models/queue_tabs/correspondence_assigned_tasks_tab.rb b/app/models/queue_tabs/correspondence_assigned_tasks_tab.rb
index 084abd93293..df5c0233876 100644
--- a/app/models/queue_tabs/correspondence_assigned_tasks_tab.rb
+++ b/app/models/queue_tabs/correspondence_assigned_tasks_tab.rb
@@ -22,7 +22,7 @@ def tasks
   end
 
   # :reek:UtilityFunction
-  def column_names
+  def self.column_names
     [
       Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
       Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
diff --git a/app/models/queue_tabs/correspondence_completed_tasks_tab.rb b/app/models/queue_tabs/correspondence_completed_tasks_tab.rb
index fddeef7ce2b..727aa42cfcb 100644
--- a/app/models/queue_tabs/correspondence_completed_tasks_tab.rb
+++ b/app/models/queue_tabs/correspondence_completed_tasks_tab.rb
@@ -31,7 +31,7 @@ def tasks
   end
 
   # :reek:UtilityFunction
-  def column_names
+  def self.column_names
     [
       Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
       Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
diff --git a/app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb b/app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb
index 70d91fb3afc..a86958d565d 100644
--- a/app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb
+++ b/app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb
@@ -24,7 +24,7 @@ def tasks
   end
 
   # :reek:UtilityFunction
-  def column_names
+  def self.column_names
     [
       Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
       Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
diff --git a/app/models/queue_tabs/organization_correspondence_action_required_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_action_required_tasks_tab.rb
index 0fb6a305525..8e096558c8d 100644
--- a/app/models/queue_tabs/organization_correspondence_action_required_tasks_tab.rb
+++ b/app/models/queue_tabs/organization_correspondence_action_required_tasks_tab.rb
@@ -28,7 +28,7 @@ def tasks
   end
 
   # :reek:UtilityFunction
-  def column_names
+  def self.column_names
     [
       Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
       Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
diff --git a/app/models/queue_tabs/organization_correspondence_assigned_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_assigned_tasks_tab.rb
index 355335fe744..ad3c179b687 100644
--- a/app/models/queue_tabs/organization_correspondence_assigned_tasks_tab.rb
+++ b/app/models/queue_tabs/organization_correspondence_assigned_tasks_tab.rb
@@ -22,7 +22,7 @@ def tasks
   end
 
   # :reek:UtilityFunction
-  def column_names
+  def self.column_names
     [
       Constants.QUEUE_CONFIG.COLUMNS.CHECKBOX_COLUMN.name,
       Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
diff --git a/app/models/queue_tabs/organization_correspondence_completed_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_completed_tasks_tab.rb
index bbcc01327e2..e0ea9174b36 100644
--- a/app/models/queue_tabs/organization_correspondence_completed_tasks_tab.rb
+++ b/app/models/queue_tabs/organization_correspondence_completed_tasks_tab.rb
@@ -34,7 +34,7 @@ def tasks
   end
 
   # :reek:UtilityFunction
-  def column_names
+  def self.column_names
     [
       Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
       Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
diff --git a/app/models/queue_tabs/organization_correspondence_pending_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_pending_tasks_tab.rb
index 19f06462b8e..e59ccb36b2b 100644
--- a/app/models/queue_tabs/organization_correspondence_pending_tasks_tab.rb
+++ b/app/models/queue_tabs/organization_correspondence_pending_tasks_tab.rb
@@ -23,7 +23,7 @@ def tasks
   end
 
   # :reek:UtilityFunction
-  def column_names
+  def self.column_names
     [
       Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
       Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
diff --git a/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb
index 60e84ba378c..a087b24f658 100644
--- a/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb
+++ b/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb
@@ -22,7 +22,7 @@ def tasks
   end
 
   # :reek:UtilityFunction
-  def column_names
+  def self.column_names
     [
       Constants.QUEUE_CONFIG.COLUMNS.CHECKBOX_COLUMN.name,
       Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
diff --git a/app/models/serializers/work_queue/correspondence_task_column_serializer.rb b/app/models/serializers/work_queue/correspondence_task_column_serializer.rb
index 52dffb2a2c8..04001d423b9 100644
--- a/app/models/serializers/work_queue/correspondence_task_column_serializer.rb
+++ b/app/models/serializers/work_queue/correspondence_task_column_serializer.rb
@@ -3,6 +3,10 @@
 class WorkQueue::CorrespondenceTaskColumnSerializer
   include FastJsonapi::ObjectSerializer
 
+  def self.serialize_attribute?(params, columns)
+    (params[:columns] & columns).any?
+  end
+
   attribute :unique_id do |object|
     object.id.to_s
   end
@@ -14,23 +18,47 @@ class WorkQueue::CorrespondenceTaskColumnSerializer
     "#{vet.first_name} #{vet.last_name} (#{vet.file_number})"
   end
 
-  attribute :notes do |object|
-    object.correspondence.notes
+  attribute :notes do |object, params|
+    columns = [Constants.QUEUE_CONFIG.COLUMNS.NOTES.name]
+    if serialize_attribute?(params, columns)
+      object.correspondence.notes
+    end
   end
 
   attribute :cmp_packet_number do |object|
     object.correspondence.cmp_packet_number
   end
 
-  attribute :closed_at, &:completed_by_date
+  attribute :closed_at do |object, params|
+    columns = [Constants.QUEUE_CONFIG.COLUMNS.CORRESPONDENCE_TASK_CLOSED_DATE.name]
 
-  attribute :days_waiting
+    if serialize_attribute?(params, columns)
+      object.completed_by_date
+    end
+  end
+
+  attribute :days_waiting do |object, params|
+    columns = [Constants.QUEUE_CONFIG.COLUMNS.DAYS_WAITING_CORRESPONDENCE.name]
+
+    if serialize_attribute?(params, columns)
+      object.days_waiting
+    end
+  end
 
   attribute :va_date_of_receipt do |object|
     object.correspondence.va_date_of_receipt
   end
 
-  attribute :label
+  attribute :label do |object, params|
+    columns = [
+      Constants.QUEUE_CONFIG.COLUMNS.TASK_TYPE.name,
+      Constants.QUEUE_CONFIG.COLUMNS.ACTION_TYPE.name
+    ]
+
+    if serialize_attribute?(params, columns)
+      object.label
+    end
+  end
 
   attribute :status
 
@@ -45,24 +73,51 @@ class WorkQueue::CorrespondenceTaskColumnSerializer
       { parent_task_url: "" }
     end
   end
-
-  attribute :assigned_to do |object|
+  
+  attribute :assigned_to do |object, params|
+    columns = [
+      Constants.QUEUE_CONFIG.COLUMNS.TASK_ASSIGNEE.name
+    ]
     assignee = object.assigned_to
-    {
-      css_id: assignee.try(:css_id),
-      is_organization: assignee.is_a?(Organization),
-      name: assignee.is_a?(Organization) ? assignee.name : assignee.css_id,
-      type: assignee.class.name,
-      id: assignee.id
-    }
+
+    if serialize_attribute?(params, columns)
+      {
+        css_id: assignee.try(:css_id),
+        name: assignee.is_a?(Organization) ? assignee.name : assignee.css_id,
+        is_organization: assignee.is_a?(Organization),
+        type: assignee.class.name,
+        id: assignee.id
+      }
+    else
+      {
+        css_id: nil,
+        is_organization: nil,
+        name: nil,
+        type: nil,
+        id: nil
+      }
+    end
   end
 
-  attribute :assigned_by do |object|
-    {
-      first_name: object.assigned_by_display_name.first,
-      last_name: object.assigned_by_display_name.last,
-      css_id: object.assigned_by.try(:css_id),
-      pg_id: object.assigned_by.try(:id)
-    }
+  attribute :assigned_by do |object, params|
+    columns = [
+      Constants.QUEUE_CONFIG.COLUMNS.TASK_ASSIGNED_BY.name
+    ]
+
+    if serialize_attribute?(params, columns)
+      {
+        first_name: object.assigned_by_display_name.first,
+        last_name: object.assigned_by_display_name.last,
+        css_id: object.assigned_by.try(:css_id),
+        pg_id: object.assigned_by.try(:id)
+      }
+    else
+      {
+        first_name: nil,
+        last_name: nil,
+        css_id: nil,
+        pg_id: nil
+      }
+    end
   end
 end
diff --git a/client/app/queue/QueueTable.jsx b/client/app/queue/QueueTable.jsx
index b87e6c38636..395cab3304a 100644
--- a/client/app/queue/QueueTable.jsx
+++ b/client/app/queue/QueueTable.jsx
@@ -657,6 +657,10 @@ export default class QueueTable extends React.PureComponent {
       catch(() => this.setState({ loadingComponent: null }));
   };
 
+  filterTasksFromSearchbar = (tasks, searchValue) => {
+    return tasks.filter((task) => this.props.taskMatchesSearch(task, searchValue));
+  };
+
   render() {
     const {
       columns,
@@ -673,7 +677,8 @@ export default class QueueTable extends React.PureComponent {
       styling,
       bodyStyling,
       enablePagination,
-      useTaskPagesApi
+      useTaskPagesApi,
+      searchValue
     } = this.props;
 
     let { totalTaskCount, numberOfPages, rowObjects, casesPerPage } = this.props;
@@ -778,7 +783,7 @@ export default class QueueTable extends React.PureComponent {
           tbodyRef={tbodyRef}
           columns={columns}
           getKeyForRow={keyGetter}
-          rowObjects={rowObjects}
+          rowObjects={searchValue ? this.filterTasksFromSearchbar(rowObjects, searchValue) : rowObjects}
           bodyClassName={bodyClassName ?? ''}
           rowClassNames={rowClassNames}
           bodyStyling={bodyStyling}
@@ -847,7 +852,9 @@ HeaderRow.propTypes = FooterRow.propTypes = Row.propTypes = BodyRows.propTypes =
   }),
   onHistoryUpdate: PropTypes.func,
   preserveFilter: PropTypes.bool,
-  isCorrespondenceTable: PropTypes.bool
+  isCorrespondenceTable: PropTypes.bool,
+  searchValue: PropTypes.string,
+  taskMatchesSearch: PropTypes.func
 };
 
 Row.propTypes.rowObjects = PropTypes.arrayOf(PropTypes.object);
diff --git a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
index f85738d5eb2..4194dce8bd7 100644
--- a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
+++ b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
@@ -6,10 +6,12 @@ import { sprintf } from 'sprintf-js';
 import querystring from 'querystring';
 import Button from '../../components/Button';
 import SearchableDropdown from '../../components/SearchableDropdown';
+import moment from 'moment';
 import QueueTable from '../QueueTable';
 import TabWindow from '../../components/TabWindow';
 import Link from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/Link';
 import QueueOrganizationDropdown from '../components/QueueOrganizationDropdown';
+import SearchBar from '../../components/SearchBar';
 import {
   actionType,
   assignedToColumn,
@@ -55,6 +57,7 @@ const CorrespondenceTableBuilder = (props) => {
   const [selectedMailTeamUser, setSelectedMailTeamUser] = useState(null);
   const [isAnyCheckboxSelected, setIsAnyCheckboxSelected] = useState(false);
   const [isDropdownItemSelected, setIsDropdownItemSelected] = useState(false);
+  const [searchValue, setSearchValue] = useState('');
   const selectedTasks = useSelector((state) => state.intakeCorrespondence.selectedTasks);
 
   const paginationOptions = () => querystring.parse(window.location.search.slice(1));
@@ -101,6 +104,48 @@ const CorrespondenceTableBuilder = (props) => {
     return index === -1 ? 0 : index;
   };
 
+  const handleSearchChange = (value) => {
+    setSearchValue(value);
+  };
+
+  const handleClearSearch = () => {
+    setSearchValue('');
+  };
+
+  const taskMatchesSearch = (task) => {
+    if (searchValue === '' || searchValue.length < 3) {
+    // Return all tasks when search value is empty or less than three characters
+      return true;
+    }
+
+    const taskNotes = task.notes || '';
+    const daysWaiting = task.daysWaiting ? task.daysWaiting.toString() : '';
+    const assignedByfirstName = (task.assignedBy && task.assignedBy.firstName) || '';
+    const assignedBylastName = (task.assignedBy && task.assignedBy.lastName) || '';
+    const assignedToName = (task.assignedTo && task.assignedTo.name) || '';
+    const taskVeteranDetails = task.veteranDetails || '';
+    const taskLabel = task.label || '';
+    const taskVaDor = task.vaDor || '';
+    const closedAt = task.closedAt || '';
+
+    const searchValueTrimmed = searchValue.trim();
+    const isNumericSearchValue = !isNaN(parseFloat(searchValueTrimmed)) && isFinite(searchValueTrimmed);
+
+    return (
+      taskVeteranDetails.toLowerCase().includes(searchValueTrimmed.toLowerCase()) ||
+    taskNotes.toLowerCase().includes(searchValueTrimmed.toLowerCase()) ||
+    moment(taskVaDor).format('MM/DD/YYYY').
+      includes(searchValueTrimmed) ||
+    assignedByfirstName.toLowerCase().includes(searchValueTrimmed.toLowerCase()) ||
+    assignedBylastName.toLowerCase().includes(searchValueTrimmed.toLowerCase()) ||
+    assignedToName.toLowerCase().includes(searchValueTrimmed.toLowerCase()) ||
+    taskLabel.toLowerCase().includes(searchValueTrimmed.toLowerCase()) ||
+    (isNumericSearchValue && daysWaiting.trim() === searchValueTrimmed) ||
+    moment(closedAt).format('MM/DD/YYYY').
+      includes(searchValue)
+    );
+  };
+
   const queueConfig = () => {
     const { config } = props;
 
@@ -125,7 +170,7 @@ const CorrespondenceTableBuilder = (props) => {
       [QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name]: vaDor(tasks, filterOptions),
       [QUEUE_CONFIG.COLUMNS.NOTES.name]: notes(),
       [QUEUE_CONFIG.COLUMNS.CHECKBOX_COLUMN.name]: checkboxColumn(handleCheckboxChange),
-      [QUEUE_CONFIG.COLUMNS.ACTION_TYPE.name]: actionType(),
+      [QUEUE_CONFIG.COLUMNS.ACTION_TYPE.name]: actionType()
     };
 
     return functionForColumn[column.name];
@@ -229,9 +274,24 @@ const CorrespondenceTableBuilder = (props) => {
           </>
 
           }
-          <p className="cf-margin-top-0">
-            {noCasesMessage || tabConfig.description}
-          </p>
+          <div style={{ display: 'flex', flexDirection: 'row' }}>
+            <p className="cf-margin-top-0" style={{ float: 'left' }}>
+              {noCasesMessage || tabConfig.description}
+            </p>
+            <div className="cf-noncomp-search" style={{ marginLeft: 'auto' }}>
+              <SearchBar
+                id="searchBar"
+                size="small"
+                title="Filter table by any of its columns"
+                isSearchAhead
+                placeholder="Type to filter..."
+                onChange={(value) => handleSearchChange(value)}
+                onClearSearch={handleClearSearch}
+                value={searchValue}
+              />
+            </div>
+          </div>
+
           <QueueTable
             key={tabConfig.name}
             columns={columnsFromConfig(config, tabConfig, tasks)}
@@ -252,6 +312,8 @@ const CorrespondenceTableBuilder = (props) => {
             }
             enablePagination
             isCorrespondenceTable
+            searchValue={searchValue}
+            taskMatchesSearch={taskMatchesSearch}
           />
         </>
       ),
diff --git a/spec/feature/queue/correspondence/correspondence_search_bar_spec.rb b/spec/feature/queue/correspondence/correspondence_search_bar_spec.rb
new file mode 100644
index 00000000000..9274f46ec2f
--- /dev/null
+++ b/spec/feature/queue/correspondence/correspondence_search_bar_spec.rb
@@ -0,0 +1,223 @@
+# frozen_string_literal: true
+
+RSpec.feature("Search Bar for Correspondence") do
+  include CorrespondenceTaskHelpers
+  # alias this to avoid the method name collision
+  alias_method :create_efolderupload_task, :create_efolderupload_failed_task
+
+  context "correspondece cases feature toggle" do
+    let(:current_user) { create(:user) }
+    before :each do
+      MailTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+      @correspondence_uuid = "123456789"
+    end
+
+    it "routes user to /under_construction if the feature toggle is disabled" do
+      FeatureToggle.disable!(:correspondence_queue)
+      visit "/queue/correspondence"
+      expect(page).to have_current_path("/under_construction")
+    end
+
+    it "routes to correspondence cases if feature toggle is enabled" do
+      FeatureToggle.enable!(:correspondence_queue)
+      visit "/queue/correspondence"
+      expect(page).to have_current_path(
+        "/queue/correspondence?tab=correspondence_assigned&page=1&sort_by=vaDor&order=asc"
+      )
+    end
+  end
+
+  context "correspondence assigned tab - locate the search bar" do
+    let(:current_user) { create(:user) }
+    before :each do
+      MailTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+    end
+
+    before do
+      20.times do
+        @review_correspondence = create(:correspondence)
+        rpt = ReviewPackageTask.find_by(appeal_id: @review_correspondence.id)
+        rpt.update!(assigned_to: current_user, status: "assigned")
+        rpt.save!
+      end
+      1.times do
+        params = {
+          first_name: "Zzzane",
+          last_name: "Zzzans"
+        }
+        veteran = create(:veteran, params)
+        review_correspondence = create(:correspondence, veteran_id: veteran.id)
+        rpt = ReviewPackageTask.find_by(appeal_id: review_correspondence.id)
+        rpt.update!(assigned_to: current_user,
+                    status: "assigned",
+                    assigned_at: 42.days.ago)
+        rpt.save!
+      end
+      FeatureToggle.enable!(:correspondence_queue)
+    end
+
+    before :each do
+      FeatureToggle.enable!(:correspondence_queue)
+      FeatureToggle.enable!(:user_queue_pagination)
+    end
+
+    it "successfully opens the assigned tab, finds the search box, and enters data there." do
+      visit "/queue/correspondence?tab=correspondence_assigned&page=1&sort_by=vaDor&order=asc"
+      expect(page).to have_content("Filter table by any of its columns")
+      expect(find("#searchBar")).to match_xpath("//input[@placeholder='Type to filter...']")
+      veteran = Veteran.first
+      find_by_id("searchBar").fill_in with: veteran.last_name
+      search_value = find("tbody > tr:nth-child(1) > td:nth-child(1)").text
+      expect(search_value.include?(veteran.last_name))
+    end
+
+    it "should display the search bar with text even we shift to other tabs " do
+      visit "/queue/correspondence?tab=correspondence_assigned&page=1&sort_by=vaDor&order=asc"
+      expect(page).to have_content("Filter table by any of its columns")
+      expect(find("#searchBar")).to match_xpath("//input[@placeholder='Type to filter...']")
+      veteran = Veteran.first
+      find_by_id("searchBar").fill_in with: veteran.last_name
+      find_by_id("tasks-tabwindow-tab-1").click
+      expect(find_by_id("searchBar").value).to eq veteran.last_name
+    end
+
+    it "Should display Only search results even when we hit pagination " do
+      visit "/queue/correspondence?tab=correspondence_assigned&page=1&sort_by=vaDor&order=asc"
+      expect(page).to have_content("Filter table by any of its columns")
+      expect(find("#searchBar")).to match_xpath("//input[@placeholder='Type to filter...']")
+      veteran = Veteran.first
+      find_by_id("searchBar").fill_in with: veteran.last_name
+      expect(page).to have_button("Next")
+      expect(page).not_to have_button("Previous")
+      click_button("Next", match: :first)
+      expect(page).not_to have_button("Next")
+      click_button("Previous", match: :first)
+      search_value = find("tbody > tr:nth-child(1) > td:nth-child(1)").text
+      expect(search_value.include?(veteran.last_name))
+    end
+
+    it "Verify the user can clear the search bar by clicking the 'x' in the search bar" do
+      visit "/queue/correspondence?tab=correspondence_assigned&page=1&sort_by=vaDor&order=asc"
+      expect(page).to have_content("Filter table by any of its columns")
+      expect(find("#searchBar")).to match_xpath("//input[@placeholder='Type to filter...']")
+      veteran = Veteran.first
+      find_by_id("searchBar").fill_in with: veteran.last_name
+      search_value = find("tbody > tr:nth-child(1) > td:nth-child(1)").text
+      expect(search_value.include?(veteran.last_name))
+      find_by_id("button-clear-search").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(1)").length == 1)
+    end
+
+    it "Verify the user can have search results sorted by veteran details." do
+      visit "/queue/correspondence?tab=correspondence_assigned&page=1&sort_by=vaDor&order=asc"
+
+      expect(page).to have_content("Filter table by any of its columns")
+      expect(find("#searchBar")).to match_xpath("//input[@placeholder='Type to filter...']")
+
+      # Find Zzzane and get details
+      find_by_id("searchBar").fill_in with: "Zzzane"
+      first("[aria-label='Page 2']").click
+      only_vet_info = page.all("#task-link")[0].text
+
+      # Return to first page, should not exist
+      first("[aria-label='Page 1']").click
+      expect(page).not_to have_content("Zzzans")
+
+      # Sort Z-A, should return details from Zzzane
+      sort_icon = find("[aria-label='Sort by Veteran Details']")
+      sort_icon.click
+      expect(page.all("#task-link")[0].text).to eq(only_vet_info)
+
+      # Sort A-Z, should result in no results
+      sort_icon = find("[aria-label='Sort by Veteran Details']")
+      sort_icon.click
+      expect(page).not_to have_content("Zzzans")
+    end
+
+    it "Verify the user can have search results filtered by receipt date on filter correctly" do
+      visit "/queue/correspondence?tab=correspondence_assigned&page=1&sort_by=vaDor&order=asc"
+      veteran = Veteran.first
+      find_by_id("searchBar").fill_in with: veteran.last_name
+      search_value = find("tbody > tr:nth-child(1) > td:nth-child(1)").text
+      expect(search_value.include?(veteran.last_name))
+      all(".unselected-filter-icon")[0].click
+      find_by_id("reactSelectContainer").click
+      find_by_id("react-select-2-option-3").click
+      all("div.input-container > input")[0].fill_in(
+        with: @review_correspondence.va_date_of_receipt.strftime("%m/%d/%Y")
+      )
+      find(".cf-submit").click
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+    end
+  end
+
+  # Tested on Correspondence Cases page
+  context "correspondence paginationg search testing" do
+    let(:current_user) { create(:user) }
+    before :each do
+      InboundOpsTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+    end
+
+    before do
+      25.times do
+        review_correspondence = create(:correspondence)
+        rpt = ReviewPackageTask.find_by(appeal_id: review_correspondence.id)
+        rpt.update!(assigned_to: current_user, status: "assigned")
+        rpt.save!
+      end
+      1.times do
+        params = {
+          first_name: "Zzzane",
+          last_name: "Zzzans"
+        }
+        veteran = create(:veteran, params)
+        review_correspondence = create(:correspondence, veteran_id: veteran.id)
+        rpt = ReviewPackageTask.find_by(appeal_id: review_correspondence.id)
+        rpt.update!(assigned_to: current_user,
+                    status: "assigned",
+                    assigned_at: 42.days.ago)
+        rpt.save!
+      end
+      FeatureToggle.enable!(:correspondence_queue)
+    end
+
+    it "should display the search bar with text even when switching pages in pagination" do
+      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
+      expect(page).to have_content("Filter table by any of its columns")
+      veteran = Veteran.first
+      find_by_id("searchBar").fill_in with: veteran.last_name
+      first("[aria-label='Page 2']").click
+      expect(find_by_id("searchBar").value).to eq veteran.last_name
+    end
+
+    it "should display the correct results with pagination and filtering" do
+      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
+      find_by_id("searchBar").fill_in with: "Zzzans"
+      first("[aria-label='Page 2']").click
+      only_vet_info = page.all("#task-link")[0].text
+      expect(page.all("#task-link")[0].text == only_vet_info)
+      # put page in the sorted Z-A state (filtering changes page Zzzane Should exist on)
+      find("[aria-label='Sort by Veteran Details']").click
+      first("[aria-label='Page 1']").click
+      expect(page.all("#task-link")[0].text == only_vet_info)
+      # check if first result is the last vet
+    end
+
+    it "should be able to search by different columns" do
+      visit "/queue/correspondence/team?tab=correspondence_team_assigned"
+      # searches by days waiting
+      find_by_id("searchBar").fill_in with: "42"
+      first("[aria-label='Page 2']").click
+      only_vet_info = page.all("#task-link")[0].text
+      expect(page.all("#task-link")[0].text == only_vet_info)
+      # put page in the sorted Z-A state (filtering changes page Zzzane Should exist on)
+      find("[aria-label='Sort by Veteran Details']").click
+      first("[aria-label='Page 1']").click
+      expect(page.all("#task-link")[0].text == only_vet_info)
+      # check if first result is the last vet
+    end
+  end
+end
diff --git a/spec/requests/correspondence_controller_spec.rb b/spec/requests/correspondence_controller_spec.rb
index 91bf09b67f4..7ba7702e621 100644
--- a/spec/requests/correspondence_controller_spec.rb
+++ b/spec/requests/correspondence_controller_spec.rb
@@ -140,7 +140,7 @@
           expect(task[:attributes][:completion_date]).to eq(nil).or be_a(String)
           expect(task[:attributes][:days_waiting]).to be_a(Integer)
           expect(task[:attributes][:va_date_of_receipt]).to be_a(String)
-          expect(task[:attributes][:label]).to be_a(String)
+          expect(task[:attributes][:label]).to eq(nil).or be_a(String)
           expect(task[:attributes][:status]).to be_a(String)
           expect(task[:attributes][:assigned_to]).to be_a(Hash)
           expect(task[:attributes][:assigned_by]).to be_a(Hash)

From c983c1d17ff778444d0b399fc44102b91f176719 Mon Sep 17 00:00:00 2001
From: Rnmarshall93 <110805785+Rnmarshall93@users.noreply.github.com>
Date: Thu, 21 Mar 2024 13:16:35 -0700
Subject: [PATCH 175/237] Correspondence Cases - Unassigned Tab - Superuser |
 Remove Select Column (#21228)

* fixed select column appearing in superuser table

* linting fixes

* fixed linter issues

* fixed merge conflicts

---------

Co-authored-by: Jim Foley <james.foley4@va.gov>
---
 app/controllers/correspondence_controller.rb  |  2 +-
 ...ion_correspondence_unassigned_tasks_tab.rb |  6 ++--
 client/app/components/ReceiptDatePicker.jsx   |  1 -
 .../correspondenceActions.js                  |  2 +-
 .../correspondence_cases_spec.rb              | 32 +++++++++----------
 5 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index e6f16fcdde5..8e01924940b 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -156,4 +156,4 @@ def verify_feature_toggle
       redirect_to "/unauthorized"
     end
   end
-end
\ No newline at end of file
+end
diff --git a/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb
index a087b24f658..35ec294f89b 100644
--- a/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb
+++ b/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb
@@ -23,12 +23,14 @@ def tasks
 
   # :reek:UtilityFunction
   def self.column_names
-    [
-      Constants.QUEUE_CONFIG.COLUMNS.CHECKBOX_COLUMN.name,
+    user = RequestStore.store[:current_user]
+    columns = [
       Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
       Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
       Constants.QUEUE_CONFIG.COLUMNS.DAYS_WAITING_CORRESPONDENCE.name,
       Constants.QUEUE_CONFIG.COLUMNS.NOTES.name
     ]
+    columns.insert(0, Constants.QUEUE_CONFIG.COLUMNS.CHECKBOX_COLUMN.name) unless user.mail_superuser?
+    columns
   end
 end
diff --git a/client/app/components/ReceiptDatePicker.jsx b/client/app/components/ReceiptDatePicker.jsx
index 8e58f9f29d1..9bad32977c5 100644
--- a/client/app/components/ReceiptDatePicker.jsx
+++ b/client/app/components/ReceiptDatePicker.jsx
@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
 import ReactSelectDropdown from '../../../client/app/components/ReactSelectDropdown';
 import DateSelector from './DateSelector';
 import Button from './Button';
-import { style } from 'glamor';
 
 const dateDropdownMap = [
   { value: 0, label: 'Between these dates' },
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
index f8be4a41710..0208eeb1c70 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
@@ -209,7 +209,7 @@ export const setSelectedVeteranDetails = (selectedVeteranDetails) => (dispatch)
       selectedVeteranDetails
     }
   });
-}
+};
 export const setErrorBanner = (isVisible) => (dispatch) => {
   dispatch({
     type: ACTIONS.SET_SHOW_CORRESPONDENCE_INTAKE_FORM_ERROR_BANNER,
diff --git a/spec/feature/queue/correspondence/correspondence_cases_spec.rb b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
index 440717db6c6..fd0f76ebbef 100644
--- a/spec/feature/queue/correspondence/correspondence_cases_spec.rb
+++ b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
@@ -173,8 +173,8 @@
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-2-option-2").click
       current_date = Time.zone.today
-      myDate = current_date.strftime("%m/%d/%Y")
-      all("div.input-container > input")[0].fill_in(with: myDate)
+      my_date = current_date.strftime("%m/%d/%Y")
+      all("div.input-container > input")[0].fill_in(with: my_date)
       find(".cf-submit").click
       expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
     end
@@ -255,7 +255,7 @@
       find("#react-select-2-option-0").click
       current_date = Time.zone.today
       start_date = (current_date - 1).strftime("%m/%d/%Y")
-      end_date = (current_date).strftime("%m/%d/%Y")
+      end_date = current_date.strftime("%m/%d/%Y")
 
       all("div.input-container > input")[0].fill_in(with: start_date)
       all("div.input-container > input")[1].fill_in(with: end_date)
@@ -274,7 +274,7 @@
       find("#reactSelectContainer").click
       find("#react-select-2-option-1").click
       current_date = Time.zone.today
-      start_date = (current_date -3).strftime("%m/%d/%Y")
+      start_date = (current_date - 3).strftime("%m/%d/%Y")
 
       all("div.input-container > input")[0].fill_in(with: start_date)
       expect(page).to have_button("Apply filter", disabled: false)
@@ -490,8 +490,8 @@
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-2-option-2").click
       current_date = Time.zone.today
-      myDate = (current_date - 4).strftime("%m/%d/%Y")
-      all("div.input-container > input")[0].fill_in(with: myDate)
+      my_date = (current_date - 4).strftime("%m/%d/%Y")
+      all("div.input-container > input")[0].fill_in(with: my_date)
       find(".cf-submit").click
       expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
     end
@@ -643,8 +643,8 @@
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-3-option-2").click
       current_date = Time.zone.today
-      myDate = (current_date - 5).strftime("%m/%d/%Y")
-      all("div.input-container > input")[0].fill_in(with: myDate)
+      my_date = (current_date - 5).strftime("%m/%d/%Y")
+      all("div.input-container > input")[0].fill_in(with: my_date)
       click_button("Apply Filter")
       expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
     end
@@ -797,8 +797,8 @@
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-3-option-1").click
       current_date = Time.zone.today
-      myDate = (current_date - 5).strftime("%m/%d/%Y")
-      all("div.input-container > input")[0].fill_in(with: myDate)
+      my_date = (current_date - 5).strftime("%m/%d/%Y")
+      all("div.input-container > input")[0].fill_in(with: my_date)
       click_button("Apply Filter")
       expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
     end
@@ -809,8 +809,8 @@
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-3-option-2").click
       current_date = Time.zone.today
-      myDate = (current_date - 5).strftime("%m/%d/%Y")
-      all("div.input-container > input")[0].fill_in(with: myDate)
+      my_date = (current_date - 5).strftime("%m/%d/%Y")
+      all("div.input-container > input")[0].fill_in(with: my_date)
       click_button("Apply Filter")
       expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
     end
@@ -1023,8 +1023,8 @@
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-2-option-2").click
       current_date = Time.zone.today
-      myDate = current_date.strftime("%m/%d/%Y")
-      all("div.input-container > input")[0].fill_in(with: myDate)
+      my_date = current_date.strftime("%m/%d/%Y")
+      all("div.input-container > input")[0].fill_in(with: my_date)
       find(".cf-submit").click
       expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
     end
@@ -1141,8 +1141,8 @@
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-2-option-2").click
       current_date = Time.zone.today
-      myDate = (current_date -3).strftime("%m/%d/%Y")
-      all("div.input-container > input")[0].fill_in(with: myDate)
+      my_date = (current_date - 3).strftime("%m/%d/%Y")
+      all("div.input-container > input")[0].fill_in(with: my_date)
       find(".cf-submit").click
       expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
     end

From b015e8ba2a8fd419f8c82f7718661ef8ed72b55c Mon Sep 17 00:00:00 2001
From: HunJerBAH <Jeremy.Hunton@va.gov>
Date: Fri, 22 Mar 2024 09:12:09 -0400
Subject: [PATCH 176/237] added back in redux store value that was removed

---
 app/controllers/correspondence_intake_controller.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/controllers/correspondence_intake_controller.rb b/app/controllers/correspondence_intake_controller.rb
index 3f2d52c48f1..afbe86182ab 100644
--- a/app/controllers/correspondence_intake_controller.rb
+++ b/app/controllers/correspondence_intake_controller.rb
@@ -2,6 +2,11 @@
 
 class CorrespondenceIntakeController < CorrespondenceController
   def intake
+    # If correspondence intake was started, json data from the database will
+    # be loaded into the page when user returns to intake
+    @redux_store ||= CorrespondenceIntake.find_by(user: current_user,
+                                                  correspondence: current_correspondence)&.redux_store
+
     respond_to do |format|
       format.html { return render "correspondence/intake" }
       format.json do

From f1463e0cea7b917c02b347e712ce699790629170 Mon Sep 17 00:00:00 2001
From: Will Medders <93014155+wmedders21@users.noreply.github.com>
Date: Fri, 22 Mar 2024 09:23:23 -0500
Subject: [PATCH 177/237] Wmedders21/appeals 42698 (#21230)

* prevent overwriting correspondence uuid on page load

* provide saved redux store to view if the intake form has been previously worked

* Update test expectations

* Merge with feature
---
 .../correspondence/intake/components/CorrespondenceIntake.jsx | 4 +++-
 .../correspondence/correspondence_queue_task_link_spec.rb     | 4 ++--
 spec/models/correspondence_config_spec.rb                     | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx b/client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx
index 116d98aa1a9..418a0dad308 100644
--- a/client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx
+++ b/client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx
@@ -99,7 +99,9 @@ export const CorrespondenceIntake = (props) => {
   );
 
   useEffect(() => {
-    props.saveCurrentIntake(intakeCorrespondence, exportStoredata);
+    if (currentStep !== 1) {
+      props.saveCurrentIntake(intakeCorrespondence, exportStoredata);
+    }
   }, [currentStep]);
 
   useEffect(() => {
diff --git a/spec/feature/queue/correspondence/correspondence_queue_task_link_spec.rb b/spec/feature/queue/correspondence/correspondence_queue_task_link_spec.rb
index e3e1d9c4a72..0f5b2da1aa9 100644
--- a/spec/feature/queue/correspondence/correspondence_queue_task_link_spec.rb
+++ b/spec/feature/queue/correspondence/correspondence_queue_task_link_spec.rb
@@ -81,7 +81,7 @@
         end
 
         it "user remains on Correspondence Cases" do
-          expect(page).to have_content("Correspondence cases")
+          expect(page).to have_content("Correspondence Cases")
         end
 
         it "a modal appears on the screen" do
@@ -105,7 +105,7 @@
         end
 
         it "user remains on Correspondence Cases" do
-          expect(page).to have_content("Correspondence cases")
+          expect(page).to have_content("Correspondence Cases")
         end
 
         it "a modal appears on the screen" do
diff --git a/spec/models/correspondence_config_spec.rb b/spec/models/correspondence_config_spec.rb
index 87b8e9b3ddd..d76385e1eb9 100644
--- a/spec/models/correspondence_config_spec.rb
+++ b/spec/models/correspondence_config_spec.rb
@@ -20,7 +20,7 @@
     describe "title" do
       context "when assigned to an org" do
         it "is formatted as expected" do
-          expect(subject[:table_title]).to eq("Correspondence cases")
+          expect(subject[:table_title]).to eq("Correspondence Cases")
         end
       end
 
@@ -28,7 +28,7 @@
         let(:assignee) { user }
 
         it "is formatted as expected" do
-          expect(subject[:table_title]).to eq("Your correspondence")
+          expect(subject[:table_title]).to eq("Your Correspondence")
         end
       end
     end

From 4f19273c294c869caafa9b9b3aab5e9e9c0fb430 Mon Sep 17 00:00:00 2001
From: Alex Smith <alex.smith.99@thunderyard.com>
Date: Fri, 22 Mar 2024 10:03:13 -0600
Subject: [PATCH 178/237] Restore Code Accidentally Removed in Merge (#21241)

---
 app/controllers/correspondence_controller.rb | 37 ++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index e9935fc91d6..a69168974dc 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -120,6 +120,43 @@ def pdf
     )
   end
 
+  def auto_assign_correspondences
+    batch = BatchAutoAssignmentAttempt.create!(
+      user: current_user,
+      status: Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.started
+    )
+
+    job_args = {
+      current_user_id: current_user.id,
+      batch_auto_assignment_attempt_id: batch.id
+    }
+
+    begin
+      perform_later_or_now(AutoAssignCorrespondenceJob, job_args)
+    rescue StandardError => error
+      Rails.logger.error(error.full_message)
+    ensure
+      render json: { batch_auto_assignment_attempt_id: batch&.id }, status: :ok
+    end
+  end
+
+  def auto_assign_status
+    batch = BatchAutoAssignmentAttempt.includes(:individual_auto_assignment_attempts)
+      .find_by!(user: current_user, id: params["batch_auto_assignment_attempt_id"])
+
+    num_assigned = batch.individual_auto_assignment_attempts
+      .where(status: Constants.CORRESPONDENCE_AUTO_ASSIGNMENT.statuses.completed).count
+
+    status_details = {
+      error_message: batch.error_info,
+      status: batch.status,
+      number_assigned: num_assigned,
+      number_attempted: batch.individual_auto_assignment_attempts.count
+    }
+
+    render json: status_details, status: :ok
+  end
+
   private
 
   # :reek:FeatureEnvy

From ae232c1d4c47668d34d5ff596acbdcc1cfff8652 Mon Sep 17 00:00:00 2001
From: Rnmarshall93 <110805785+Rnmarshall93@users.noreply.github.com>
Date: Fri, 22 Mar 2024 10:23:32 -0700
Subject: [PATCH 179/237] 35485 text fix (#21242)

* fixed missing text

* updated instructions text

* added instructions to action required tasks

---------

Co-authored-by: HunJerBAH <Jeremy.Hunton@va.gov>
---
 client/app/queue/correspondence/CorrespondenceCases.jsx | 4 +++-
 db/seeds/queue_correspondences.rb                       | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/client/app/queue/correspondence/CorrespondenceCases.jsx b/client/app/queue/correspondence/CorrespondenceCases.jsx
index 778f907d88e..e16996a3f73 100644
--- a/client/app/queue/correspondence/CorrespondenceCases.jsx
+++ b/client/app/queue/correspondence/CorrespondenceCases.jsx
@@ -101,7 +101,9 @@ const CorrespondenceCases = (props) => {
 
   const textAreaElement = (
     <div style={{ width: '280%' }}>
-      <TextareaField onChange={handleDecisionReasonInput} value={decisionReason} />
+      <TextareaField label="Provide a reason for rejection"
+        onChange={handleDecisionReasonInput}
+        value={decisionReason} />
     </div>);
 
   useEffect(() => {
diff --git a/db/seeds/queue_correspondences.rb b/db/seeds/queue_correspondences.rb
index 8b9cbb2694a..50b463f6489 100644
--- a/db/seeds/queue_correspondences.rb
+++ b/db/seeds/queue_correspondences.rb
@@ -185,7 +185,8 @@ def create_correspondence_with_action_required_tasks(user = {}, veteran = {})
           appeal_id: corres.id,
           appeal_type: "Correspondence",
           assigned_to: InboundOpsTeam.singleton,
-          assigned_by_id: rpt.assigned_to_id
+          assigned_by_id: rpt.assigned_to_id,
+          instructions: ["Test instructions for #{task_array[index]&.name}."]
         )
         pat.update(assigned_at: corres.va_date_of_receipt)
       end
@@ -202,7 +203,8 @@ def create_correspondences_with_review_remove_package_tasks
             appeal_type: "Correspondence",
             appeal_id: corres.id,
             assigned_to: InboundOpsTeam.singleton,
-            assigned_by_id: rpt.assigned_to_id
+            assigned_by_id: rpt.assigned_to_id,
+            instructions: ["Test instructions for #{task_array[index]&.name}."]
           )
         end
     end

From 24de5525c9db2b54ab94bbf1cc8966f281692a05 Mon Sep 17 00:00:00 2001
From: Rnmarshall93 <110805785+Rnmarshall93@users.noreply.github.com>
Date: Fri, 22 Mar 2024 14:23:20 -0700
Subject: [PATCH 180/237] text fix (#21246)

Co-authored-by: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
---
 app/models/concerns/correspondence_controller_util.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/concerns/correspondence_controller_util.rb b/app/models/concerns/correspondence_controller_util.rb
index f33e66944ca..1e87aabb191 100644
--- a/app/models/concerns/correspondence_controller_util.rb
+++ b/app/models/concerns/correspondence_controller_util.rb
@@ -61,7 +61,7 @@ def reassign_remove_banner_action(mail_team_user)
       end
       set_reassign_remove_banner_params(mail_team_user, operation_type)
     rescue StandardError
-      set_error_banner_params(operation_type, mail_team_user)
+      set_error_banner_params(mail_team_user)
     end
   end
 
@@ -200,8 +200,8 @@ def set_reassign_remove_banner_params(user, operation_type)
     end
   end
 
-  def set_error_banner_params(operation_type, mail_team_user)
-    operation_verb = operation_type == "approve" ? "approved" : "rejected"
+  def set_error_banner_params(mail_team_user)
+    operation_verb = @action_type == "approve" ? "approved" : "rejected"
     @response_header = "Package request for #{mail_team_user.css_id} could not be #{operation_verb}"
     @response_message = "Please try again at a later time or contact the Help Desk."
     @response_type = "error"

From 0bb292bd71a20b57601f7e484d76d48bdf91d7e2 Mon Sep 17 00:00:00 2001
From: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
Date: Tue, 26 Mar 2024 09:00:23 -0400
Subject: [PATCH 181/237] changed contents of correspondence seed notes
 (#21259)

---
 db/seeds/correspondence.rb                                | 8 ++++----
 spec/factories/correspondence.rb                          | 2 +-
 .../correspondence/add_related_correspondence_spec.rb     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/db/seeds/correspondence.rb b/db/seeds/correspondence.rb
index f2499959d8f..dd45083b4c7 100644
--- a/db/seeds/correspondence.rb
+++ b/db/seeds/correspondence.rb
@@ -54,7 +54,7 @@ def create_correspondences
           cmp_queue_id: 1,
           cmp_packet_number: @cmp_packet_number,
           va_date_of_receipt: Time.zone.yesterday,
-          notes: "This is a note from CMP.",
+          notes: "This is a test note",
           assigned_by_id: 81,
           updated_by_id: 81,
           veteran_id: veteran.id,
@@ -74,7 +74,7 @@ def create_correspondences
           cmp_queue_id: 1,
           cmp_packet_number: @cmp_packet_number,
           va_date_of_receipt: Time.zone.yesterday,
-          notes: "This is a note from CMP.",
+          notes: "This is a test note.",
           assigned_by_id: 81,
           updated_by_id: 81,
           veteran_id: veteran.id,
@@ -101,7 +101,7 @@ def create_correspondences
           cmp_queue_id: 1,
           cmp_packet_number: @cmp_packet_number,
           va_date_of_receipt: Time.zone.yesterday,
-          notes: "This is a note from CMP.",
+          notes: "This is a test note.",
           assigned_by_id: 81,
           updated_by_id: 81,
           veteran_id: veteran.id,
@@ -128,7 +128,7 @@ def create_correspondences
           cmp_queue_id: cmp_queue_id,
           cmp_packet_number: @cmp_packet_number,
           va_date_of_receipt: Time.zone.yesterday,
-          notes: "This is a note from CMP.",
+          notes: "This is a test note.",
           assigned_by_id: 81,
           updated_by_id: 81,
           veteran_id: veteran.id,
diff --git a/spec/factories/correspondence.rb b/spec/factories/correspondence.rb
index 5687efee792..281881dbd76 100644
--- a/spec/factories/correspondence.rb
+++ b/spec/factories/correspondence.rb
@@ -8,7 +8,7 @@
     cmp_queue_id { 1 }
     cmp_packet_number { rand(1_000_000_000..9_999_999_999) }
     va_date_of_receipt { Time.zone.yesterday }
-    notes { "This is a note from CMP." }
+    notes { "This is a test note." }
     assigned_by factory: :user
 
     correspondence_type
diff --git a/spec/feature/queue/correspondence/add_related_correspondence_spec.rb b/spec/feature/queue/correspondence/add_related_correspondence_spec.rb
index d35f075c537..b7fe8cb57ee 100644
--- a/spec/feature/queue/correspondence/add_related_correspondence_spec.rb
+++ b/spec/feature/queue/correspondence/add_related_correspondence_spec.rb
@@ -88,7 +88,7 @@
         expect(page).to have_content("Mail")
         expect(page).to have_content("15")
         expect(page).to have_content("9")
-        expect(page).to have_content("This is a note from CMP")
+        expect(page).to have_content("This is a test note")
       end
 
       it "table displays 15 items per page" do

From 21ac0f670b57930ca3dea8bf0d224520bd69e3e1 Mon Sep 17 00:00:00 2001
From: HunJerBAH <Jeremy.Hunton@va.gov>
Date: Tue, 26 Mar 2024 11:02:07 -0400
Subject: [PATCH 182/237] added Auto Assign button to Correspondence Cases
 table

---
 app/controllers/correspondence_controller.rb                 | 4 ++--
 .../app/queue/correspondence/CorrespondenceTableBuilder.jsx  | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index 4f3207ecc8a..5d299613ce3 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -108,8 +108,6 @@ def document_type_correspondence
     render json: { data: data }
   end
 
-  private
-
   def handle_mail_superuser_or_supervisor
     set_handle_mail_superuser_or_supervisor_params(current_user, params)
     mail_team_user = User.find_by(css_id: params[:user].strip) if params[:user].present?
@@ -159,6 +157,8 @@ def auto_assign_status
     render json: status_details, status: :ok
   end
 
+  private
+
   def handle_reassign_or_remove_task(mail_team_user)
     return unless @reassign_remove_task_id.present? && @action_type.present?
 
diff --git a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
index 4194dce8bd7..64f37985b3f 100644
--- a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
+++ b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
@@ -12,6 +12,7 @@ import TabWindow from '../../components/TabWindow';
 import Link from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/Link';
 import QueueOrganizationDropdown from '../components/QueueOrganizationDropdown';
 import SearchBar from '../../components/SearchBar';
+import BatchAutoAssignButton from './component/BatchAutoAssignButton';
 import {
   actionType,
   assignedToColumn,
@@ -228,9 +229,7 @@ const CorrespondenceTableBuilder = (props) => {
                   disabled={!isDropdownItemSelected || !isAnyCheckboxSelected}
                 />
                 <span style={{ marginLeft: 'auto' }}>
-                  <Button
-                    name="Auto assign correspondence"
-                  />
+                  <BatchAutoAssignButton />
                 </span>
               </>
           }

From 3a052f2d2f4b051bef646901786015ba0097104f Mon Sep 17 00:00:00 2001
From: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
Date: Tue, 26 Mar 2024 14:38:03 -0400
Subject: [PATCH 183/237] moved NOD schema change to 27311 branch (#21271)

---
 .../20240229165212_nod_column_in_correspondences.rb |  7 +++++++
 db/schema.rb                                        | 13 +++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 db/migrate/20240229165212_nod_column_in_correspondences.rb

diff --git a/db/migrate/20240229165212_nod_column_in_correspondences.rb b/db/migrate/20240229165212_nod_column_in_correspondences.rb
new file mode 100644
index 00000000000..d57f0101e61
--- /dev/null
+++ b/db/migrate/20240229165212_nod_column_in_correspondences.rb
@@ -0,0 +1,7 @@
+class NodColumnInCorrespondences < Caseflow::Migration
+  def change
+    safety_assured do
+      add_column :correspondences, :nod, :boolean, null: false, default: false, comment: 'NOD (Notice of Disagreement)'
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index ce537114d9c..583bfe14357 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -2,15 +2,15 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
+# This file is the source Rails uses to define your schema when running `rails
+# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2024_02_27_154315) do
+ActiveRecord::Schema.define(version: 2024_02_29_165212) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -668,6 +668,7 @@
     t.integer "cmp_queue_id", comment: "Foreign key to CMP queues table"
     t.integer "correspondence_type_id", comment: "Foreign key for correspondence_types table"
     t.datetime "created_at", null: false, comment: "Standard created_at/updated_at timestamps"
+    t.boolean "nod", default: false, null: false, comment: "NOD (Notice of Disagreement)"
     t.text "notes", comment: "Comes from CMP; can be updated by user"
     t.integer "package_document_type_id", comment: "Represents entire CMP package document type"
     t.datetime "portal_entry_date", comment: "Time when correspondence is created in Caseflow"

From 81c9e82d8d4fa97c6ff7cb3f2e5a0df48b40774a Mon Sep 17 00:00:00 2001
From: divyadasari-va <135847343+divyadasari-va@users.noreply.github.com>
Date: Tue, 26 Mar 2024 20:25:20 -0600
Subject: [PATCH 184/237] Div/appeals 42502 (#21267)

* Initial commit for Optimize Correspondence Table Queries

* Removed instance variable

---------

Co-authored-by: Jim Foley <james.foley4@va.gov>
---
 .../correspondence_task_pages_controller.rb   |  6 ++++
 ...k_belongs_to_polymorphic_appeal_concern.rb |  5 ++++
 app/models/correspondence_queue_tab.rb        |  2 +-
 .../correspondence_in_progress_tasks_tab.rb   |  3 +-
 .../correspondence_task_column_serializer.rb  | 28 ++++---------------
 app/models/tasks/correspondence_task.rb       |  2 +-
 6 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/app/controllers/correspondence_task_pages_controller.rb b/app/controllers/correspondence_task_pages_controller.rb
index 92686e06d66..2710891f4ef 100644
--- a/app/controllers/correspondence_task_pages_controller.rb
+++ b/app/controllers/correspondence_task_pages_controller.rb
@@ -8,6 +8,12 @@ def index
   end
 
   def assignee
+    @assignee ||= find_assignee
+  end
+
+  private
+
+  def find_assignee
     if params[:user_id]
       User.find(params[:user_id])
     elsif params[:organization_id]
diff --git a/app/models/concerns/task_belongs_to_polymorphic_appeal_concern.rb b/app/models/concerns/task_belongs_to_polymorphic_appeal_concern.rb
index 56a321d80e4..3a17d3154df 100644
--- a/app/models/concerns/task_belongs_to_polymorphic_appeal_concern.rb
+++ b/app/models/concerns/task_belongs_to_polymorphic_appeal_concern.rb
@@ -22,9 +22,14 @@ module TaskBelongsToPolymorphicAppealConcern
                -> { where(tasks: { appeal_type: "SupplementalClaim" }) },
                class_name: "SupplementalClaim", foreign_key: "appeal_id", optional: true
 
+    belongs_to :correspondence,
+               -> { where(tasks: { appeal_type: "Correspondence" }) },
+               class_name: "Correspondence", foreign_key: "appeal_id", optional: true
+
     scope :ama, -> { where(appeal_type: "Appeal") }
     scope :legacy, -> { where(appeal_type: "LegacyAppeal") }
     scope :higher_level_review, -> { where(appeal_type: "HigherLevelReview") }
     scope :supplemental_claim, -> { where(appeal_type: "SupplementalClaim") }
+    scope :correspondence, -> { where(appeal_type: "Correspondence") }
   end
 end
diff --git a/app/models/correspondence_queue_tab.rb b/app/models/correspondence_queue_tab.rb
index f9d078fa422..92a441be46a 100644
--- a/app/models/correspondence_queue_tab.rb
+++ b/app/models/correspondence_queue_tab.rb
@@ -7,7 +7,7 @@ def columns
 
   def task_includes
     [
-      { appeal: [:package_document_type] },
+      { appeal: [:package_document_type, :veteran] },
       :assigned_by,
       :assigned_to,
       :children,
diff --git a/app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb b/app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb
index a86958d565d..b4228f0274b 100644
--- a/app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb
+++ b/app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb
@@ -18,7 +18,8 @@ def description
   end
 
   def tasks
-    CorrespondenceTask.where(assigned_to: assignee)
+    CorrespondenceTask.includes(*task_includes)
+      .where(assigned_to: assignee)
       .where.not(type: EfolderUploadFailedTask.name)
       .where(status: [Constants.TASK_STATUSES.in_progress, Constants.TASK_STATUSES.on_hold])
   end
diff --git a/app/models/serializers/work_queue/correspondence_task_column_serializer.rb b/app/models/serializers/work_queue/correspondence_task_column_serializer.rb
index 04001d423b9..c471bb8f2be 100644
--- a/app/models/serializers/work_queue/correspondence_task_column_serializer.rb
+++ b/app/models/serializers/work_queue/correspondence_task_column_serializer.rb
@@ -25,10 +25,6 @@ def self.serialize_attribute?(params, columns)
     end
   end
 
-  attribute :cmp_packet_number do |object|
-    object.correspondence.cmp_packet_number
-  end
-
   attribute :closed_at do |object, params|
     columns = [Constants.QUEUE_CONFIG.COLUMNS.CORRESPONDENCE_TASK_CLOSED_DATE.name]
 
@@ -60,8 +56,6 @@ def self.serialize_attribute?(params, columns)
     end
   end
 
-  attribute :status
-
   attribute :assigned_at
 
   attribute :task_url
@@ -73,7 +67,7 @@ def self.serialize_attribute?(params, columns)
       { parent_task_url: "" }
     end
   end
-  
+
   attribute :assigned_to do |object, params|
     columns = [
       Constants.QUEUE_CONFIG.COLUMNS.TASK_ASSIGNEE.name
@@ -82,19 +76,11 @@ def self.serialize_attribute?(params, columns)
 
     if serialize_attribute?(params, columns)
       {
-        css_id: assignee.try(:css_id),
-        name: assignee.is_a?(Organization) ? assignee.name : assignee.css_id,
-        is_organization: assignee.is_a?(Organization),
-        type: assignee.class.name,
-        id: assignee.id
+        name: assignee.is_a?(Organization) ? assignee.name : assignee.css_id
       }
     else
       {
-        css_id: nil,
-        is_organization: nil,
-        name: nil,
-        type: nil,
-        id: nil
+        name: nil
       }
     end
   end
@@ -107,16 +93,12 @@ def self.serialize_attribute?(params, columns)
     if serialize_attribute?(params, columns)
       {
         first_name: object.assigned_by_display_name.first,
-        last_name: object.assigned_by_display_name.last,
-        css_id: object.assigned_by.try(:css_id),
-        pg_id: object.assigned_by.try(:id)
+        last_name: object.assigned_by_display_name.last
       }
     else
       {
         first_name: nil,
-        last_name: nil,
-        css_id: nil,
-        pg_id: nil
+        last_name: nil
       }
     end
   end
diff --git a/app/models/tasks/correspondence_task.rb b/app/models/tasks/correspondence_task.rb
index 01252d77a6c..8486f1831d6 100644
--- a/app/models/tasks/correspondence_task.rb
+++ b/app/models/tasks/correspondence_task.rb
@@ -64,7 +64,7 @@ def self.create_child_task(parent_task, current_user, params)
   end
 
   def correspondence
-    appeal
+    Correspondence.find(appeal_id)
   end
 
   def completed_by_date

From 59dd568cfcf081697c341afbd14aa494230c9f50 Mon Sep 17 00:00:00 2001
From: Kamala Madamanchi <110078646+kamala-07@users.noreply.github.com>
Date: Wed, 27 Mar 2024 15:02:24 -0500
Subject: [PATCH 185/237] fix for filter value VADOR and Date Completed
 (#21240)

* fix for filter value VADOR and Date Completed

* fix selected filter

---------

Co-authored-by: piedram <maite.piedrayera@va.gov>
Co-authored-by: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
---
 client/app/components/TableFilter.jsx | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/client/app/components/TableFilter.jsx b/client/app/components/TableFilter.jsx
index 736d255cf8e..c7a6d3b3ec0 100644
--- a/client/app/components/TableFilter.jsx
+++ b/client/app/components/TableFilter.jsx
@@ -133,6 +133,18 @@ class TableFilter extends React.PureComponent {
   //
   // Adds the text (string) for a filtered value to an internal list. The list holds all the
   // values to filter by.
+  putIntofilter = (filtersForColumn, columnName, value) => {
+    let newValue = [];
+
+    if ((columnName === 'Receipt Date') || (columnName === 'Date Completed')) {
+      newValue = [value];
+    } else {
+      newValue = filtersForColumn.concat([value]);
+    }
+
+    return newValue;
+  }
+
   updateSelectedFilter = (value, columnName) => {
     const { filteredByList } = this.props;
     const filtersForColumn = _.get(filteredByList, String(columnName));
@@ -142,7 +154,7 @@ class TableFilter extends React.PureComponent {
       if (filtersForColumn.includes(value)) {
         newFilters = _.pull(filtersForColumn, value);
       } else {
-        newFilters = filtersForColumn.concat([value]);
+        newFilters = this.putIntofilter(filtersForColumn, columnName, value);
       }
     } else {
       newFilters = newFilters.concat([value]);

From fdfe9dd25993375af8bcc31dd9fcc69846b008c5 Mon Sep 17 00:00:00 2001
From: piedram <maite.piedrayera@va.gov>
Date: Thu, 28 Mar 2024 00:17:56 -0400
Subject: [PATCH 186/237] Modified selector style

---
 client/app/components/ReceiptDatePicker.jsx   | 67 ++++++++++++++++---
 .../components/TaskCompletedDatePicker.jsx    | 67 ++++++++++++++++---
 2 files changed, 118 insertions(+), 16 deletions(-)

diff --git a/client/app/components/ReceiptDatePicker.jsx b/client/app/components/ReceiptDatePicker.jsx
index 9bad32977c5..8fe8bf74522 100644
--- a/client/app/components/ReceiptDatePicker.jsx
+++ b/client/app/components/ReceiptDatePicker.jsx
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import ReactSelectDropdown from '../../../client/app/components/ReactSelectDropdown';
 import DateSelector from './DateSelector';
 import Button from './Button';
+import { css } from 'glamor';
 
 const dateDropdownMap = [
   { value: 0, label: 'Between these dates' },
@@ -27,6 +28,51 @@ const receiptDatePicker = (props) => {
     }
   };
 
+  const styles = {
+    optSelect: css({
+      '.receiptDate': {
+      },
+      '& .css-yk16xz-control': {
+        borderRadius: '0px'
+      },
+      '& .css-1pahdxg-control': {
+        borderColor: 'hsl(0, 0%, 100%)',
+        boxShadow: '0 0 0 1px #5B616B !important',
+        borderRadius: '0px !important',
+        ':hover': {
+          borderColor: 'hsl(0, 0%, 80%)',
+        }
+      }
+    })
+  };
+
+  const selectContainerStyles = css({
+    '& .data-css-1co2jut': {
+      margin: '0 5% 0 5%'
+    },
+    '& .cf-form-textinput.usa-input-error': {
+      borderLeft: '4px solid #cd2026',
+      marginTop: '0px',
+      paddingBottom: '0px',
+      paddingLeft: '0.5rem',
+      paddingTop: '0px',
+      position: 'relative',
+      right: '2px'
+    },
+    '& .usa-input-error input': {
+      width: 'inherit'
+    },
+    '& .cf-form-textinput': {
+      paddingTop: '7% !important',
+      marginBottom: 0,
+      '& .input-container': {
+        '& input': {
+          margin: 0
+        }
+      }
+    }
+  });
+
   const getDatePickerElements = () => {
     const receiptDateFilterStates = props.receiptDateFilterStates;
     const dateErrorsFrom = props.dateErrorsFrom;
@@ -34,7 +80,7 @@ const receiptDatePicker = (props) => {
 
     switch (props.receiptDateState) {
     case receiptDateFilterStates.BETWEEN: return (
-      <div style={{ marginLeft: '5%', marginRight: '5%' }}>
+      <div style={{ margin: '0 5%' }}>
         <DateSelector
           onChange={props.handleDateChange}
           label="From"
@@ -49,7 +95,7 @@ const receiptDatePicker = (props) => {
         />
       </div>);
     case receiptDateFilterStates.BEFORE: return (
-      <div style={{ marginLeft: '5%', marginRight: '5%' }}>
+      <div style={{ margin: '0 5%' }}>
         <DateSelector
           onChange={(value) => props.handleDateChange(value)}
           label = "Receipt date"
@@ -59,7 +105,7 @@ const receiptDatePicker = (props) => {
       </div>
     );
     case receiptDateFilterStates.AFTER: return (
-      <div style={{ marginLeft: '5%', marginRight: '5%' }}>
+      <div style={{ margin: '0 5%' }}>
         <DateSelector
           onChange={(value) => props.handleDateChange(value)}
           label = "Receipt date"
@@ -69,7 +115,7 @@ const receiptDatePicker = (props) => {
       </div>
     );
     case receiptDateFilterStates.ON: return (
-      <div style={{ marginLeft: '5%', marginRight: '5%' }}>
+      <div style={{ margin: '0 5%' }}>
         <DateSelector
           onChange={(value) => props.handleDateChange(value)}
           label = "Receipt date"
@@ -83,19 +129,24 @@ const receiptDatePicker = (props) => {
     }
   };
 
-  return <div id="dropdown">
-    <div style={{ marginLeft: '5%', marginRight: '5%' }}>
+  return <div id="dropdown" {...selectContainerStyles}>
+    <div style={{ marginLeft: '5%', marginRight: '5%', marginTop: '3.5%' }}>
       <ReactSelectDropdown
+        className = {`receiptDate ${styles.optSelect}`}
         label="Date filter parameters"
         options={dateDropdownMap}
         onChangeMethod={props.onChangeMethod}
       />
     </div>
-    <div style={{ width: '100%', margin: 'auto' }}>
+    <div style={{ width: '100%', margin: 'auto', paddingBottom: '14%' }}>
       {getDatePickerElements()}
     </div>
 
-    <div style={{ display: 'flex', margin: '10px 0px', justifyContent: 'center', width: '190px' }}>
+    <div style={{ display: 'flex',
+      padding: '18px 10px 27px 0',
+      justifyContent: 'right',
+      width: '190px',
+      borderTop: '1px solid #d6d7d9' }}>
       <Button disabled={props.isApplyButtonEnabled} onClick={props.handleApplyFilter}>
         <span>Apply Filter</span>
       </Button>
diff --git a/client/app/components/TaskCompletedDatePicker.jsx b/client/app/components/TaskCompletedDatePicker.jsx
index 111a16b85ed..0593f5953ab 100644
--- a/client/app/components/TaskCompletedDatePicker.jsx
+++ b/client/app/components/TaskCompletedDatePicker.jsx
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import ReactSelectDropdown from '../../../client/app/components/ReactSelectDropdown';
 import DateSelector from './DateSelector';
 import Button from './Button';
+import { css } from 'glamor';
 
 const dateDropdownMap = [
   { value: 0, label: 'Between these dates' },
@@ -45,6 +46,51 @@ const TaskCompletedDatePicker = (props) => {
     }
   };
 
+  const styles = {
+    optSelect: css({
+      '.receiptDate': {
+      },
+      '& .css-yk16xz-control': {
+        borderRadius: '0px'
+      },
+      '& .css-1pahdxg-control': {
+        borderColor: 'hsl(0, 0%, 100%)',
+        boxShadow: '0 0 0 1px #5B616B !important',
+        borderRadius: '0px !important',
+        ':hover': {
+          borderColor: 'hsl(0, 0%, 80%)',
+        }
+      }
+    })
+  };
+
+  const selectContainerStyles = css({
+    '& .data-css-1co2jut': {
+      margin: '0 5% 0 5%'
+    },
+    '& .cf-form-textinput.usa-input-error': {
+      borderLeft: '4px solid #cd2026',
+      marginTop: '0px',
+      paddingBottom: '0px',
+      paddingLeft: '0.5rem',
+      paddingTop: '0px',
+      position: 'relative',
+      right: '2px'
+    },
+    '& .usa-input-error input': {
+      width: 'inherit'
+    },
+    '& .cf-form-textinput': {
+      paddingTop: '11px !important',
+      marginBottom: 0,
+      '& .input-container': {
+        '& input': {
+          margin: 0
+        }
+      }
+    }
+  });
+
   const taskCompletedDateFilterStates = props.taskCompletedDateFilterStates;
   const isApplyFilterButtonDisabled =
     props.taskCompletedDateState === taskCompletedDateFilterStates.BETWEEN ?
@@ -55,7 +101,7 @@ const TaskCompletedDatePicker = (props) => {
 
     switch (props.taskCompletedDateState) {
     case taskCompletedDateFilterStates.BETWEEN: return (
-      <div style={{ margin: '5% 5%' }}>
+      <div style={{ margin: '0 5%' }}>
         <DateSelector
           onChange={handleDateChange}
           label="From"
@@ -68,7 +114,7 @@ const TaskCompletedDatePicker = (props) => {
           errorMessage={errorMessagesNode(dateErrorsTo, 'toDate')} />
       </div>);
     case taskCompletedDateFilterStates.BEFORE: return (
-      <div style={{ margin: '5% 5%' }}>
+      <div style={{ margin: '0 5%' }} >
         <DateSelector
           onChange={handleDateChange}
           label="Date Completed"
@@ -77,7 +123,7 @@ const TaskCompletedDatePicker = (props) => {
       </div>
     );
     case taskCompletedDateFilterStates.AFTER: return (
-      <div style={{ margin: '5% 5%' }}>
+      <div style={{ margin: '0 5%' }}>
         <DateSelector
           onChange={handleDateChange}
           label="Date Completed"
@@ -86,7 +132,7 @@ const TaskCompletedDatePicker = (props) => {
       </div>
     );
     case taskCompletedDateFilterStates.ON: return (
-      <div style={{ margin: '5% 5%' }}>
+      <div style={{ margin: '0 5%' }}>
         <DateSelector
           onChange={handleDateChange}
           label="Date Completed"
@@ -99,18 +145,23 @@ const TaskCompletedDatePicker = (props) => {
     }
   };
 
-  return <div id="dropdown">
-    <div style={{ marginLeft: '5%', marginRight: '5%' }}>
+  return <div id="dropdown" {...selectContainerStyles}>
+    <div style={{ marginLeft: '5%', marginRight: '5%', marginTop: '3.5%' }}>
       <ReactSelectDropdown
+        className = {`receiptDate ${styles.optSelect}`}
         label="Date filter parameters"
         options={dateDropdownMap}
         onChangeMethod={props.onChangeMethod} />
     </div>
 
-    <div style={{ width: '100%', margin: 'auto' }}>
+    <div style={{ width: '100%', margin: 'auto', paddingBottom: '14%' }}>
       {getDatePickerElements()}
     </div>
-    <div style={{ margin: '10px 20px', display: 'flex', justifyContent: 'end', width: '190px' }}>
+    <div style={{ display: 'flex',
+      padding: '18px 10px 27px 0',
+      justifyContent: 'right',
+      width: '190px',
+      borderTop: '1px solid #d6d7d9' }}>
       <Button onClick={handleApplyFilter} disabled={isApplyFilterButtonDisabled}>Apply filter</Button>
     </div>
   </div>;

From 5e5d29b222ee62d1fb890fa0de5776bc01a87d26 Mon Sep 17 00:00:00 2001
From: piedram <maite.piedrayera@va.gov>
Date: Thu, 28 Mar 2024 12:22:41 -0400
Subject: [PATCH 187/237] changes in table style

---
 .../correspondence/CorrespondenceTableBuilder.jsx      | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
index 4194dce8bd7..9efeb54ff35 100644
--- a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
+++ b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
@@ -35,6 +35,12 @@ import { isActiveOrganizationVHA } from '../selectors';
 const rootStyles = css({
   '.usa-alert + &': {
     marginTop: '1.5em'
+  },
+  '& .cf-tab-window-body-full-screen': {
+    padding: '26px 30px 30px 30px',
+    '& p.cf-margin-bottom-0rem': {
+      margin: 0
+    }
   }
 });
 
@@ -210,7 +216,7 @@ const CorrespondenceTableBuilder = (props) => {
     const getBulkAssignArea = () => {
       return (<>
         <p className="cf-margin-bottom-0rem">Assign to mail team user</p>
-        <div style={{ display: 'flex', flexDirection: 'row' }}>
+        <div style={{ display: 'flex', flexDirection: 'row', paddingBottom: '25px' }}>
           <SearchableDropdown
             className="cf-dropdown"
             name="Assign to mail team user"
@@ -274,7 +280,7 @@ const CorrespondenceTableBuilder = (props) => {
           </>
 
           }
-          <div style={{ display: 'flex', flexDirection: 'row' }}>
+          <div style={{ display: 'flex', flexDirection: 'row', paddingTop: '17px' }}>
             <p className="cf-margin-top-0" style={{ float: 'left' }}>
               {noCasesMessage || tabConfig.description}
             </p>

From 098a0666720326400c6a0d4962be8b51a2643fb1 Mon Sep 17 00:00:00 2001
From: piedram <maite.piedrayera@va.gov>
Date: Thu, 28 Mar 2024 14:28:23 -0400
Subject: [PATCH 188/237] fix table style

---
 .../correspondence/CorrespondenceTableBuilder.jsx     | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
index 9efeb54ff35..4ac5c2815d6 100644
--- a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
+++ b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
@@ -37,9 +37,12 @@ const rootStyles = css({
     marginTop: '1.5em'
   },
   '& .cf-tab-window-body-full-screen': {
-    padding: '26px 30px 30px 30px',
-    '& p.cf-margin-bottom-0rem': {
-      margin: 0
+    padding: '16px 30px 30px 30px',
+    '& #tasks-tabwindow-tabpanel-3': {
+      '& p.cf-margin-bottom-0rem': {
+        marginTop: 0
+      }
+
     }
   }
 });
@@ -280,7 +283,7 @@ const CorrespondenceTableBuilder = (props) => {
           </>
 
           }
-          <div style={{ display: 'flex', flexDirection: 'row', paddingTop: '17px' }}>
+          <div style={{ display: 'flex', flexDirection: 'row' }}>
             <p className="cf-margin-top-0" style={{ float: 'left' }}>
               {noCasesMessage || tabConfig.description}
             </p>

From 6bbf2adf90d5cdc72ed782a5d0920511445ee676 Mon Sep 17 00:00:00 2001
From: divyadasari-va <135847343+divyadasari-va@users.noreply.github.com>
Date: Thu, 28 Mar 2024 12:59:55 -0600
Subject: [PATCH 189/237] Commit for return to queue link fix (#21292)

---
 .../review_package/CorrespondenceReviewPackage.jsx            | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
index 1fc2ff03046..e2cfb517e99 100644
--- a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
+++ b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
@@ -1,5 +1,6 @@
 import AppSegment from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/AppSegment';
 import React, { useEffect, useState } from 'react';
+import { useHistory } from 'react-router';
 import ReviewPackageData from './ReviewPackageData';
 import ReviewPackageCaseTitle from './ReviewPackageCaseTitle';
 import Button from '../../../components/Button';
@@ -20,6 +21,7 @@ import {
   from '../../../../COPY';
 
 export const CorrespondenceReviewPackage = (props) => {
+  const history = useHistory();
   const [reviewDetails, setReviewDetails] = useState({
     veteran_name: {},
     dropdown_values: [],
@@ -100,7 +102,7 @@ export const CorrespondenceReviewPackage = (props) => {
     if (disableButton) {
       setShowModal(!showModal);
     } else {
-      history.push('/queue/correspondence');
+      history.goBack();
     }
   };
 

From b8de3a20766598ca4a3de756c0f9cbad2f102b61 Mon Sep 17 00:00:00 2001
From: IsaiahBar <107133331+IsaiahBar@users.noreply.github.com>
Date: Thu, 28 Mar 2024 15:58:03 -0400
Subject: [PATCH 190/237] fix assigned and unassigned banner (#21283)

Co-authored-by: Jim Foley <james.foley4@va.gov>
Co-authored-by: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
---
 app/models/concerns/correspondence_controller_util.rb    | 9 ++++++---
 .../correspondence_cases_batch_assignment.rb             | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/models/concerns/correspondence_controller_util.rb b/app/models/concerns/correspondence_controller_util.rb
index 1e87aabb191..9089c651496 100644
--- a/app/models/concerns/correspondence_controller_util.rb
+++ b/app/models/concerns/correspondence_controller_util.rb
@@ -4,6 +4,9 @@
 
 # Contains most of the logic inside of CorrespondenceController
 module CorrespondenceControllerUtil
+
+  MAX_QUEUED_ITEMS = 60
+
   def current_correspondence
     @current_correspondence ||= correspondence
   end
@@ -209,7 +212,7 @@ def set_error_banner_params(mail_team_user)
 
   def handle_correspondence_unassigned_response(user, task_count)
     success_header_unassigned = "You have successfully assigned #{task_count} Correspondence to #{user.css_id}."
-    failure_header_unassigned = "Correspondence assignment to #{user.css_id} has failed"
+    failure_header_unassigned = "Correspondence assignment to #{user.css_id} could not be completed"
     success_message = "Please go to your individual queue to see any self-assigned correspondence."
     failure_message = "Queue volume has reached maximum capacity for this user."
     {
@@ -220,7 +223,7 @@ def handle_correspondence_unassigned_response(user, task_count)
 
   def handle_correspondence_assigned_response(user, task_count)
     success_header_assigned = "You have successfully reassigned #{task_count} Correspondence to #{user.css_id}."
-    failure_header_assigned = "Correspondence reassignment to #{user.css_id} has failed"
+    failure_header_assigned = "Correspondence reassignment to #{user.css_id} could not be completed"
     success_message = "Please go to your individual queue to see any self-assigned correspondence."
     failure_message = "Queue volume has reached maximum capacity for this user."
     {
@@ -234,7 +237,7 @@ def message_template(user, task_count, tab)
     when "correspondence_unassigned"
       handle_correspondence_unassigned_response(user, task_count)
     when "correspondence_team_assigned"
-      handle_correspondence_assigned_response
+      handle_correspondence_assigned_response(user, task_count)
     end
   end
 
diff --git a/spec/feature/queue/correspondence/correspondence_cases_batch_assignment.rb b/spec/feature/queue/correspondence/correspondence_cases_batch_assignment.rb
index f11fc5d0f76..e883bb7cef3 100644
--- a/spec/feature/queue/correspondence/correspondence_cases_batch_assignment.rb
+++ b/spec/feature/queue/correspondence/correspondence_cases_batch_assignment.rb
@@ -109,7 +109,7 @@
       ')
       expect(page).to have_button("Assign", disabled: false)
       find_by_id("button-Assign").click
-      expect(page).to have_content("Correspondence assignment to #{target_user.css_id} has failed")
+      expect(page).to have_content("Correspondence assignment to #{target_user.css_id} could not be completed")
       expect(page).to have_content("Queue volume has reached maximum capacity for this user.")
     end
 
@@ -156,7 +156,7 @@
       ')
       expect(page).to have_button("Reassign", disabled: false)
       find_by_id("button-Reassign").click
-      expect(page).to have_content("Correspondence reassignment to #{target_user.css_id} has failed")
+      expect(page).to have_content("Correspondence reassignment to #{target_user.css_id} could not be completed")
       expect(page).to have_content("Queue volume has reached maximum capacity for this user.")
     end
   end

From e2e354c1c13b9486c2863c44b00451b6a758c28d Mon Sep 17 00:00:00 2001
From: piedram <maite.piedrayera@va.gov>
Date: Thu, 28 Mar 2024 16:02:02 -0400
Subject: [PATCH 191/237] change style

---
 client/app/queue/correspondence/CorrespondenceTableBuilder.jsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
index 4ac5c2815d6..ae25ed7bb92 100644
--- a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
+++ b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
@@ -37,12 +37,11 @@ const rootStyles = css({
     marginTop: '1.5em'
   },
   '& .cf-tab-window-body-full-screen': {
-    padding: '16px 30px 30px 30px',
+    padding: '26px 30px 30px 30px',
     '& #tasks-tabwindow-tabpanel-3': {
       '& p.cf-margin-bottom-0rem': {
         marginTop: 0
       }
-
     }
   }
 });

From d8328baafce6891b4d10e9dd0b2ce84243ee54c2 Mon Sep 17 00:00:00 2001
From: piedram <maite.piedrayera@va.gov>
Date: Thu, 28 Mar 2024 16:27:07 -0400
Subject: [PATCH 192/237] fix checkbox

---
 .../queue/correspondence/CorrespondenceTableBuilder.jsx   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
index ae25ed7bb92..66910e5fe7a 100644
--- a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
+++ b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
@@ -43,6 +43,14 @@ const rootStyles = css({
         marginTop: 0
       }
     }
+  },
+  '& #case-table-description': {
+    '& tr td:nth-child(1):focus': {
+      outline: 'none',
+    },
+    '& .cf-form-checkboxes': {
+      marginLeft: '0.5rem'
+    }
   }
 });
 

From 508919d7a99f995a1dd483a6fe5e1ae1c4b5c7fc Mon Sep 17 00:00:00 2001
From: HunJerBAH <Jeremy.Hunton@va.gov>
Date: Fri, 29 Mar 2024 09:10:14 -0400
Subject: [PATCH 193/237] added temp bypass for Rails issue

---
 config/environments/development.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 1a33636ee4c..9693f43dba3 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -6,6 +6,9 @@
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
+  # Bypass DNS rebinding protection for all `demo` sub-domains
+  config.hosts << ".demo.appeals.va.gov"
+
   # Eager load code on boot.
   config.eager_load = true
 

From 2a028bfc1683bc84ac34aa5e7047f6f587f0a6fd Mon Sep 17 00:00:00 2001
From: Ki Mau <ki.mau@va.gov>
Date: Fri, 29 Mar 2024 12:09:58 -0400
Subject: [PATCH 194/237] Ki/APPEALS-42721 & APPEALS-41062 - "Under
 Construction" Links Console Logs the Correspondence Explain Page (Test
 Environments) (#21290)

* APPEALS-42721 - Under Construction rerouting

* APPEALS-42721 - Explain Page Route Fix

* Add to App Controller

* APPEALS-42721 - Working Right-Click Explain Linking

* Linting and Cleanup

* Update correspondence_task_column_serializer.rb

* Update correspondence_task_column_serializer.rb

* Route

* APPEALS-42721 - Update Spec Pathing for Correspondence Explain

---------

Co-authored-by: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
---
 app/models/tasks/correspondence_task.rb         |  7 ++++++-
 .../app/queue/components/TaskTableColumns.jsx   | 17 +++++++++++++++++
 config/routes.rb                                |  2 +-
 spec/controllers/explain_controller_spec.rb     |  2 +-
 spec/feature/explain_spec.rb                    |  2 +-
 5 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/app/models/tasks/correspondence_task.rb b/app/models/tasks/correspondence_task.rb
index 8486f1831d6..1c7cd12ed14 100644
--- a/app/models/tasks/correspondence_task.rb
+++ b/app/models/tasks/correspondence_task.rb
@@ -72,7 +72,12 @@ def completed_by_date
   end
 
   def task_url
-    "/under_construction"
+    # Future: route to the Correspondence Details Page after implementation.
+    if ENV["RAILS_ENV"] == "production"
+      "/under_construction"
+    else
+      "/explain/correspondence/#{correspondence.uuid}/"
+    end
   end
 
   private
diff --git a/client/app/queue/components/TaskTableColumns.jsx b/client/app/queue/components/TaskTableColumns.jsx
index 2385d718c8f..e165d9ce447 100644
--- a/client/app/queue/components/TaskTableColumns.jsx
+++ b/client/app/queue/components/TaskTableColumns.jsx
@@ -243,6 +243,14 @@ export const veteranDetails = () => {
     dispatch(setShowReassignPackageModal(true));
   };
 
+  // Developer Function for in-progress and future work
+  const handleExplainPageInConSoleLog = (task) => {
+    // eslint-disable-next-line
+    console.log("Correspondence Explain Page for Under Construction Link:")
+    // eslint-disable-next-line
+    console.log(window.location.origin + task.taskUrl);
+  };
+
   return {
     header: 'Veteran Details',
     label: 'Veteran Details',
@@ -268,6 +276,15 @@ export const veteranDetails = () => {
         >
           {task.veteranDetails}
         </a>;
+      } else if (task.taskUrl.includes('explain')) {
+        return <a
+          href="/under_construction"
+          onContextMenu={() => handleExplainPageInConSoleLog(task)}
+          aria-label={`${task.label } Link`}
+          id="task-link"
+        >
+          {task.veteranDetails}
+        </a>;
       }
 
       return <a
diff --git a/config/routes.rb b/config/routes.rb
index 89f56892a2a..987744767cd 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -351,7 +351,7 @@
     get 'correspondence/organizations/:organization_id(*rest)', to: 'correspondence_task_pages#index'
     get '/:user_id(*rest)', to: 'legacy_tasks#index'
   end
-  match '/explain/correspondence/:correspondence_uuid/:any' => 'explain#show', via: [:get]
+  match '/explain/correspondence/:correspondence_uuid' => 'explain#show', via: [:get]
 
   # requests to CAVC Dashboard that don't require an appeal_id should go here
   scope path: "/cavc_dashboard" do
diff --git a/spec/controllers/explain_controller_spec.rb b/spec/controllers/explain_controller_spec.rb
index c9c1263471a..c68a4ceadf3 100644
--- a/spec/controllers/explain_controller_spec.rb
+++ b/spec/controllers/explain_controller_spec.rb
@@ -145,7 +145,7 @@
     end
   end
 
-  describe "GET explain/correspondence/:correspondence_uuid/:any" do
+  describe "GET explain/correspondence/:correspondence_uuid/" do
     let(:user_roles) { ["System Admin"] }
     let(:veteran) { create(:veteran) }
     let(:package_document_type) do
diff --git a/spec/feature/explain_spec.rb b/spec/feature/explain_spec.rb
index b137ae91878..c8837ca4c04 100644
--- a/spec/feature/explain_spec.rb
+++ b/spec/feature/explain_spec.rb
@@ -37,7 +37,7 @@
     end
 
     scenario "admin visits explain page for correspondence" do
-      visit "explain/correspondence/#{correspondence.uuid}/review_package"
+      visit "explain/correspondence/#{correspondence.uuid}/"
       expect(page).to have_content("Correspondence #{correspondence.uuid}")
       expect(page).to have_content("Task Tree")
       expect(page).to have_content("Task Versions")

From 5740584e48324528bdbdbab7c3df3589137b3e77 Mon Sep 17 00:00:00 2001
From: divyadasari-va <135847343+divyadasari-va@users.noreply.github.com>
Date: Mon, 1 Apr 2024 10:31:59 -0600
Subject: [PATCH 195/237] Initial commit for Remove Scroll Bar on Queue Table
 (#21305)

---
 .../CorrespondenceTableBuilder.jsx            | 48 ++++++++++---------
 client/app/styles/_table.scss                 |  4 ++
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
index 4194dce8bd7..3d7df919b3d 100644
--- a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
+++ b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
@@ -292,29 +292,31 @@ const CorrespondenceTableBuilder = (props) => {
             </div>
           </div>
 
-          <QueueTable
-            key={tabConfig.name}
-            columns={columnsFromConfig(config, tabConfig, tasks)}
-            rowObjects={tasks}
-            getKeyForRow={(_rowNumber, task) => task.uniqueId}
-            casesPerPage={config.tasks_per_page}
-            numberOfPages={tabConfig.task_page_count}
-            totalTaskCount={totalTaskCount}
-            taskPagesApiEndpoint={tabConfig.task_page_endpoint_base_path}
-            tabPaginationOptions={
-              savedPaginationOptions.tab === tabConfig.name ? savedPaginationOptions : {}
-            }
-            // Limit filter preservation/retention to only VHA orgs for now.
-            {...(isVhaOrg ? { preserveFilter: true } : {})}
-            defaultSort={defaultSort}
-            useTaskPagesApi={
-              config.use_task_pages_api && !tabConfig.contains_legacy_tasks
-            }
-            enablePagination
-            isCorrespondenceTable
-            searchValue={searchValue}
-            taskMatchesSearch={taskMatchesSearch}
-          />
+          <div className="correspondence-builder-table">
+            <QueueTable
+              key={tabConfig.name}
+              columns={columnsFromConfig(config, tabConfig, tasks)}
+              rowObjects={tasks}
+              getKeyForRow={(_rowNumber, task) => task.uniqueId}
+              casesPerPage={config.tasks_per_page}
+              numberOfPages={tabConfig.task_page_count}
+              totalTaskCount={totalTaskCount}
+              taskPagesApiEndpoint={tabConfig.task_page_endpoint_base_path}
+              tabPaginationOptions={
+                savedPaginationOptions.tab === tabConfig.name ? savedPaginationOptions : {}
+              }
+              // Limit filter preservation/retention to only VHA orgs for now.
+              {...(isVhaOrg ? { preserveFilter: true } : {})}
+              defaultSort={defaultSort}
+              useTaskPagesApi={
+                config.use_task_pages_api && !tabConfig.contains_legacy_tasks
+              }
+              enablePagination
+              isCorrespondenceTable
+              searchValue={searchValue}
+              taskMatchesSearch={taskMatchesSearch}
+            />
+          </div>
         </>
       ),
     };
diff --git a/client/app/styles/_table.scss b/client/app/styles/_table.scss
index 5c6b9c1b6dc..d2a3aa09b87 100644
--- a/client/app/styles/_table.scss
+++ b/client/app/styles/_table.scss
@@ -17,6 +17,10 @@
   overflow-x: auto;
 }
 
+.correspondence-builder-table .cf-table-wrapper {
+  overflow-x: initial;
+}
+
 .cf-table-wrapper:focus {
   outline: none;
 }

From 3b7c3868fdc65ba0c9badd83c843a38011f99271 Mon Sep 17 00:00:00 2001
From: Ki Mau <ki.mau@va.gov>
Date: Mon, 1 Apr 2024 12:57:18 -0400
Subject: [PATCH 196/237] APPEALS-43181 - Remove view width and replace with
 standard percentage (#21312)

Co-authored-by: Jim Foley <james.foley4@va.gov>
---
 .../correspondence/CorrespondenceCases.jsx      | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/client/app/queue/correspondence/CorrespondenceCases.jsx b/client/app/queue/correspondence/CorrespondenceCases.jsx
index e16996a3f73..b5a9474fd55 100644
--- a/client/app/queue/correspondence/CorrespondenceCases.jsx
+++ b/client/app/queue/correspondence/CorrespondenceCases.jsx
@@ -90,14 +90,15 @@ const CorrespondenceCases = (props) => {
     return false;
   };
 
-  const approveElement = (<div style={{ width: '28vw' }}>
-    <ReactSelectDropdown
-      className="cf-margin-left-2rem img"
-      label="Assign to person"
-      onChangeMethod={(val) => setSelectedMailTeamUser(val.value)}
-      options={buildMailUserData(props.mailTeamUsers)}
-    />
-  </div>);
+  const approveElement = (
+    <div style={{ width: '250%' }}>
+      <ReactSelectDropdown
+        className="cf-margin-left-2rem img"
+        label="Assign to person"
+        onChangeMethod={(val) => setSelectedMailTeamUser(val.value)}
+        options={buildMailUserData(props.mailTeamUsers)}
+      />
+    </div>);
 
   const textAreaElement = (
     <div style={{ width: '280%' }}>

From 4e9d0ef23eef42acef686c936e09a55ab7455144 Mon Sep 17 00:00:00 2001
From: Kamala Madamanchi <110078646+kamala-07@users.noreply.github.com>
Date: Mon, 1 Apr 2024 14:16:10 -0500
Subject: [PATCH 197/237] Remove package actions from View package button
 Review package page (#21302)

Co-authored-by: Jim Foley <james.foley4@va.gov>
---
 .../correspondence_controller_util.rb         | 17 +++++-----
 .../correspondence/CorrespondenceCases.jsx    |  6 ++--
 .../component/RemovePackageModal.jsx          | 23 ++++++++++++--
 .../CorrespondenceReviewPackage.jsx           | 19 +++++++++++-
 .../review_package/ReviewPackageCaseTitle.jsx |  4 ++-
 .../correspondence_controller_spec.rb         | 31 +++++++++++++++++++
 6 files changed, 86 insertions(+), 14 deletions(-)

diff --git a/app/models/concerns/correspondence_controller_util.rb b/app/models/concerns/correspondence_controller_util.rb
index 9089c651496..cde936e9ea5 100644
--- a/app/models/concerns/correspondence_controller_util.rb
+++ b/app/models/concerns/correspondence_controller_util.rb
@@ -39,13 +39,14 @@ def set_handle_mail_superuser_or_supervisor_params(current_user, params)
     @is_supervisor = current_user.mail_supervisor?
     @reassign_remove_task_id = params[:taskId].strip if params[:taskId].present?
     @action_type = params[:userAction].strip if params[:userAction].present?
+    @veteran_name = URI.decode(params[:veteranName].strip) if params[:veteranName].present?
   end
 
   def correspondence_team
     if current_user.mail_superuser? || current_user.mail_supervisor?
       handle_mail_superuser_or_supervisor
     elsif current_user.mail_team_user?
-      redirect_to "/queue/correspondence"
+      redirect_to "/queue/correspondence/team"
     else
       redirect_to "/unauthorized"
     end
@@ -64,7 +65,7 @@ def reassign_remove_banner_action(mail_team_user)
       end
       set_reassign_remove_banner_params(mail_team_user, operation_type)
     rescue StandardError
-      set_error_banner_params(mail_team_user)
+      set_error_banner_params
     end
   end
 
@@ -191,7 +192,7 @@ def set_banner_params(user, task_count, tab)
   def set_reassign_remove_banner_params(user, operation_type)
     case operation_type
     when "remove"
-      template = remove_message_template(user)
+      template = remove_message_template
       @response_header = template[:header]
       @response_message = template[:message]
       @response_type = "success"
@@ -203,9 +204,9 @@ def set_reassign_remove_banner_params(user, operation_type)
     end
   end
 
-  def set_error_banner_params(mail_team_user)
+  def set_error_banner_params
     operation_verb = @action_type == "approve" ? "approved" : "rejected"
-    @response_header = "Package request for #{mail_team_user.css_id} could not be #{operation_verb}"
+    @response_header = "Package request for #{@veteran_name} could not be #{operation_verb}"
     @response_message = "Please try again at a later time or contact the Help Desk."
     @response_type = "error"
   end
@@ -260,11 +261,11 @@ def reassign_message_template(user)
     end
   end
 
-  def remove_message_template(user)
-    success_header_approved = "You have successfully removed a mail package for #{user.css_id}"
+  def remove_message_template
+    success_header_approved = "You have successfully removed a mail package for #{@veteran_name}"
     success_message_approved = "The package has been removed from Caseflow and must be manually uploaded again
      from the Centralized Mail Portal, if it needs to be processed."
-    success_header_rejected = "You have successfully rejected a package request for #{user.css_id}"
+    success_header_rejected = "You have successfully rejected a package request for #{@veteran_name}"
     success_message_rejected = "The package will be re-assigned to the user that sent the request."
 
     case @action_type
diff --git a/client/app/queue/correspondence/CorrespondenceCases.jsx b/client/app/queue/correspondence/CorrespondenceCases.jsx
index b5a9474fd55..c510f9e9d53 100644
--- a/client/app/queue/correspondence/CorrespondenceCases.jsx
+++ b/client/app/queue/correspondence/CorrespondenceCases.jsx
@@ -139,17 +139,19 @@ const CorrespondenceCases = (props) => {
       displayElement: selectedRequestChoice === 'reject'
     }
   ];
-
   const handleConfirmReassignRemoveClick = (operation) => {
     const newUrl = new URL(window.location.href);
     const searchParams = new URLSearchParams(newUrl.search);
-
     // Encode and set the query parameters
+
     searchParams.set('user', encodeURIComponent(selectedMailTeamUser));
     searchParams.set('taskId', encodeURIComponent(currentSelectedVeteran.uniqueId));
+    searchParams.set('veteranName', encodeURIComponent(currentSelectedVeteran.veteranDetails.split('(')[0].trim()));
     searchParams.set('userAction', encodeURIComponent(selectedRequestChoice));
     searchParams.set('decisionReason', encodeURIComponent(decisionReason));
     searchParams.set('operation', encodeURIComponent(operation));
+    searchParams.set('tab', encodeURIComponent('correspondence_unassigned'));
+    searchParams.set('page', encodeURIComponent('1'));
 
     // Construct the new URL with encoded query parameters
     newUrl.search = searchParams.toString();
diff --git a/client/app/queue/correspondence/component/RemovePackageModal.jsx b/client/app/queue/correspondence/component/RemovePackageModal.jsx
index e2452ae8e6a..cee2e174bac 100644
--- a/client/app/queue/correspondence/component/RemovePackageModal.jsx
+++ b/client/app/queue/correspondence/component/RemovePackageModal.jsx
@@ -90,11 +90,29 @@ class RemovePackageModal extends React.Component {
   render() {
     const { onCancel } = this.props;
     const submit = () => {
+      let selectedRequestChoice;
       if (this.state.reasonForRemove === 'Approve request') {
-        this.removePackage();
+        selectedRequestChoice ='approve';
       } else {
-        this.completePackage();
+        selectedRequestChoice ='reject';
       }
+      const newUrl = new URL(window.location.href);
+      const searchParams = new URLSearchParams(newUrl.search);
+      const taskId = this.props.reviewDetails.taskId;
+      const veteranName = this.props.reviewDetails.veteranName;
+      // Encode and set the query parameters
+      searchParams.set('taskId', encodeURIComponent(taskId));
+      searchParams.set('veteranName', encodeURIComponent(veteranName));
+      searchParams.set('userAction', encodeURIComponent(selectedRequestChoice));
+      searchParams.set('decisionReason', encodeURIComponent(this.state.reasonReject));
+      searchParams.set('operation', encodeURIComponent('remove'));
+      searchParams.set('tab', encodeURIComponent('correspondence_unassigned'));
+      searchParams.set('page', encodeURIComponent('1'));
+
+      // Construct the new URL with encoded query parameters
+      newUrl.search = searchParams.toString();
+      newUrl.pathname = '/queue/correspondence/team';
+      window.location.href = newUrl.href;
     };
 
     const removeReasonOptions = [
@@ -150,6 +168,7 @@ const mapStateToProps = (state) => {
 };
 
 RemovePackageModal.propTypes = {
+  reviewDetails: PropTypes.object,
   modalState: PropTypes.bool,
   onCancel: PropTypes.func,
   setModalState: PropTypes.func,
diff --git a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
index e2cfb517e99..7423d1a8893 100644
--- a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
+++ b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
@@ -38,6 +38,10 @@ export const CorrespondenceReviewPackage = (props) => {
   const [errorMessage, setErrorMessage] = useState('');
   const [selectedId, setSelectedId] = useState(0);
   const [isReadOnly, setIsReadOnly] = useState(false);
+  const [reviewPackageDetails, setReviewPackageDetails] = useState({
+    veteranName: '',
+    taksId: [],
+  });
 
   // Banner Information takes in the following object:
   // {  title: ,  message: ,  bannerType: }
@@ -51,6 +55,13 @@ export const CorrespondenceReviewPackage = (props) => {
       const assignedRemoveTask = tasks.find((task) => task.status === 'assigned' && task.type === 'RemovePackageTask');
       const isInboundOpsTeam = correspondence.organizations.find((org) => org.name === 'Inbound Ops Team');
 
+      if(assignedRemoveTask) {
+        setReviewPackageDetails((prev) => {
+          return {...prev, taskId: assignedRemoveTask.id}
+          }
+        )
+      }
+
       // Return true if a removePackageTask that is currently assigned is found, else false
       return (typeof assignedRemoveTask !== 'undefined') && isInboundOpsTeam;
     };
@@ -75,6 +86,11 @@ export const CorrespondenceReviewPackage = (props) => {
         dropdown_values: data.correspondence_types || [],
       });
 
+      setReviewPackageDetails((prev) => {
+        return { ...prev, veteranName: `${data.veteran_name.first_name} ${data.veteran_name.last_name}`}
+        }
+      )
+
       setEditableData({
         notes: data.notes,
         veteran_file_number: data.file_number,
@@ -85,7 +101,7 @@ export const CorrespondenceReviewPackage = (props) => {
         setBannerInformation({
           title: CORRESPONDENCE_READONLY_BANNER_HEADER,
           message: CORRESPONDENCE_READONLY_BANNER_MESSAGE,
-          bannerType: 'warning'
+          bannerType: 'info'
         });
         setIsReadOnly(true);
       }
@@ -172,6 +188,7 @@ export const CorrespondenceReviewPackage = (props) => {
       <React.Fragment>
         <AppSegment filledBackground>
           <ReviewPackageCaseTitle
+            reviewDetails={reviewPackageDetails}
             handlePackageActionModal={handlePackageActionModal}
             correspondence={props.correspondence}
             packageActionModal={packageActionModal}
diff --git a/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx b/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx
index d3a5697dcca..c2119aecc39 100644
--- a/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx
+++ b/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx
@@ -57,7 +57,7 @@ const ReviewPackageCaseTitle = (props) => {
 
   return (
     <div>
-      <CaseTitleScaffolding correspondence_id = {props.correspondence.id} isReadOnly={props.isReadOnly} />
+      <CaseTitleScaffolding reviewDetails={props.reviewDetails} correspondence_id = {props.correspondence.id} isReadOnly={props.isReadOnly} />
       <CaseSubTitleScaffolding {...props} isReadOnly={props.isReadOnly} />
     </div>
   );
@@ -92,6 +92,7 @@ const CaseTitleScaffolding = (props) => {
       </span>
       { modalState &&
       <RemovePackageModal
+        reviewDetails={props.reviewDetails}
         modalState={modalState}
         setModalState={setModalState}
         onCancel={closeModal}
@@ -129,6 +130,7 @@ const CaseSubTitleScaffolding = (props) => (
 );
 
 ReviewPackageCaseTitle.propTypes = {
+  reviewDetails: PropTypes.object,
   handlePackageActionModal: PropTypes.func,
   correspondence: PropTypes.object,
   isReadOnly: PropTypes.bool
diff --git a/spec/controllers/correspondence_controller_spec.rb b/spec/controllers/correspondence_controller_spec.rb
index d3d0ce65104..b2502dd1069 100644
--- a/spec/controllers/correspondence_controller_spec.rb
+++ b/spec/controllers/correspondence_controller_spec.rb
@@ -72,6 +72,37 @@
     end
   end
 
+  describe "GET #correspondence_team" do
+    before do
+      InboundOpsTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+    end
+
+    it "returns a successful response" do
+      get :correspondence_team, params: { taskId: esw_tasks.first[:task_id],
+                                          veteranName: "Bob%20Smithwatsica",
+                                          userAction: "approve",
+                                          user: current_user.css_id,
+                                          decisionReason: "",
+                                          operation: "remove" }
+      expect(controller.view_assigns["response_header"]).to eq("You have successfully removed a mail package for Bob Smithwatsica")
+      expect(controller.view_assigns["response_message"]).to eq("The package has been removed from Caseflow and must be manually uploaded again\n     from the Centralized Mail Portal, if it needs to be processed.")
+    end
+
+    it "returns a failure response" do
+      allow(controller).to receive(:update_remove_task).and_raise(StandardError)
+      get :correspondence_team, params: { taskId: esw_tasks.first[:task_id],
+                                          veteranName: "Bob%20Smithwatsica",
+                                          userAction: "approve",
+                                          user: current_user.css_id,
+                                          decisionReason: "",
+                                          operation: "remove" }
+
+      expect(controller.view_assigns["response_header"]).to eq("Package request for Bob Smithwatsica could not be approved")
+      expect(controller.view_assigns["response_message"]).to eq("Please try again at a later time or contact the Help Desk.")
+    end
+  end
+
   describe "PATCH #update" do
     let(:veteran) { create(:veteran, file_number: new_file_number) }
     before do

From 2861658151c54651ef4478fd83c31e12e6369600 Mon Sep 17 00:00:00 2001
From: Will Medders <93014155+wmedders21@users.noreply.github.com>
Date: Mon, 1 Apr 2024 14:44:27 -0500
Subject: [PATCH 198/237] Package Document Type column APPEALS-40970 (#21273)

* updated correspondence table

* run correspondence nod column migration

* Add nod value to seed helper for correspondence queue

* semi functional nod column

* Add package doc type filter options to constants file

* Add column title to constants file

* remove binding.pry

* add filtering logic for package doc type

* Add search logic for package doc type

* Update package doc type column for filtering and searching

* rollback nod migration

* added feature test for package document type column

* fixed several receipt date failures

* test fixes

* update selectors for specs to account for new column

* fixed several failing rspecs

* reverted taskCompletedDateColumn to master version

* fixed failing rspecs

* removed stray binding.pry

* fied linting issues

* fixed linting issue

* removed binding.pry

* fixed ordering of assigned columns

---------

Co-authored-by: Ryan Marshall <rnmarshall1993@gmail.com>
Co-authored-by: Jim Foley <james.foley4@va.gov>
---
 .../correspondence_controller_util.rb         |   4 +-
 app/models/correspondence_queue_column.rb     |  14 +-
 .../correspondence_assigned_tasks_tab.rb      |   1 +
 .../correspondence_completed_tasks_tab.rb     |   1 +
 .../correspondence_in_progress_tasks_tab.rb   |   1 +
 ...orrespondence_action_required_tasks_tab.rb |   1 +
 ...ation_correspondence_assigned_tasks_tab.rb |  16 +-
 ...tion_correspondence_completed_tasks_tab.rb |   1 +
 ...zation_correspondence_pending_tasks_tab.rb |   1 +
 ...ion_correspondence_unassigned_tasks_tab.rb |   1 +
 .../correspondence_task_column_serializer.rb  |   2 +
 app/models/task_sorter.rb                     |   2 +
 app/models/tasks/correspondence_task.rb       |   4 +
 .../tasks/correspondence_task_filter.rb       |  17 ++
 client/COPY.json                              |   1 +
 .../app/queue/components/TaskTableColumns.jsx |  32 +--
 .../CorrespondenceTableBuilder.jsx            |   9 +-
 client/app/queue/utils.js                     |   1 +
 client/constants/QUEUE_CONFIG.json            |   9 +
 db/seeds/helpers/queue_helpers.rb             |   3 +-
 spec/factories/correspondence.rb              |   1 -
 .../correspondence_cases_spec.rb              | 198 +++++++++++++-----
 .../correspondence_search_bar_spec.rb         |   2 +-
 spec/models/correspondence_config_spec.rb     |  23 +-
 .../correspondence_controller_spec.rb         |   2 -
 25 files changed, 254 insertions(+), 93 deletions(-)

diff --git a/app/models/concerns/correspondence_controller_util.rb b/app/models/concerns/correspondence_controller_util.rb
index cde936e9ea5..a413ed68796 100644
--- a/app/models/concerns/correspondence_controller_util.rb
+++ b/app/models/concerns/correspondence_controller_util.rb
@@ -65,7 +65,7 @@ def reassign_remove_banner_action(mail_team_user)
       end
       set_reassign_remove_banner_params(mail_team_user, operation_type)
     rescue StandardError
-      set_error_banner_params
+      handle_error_banner_params(mail_team_user)
     end
   end
 
@@ -204,7 +204,7 @@ def set_reassign_remove_banner_params(user, operation_type)
     end
   end
 
-  def set_error_banner_params
+  def handle_error_banner_params(mail_team_user)
     operation_verb = @action_type == "approve" ? "approved" : "rejected"
     @response_header = "Package request for #{@veteran_name} could not be #{operation_verb}"
     @response_message = "Please try again at a later time or contact the Help Desk."
diff --git a/app/models/correspondence_queue_column.rb b/app/models/correspondence_queue_column.rb
index 80ffa3d347d..308421b4fcc 100644
--- a/app/models/correspondence_queue_column.rb
+++ b/app/models/correspondence_queue_column.rb
@@ -22,7 +22,8 @@ def to_hash(tasks)
     Constants.QUEUE_CONFIG.COLUMNS.TASK_TYPE.name => :task_type_options,
     Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name => :va_dor_options,
     Constants.QUEUE_CONFIG.COLUMNS.TASK_CLOSED_DATE.name => :date_completed_options,
-    Constants.QUEUE_CONFIG.COLUMNS.TASK_ASSIGNEE.name => :task_type_options
+    Constants.QUEUE_CONFIG.COLUMNS.TASK_ASSIGNEE.name => :task_type_options,
+    Constants.QUEUE_CONFIG.COLUMNS.PACKAGE_DOCUMENT_TYPE.name => :package_document_type_options
   }.freeze
 
   private
@@ -34,6 +35,17 @@ def task_type_options(tasks)
     end
   end
 
+  def package_document_type_options(tasks)
+    tasks.joins(:appeal).group(:nod).count.each_pair.map do |option, count|
+      label = if option
+                self.class.format_option_label(Constants.QUEUE_CONFIG.PACKAGE_DOC_TYPE_FILTER_OPTIONS.NOD, count)
+              else
+                self.class.format_option_label(Constants.QUEUE_CONFIG.PACKAGE_DOC_TYPE_FILTER_OPTIONS.NON_NOD, count)
+              end
+      self.class.filter_option_hash(option.to_s, label)
+    end
+  end
+
   # placeholder method because the function is required
   def va_dor_options(dummy)
     dummy
diff --git a/app/models/queue_tabs/correspondence_assigned_tasks_tab.rb b/app/models/queue_tabs/correspondence_assigned_tasks_tab.rb
index df5c0233876..7ecf64ca7c0 100644
--- a/app/models/queue_tabs/correspondence_assigned_tasks_tab.rb
+++ b/app/models/queue_tabs/correspondence_assigned_tasks_tab.rb
@@ -25,6 +25,7 @@ def tasks
   def self.column_names
     [
       Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
+      Constants.QUEUE_CONFIG.COLUMNS.PACKAGE_DOCUMENT_TYPE.name,
       Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
       Constants.QUEUE_CONFIG.COLUMNS.DAYS_WAITING_CORRESPONDENCE.name,
       Constants.QUEUE_CONFIG.COLUMNS.NOTES.name
diff --git a/app/models/queue_tabs/correspondence_completed_tasks_tab.rb b/app/models/queue_tabs/correspondence_completed_tasks_tab.rb
index 727aa42cfcb..9063ba5ba28 100644
--- a/app/models/queue_tabs/correspondence_completed_tasks_tab.rb
+++ b/app/models/queue_tabs/correspondence_completed_tasks_tab.rb
@@ -34,6 +34,7 @@ def tasks
   def self.column_names
     [
       Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
+      Constants.QUEUE_CONFIG.COLUMNS.PACKAGE_DOCUMENT_TYPE.name,
       Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
       Constants.QUEUE_CONFIG.COLUMNS.CORRESPONDENCE_TASK_CLOSED_DATE.name,
       Constants.QUEUE_CONFIG.COLUMNS.NOTES.name
diff --git a/app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb b/app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb
index b4228f0274b..56aee490fdd 100644
--- a/app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb
+++ b/app/models/queue_tabs/correspondence_in_progress_tasks_tab.rb
@@ -28,6 +28,7 @@ def tasks
   def self.column_names
     [
       Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
+      Constants.QUEUE_CONFIG.COLUMNS.PACKAGE_DOCUMENT_TYPE.name,
       Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
       Constants.QUEUE_CONFIG.COLUMNS.TASK_TYPE.name,
       Constants.QUEUE_CONFIG.COLUMNS.DAYS_WAITING_CORRESPONDENCE.name,
diff --git a/app/models/queue_tabs/organization_correspondence_action_required_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_action_required_tasks_tab.rb
index 8e096558c8d..8abc16fe478 100644
--- a/app/models/queue_tabs/organization_correspondence_action_required_tasks_tab.rb
+++ b/app/models/queue_tabs/organization_correspondence_action_required_tasks_tab.rb
@@ -31,6 +31,7 @@ def tasks
   def self.column_names
     [
       Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
+      Constants.QUEUE_CONFIG.COLUMNS.PACKAGE_DOCUMENT_TYPE.name,
       Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
       Constants.QUEUE_CONFIG.COLUMNS.DAYS_WAITING_CORRESPONDENCE.name,
       Constants.QUEUE_CONFIG.COLUMNS.TASK_ASSIGNED_BY.name,
diff --git a/app/models/queue_tabs/organization_correspondence_assigned_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_assigned_tasks_tab.rb
index ad3c179b687..5610131f9bb 100644
--- a/app/models/queue_tabs/organization_correspondence_assigned_tasks_tab.rb
+++ b/app/models/queue_tabs/organization_correspondence_assigned_tasks_tab.rb
@@ -23,14 +23,16 @@ def tasks
 
   # :reek:UtilityFunction
   def self.column_names
+    columns = Constants.QUEUE_CONFIG.COLUMNS
     [
-      Constants.QUEUE_CONFIG.COLUMNS.CHECKBOX_COLUMN.name,
-      Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
-      Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
-      Constants.QUEUE_CONFIG.COLUMNS.DAYS_WAITING_CORRESPONDENCE.name,
-      Constants.QUEUE_CONFIG.COLUMNS.TASK_TYPE.name,
-      Constants.QUEUE_CONFIG.COLUMNS.TASK_ASSIGNEE.name,
-      Constants.QUEUE_CONFIG.COLUMNS.NOTES.name
+      columns.CHECKBOX_COLUMN.name,
+      columns.VETERAN_DETAILS.name,
+      columns.PACKAGE_DOCUMENT_TYPE.name,
+      columns.VA_DATE_OF_RECEIPT.name,
+      columns.DAYS_WAITING_CORRESPONDENCE.name,
+      columns.TASK_TYPE.name,
+      columns.TASK_ASSIGNEE.name,
+      columns.NOTES.name
     ]
   end
 end
diff --git a/app/models/queue_tabs/organization_correspondence_completed_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_completed_tasks_tab.rb
index e0ea9174b36..2b885e645e3 100644
--- a/app/models/queue_tabs/organization_correspondence_completed_tasks_tab.rb
+++ b/app/models/queue_tabs/organization_correspondence_completed_tasks_tab.rb
@@ -37,6 +37,7 @@ def tasks
   def self.column_names
     [
       Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
+      Constants.QUEUE_CONFIG.COLUMNS.PACKAGE_DOCUMENT_TYPE.name,
       Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
       Constants.QUEUE_CONFIG.COLUMNS.CORRESPONDENCE_TASK_CLOSED_DATE.name,
       Constants.QUEUE_CONFIG.COLUMNS.NOTES.name
diff --git a/app/models/queue_tabs/organization_correspondence_pending_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_pending_tasks_tab.rb
index e59ccb36b2b..68eb139bc95 100644
--- a/app/models/queue_tabs/organization_correspondence_pending_tasks_tab.rb
+++ b/app/models/queue_tabs/organization_correspondence_pending_tasks_tab.rb
@@ -26,6 +26,7 @@ def tasks
   def self.column_names
     [
       Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
+      Constants.QUEUE_CONFIG.COLUMNS.PACKAGE_DOCUMENT_TYPE.name,
       Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
       Constants.QUEUE_CONFIG.COLUMNS.DAYS_WAITING_CORRESPONDENCE.name,
       Constants.QUEUE_CONFIG.COLUMNS.TASK_TYPE.name,
diff --git a/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb
index 35ec294f89b..7e9cf41e68c 100644
--- a/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb
+++ b/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb
@@ -26,6 +26,7 @@ def self.column_names
     user = RequestStore.store[:current_user]
     columns = [
       Constants.QUEUE_CONFIG.COLUMNS.VETERAN_DETAILS.name,
+      Constants.QUEUE_CONFIG.COLUMNS.PACKAGE_DOCUMENT_TYPE.name,
       Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name,
       Constants.QUEUE_CONFIG.COLUMNS.DAYS_WAITING_CORRESPONDENCE.name,
       Constants.QUEUE_CONFIG.COLUMNS.NOTES.name
diff --git a/app/models/serializers/work_queue/correspondence_task_column_serializer.rb b/app/models/serializers/work_queue/correspondence_task_column_serializer.rb
index c471bb8f2be..19f8237c5a8 100644
--- a/app/models/serializers/work_queue/correspondence_task_column_serializer.rb
+++ b/app/models/serializers/work_queue/correspondence_task_column_serializer.rb
@@ -13,6 +13,8 @@ def self.serialize_attribute?(params, columns)
 
   attribute :instructions
 
+  attribute :nod
+
   attribute :veteran_details do |object|
     vet = Veteran.find(object.correspondence.veteran_id)
     "#{vet.first_name} #{vet.last_name} (#{vet.file_number})"
diff --git a/app/models/task_sorter.rb b/app/models/task_sorter.rb
index f6e2173fa25..01caa2513a4 100644
--- a/app/models/task_sorter.rb
+++ b/app/models/task_sorter.rb
@@ -40,6 +40,8 @@ def sorted_tasks
       tasks.joins(:appeal).order(assigned_at: reverse_sort_order.to_sym)
     when Constants.QUEUE_CONFIG.COLUMNS.CORRESPONDENCE_TASK_CLOSED_DATE.name
       tasks.joins(:appeal).order(closed_at: sort_order.to_sym)
+    when Constants.QUEUE_CONFIG.COLUMNS.PACKAGE_DOCUMENT_TYPE.name
+      tasks.joins(:appeal).order(nod: sort_order.to_sym)
     else
       # Always join to the CachedAppeal and users tables because we sometimes need it, joining does not slow down the
       # application, and conditional logic to only join sometimes adds unnecessary complexity.
diff --git a/app/models/tasks/correspondence_task.rb b/app/models/tasks/correspondence_task.rb
index 1c7cd12ed14..1aea97a142e 100644
--- a/app/models/tasks/correspondence_task.rb
+++ b/app/models/tasks/correspondence_task.rb
@@ -19,6 +19,10 @@ def self.package_action_task_names
     ]
   end
 
+  def nod
+    correspondence.nod
+  end
+
   def verify_org_task_unique
     if Task.where(
       appeal_id: appeal_id,
diff --git a/app/models/tasks/correspondence_task_filter.rb b/app/models/tasks/correspondence_task_filter.rb
index 6030b8f16aa..c008b612523 100644
--- a/app/models/tasks/correspondence_task_filter.rb
+++ b/app/models/tasks/correspondence_task_filter.rb
@@ -5,6 +5,7 @@ def filtered_tasks
     va_dor_params = filter_params.select { |param| param.include?("col=vaDor") }
     date_completed_params = filter_params.select { |param| param.include?("col=correspondenceCompletedDateColumn") }
     task_column_params = filter_params.select { |param| param.include?("col=taskColumn") }
+    nod_column_params = filter_params.select { |param| param.include?("col=packageDocTypeColumn") }
 
     # task_column_params comes in as a single string, delimited by |. Updates task_column_params
     # to be an array of the incoming values.
@@ -19,6 +20,13 @@ def filtered_tasks
       result = result.merge(filter_by_va_dor(value_hash[:val]))
     end
 
+    unless nod_column_params.empty?
+      nod_column_params.each do |param|
+        value_hash = Rack::Utils.parse_nested_query(param).deep_symbolize_keys
+        result = result.merge(filter_by_nod(value_hash[:val]))
+      end
+    end
+
     unless task_column_params.empty?
       result = result.merge(filter_by_task(task_column_params))
     end
@@ -32,6 +40,15 @@ def filtered_tasks
 
   private
 
+  def filter_by_nod(nod_value)
+    # If both NOD and Non-NOD checkboxes are selected in the filter dropdown,
+    # nod_value will be "true|false" or "false|true",
+    # so we return all the tasks if the string contains pipe character.
+    return tasks if nod_value.include?("|")
+
+    tasks.joins(:appeal).where("correspondences.nod = ?", nod_value)
+  end
+
   def filter_by_date(date_info)
     date_type, first_date, second_date = date_info.split(",")
 
diff --git a/client/COPY.json b/client/COPY.json
index 947750d6f86..6d3e98d4c8e 100644
--- a/client/COPY.json
+++ b/client/COPY.json
@@ -51,6 +51,7 @@
   "CASE_LIST_TABLE_QUEUE_DROPDOWN_OWN_CASES_LABEL": "Your cases",
   "CASE_LIST_TABLE_QUEUE_DROPDOWN_TEAM_CASES_LABEL": "%s team cases",
   "CASE_LIST_TABLE_QUEUE_DROPDOWN_CORRESPONDENCE_CASES": "Correspondence Cases",
+  "CASE_LIST_TABLE_PACKAGE_DOCUMENT_TYPE_COLUMN_TITLE": "Package Document Type",
   "TITLE_MODAL_EDIT_DOCUMENT_TYPE_CORRESPONDENCE": "Edit document type",
   "TEXT_MODAL_EDIT_DOCUMENT_TYPE_CORRESPONDENCE": "Change the document type of the selected document.",
   "ORIGINAL_DOC_EDIT_DOCUMENT_TYPE_CORRESPONDENCE": "Original document type",
diff --git a/client/app/queue/components/TaskTableColumns.jsx b/client/app/queue/components/TaskTableColumns.jsx
index e165d9ce447..7d00d1ec6b8 100644
--- a/client/app/queue/components/TaskTableColumns.jsx
+++ b/client/app/queue/components/TaskTableColumns.jsx
@@ -23,7 +23,7 @@ import {
 } from 'app/queue/correspondence/correspondenceReducer/correspondenceActions';
 
 import { taskHasCompletedHold, hasDASRecord, collapseColumn, regionalOfficeCity, renderAppealType } from '../utils';
-import { daysSinceAssigned, daysSincePlacedOnHold } from '../../util/DateUtil';
+import { DateString, daysSinceAssigned, daysSincePlacedOnHold } from '../../util/DateUtil';
 
 import COPY from '../../../COPY';
 import QUEUE_CONFIG from '../../../constants/QUEUE_CONFIG';
@@ -314,6 +314,24 @@ export const vaDor = () => {
   };
 };
 
+export const packageDocumentType = (filterOptions) => {
+  return {
+    header: COPY.CASE_LIST_TABLE_PACKAGE_DOCUMENT_TYPE_COLUMN_TITLE,
+    filterOptions,
+    columnName: COPY.CASE_LIST_TABLE_PACKAGE_DOCUMENT_TYPE_COLUMN_TITLE,
+    valueName: COPY.CASE_LIST_TABLE_PACKAGE_DOCUMENT_TYPE_COLUMN_TITLE,
+    backendCanSort: true,
+    enableFilter: true,
+    anyFiltersAreSet: true,
+    getSortValue: (task) => task.nod,
+    name: QUEUE_CONFIG.COLUMNS.PACKAGE_DOCUMENT_TYPE.name,
+    label: QUEUE_CONFIG.COLUMNS.PACKAGE_DOCUMENT_TYPE.name,
+    valueFunction: (task) => {
+      return task.nod ? 'NOD' : 'Non-NOD';
+    }
+  };
+};
+
 export const notes = () => {
   return {
     header: 'Notes',
@@ -625,18 +643,8 @@ export const taskCompletedDateColumn = () => {
   return {
     header: COPY.CASE_LIST_TABLE_COMPLETED_ON_DATE_COLUMN_TITLE,
     name: QUEUE_CONFIG.COLUMNS.TASK_CLOSED_DATE.name,
-    filterOptions: [],
-    valueName: 'Date Completed',
-    customFilterLabels: CO_LOCATED_ADMIN_ACTIONS,
-    label: 'Filter by date completed',
-    columnName: QUEUE_CONFIG.COLUMNS.TASK_CLOSED_DATE.name,
-    anyFiltersAreSet: true,
+    valueFunction: (task) => task.closedAt ? <DateString date={task.closedAt} /> : null,
     backendCanSort: true,
-    enableFilter: true,
-    filterable: true,
-    valueFunction: (task) => {
-      return moment(task.closedAt).format('MM/DD/YYYY');
-    },
     getSortValue: (task) => task.closedAt ? new Date(task.closedAt) : null
   };
 };
diff --git a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
index 3d7df919b3d..eae9b15103d 100644
--- a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
+++ b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
@@ -22,7 +22,8 @@ import {
   taskColumn,
   correspondenceCompletedDateColumn,
   vaDor,
-  veteranDetails
+  veteranDetails,
+  packageDocumentType
 } from '../components/TaskTableColumns';
 
 import { tasksWithCorrespondenceFromRawTasks } from '../utils';
@@ -127,7 +128,7 @@ const CorrespondenceTableBuilder = (props) => {
     const taskLabel = task.label || '';
     const taskVaDor = task.vaDor || '';
     const closedAt = task.closedAt || '';
-
+    const packageDocType = task.nod ? 'NOD' : 'Non-NOD';
     const searchValueTrimmed = searchValue.trim();
     const isNumericSearchValue = !isNaN(parseFloat(searchValueTrimmed)) && isFinite(searchValueTrimmed);
 
@@ -139,6 +140,7 @@ const CorrespondenceTableBuilder = (props) => {
     assignedByfirstName.toLowerCase().includes(searchValueTrimmed.toLowerCase()) ||
     assignedBylastName.toLowerCase().includes(searchValueTrimmed.toLowerCase()) ||
     assignedToName.toLowerCase().includes(searchValueTrimmed.toLowerCase()) ||
+    packageDocType.toLowerCase().includes(searchValueTrimmed.toLowerCase()) ||
     taskLabel.toLowerCase().includes(searchValueTrimmed.toLowerCase()) ||
     (isNumericSearchValue && daysWaiting.trim() === searchValueTrimmed) ||
     moment(closedAt).format('MM/DD/YYYY').
@@ -170,7 +172,8 @@ const CorrespondenceTableBuilder = (props) => {
       [QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name]: vaDor(tasks, filterOptions),
       [QUEUE_CONFIG.COLUMNS.NOTES.name]: notes(),
       [QUEUE_CONFIG.COLUMNS.CHECKBOX_COLUMN.name]: checkboxColumn(handleCheckboxChange),
-      [QUEUE_CONFIG.COLUMNS.ACTION_TYPE.name]: actionType()
+      [QUEUE_CONFIG.COLUMNS.ACTION_TYPE.name]: actionType(),
+      [QUEUE_CONFIG.COLUMNS.PACKAGE_DOCUMENT_TYPE.name]: packageDocumentType(filterOptions)
     };
 
     return functionForColumn[column.name];
diff --git a/client/app/queue/utils.js b/client/app/queue/utils.js
index 187095c6585..2a1f02b4dc4 100644
--- a/client/app/queue/utils.js
+++ b/client/app/queue/utils.js
@@ -84,6 +84,7 @@ const correspondenceTaskAttributesFromRawTask = (task) => {
     closedAt: task.attributes.closed_at,
     daysWaiting: task.attributes.days_waiting,
     vaDor: task.attributes.va_date_of_receipt,
+    nod: task.attributes.nod,
     label: task.attributes.label,
     taskUrl: task.attributes.task_url,
     parentTaskUrl: task.attributes.parent_task_url.parent_task_url,
diff --git a/client/constants/QUEUE_CONFIG.json b/client/constants/QUEUE_CONFIG.json
index 36ef3de8a39..ee07f901587 100644
--- a/client/constants/QUEUE_CONFIG.json
+++ b/client/constants/QUEUE_CONFIG.json
@@ -163,6 +163,10 @@
     "VETERAN_DETAILS": {
       "name": "veteranDetails"
     },
+    "PACKAGE_DOCUMENT_TYPE": {
+      "filterable": true,
+      "name": "packageDocTypeColumn"
+    },
     "VETERAN_PARTICIPANT_ID": {
       "name": "veteranParticipantIdColumn"
     },
@@ -254,5 +258,10 @@
     "IS_FORMER_TRAVEL": {
       "key": "former Travel"
     }
+  },
+
+  "PACKAGE_DOC_TYPE_FILTER_OPTIONS": {
+    "NOD": "NOD",
+    "NON_NOD": "Non-NOD"
   }
 }
diff --git a/db/seeds/helpers/queue_helpers.rb b/db/seeds/helpers/queue_helpers.rb
index af2174400bd..cce0d554bdd 100644
--- a/db/seeds/helpers/queue_helpers.rb
+++ b/db/seeds/helpers/queue_helpers.rb
@@ -38,7 +38,8 @@ def create_correspondence(user = {}, veteran = {})
       notes: generate_notes([package_doc_type, corr_type, receipt_date, user]),
       assigned_by_id: user.id,
       updated_by_id: user.id,
-      veteran_id: vet.id
+      veteran_id: vet.id,
+      nod: [true, false].sample,
     ).tap { @cmp_packet_number += 1 }
   end
 
diff --git a/spec/factories/correspondence.rb b/spec/factories/correspondence.rb
index 281881dbd76..10f330353ec 100644
--- a/spec/factories/correspondence.rb
+++ b/spec/factories/correspondence.rb
@@ -10,7 +10,6 @@
     va_date_of_receipt { Time.zone.yesterday }
     notes { "This is a test note." }
     assigned_by factory: :user
-
     correspondence_type
     veteran
     package_document_type
diff --git a/spec/feature/queue/correspondence/correspondence_cases_spec.rb b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
index fd0f76ebbef..b4177ae4285 100644
--- a/spec/feature/queue/correspondence/correspondence_cases_spec.rb
+++ b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
@@ -148,50 +148,50 @@
 
     it "uses receipt date between filter correctly" do
       visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
-      all(".unselected-filter-icon")[0].click
+      all(".unselected-filter-icon")[1].click
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-2-option-0").click
       all("div.input-container > input")[0].fill_in(with: "10/09/2000")
       all("div.input-container > input")[1].fill_in(with: "10/11/2000")
       find(".cf-submit").click
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(5)").length == 1)
     end
 
     it "uses receipt date before filter correctly" do
       visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
-      all(".unselected-filter-icon")[0].click
+      all(".unselected-filter-icon")[1].click
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-2-option-1").click
       all("div.input-container > input")[0].fill_in(with: "10/01/2001")
       find(".cf-submit").click
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(5)").length == 1)
     end
 
     it "uses receipt date after filter correctly" do
       visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
-      all(".unselected-filter-icon")[0].click
+      all(".unselected-filter-icon")[1].click
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-2-option-2").click
       current_date = Time.zone.today
       my_date = current_date.strftime("%m/%d/%Y")
       all("div.input-container > input")[0].fill_in(with: my_date)
       find(".cf-submit").click
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(5)").length == 1)
     end
 
     it "uses receipt date on filter correctly" do
       visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
-      all(".unselected-filter-icon")[0].click
+      all(".unselected-filter-icon")[1].click
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-2-option-3").click
       all("div.input-container > input")[0].fill_in(with: "10/10/2000")
       find(".cf-submit").click
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(5)").length == 1)
     end
 
     it "uses uses task filter correctly" do
       visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
-      all(".unselected-filter-icon")[1].click
+      all(".unselected-filter-icon")[2].click
       find("label", text: "Review Package Task (1)").click
       expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
     end
@@ -334,11 +334,11 @@
       visit "/queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=vaDor&order=asc"
       find("[aria-label='Sort by Notes']").click
 
-      notes = all("tbody > tr > td:nth-child(4)").map(&:text)
+      notes = all("tbody > tr > td:nth-child(5)").map(&:text)
       expect(notes).to eq(notes.sort.reverse)
 
       find("[aria-label='Sort by Notes']").click
-      notes = all("tbody > tr > td:nth-child(4)").map(&:text)
+      notes = all("tbody > tr > td:nth-child(5)").map(&:text)
       expect(notes).to eq(notes.sort)
     end
   end
@@ -465,45 +465,45 @@
 
     it "uses receipt date between filter correctly" do
       visit "/queue/correspondence/team?tab=correspondence_action_required"
-      all(".unselected-filter-icon")[0].click
+      all(".unselected-filter-icon")[1].click
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-2-option-0").click
       all("div.input-container > input")[0].fill_in(with: "10/09/2000")
       all("div.input-container > input")[1].fill_in(with: "10/11/2000")
       find(".cf-submit").click
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(5)").length == 1)
     end
 
     it "uses receipt date before filter correctly" do
       visit "/queue/correspondence/team?tab=correspondence_action_required"
-      all(".unselected-filter-icon")[0].click
+      all(".unselected-filter-icon")[1].click
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-2-option-1").click
       all("div.input-container > input")[0].fill_in(with: "10/01/2001")
       find(".cf-submit").click
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(5)").length == 1)
     end
 
     it "uses receipt date after filter correctly" do
       visit "/queue/correspondence/team?tab=correspondence_action_required"
-      all(".unselected-filter-icon")[0].click
+      all(".unselected-filter-icon")[1].click
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-2-option-2").click
       current_date = Time.zone.today
       my_date = (current_date - 4).strftime("%m/%d/%Y")
       all("div.input-container > input")[0].fill_in(with: my_date)
       find(".cf-submit").click
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(5)").length == 1)
     end
 
     it "uses receipt date on filter correctly" do
       visit "/queue/correspondence/team?tab=correspondence_action_required"
-      all(".unselected-filter-icon")[0].click
+      all(".unselected-filter-icon")[1].click
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-2-option-3").click
       all("div.input-container > input")[0].fill_in(with: "10/10/2000")
       find(".cf-submit").click
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(5)").length == 1)
     end
   end
 
@@ -618,45 +618,45 @@
 
     it "uses receipt date between filter correctly" do
       visit "/queue/correspondence/team?tab=correspondence_unassigned"
-      all(".unselected-filter-icon")[0].click
+      all(".unselected-filter-icon")[1].click
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-3-option-0").click
       all("div.input-container > input")[0].fill_in(with: "10/09/2000")
       all("div.input-container > input")[1].fill_in(with: "10/11/2000")
       click_button("Apply Filter")
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(5)").length == 1)
     end
 
     it "uses receipt date before filter correctly" do
       visit "/queue/correspondence/team?tab=correspondence_unassigned"
-      all(".unselected-filter-icon")[0].click
+      all(".unselected-filter-icon")[1].click
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-3-option-1").click
       all("div.input-container > input")[0].fill_in(with: "10/01/2001")
       click_button("Apply Filter")
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(5)").length == 1)
     end
 
     it "uses receipt date after filter correctly" do
       visit "/queue/correspondence/team?tab=correspondence_unassigned"
-      all(".unselected-filter-icon")[0].click
+      all(".unselected-filter-icon")[1].click
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-3-option-2").click
       current_date = Time.zone.today
       my_date = (current_date - 5).strftime("%m/%d/%Y")
       all("div.input-container > input")[0].fill_in(with: my_date)
       click_button("Apply Filter")
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(5)").length == 1)
     end
 
     it "uses receipt date on filter correctly" do
       visit "/queue/correspondence/team?tab=correspondence_unassigned"
-      all(".unselected-filter-icon")[0].click
+      all(".unselected-filter-icon")[1].click
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-3-option-3").click
       all("div.input-container > input")[0].fill_in(with: "10/10/2000")
       click_button("Apply Filter")
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(5)").length == 1)
     end
   end
 
@@ -782,47 +782,47 @@
 
     it "uses receipt date between filter correctly" do
       visit "/queue/correspondence/team?tab=correspondence_team_assigned"
-      all(".unselected-filter-icon")[0].click
+      all(".unselected-filter-icon")[1].click
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-3-option-0").click
       all("div.input-container > input")[0].fill_in(with: "10/09/2000")
       all("div.input-container > input")[1].fill_in(with: "10/11/2000")
       click_button("Apply Filter")
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(5)").length == 1)
     end
 
     it "uses receipt date before filter correctly" do
       visit "/queue/correspondence/team?tab=correspondence_team_assigned"
-      all(".unselected-filter-icon")[0].click
+      all(".unselected-filter-icon")[1].click
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-3-option-1").click
       current_date = Time.zone.today
       my_date = (current_date - 5).strftime("%m/%d/%Y")
       all("div.input-container > input")[0].fill_in(with: my_date)
       click_button("Apply Filter")
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(5)").length == 1)
     end
 
     it "uses receipt date after filter correctly" do
       visit "/queue/correspondence/team?tab=correspondence_team_assigned"
-      all(".unselected-filter-icon")[0].click
+      all(".unselected-filter-icon")[1].click
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-3-option-2").click
       current_date = Time.zone.today
       my_date = (current_date - 5).strftime("%m/%d/%Y")
       all("div.input-container > input")[0].fill_in(with: my_date)
       click_button("Apply Filter")
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(5)").length == 1)
     end
 
     it "uses receipt date on filter correctly" do
       visit "/queue/correspondence/team?tab=correspondence_team_assigned"
-      all(".unselected-filter-icon")[0].click
+      all(".unselected-filter-icon")[1].click
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-3-option-3").click
       all("div.input-container > input")[0].fill_in(with: "10/10/2000")
       click_button("Apply Filter")
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(5)").length == 1)
     end
   end
 
@@ -998,45 +998,45 @@
 
     it "uses receipt date between filter correctly" do
       visit "/queue/correspondence?tab=correspondence_completed&page=1&sort_by=vaDor&order=asc"
-      all(".unselected-filter-icon")[0].click
+      all(".unselected-filter-icon")[1].click
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-2-option-0").click
       all("div.input-container > input")[0].fill_in(with: "10/09/2000")
       all("div.input-container > input")[1].fill_in(with: "10/11/2000")
       find(".cf-submit").click
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(5)").length == 1)
     end
 
     it "uses receipt date before filter correctly" do
       visit "/queue/correspondence?tab=correspondence_completed&page=1&sort_by=vaDor&order=asc"
-      all(".unselected-filter-icon")[0].click
+      all(".unselected-filter-icon")[1].click
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-2-option-1").click
       all("div.input-container > input")[0].fill_in(with: "10/01/2001")
       find(".cf-submit").click
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(5)").length == 1)
     end
 
     it "uses receipt date after filter correctly" do
       visit "/queue/correspondence?tab=correspondence_completed&page=1&sort_by=vaDor&order=asc"
-      all(".unselected-filter-icon")[0].click
+      all(".unselected-filter-icon")[1].click
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-2-option-2").click
       current_date = Time.zone.today
       my_date = current_date.strftime("%m/%d/%Y")
       all("div.input-container > input")[0].fill_in(with: my_date)
       find(".cf-submit").click
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(5)").length == 1)
     end
 
     it "uses receipt date on filter correctly" do
       visit "/queue/correspondence?tab=correspondence_completed&page=1&sort_by=vaDor&order=asc"
-      all(".unselected-filter-icon")[0].click
+      all(".unselected-filter-icon")[1].click
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-2-option-3").click
       all("div.input-container > input")[0].fill_in(with: "10/10/2000")
       find(".cf-submit").click
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(5)").length == 1)
     end
   end
 
@@ -1116,45 +1116,45 @@
 
     it "uses receipt date between filter correctly" do
       visit "/queue/correspondence/team?tab=correspondence_pending"
-      all(".unselected-filter-icon")[0].click
+      all(".unselected-filter-icon")[1].click
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-2-option-0").click
       all("div.input-container > input")[0].fill_in(with: "10/09/2000")
       all("div.input-container > input")[1].fill_in(with: "10/11/2000")
       find(".cf-submit").click
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(5)").length == 1)
     end
 
     it "uses receipt date before filter correctly" do
       visit "/queue/correspondence/team?tab=correspondence_pending"
-      all(".unselected-filter-icon")[0].click
+      all(".unselected-filter-icon")[1].click
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-2-option-1").click
       all("div.input-container > input")[0].fill_in(with: "10/01/2001")
       find(".cf-submit").click
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(5)").length == 1)
     end
 
     it "uses receipt date after filter correctly" do
       visit "/queue/correspondence/team?tab=correspondence_pending"
-      all(".unselected-filter-icon")[0].click
+      all(".unselected-filter-icon")[1].click
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-2-option-2").click
       current_date = Time.zone.today
       my_date = (current_date - 3).strftime("%m/%d/%Y")
       all("div.input-container > input")[0].fill_in(with: my_date)
       find(".cf-submit").click
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(5)").length == 1)
     end
 
     it "uses receipt date on filter correctly" do
       visit "/queue/correspondence/team?tab=correspondence_pending"
-      all(".unselected-filter-icon")[0].click
+      all(".unselected-filter-icon")[1].click
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-2-option-3").click
       all("div.input-container > input")[0].fill_in(with: "10/10/2000")
       find(".cf-submit").click
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 1)
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(5)").length == 1)
     end
 
     it "uses days waiting sort correctly" do
@@ -1191,10 +1191,10 @@
 
     it "uses tasks filter correctly" do
       visit "/queue/correspondence/team?tab=correspondence_pending"
-      all(".unselected-filter-icon")[1].click
+      all(".unselected-filter-icon")[2].click
       all(".cf-filter-option-row")[1].click
       # find_by_id("0-CavcCorrespondenceCorrespondenceTask").click
-      expect(all("tbody > tr:nth-child(1) > td:nth-child(4)").length == 5)
+      expect(all("tbody > tr:nth-child(1) > td:nth-child(3)").length == 5)
     end
 
     it "uses assigned to sort correctly" do
@@ -1257,7 +1257,7 @@
       visit "queue/correspondence/team?tab=correspondence_action_required&page=1&sort_by=vaDor&order=asc"
       all("[aria-label='Reassign Package Task Link']")[0].click
       find('[for="vertical-radio_reject"]').click
-      find(".cf-form-textarea", visible: false).find(:xpath, "./*").fill_in with: "this is a rejection reason"
+      all("textarea")[0].fill_in with: "this is a rejection reason"
       find("#Review-request-button-id-1").click
       expect(page).to have_content("You have successfully rejected a package request for")
     end
@@ -1274,7 +1274,7 @@
       visit "queue/correspondence/team?tab=correspondence_action_required&page=1&sort_by=vaDor&order=asc"
       all("[aria-label='Remove Package Task Link']")[0].click
       find('[for="vertical-radio_reject"]').click
-      find(".cf-form-textarea", visible: false).find(:xpath, "./*").fill_in with: "this is a rejection reason"
+      all("textarea")[0].fill_in with: "this is a rejection reason"
       find("#Review-request-button-id-1").click
       expect(page).to have_content("You have successfully rejected a package request")
     end
@@ -1410,4 +1410,92 @@
       expect(page).to have_content("Date completed cannot be in the future.")
     end
   end
+
+  context "Package document type column" do
+    let(:current_user) { create(:user) }
+    let(:alt_user) { create(:user) }
+    let(:mail_team_user) { create(:user) }
+    before :each do
+      MailTeam.singleton.add_user(current_user)
+      MailTeam.singleton.add_user(alt_user)
+      InboundOpsTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+      FeatureToggle.enable!(:correspondence_queue)
+    end
+
+    before do
+      5.times do
+        corres_array = (1..2).map { |index| create(:correspondence, nod: index == 1) }
+        task_array = [ReassignPackageTask, RemovePackageTask]
+
+        corres_array.each_with_index do |corres, index|
+          rpt = ReviewPackageTask.find_by(appeal_id: corres.id)
+          task_array[index].create!(
+            parent_id: rpt.id,
+            appeal_type: "Correspondence",
+            appeal_id: corres.id,
+            assigned_to: InboundOpsTeam.singleton,
+            instructions: ["This was the default"],
+            assigned_by_id: rpt.assigned_to_id
+          )
+        end
+      end
+    end
+
+    it "appears on each tab of team cases" do
+      visit "queue/correspondence/team?tab=correspondence_unassigned&page=1&sort_by=vaDor&order=asc"
+      expect(page).to have_content("Package Document Type")
+      visit "queue/correspondence/team?tab=correspondence_action_required&page=1&sort_by=vaDor&order=asc"
+      expect(page).to have_content("Package Document Type")
+      visit "queue/correspondence/team?tab=correspondence_pending&page=1&sort_by=vaDor&order=asc"
+      expect(page).to have_content("Package Document Type")
+      visit "queue/correspondence/team?tab=correspondence_team_assigned&page=1&sort_by=vaDor&order=asc"
+      expect(page).to have_content("Package Document Type")
+      visit "queue/correspondence/team?tab=correspondence_team_completed&page=1&sort_by=vaDor&order=asc"
+      expect(page).to have_content("Package Document Type")
+    end
+
+    it "appears on each tab of individual queue" do
+      User.authenticate!(user: alt_user)
+      visit "queue/correspondence/?tab=correspondence_assigned&page=1&sort_by=vaDor&order=asc"
+      expect(page).to have_content("Package Document Type")
+      visit "queue/correspondence/?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
+      expect(page).to have_content("Package Document Type")
+      visit "queue/correspondence/?tab=correspondence_completed&page=1&sort_by=vaDor&order=asc"
+      expect(page).to have_content("Package Document Type")
+    end
+
+    it "correctly sorts NOD type" do
+      visit "queue/correspondence/team?tab=correspondence_unassigned&page=1&sort_by=vaDor&order=asc"
+      # binding.pry
+      find("[aria-label='Package Document Type']").click
+      first_task = find("tbody > tr:nth-child(1) > td:nth-child(3)")
+      find("[aria-label='Package Document Type']").click
+      second_task = find("tbody > tr:nth-child(1) > td:nth-child(3)")
+      find("[aria-label='Package Document Type']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(3)").text == first_task.text)
+      find("[aria-label='Package Document Type']").click
+      expect(find("tbody > tr:nth-child(1) > td:nth-child(3)").text == second_task.text)
+    end
+
+    it "correctly filters NOD type" do
+      visit "queue/correspondence/team?tab=correspondence_unassigned&page=1&sort_by=vaDor&order=asc"
+      find("[aria-label='packageDocTypeColumn']").click
+      all(".cf-filter-option-row")[1].click
+      expect(page).to_not have_content("Non-NOD")
+      visit "queue/correspondence/team?tab=correspondence_unassigned&page=1&sort_by=vaDor&order=asc"
+      find("[aria-label='packageDocTypeColumn']").click
+      all(".cf-filter-option-row")[1].click
+      find("[aria-label='packageDocTypeColumn. Filtering by true']").click
+      all(".cf-filter-option-row")[2].click
+      expect(page).to have_content("Package Document Type (2)")
+      expect(page).to have_content("Viewing 1-10 of 10 total")
+    end
+
+    it "correctly uses search bar" do
+      visit "queue/correspondence/team?tab=correspondence_unassigned&page=1&sort_by=vaDor&order=asc"
+      fill_in "searchBar", with: "-nod"
+      expect all("td", text: "Non-NOD").length == 5
+    end
+  end
 end
diff --git a/spec/feature/queue/correspondence/correspondence_search_bar_spec.rb b/spec/feature/queue/correspondence/correspondence_search_bar_spec.rb
index 9274f46ec2f..8456afd44a6 100644
--- a/spec/feature/queue/correspondence/correspondence_search_bar_spec.rb
+++ b/spec/feature/queue/correspondence/correspondence_search_bar_spec.rb
@@ -142,7 +142,7 @@
       find_by_id("searchBar").fill_in with: veteran.last_name
       search_value = find("tbody > tr:nth-child(1) > td:nth-child(1)").text
       expect(search_value.include?(veteran.last_name))
-      all(".unselected-filter-icon")[0].click
+      all(".unselected-filter-icon")[1].click
       find_by_id("reactSelectContainer").click
       find_by_id("react-select-2-option-3").click
       all("div.input-container > input")[0].fill_in(
diff --git a/spec/models/correspondence_config_spec.rb b/spec/models/correspondence_config_spec.rb
index d76385e1eb9..31a3f1fca41 100644
--- a/spec/models/correspondence_config_spec.rb
+++ b/spec/models/correspondence_config_spec.rb
@@ -58,23 +58,30 @@
         it "tabs have the correct columns" do
           expect(subject[:tabs].find { |tab| tab[:label] == "Unassigned" }[:columns]
           .map { |column| column[:name] })
-            .to eq(%w[checkboxColumn veteranDetails vaDor daysWaitingCorrespondence notes])
+            .to eq(%w[checkboxColumn veteranDetails packageDocTypeColumn vaDor daysWaitingCorrespondence notes])
 
           expect(subject[:tabs].find { |tab| tab[:label] == "Action Required" }[:columns]
           .map { |column| column[:name] })
-            .to eq(%w[veteranDetails vaDor daysWaitingCorrespondence assignedByColumn actionType notes])
+            .to eq(
+              %w[veteranDetails packageDocTypeColumn vaDor daysWaitingCorrespondence assignedByColumn actionType notes]
+            )
 
           expect(subject[:tabs].find { |tab| tab[:label] == "Pending" }[:columns]
           .map { |column| column[:name] })
-            .to eq(%w[veteranDetails vaDor daysWaitingCorrespondence taskColumn assignedToColumn])
+            .to eq(%w[veteranDetails packageDocTypeColumn vaDor daysWaitingCorrespondence taskColumn assignedToColumn])
 
           expect(subject[:tabs].find { |tab| tab[:label] == "Assigned" }[:columns]
           .map { |column| column[:name] })
-            .to eq(%w[checkboxColumn veteranDetails vaDor daysWaitingCorrespondence taskColumn assignedToColumn notes])
+            .to eq(
+              %w[
+                checkboxColumn veteranDetails packageDocTypeColumn
+                vaDor daysWaitingCorrespondence taskColumn assignedToColumn notes
+              ]
+            )
 
           expect(subject[:tabs].find { |tab| tab[:label] == "Completed" }[:columns]
           .map { |column| column[:name] })
-            .to eq(%w[veteranDetails vaDor correspondenceCompletedDateColumn notes])
+            .to eq(%w[veteranDetails packageDocTypeColumn vaDor correspondenceCompletedDateColumn notes])
         end
       end
 
@@ -90,15 +97,15 @@
         it "tabs have the correct columns" do
           expect(subject[:tabs].find { |tab| tab[:label] == "Assigned" }[:columns]
           .map { |column| column[:name] })
-            .to eq(%w[veteranDetails vaDor daysWaitingCorrespondence notes])
+            .to eq(%w[veteranDetails packageDocTypeColumn vaDor daysWaitingCorrespondence notes])
 
           expect(subject[:tabs].find { |tab| tab[:label] == "In Progress" }[:columns]
           .map { |column| column[:name] })
-            .to eq(%w[veteranDetails vaDor taskColumn daysWaitingCorrespondence notes])
+            .to eq(%w[veteranDetails packageDocTypeColumn vaDor taskColumn daysWaitingCorrespondence notes])
 
           expect(subject[:tabs].find { |tab| tab[:label] == "Completed" }[:columns]
           .map { |column| column[:name] })
-            .to eq(%w[veteranDetails vaDor correspondenceCompletedDateColumn notes])
+            .to eq(%w[veteranDetails packageDocTypeColumn vaDor correspondenceCompletedDateColumn notes])
         end
       end
     end
diff --git a/spec/requests/correspondence_controller_spec.rb b/spec/requests/correspondence_controller_spec.rb
index 7ba7702e621..febbed96b40 100644
--- a/spec/requests/correspondence_controller_spec.rb
+++ b/spec/requests/correspondence_controller_spec.rb
@@ -97,7 +97,6 @@
           expect(task[:attributes][:days_waiting]).to be_a(Integer)
           expect(task[:attributes][:va_date_of_receipt]).to be_a(String)
           expect(task[:attributes][:label]).to be_a(String)
-          expect(task[:attributes][:status]).to be_a(String)
           expect(task[:attributes][:assigned_to]).to be_a(Hash)
           expect(task[:attributes][:assigned_by]).to be_a(Hash)
         end
@@ -141,7 +140,6 @@
           expect(task[:attributes][:days_waiting]).to be_a(Integer)
           expect(task[:attributes][:va_date_of_receipt]).to be_a(String)
           expect(task[:attributes][:label]).to eq(nil).or be_a(String)
-          expect(task[:attributes][:status]).to be_a(String)
           expect(task[:attributes][:assigned_to]).to be_a(Hash)
           expect(task[:attributes][:assigned_by]).to be_a(Hash)
         end

From 034f4cc353d7300cb18263e7c98cccfc278b1054 Mon Sep 17 00:00:00 2001
From: Ki Mau <ki.mau@va.gov>
Date: Mon, 1 Apr 2024 16:31:13 -0400
Subject: [PATCH 199/237] APPEALS-42996 - Removed Character Limit (#21314)

Co-authored-by: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
---
 .../app/queue/correspondence/CorrespondenceTableBuilder.jsx  | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
index eae9b15103d..5a8d68a7d1a 100644
--- a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
+++ b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
@@ -114,11 +114,6 @@ const CorrespondenceTableBuilder = (props) => {
   };
 
   const taskMatchesSearch = (task) => {
-    if (searchValue === '' || searchValue.length < 3) {
-    // Return all tasks when search value is empty or less than three characters
-      return true;
-    }
-
     const taskNotes = task.notes || '';
     const daysWaiting = task.daysWaiting ? task.daysWaiting.toString() : '';
     const assignedByfirstName = (task.assignedBy && task.assignedBy.firstName) || '';

From c2ac1d58926e6f4b0fce4a7ea352ef47f9507f20 Mon Sep 17 00:00:00 2001
From: piedram <110848569+piedram@users.noreply.github.com>
Date: Mon, 1 Apr 2024 18:21:24 -0400
Subject: [PATCH 200/237] Add VADOR  label to filter (#21319)

Co-authored-by: Jim Foley <james.foley4@va.gov>
Co-authored-by: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
---
 client/app/components/FilterSummary.jsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/app/components/FilterSummary.jsx b/client/app/components/FilterSummary.jsx
index 07bbca46cb7..2a6da55813c 100644
--- a/client/app/components/FilterSummary.jsx
+++ b/client/app/components/FilterSummary.jsx
@@ -16,7 +16,8 @@ const ALTERNATE_COLUMN_NAMES = {
   suggestedLocation: 'Suggested Location',
   hearingLocation: 'Hearing Location',
   readableEventType: 'Actvitity',
-  eventUser: 'User'
+  eventUser: 'User',
+  'Receipt Date': 'VA DOR'
 };
 
 const FilterSummary = ({ filteredByList, clearFilteredByList }) => {

From 3e44b7bc3caf9555f7dbf694bc370e4f12fe3ce8 Mon Sep 17 00:00:00 2001
From: piedram <maite.piedrayera@va.gov>
Date: Tue, 2 Apr 2024 13:13:38 -0400
Subject: [PATCH 201/237] change text for the error message in VADOR and Date
 Complered Filter

---
 client/app/queue/QueueDropdownFilter.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/app/queue/QueueDropdownFilter.jsx b/client/app/queue/QueueDropdownFilter.jsx
index f5fa3dddac9..bfec107511d 100644
--- a/client/app/queue/QueueDropdownFilter.jsx
+++ b/client/app/queue/QueueDropdownFilter.jsx
@@ -91,16 +91,16 @@ class QueueDropdownFilter extends React.PureComponent {
     if (currentSelector === 0) {
       if (type === 'fromDate') {
         if (secondaryDate !== '' && date > secondaryDate) {
-          foundErrors = [...foundErrors, { key: type, message: 'Start date must be less than the end date' }];
+          foundErrors = [...foundErrors, { key: type, message: 'From date cannot occur after to date.' }];
         }
       } else if (date < primaryDate) {
-        foundErrors = [...foundErrors, { key: type, message: 'End date must be greater than the start date' }];
+        foundErrors = [...foundErrors, { key: type, message: 'To date cannot occur before from date.' }];
       }
     }
 
     // Prevent the date from being picked past the current day.
     if (convertStringToDate(date) > new Date()) {
-      foundErrors = [...foundErrors, { key: type, message: `${messageText} cannot be in the future.` }];
+      foundErrors = [...foundErrors, { key: type, message: `${messageText} cannot occur in the the future.` }];
     }
 
     if (type === 'fromDate') {

From b80da33f5eead9bf69e805050e89670303b0b4b4 Mon Sep 17 00:00:00 2001
From: Kamala Madamanchi <110078646+kamala-07@users.noreply.github.com>
Date: Tue, 2 Apr 2024 20:49:46 -0500
Subject: [PATCH 202/237] Remove package info banner for regular mail user
 (#21323)

---
 .../CorrespondenceReviewPackage.jsx           | 22 +++++++++++--------
 .../review_package/ReviewPackageCaseTitle.jsx | 21 +++++++++++++-----
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
index 7423d1a8893..05851a9bd6b 100644
--- a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
+++ b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
@@ -38,6 +38,7 @@ export const CorrespondenceReviewPackage = (props) => {
   const [errorMessage, setErrorMessage] = useState('');
   const [selectedId, setSelectedId] = useState(0);
   const [isReadOnly, setIsReadOnly] = useState(false);
+  const [isInboundOpsTeam, setIsInboundOpsTeam] = useState(false);
   const [reviewPackageDetails, setReviewPackageDetails] = useState({
     veteranName: '',
     taksId: [],
@@ -53,17 +54,19 @@ export const CorrespondenceReviewPackage = (props) => {
     // When a remove package task is active and pending review, the page is read-only
     const isPageReadOnly = (tasks) => {
       const assignedRemoveTask = tasks.find((task) => task.status === 'assigned' && task.type === 'RemovePackageTask');
-      const isInboundOpsTeam = correspondence.organizations.find((org) => org.name === 'Inbound Ops Team');
+      const inboundOpsTeam = correspondence.organizations.find((org) => org.name === 'Inbound Ops Team');
 
-      if(assignedRemoveTask) {
+      setIsInboundOpsTeam(Boolean(inboundOpsTeam));
+
+      if (assignedRemoveTask) {
         setReviewPackageDetails((prev) => {
-          return {...prev, taskId: assignedRemoveTask.id}
-          }
-        )
+          return { ...prev, taskId: assignedRemoveTask.id };
+        }
+        );
       }
 
       // Return true if a removePackageTask that is currently assigned is found, else false
-      return (typeof assignedRemoveTask !== 'undefined') && isInboundOpsTeam;
+      return (typeof assignedRemoveTask !== 'undefined');
     };
 
     try {
@@ -87,9 +90,9 @@ export const CorrespondenceReviewPackage = (props) => {
       });
 
       setReviewPackageDetails((prev) => {
-        return { ...prev, veteranName: `${data.veteran_name.first_name} ${data.veteran_name.last_name}`}
-        }
-      )
+        return { ...prev, veteranName: `${data.veteran_name.first_name} ${data.veteran_name.last_name}` };
+      }
+      );
 
       setEditableData({
         notes: data.notes,
@@ -193,6 +196,7 @@ export const CorrespondenceReviewPackage = (props) => {
             correspondence={props.correspondence}
             packageActionModal={packageActionModal}
             isReadOnly={isReadOnly}
+            isInboundOpsTeam={isInboundOpsTeam}
           />
           <ReviewPackageData
             correspondence={props.correspondence}
diff --git a/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx b/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx
index c2119aecc39..cb2e4fabb8a 100644
--- a/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx
+++ b/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx
@@ -57,8 +57,13 @@ const ReviewPackageCaseTitle = (props) => {
 
   return (
     <div>
-      <CaseTitleScaffolding reviewDetails={props.reviewDetails} correspondence_id = {props.correspondence.id} isReadOnly={props.isReadOnly} />
-      <CaseSubTitleScaffolding {...props} isReadOnly={props.isReadOnly} />
+      <CaseTitleScaffolding
+        reviewDetails={props.reviewDetails}
+        correspondence_id={props.correspondence.id}
+        isReadOnly={props.isReadOnly}
+        isInboundOpsTeam={props.isInboundOpsTeam}
+      />
+      <CaseSubTitleScaffolding {...props} isReadOnly={props.isReadOnly} isInboundOpsTeam={props.isInboundOpsTeam} />
     </div>
   );
 };
@@ -79,7 +84,7 @@ const CaseTitleScaffolding = (props) => {
       <h1 {...headerStyling}>{COPY.CORRESPONDENCE_REVIEW_PACKAGE_TITLE}</h1>
 
       <span {...removebotton}>
-        { props.isReadOnly &&
+        { props.isReadOnly && props.isInboundOpsTeam &&
           <Button
             name="Review removal request"
             styling={{ style: { marginRight: '2rem', padding: '15px', fontSize: 'larger' } }}
@@ -133,18 +138,22 @@ ReviewPackageCaseTitle.propTypes = {
   reviewDetails: PropTypes.object,
   handlePackageActionModal: PropTypes.func,
   correspondence: PropTypes.object,
-  isReadOnly: PropTypes.bool
+  isReadOnly: PropTypes.bool,
+  isInboundOpsTeam: PropTypes.bool
 };
 
 CaseSubTitleScaffolding.propTypes = {
   handlePackageActionModal: PropTypes.func,
   packageActionModal: PropTypes.string,
-  isReadOnly: PropTypes.bool
+  isReadOnly: PropTypes.bool,
+  isInboundOpsTeam: PropTypes.bool
 };
 
 CaseTitleScaffolding.propTypes = {
   correspondence_id: PropTypes.number,
-  isReadOnly: PropTypes.bool
+  reviewDetails: PropTypes.object,
+  isReadOnly: PropTypes.bool,
+  isInboundOpsTeam: PropTypes.bool
 };
 
 export default ReviewPackageCaseTitle;

From 536645e62f655ba7e7e9f796a05612e835c97fec Mon Sep 17 00:00:00 2001
From: Kamala Madamanchi <110078646+kamala-07@users.noreply.github.com>
Date: Tue, 2 Apr 2024 20:49:46 -0500
Subject: [PATCH 203/237] Remove package info banner for regular mail user
 (#21323)

---
 .../CorrespondenceReviewPackage.jsx           | 22 +++++++++++--------
 .../review_package/ReviewPackageCaseTitle.jsx | 21 +++++++++++++-----
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
index 7423d1a8893..05851a9bd6b 100644
--- a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
+++ b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
@@ -38,6 +38,7 @@ export const CorrespondenceReviewPackage = (props) => {
   const [errorMessage, setErrorMessage] = useState('');
   const [selectedId, setSelectedId] = useState(0);
   const [isReadOnly, setIsReadOnly] = useState(false);
+  const [isInboundOpsTeam, setIsInboundOpsTeam] = useState(false);
   const [reviewPackageDetails, setReviewPackageDetails] = useState({
     veteranName: '',
     taksId: [],
@@ -53,17 +54,19 @@ export const CorrespondenceReviewPackage = (props) => {
     // When a remove package task is active and pending review, the page is read-only
     const isPageReadOnly = (tasks) => {
       const assignedRemoveTask = tasks.find((task) => task.status === 'assigned' && task.type === 'RemovePackageTask');
-      const isInboundOpsTeam = correspondence.organizations.find((org) => org.name === 'Inbound Ops Team');
+      const inboundOpsTeam = correspondence.organizations.find((org) => org.name === 'Inbound Ops Team');
 
-      if(assignedRemoveTask) {
+      setIsInboundOpsTeam(Boolean(inboundOpsTeam));
+
+      if (assignedRemoveTask) {
         setReviewPackageDetails((prev) => {
-          return {...prev, taskId: assignedRemoveTask.id}
-          }
-        )
+          return { ...prev, taskId: assignedRemoveTask.id };
+        }
+        );
       }
 
       // Return true if a removePackageTask that is currently assigned is found, else false
-      return (typeof assignedRemoveTask !== 'undefined') && isInboundOpsTeam;
+      return (typeof assignedRemoveTask !== 'undefined');
     };
 
     try {
@@ -87,9 +90,9 @@ export const CorrespondenceReviewPackage = (props) => {
       });
 
       setReviewPackageDetails((prev) => {
-        return { ...prev, veteranName: `${data.veteran_name.first_name} ${data.veteran_name.last_name}`}
-        }
-      )
+        return { ...prev, veteranName: `${data.veteran_name.first_name} ${data.veteran_name.last_name}` };
+      }
+      );
 
       setEditableData({
         notes: data.notes,
@@ -193,6 +196,7 @@ export const CorrespondenceReviewPackage = (props) => {
             correspondence={props.correspondence}
             packageActionModal={packageActionModal}
             isReadOnly={isReadOnly}
+            isInboundOpsTeam={isInboundOpsTeam}
           />
           <ReviewPackageData
             correspondence={props.correspondence}
diff --git a/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx b/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx
index c2119aecc39..cb2e4fabb8a 100644
--- a/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx
+++ b/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx
@@ -57,8 +57,13 @@ const ReviewPackageCaseTitle = (props) => {
 
   return (
     <div>
-      <CaseTitleScaffolding reviewDetails={props.reviewDetails} correspondence_id = {props.correspondence.id} isReadOnly={props.isReadOnly} />
-      <CaseSubTitleScaffolding {...props} isReadOnly={props.isReadOnly} />
+      <CaseTitleScaffolding
+        reviewDetails={props.reviewDetails}
+        correspondence_id={props.correspondence.id}
+        isReadOnly={props.isReadOnly}
+        isInboundOpsTeam={props.isInboundOpsTeam}
+      />
+      <CaseSubTitleScaffolding {...props} isReadOnly={props.isReadOnly} isInboundOpsTeam={props.isInboundOpsTeam} />
     </div>
   );
 };
@@ -79,7 +84,7 @@ const CaseTitleScaffolding = (props) => {
       <h1 {...headerStyling}>{COPY.CORRESPONDENCE_REVIEW_PACKAGE_TITLE}</h1>
 
       <span {...removebotton}>
-        { props.isReadOnly &&
+        { props.isReadOnly && props.isInboundOpsTeam &&
           <Button
             name="Review removal request"
             styling={{ style: { marginRight: '2rem', padding: '15px', fontSize: 'larger' } }}
@@ -133,18 +138,22 @@ ReviewPackageCaseTitle.propTypes = {
   reviewDetails: PropTypes.object,
   handlePackageActionModal: PropTypes.func,
   correspondence: PropTypes.object,
-  isReadOnly: PropTypes.bool
+  isReadOnly: PropTypes.bool,
+  isInboundOpsTeam: PropTypes.bool
 };
 
 CaseSubTitleScaffolding.propTypes = {
   handlePackageActionModal: PropTypes.func,
   packageActionModal: PropTypes.string,
-  isReadOnly: PropTypes.bool
+  isReadOnly: PropTypes.bool,
+  isInboundOpsTeam: PropTypes.bool
 };
 
 CaseTitleScaffolding.propTypes = {
   correspondence_id: PropTypes.number,
-  isReadOnly: PropTypes.bool
+  reviewDetails: PropTypes.object,
+  isReadOnly: PropTypes.bool,
+  isInboundOpsTeam: PropTypes.bool
 };
 
 export default ReviewPackageCaseTitle;

From be78a1435e66adafdab2839cb48831f4f9610f44 Mon Sep 17 00:00:00 2001
From: Will Medders <93014155+wmedders21@users.noreply.github.com>
Date: Wed, 3 Apr 2024 10:17:01 -0500
Subject: [PATCH 204/237] Reverse sort package doc type column (#21325)

---
 app/models/task_sorter.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/task_sorter.rb b/app/models/task_sorter.rb
index 01caa2513a4..460340be93f 100644
--- a/app/models/task_sorter.rb
+++ b/app/models/task_sorter.rb
@@ -41,7 +41,8 @@ def sorted_tasks
     when Constants.QUEUE_CONFIG.COLUMNS.CORRESPONDENCE_TASK_CLOSED_DATE.name
       tasks.joins(:appeal).order(closed_at: sort_order.to_sym)
     when Constants.QUEUE_CONFIG.COLUMNS.PACKAGE_DOCUMENT_TYPE.name
-      tasks.joins(:appeal).order(nod: sort_order.to_sym)
+      # Reverse sort since nod is a bool column. However the UI text needs to be sorted by display value.
+      tasks.joins(:appeal).order(nod: reverse_sort_order.to_sym)
     else
       # Always join to the CachedAppeal and users tables because we sometimes need it, joining does not slow down the
       # application, and conditional logic to only join sometimes adds unnecessary complexity.

From 7432bf840b2e05b5ceeba9bfa5ea0d8126b8be8c Mon Sep 17 00:00:00 2001
From: Will Medders <93014155+wmedders21@users.noreply.github.com>
Date: Wed, 3 Apr 2024 10:17:01 -0500
Subject: [PATCH 205/237] Reverse sort package doc type column (#21325)

---
 app/models/task_sorter.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/task_sorter.rb b/app/models/task_sorter.rb
index 01caa2513a4..460340be93f 100644
--- a/app/models/task_sorter.rb
+++ b/app/models/task_sorter.rb
@@ -41,7 +41,8 @@ def sorted_tasks
     when Constants.QUEUE_CONFIG.COLUMNS.CORRESPONDENCE_TASK_CLOSED_DATE.name
       tasks.joins(:appeal).order(closed_at: sort_order.to_sym)
     when Constants.QUEUE_CONFIG.COLUMNS.PACKAGE_DOCUMENT_TYPE.name
-      tasks.joins(:appeal).order(nod: sort_order.to_sym)
+      # Reverse sort since nod is a bool column. However the UI text needs to be sorted by display value.
+      tasks.joins(:appeal).order(nod: reverse_sort_order.to_sym)
     else
       # Always join to the CachedAppeal and users tables because we sometimes need it, joining does not slow down the
       # application, and conditional logic to only join sometimes adds unnecessary complexity.

From d200e1249afe9216359563c97f643d590ed941f8 Mon Sep 17 00:00:00 2001
From: Alex Smith <alex.smith.99@thunderyard.com>
Date: Wed, 3 Apr 2024 09:50:29 -0600
Subject: [PATCH 206/237] Move Auto Assign Button to Correspondence Queue
 (#21324)

* Move Auto Assign Button to Correspondence Queue

* Fix Lint Errors
---
 client/app/queue/OrganizationQueue.jsx                    | 2 --
 client/app/queue/QueueTableBuilder.jsx                    | 6 ------
 client/app/queue/correspondence/CorrespondenceCases.jsx   | 7 ++++++-
 .../correspondence/component/AutoAssignAlertBanner.jsx    | 3 ++-
 .../correspondence/component/BatchAutoAssignButton.jsx    | 8 +++++---
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/client/app/queue/OrganizationQueue.jsx b/client/app/queue/OrganizationQueue.jsx
index 626c52900ad..79ee4a78b73 100644
--- a/client/app/queue/OrganizationQueue.jsx
+++ b/client/app/queue/OrganizationQueue.jsx
@@ -8,7 +8,6 @@ import QueueTableBuilder from './QueueTableBuilder';
 import Alert from '../components/Alert';
 import AppSegment from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/AppSegment';
 import { clearCaseSelectSearch } from '../reader/CaseSelect/CaseSelectActions';
-import AutoAssignAlertBanner from './correspondence/component/AutoAssignAlertBanner';
 
 const containerStyles = css({
   position: 'relative'
@@ -28,7 +27,6 @@ class OrganizationQueue extends React.PureComponent {
 
     return <React.Fragment>
       {success && <Alert styling={alertPaddingStyles} type="success" title={success.title} message={success.detail} />}
-      {featureToggles.correspondence_queue && <AutoAssignAlertBanner />}
       <AppSegment filledBackground styling={containerStyles}>
         <QueueTableBuilder featureToggles={featureToggles} />
       </AppSegment>
diff --git a/client/app/queue/QueueTableBuilder.jsx b/client/app/queue/QueueTableBuilder.jsx
index cc054109078..9029420c3a7 100644
--- a/client/app/queue/QueueTableBuilder.jsx
+++ b/client/app/queue/QueueTableBuilder.jsx
@@ -42,7 +42,6 @@ import COPY from '../../COPY';
 import QUEUE_CONFIG from '../../constants/QUEUE_CONFIG';
 import { css } from 'glamor';
 import { isActiveOrganizationVHA } from '../queue/selectors';
-import BatchAutoAssignButton from './correspondence/component/BatchAutoAssignButton';
 
 const rootStyles = css({
   '.usa-alert + &': {
@@ -211,11 +210,6 @@ const QueueTableBuilder = (props) => {
       label: sprintf(tabConfig.label, totalTaskCount),
       page: (
         <React.Fragment>
-          {props.userCanBulkAssign &&
-          tabConfig.allow_bulk_assign &&
-          props.activeOrganization.type === 'InboundOpsTeam' && (
-            <BatchAutoAssignButton />
-          )}
           <p className="cf-margin-top-0">
             {noCasesMessage || tabConfig.description}
           </p>
diff --git a/client/app/queue/correspondence/CorrespondenceCases.jsx b/client/app/queue/correspondence/CorrespondenceCases.jsx
index 6f0f8d86c32..36235d473df 100644
--- a/client/app/queue/correspondence/CorrespondenceCases.jsx
+++ b/client/app/queue/correspondence/CorrespondenceCases.jsx
@@ -11,6 +11,8 @@ import { css } from 'glamor';
 import CorrespondenceTable from './CorrespondenceTable';
 import QueueOrganizationDropdown from '../components/QueueOrganizationDropdown';
 import Alert from '../../components/Alert';
+import AutoAssignAlertBanner from '../correspondence/component/AutoAssignAlertBanner';
+import BatchAutoAssignButton from '../correspondence/component/BatchAutoAssignButton';
 
 export const CorrespondenceCases = (props) => {
   const {
@@ -46,6 +48,7 @@ export const CorrespondenceCases = (props) => {
 
   return (
     <AppSegment filledBackground>
+      {props.featureToggles.correspondence_queue && <AutoAssignAlertBanner />}
       {(Object.keys(veteranInformation).length > 0) &&
         currentAction.action_type === 'DeleteReviewPackage' &&
         <Alert
@@ -56,6 +59,7 @@ export const CorrespondenceCases = (props) => {
       }
       <h1 {...css({ display: 'inline-block' })}>{COPY.CASE_LIST_TABLE_QUEUE_DROPDOWN_CORRESPONDENCE_CASES}</h1>
       <QueueOrganizationDropdown organizations={organizations} />
+      {props.featureToggles.correspondence_queue && <BatchAutoAssignButton />}
       {vetCorrespondences &&
         <CorrespondenceTable
           vetCorrespondences={vetCorrespondences}
@@ -70,7 +74,8 @@ CorrespondenceCases.propTypes = {
   loadVetCorrespondence: PropTypes.func,
   vetCorrespondences: PropTypes.array,
   currentAction: PropTypes.object,
-  veteranInformation: PropTypes.object
+  veteranInformation: PropTypes.object,
+  featureToggles: PropTypes.object
 };
 
 const mapStateToProps = (state) => ({
diff --git a/client/app/queue/correspondence/component/AutoAssignAlertBanner.jsx b/client/app/queue/correspondence/component/AutoAssignAlertBanner.jsx
index dd6bbdd69b8..7f4aa3ada23 100644
--- a/client/app/queue/correspondence/component/AutoAssignAlertBanner.jsx
+++ b/client/app/queue/correspondence/component/AutoAssignAlertBanner.jsx
@@ -93,12 +93,13 @@ const AutoAssignAlertBanner = (props) => {
 
   return (
     <>
-      { batchId && bannerAlert.message &&
+      {batchId && bannerAlert.message &&
         <Alert
           type={bannerAlert.type}
           title={bannerAlert.title}
           message={bannerAlert.message}
           scrollOnAlert={false}
+          lowerMargin
         />
       }
     </>
diff --git a/client/app/queue/correspondence/component/BatchAutoAssignButton.jsx b/client/app/queue/correspondence/component/BatchAutoAssignButton.jsx
index 870cd5aaff2..02baa853b05 100644
--- a/client/app/queue/correspondence/component/BatchAutoAssignButton.jsx
+++ b/client/app/queue/correspondence/component/BatchAutoAssignButton.jsx
@@ -5,8 +5,10 @@ import COPY from '../../../../COPY';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
-import { setBatchAutoAssignmentAttemptId,
-  setAutoAssignButtonDisabled } from '../correspondenceReducer/reviewPackageActions';
+import {
+  setBatchAutoAssignmentAttemptId,
+  setAutoAssignButtonDisabled
+} from '../correspondenceReducer/reviewPackageActions';
 
 const BatchAutoAssignButton = (props) => {
   const handleAutoAssign = async () => {
@@ -22,7 +24,7 @@ const BatchAutoAssignButton = (props) => {
   };
 
   return (
-    <div>
+    <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
       <Button
         onClick={handleAutoAssign}
         ariaLabel="Auto assign correspondences"

From 139c5c81c14f407df3b4f7300c029dba09fea47c Mon Sep 17 00:00:00 2001
From: piedram <maite.piedrayera@va.gov>
Date: Wed, 3 Apr 2024 11:54:48 -0400
Subject: [PATCH 207/237] testing

---
 client/app/queue/QueueDropdownFilter.jsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/app/queue/QueueDropdownFilter.jsx b/client/app/queue/QueueDropdownFilter.jsx
index bfec107511d..f115cfbdff8 100644
--- a/client/app/queue/QueueDropdownFilter.jsx
+++ b/client/app/queue/QueueDropdownFilter.jsx
@@ -47,6 +47,7 @@ const convertStringToDate = (stringDate) => {
   date.setDate(Number(splitVals[2]));
 
   return date;
+
 };
 
 class QueueDropdownFilter extends React.PureComponent {

From 168c5ea4f586b74974a4e12c542551206e6a8ff2 Mon Sep 17 00:00:00 2001
From: piedram <maite.piedrayera@va.gov>
Date: Wed, 3 Apr 2024 11:55:38 -0400
Subject: [PATCH 208/237] remove space

---
 client/app/queue/QueueDropdownFilter.jsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/app/queue/QueueDropdownFilter.jsx b/client/app/queue/QueueDropdownFilter.jsx
index f115cfbdff8..bfec107511d 100644
--- a/client/app/queue/QueueDropdownFilter.jsx
+++ b/client/app/queue/QueueDropdownFilter.jsx
@@ -47,7 +47,6 @@ const convertStringToDate = (stringDate) => {
   date.setDate(Number(splitVals[2]));
 
   return date;
-
 };
 
 class QueueDropdownFilter extends React.PureComponent {

From c57d047a68de518c1658404ff6b004b3dc915e87 Mon Sep 17 00:00:00 2001
From: divyadasari-va <135847343+divyadasari-va@users.noreply.github.com>
Date: Wed, 3 Apr 2024 12:53:51 -0600
Subject: [PATCH 209/237] Fix for Viewing 1-15 of total number (#21328)

---
 client/app/queue/QueueTable.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/app/queue/QueueTable.jsx b/client/app/queue/QueueTable.jsx
index 395cab3304a..0c9c8e14ea0 100644
--- a/client/app/queue/QueueTable.jsx
+++ b/client/app/queue/QueueTable.jsx
@@ -349,7 +349,7 @@ export default class QueueTable extends React.PureComponent {
     const firstResponse = {
       task_page_count: this.props.numberOfPages,
       tasks_per_page: this.props.casesPerPage,
-      total_task_count: this.props.rowObjects.length,
+      total_task_count: this.props.totalTaskCount,
       tasks: this.props.rowObjects
     };
 

From 89c006de884bad67adbb4e1a0e32475b49d85cc6 Mon Sep 17 00:00:00 2001
From: Alex Smith <alex.smith.99@thunderyard.com>
Date: Wed, 3 Apr 2024 14:30:42 -0600
Subject: [PATCH 210/237] Asmith/appeals 43476 uat integration (#21327)

* Move Auto Assign Button to Correspondence Queue (#21324)

* Move Auto Assign Button to Correspondence Queue

* Fix Lint Errors

* Include RunAsyncable

---------

Co-authored-by: cacevesva <109166981+cacevesva@users.noreply.github.com>
---
 app/controllers/correspondence_controller.rb       |  2 ++
 client/app/queue/OrganizationQueue.jsx             |  2 --
 client/app/queue/QueueTableBuilder.jsx             |  6 ------
 .../queue/correspondence/CorrespondenceCases.jsx   |  6 ++++--
 .../component/AutoAssignAlertBanner.jsx            |  3 ++-
 .../component/BatchAutoAssignButton.jsx            |  8 +++++---
 client/constants/QUEUE_CONFIG.json                 | 14 --------------
 7 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index 5d299613ce3..8a62ae8265c 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -3,6 +3,8 @@
 # :reek:RepeatedConditional
 class CorrespondenceController < ApplicationController
   include CorrespondenceControllerUtil
+  include RunAsyncable
+
   before_action :verify_correspondence_access
   before_action :verify_feature_toggle
   before_action :correspondence
diff --git a/client/app/queue/OrganizationQueue.jsx b/client/app/queue/OrganizationQueue.jsx
index 626c52900ad..79ee4a78b73 100644
--- a/client/app/queue/OrganizationQueue.jsx
+++ b/client/app/queue/OrganizationQueue.jsx
@@ -8,7 +8,6 @@ import QueueTableBuilder from './QueueTableBuilder';
 import Alert from '../components/Alert';
 import AppSegment from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/AppSegment';
 import { clearCaseSelectSearch } from '../reader/CaseSelect/CaseSelectActions';
-import AutoAssignAlertBanner from './correspondence/component/AutoAssignAlertBanner';
 
 const containerStyles = css({
   position: 'relative'
@@ -28,7 +27,6 @@ class OrganizationQueue extends React.PureComponent {
 
     return <React.Fragment>
       {success && <Alert styling={alertPaddingStyles} type="success" title={success.title} message={success.detail} />}
-      {featureToggles.correspondence_queue && <AutoAssignAlertBanner />}
       <AppSegment filledBackground styling={containerStyles}>
         <QueueTableBuilder featureToggles={featureToggles} />
       </AppSegment>
diff --git a/client/app/queue/QueueTableBuilder.jsx b/client/app/queue/QueueTableBuilder.jsx
index 898495039e7..0c0186aadb5 100644
--- a/client/app/queue/QueueTableBuilder.jsx
+++ b/client/app/queue/QueueTableBuilder.jsx
@@ -42,7 +42,6 @@ import COPY from '../../COPY';
 import QUEUE_CONFIG from '../../constants/QUEUE_CONFIG';
 import { css } from 'glamor';
 import { isActiveOrganizationVHA } from '../queue/selectors';
-import BatchAutoAssignButton from './correspondence/component/BatchAutoAssignButton';
 
 const rootStyles = css({
   '.usa-alert + &': {
@@ -211,11 +210,6 @@ const QueueTableBuilder = (props) => {
       label: sprintf(tabConfig.label, totalTaskCount),
       page: (
         <React.Fragment>
-          {props.userCanBulkAssign &&
-          tabConfig.allow_bulk_assign &&
-          props.activeOrganization.type === 'InboundOpsTeam' && (
-            <BatchAutoAssignButton />
-          )}
           <p className="cf-margin-top-0">
             {noCasesMessage || tabConfig.description}
           </p>
diff --git a/client/app/queue/correspondence/CorrespondenceCases.jsx b/client/app/queue/correspondence/CorrespondenceCases.jsx
index e16996a3f73..1b1c40b2cff 100644
--- a/client/app/queue/correspondence/CorrespondenceCases.jsx
+++ b/client/app/queue/correspondence/CorrespondenceCases.jsx
@@ -15,6 +15,7 @@ import Modal from 'app/components/Modal';
 import RadioFieldWithChildren from '../../components/RadioFieldWithChildren';
 import ReactSelectDropdown from '../../components/ReactSelectDropdown';
 import TextareaField from '../../components/TextareaField';
+import AutoAssignAlertBanner from '../correspondence/component/AutoAssignAlertBanner';
 
 const CorrespondenceCases = (props) => {
   const dispatch = useDispatch();
@@ -222,6 +223,7 @@ const CorrespondenceCases = (props) => {
         />
       )}
       <AppSegment filledBackground>
+        {props.featureToggles.correspondence_queue && <AutoAssignAlertBanner />}
         {(veteranInformation?.veteranName?.firstName && veteranInformation?.veteranName?.lastName) &&
           currentAction.action_type === 'DeleteReviewPackage' && (
           <Alert
@@ -293,8 +295,8 @@ CorrespondenceCases.propTypes = {
   taskIds: PropTypes.array,
   isMailTeamUser: PropTypes.bool,
   isMailSuperUser: PropTypes.bool,
-  isMailSupervisor: PropTypes.bool
-
+  isMailSupervisor: PropTypes.bool,
+  featureToggles: PropTypes.object
 };
 
 export default CorrespondenceCases;
diff --git a/client/app/queue/correspondence/component/AutoAssignAlertBanner.jsx b/client/app/queue/correspondence/component/AutoAssignAlertBanner.jsx
index dd6bbdd69b8..7f4aa3ada23 100644
--- a/client/app/queue/correspondence/component/AutoAssignAlertBanner.jsx
+++ b/client/app/queue/correspondence/component/AutoAssignAlertBanner.jsx
@@ -93,12 +93,13 @@ const AutoAssignAlertBanner = (props) => {
 
   return (
     <>
-      { batchId && bannerAlert.message &&
+      {batchId && bannerAlert.message &&
         <Alert
           type={bannerAlert.type}
           title={bannerAlert.title}
           message={bannerAlert.message}
           scrollOnAlert={false}
+          lowerMargin
         />
       }
     </>
diff --git a/client/app/queue/correspondence/component/BatchAutoAssignButton.jsx b/client/app/queue/correspondence/component/BatchAutoAssignButton.jsx
index 870cd5aaff2..02baa853b05 100644
--- a/client/app/queue/correspondence/component/BatchAutoAssignButton.jsx
+++ b/client/app/queue/correspondence/component/BatchAutoAssignButton.jsx
@@ -5,8 +5,10 @@ import COPY from '../../../../COPY';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
-import { setBatchAutoAssignmentAttemptId,
-  setAutoAssignButtonDisabled } from '../correspondenceReducer/reviewPackageActions';
+import {
+  setBatchAutoAssignmentAttemptId,
+  setAutoAssignButtonDisabled
+} from '../correspondenceReducer/reviewPackageActions';
 
 const BatchAutoAssignButton = (props) => {
   const handleAutoAssign = async () => {
@@ -22,7 +24,7 @@ const BatchAutoAssignButton = (props) => {
   };
 
   return (
-    <div>
+    <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
       <Button
         onClick={handleAutoAssign}
         ariaLabel="Auto assign correspondences"
diff --git a/client/constants/QUEUE_CONFIG.json b/client/constants/QUEUE_CONFIG.json
index 36ef3de8a39..f8fc50cee34 100644
--- a/client/constants/QUEUE_CONFIG.json
+++ b/client/constants/QUEUE_CONFIG.json
@@ -23,23 +23,18 @@
   "READY_FOR_REVIEW_TASKS_TAB_NAME": "readyForReviewTab",
   "VHA_PO_ON_HOLD_TASKS_TAB_NAME": "po_on_hold",
   "VHA_PO_COMPLETED_TASKS_TAB_NAME": "po_completed",
-
   "CASE_LIST_TABLE_QUEUE_DROPDOWN_OWN_CORRESPONDENCE_LABEL": "Your Correspondence",
   "CASE_LIST_TABLE_QUEUE_DROPDOWN_OWN_CASES_LABEL": "Your cases",
   "CASE_LIST_TABLE_QUEUE_DROPDOWN_CORRESPONDENCE_CASES": "Correspondence Cases",
-
   "EDUCATION_RPO_ASSIGNED_TASKS_TAB_NAME": "education_rpo_assigned",
   "EDUCATION_RPO_IN_PROGRESS_TASKS_TAB_NAME": "education_rpo_in_progress",
   "EDUCATION_RPO_COMPLETED_TASKS_TAB_NAME": "education_rpo_completed",
-
   "EDUCATION_EMO_UNASSIGNED_TASKS_TAB_NAME": "education_emo_unassigned",
   "EDUCATION_EMO_ASSIGNED_TASKS_TAB_NAME": "education_emo_assigned",
   "EDUCATION_EMO_COMPLETED_TASKS_TAB_NAME": "education_emo_completed",
-
   "CAREGIVER_SUPPORT_UNASSIGNED_TASK_TAB_NAME": "vha_caregiver_support_unassigned",
   "CAREGIVER_SUPPORT_IN_PROGRESS_TASKS_TAB_NAME": "caregiver_support_in_progress",
   "CAREGIVER_SUPPORT_COMPLETED_TASKS_TAB_NAME": "caregiver_support_completed",
-
   "CORRESPONDENCE_ASSIGNED_TASKS_LABEL": "Assigned",
   "CORRESPONDENCE_COMPLETED_TASKS_LABEL": "Completed",
   "CORRESPONDENCE_IN_PROGRESS_TASKS_LABEL": "In Progress",
@@ -48,7 +43,6 @@
   "CORRESPONDENCE_TEAM_COMPLETED_TASKS_LABEL": "Completed",
   "CORRESPONDENCE_PENDING_TASKS_LABEL": "Pending",
   "CORRESPONDENCE_UNASSIGNED_TASKS_LABEL": "Unassigned",
-
   "CORRESPONDENCE_ASSIGNED_TASKS_TAB_NAME": "correspondence_assigned",
   "CORRESPONDENCE_COMPLETED_TASKS_TAB_NAME": "correspondence_completed",
   "CORRESPONDENCE_IN_PROGRESS_TASKS_TAB_NAME": "correspondence_in_progress",
@@ -57,7 +51,6 @@
   "CORRESPONDENCE_TEAM_COMPLETED_TASKS_TAB_NAME": "correspondence_team_completed",
   "CORRESPONDENCE_PENDING_TASKS_TAB_NAME": "correspondence_pending",
   "CORRESPONDENCE_UNASSIGNED_TASKS_TAB_NAME": "correspondence_unassigned",
-
   "CORRESPONDENCE_ASSIGNED_TASKS_DESCRIPTION": "Correspondence assigned to you:",
   "CORRESPONDENCE_COMPLETED_TASKS_DESCRIPTION": "Completed correspondence:",
   "CORRESPONDENCE_IN_PROGRESS_TASKS_DESCRIPTION": "Correspondence in progress that are assigned to you:",
@@ -66,11 +59,8 @@
   "CORRESPONDENCE_TEAM_COMPLETED_TASKS_DESCRIPTION": "Completed correspondence:",
   "CORRESPONDENCE_PENDING_TASKS_DESCRIPTION": "Correspondence that is currently assigned to non-mail team users:",
   "CORRESPONDENCE_UNASSIGNED_TASKS_DESCRIPTION": "Correspondence owned by the Mail team are unassigned to an individual:",
-
   "CORRESPONDENCE_ORG_TABLE_TITLE": "Correspondence Cases",
   "CORRESPONDENCE_USER_TABLE_TITLE": "Your Correspondence",
-
-
   "COLUMNS": {
     "ACTION_TYPE": {
       "name": "actionType",
@@ -232,21 +222,17 @@
       "sorting_columns": ["type", "action", "created_at"]
     }
   },
-
   "TAB_NAME_REQUEST_PARAM": "tab",
   "PAGE_NUMBER_REQUEST_PARAM": "page",
   "SORT_COLUMN_REQUEST_PARAM": "sort_by",
   "SORT_DIRECTION_REQUEST_PARAM": "order",
   "FILTER_COLUMN_REQUEST_PARAM": "filter",
   "SEARCH_QUERY_REQUEST_PARAM": "search_query",
-
   "COLUMN_SORT_ORDER_ASC": "asc",
   "COLUMN_SORT_ORDER_DESC": "desc",
-
   "DEFAULT_SORTING_COLUMN_KEY": "sortColName",
   "DEFAULT_SORTING_DIRECTION_KEY": "sortAscending",
   "BLANK_FILTER_KEY_VALUE": "None",
-
   "FILTER_OPTIONS": {
     "IS_AOD": {
       "key": "is_aod"

From 7aad0d30e74f081f4d80a6070fd2d24df901a3a2 Mon Sep 17 00:00:00 2001
From: Alex Smith <alex.smith.99@thunderyard.com>
Date: Wed, 3 Apr 2024 17:39:38 -0600
Subject: [PATCH 211/237] Fix Broken Specs in Combo Branch (#21331)

* Move Auto Assign Button to Correspondence Queue (#21324)

* Move Auto Assign Button to Correspondence Queue

* Fix Lint Errors

* Include RunAsyncable

* Fix Broken Task Factories

---------

Co-authored-by: cacevesva <109166981+cacevesva@users.noreply.github.com>
---
 spec/factories/task.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/spec/factories/task.rb b/spec/factories/task.rb
index d36f0e4b4ff..17161c27a27 100644
--- a/spec/factories/task.rb
+++ b/spec/factories/task.rb
@@ -623,15 +623,23 @@ def self.find_first_task_or_create(appeal, task_type, **kwargs)
       end
 
       factory :review_package_task, class: ReviewPackageTask do
+        appeal { create(:correspondence) }
+        appeal_type { Correspondence.name }
       end
 
       factory :merge_package_task, class: MergePackageTask do
+        appeal { create(:correspondence) }
+        appeal_type { Correspondence.name }
       end
 
       factory :reassign_package_task, class: ReassignPackageTask do
+        appeal { create(:correspondence) }
+        appeal_type { Correspondence.name }
       end
 
       factory :split_package_task, class: SplitPackageTask do
+        appeal { create(:correspondence) }
+        appeal_type { Correspondence.name }
       end
 
       factory :efolder_upload_failed_task, class: EfolderUploadFailedTask do

From df9af549fa1ae912880ec49fca330e9f505f9d92 Mon Sep 17 00:00:00 2001
From: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
Date: Thu, 4 Apr 2024 09:38:09 -0400
Subject: [PATCH 212/237] APPEALS-42953: Renamed correspondences_appeal to
 correspondence_appeal (#21329)

* replaced correspondences_appeals with correspondence_appeal

* added safe indecies to new correspondence_appeals table

* updated correspondence_appeal namespace

---------

Co-authored-by: Jim Foley <james.foley4@va.gov>
---
 app/models/appeal.rb                          |  4 +--
 app/models/correspondence.rb                  |  4 +--
 ...ces_appeal.rb => correspondence_appeal.rb} |  2 +-
 app/queries/appeals_updated_since_query.rb    |  2 +-
 .../correspondence_intake_processor.rb        |  2 +-
 ...403154413_create_correspondence_appeals.rb | 26 +++++++++++++++++++
 ..._safe_indices_to_correspondence_appeals.rb |  6 +++++
 db/schema.rb                                  | 24 ++++++++---------
 .../correspondence/submit_intake_form_spec.rb |  2 +-
 ..._spec.rb => correspondence_appeal_spec.rb} |  6 ++---
 10 files changed, 55 insertions(+), 23 deletions(-)
 rename app/models/{correspondences_appeal.rb => correspondence_appeal.rb} (63%)
 create mode 100644 db/migrate/20240403154413_create_correspondence_appeals.rb
 create mode 100644 db/migrate/20240403160601_add_safe_indices_to_correspondence_appeals.rb
 rename spec/models/{correspondences_appeal_spec.rb => correspondence_appeal_spec.rb} (81%)

diff --git a/app/models/appeal.rb b/app/models/appeal.rb
index a6e4fc04c44..ea98df37fb2 100644
--- a/app/models/appeal.rb
+++ b/app/models/appeal.rb
@@ -25,8 +25,8 @@ class Appeal < DecisionReview
   has_many :email_recipients, class_name: "HearingEmailRecipient"
   has_many :available_hearing_locations, as: :appeal, class_name: "AvailableHearingLocations"
   has_many :vbms_uploaded_documents, as: :appeal
-  has_many :correspondences_appeals
-  has_many :correspondences, through: :correspondences_appeals
+  has_many :correspondence_appeals
+  has_many :correspondences, through: :correspondence_appeals
 
   # decision_documents is effectively a has_one until post decisional motions are supported
   has_many :decision_documents, as: :appeal
diff --git a/app/models/correspondence.rb b/app/models/correspondence.rb
index dabc983b82c..cdd7f4d9bf6 100644
--- a/app/models/correspondence.rb
+++ b/app/models/correspondence.rb
@@ -13,8 +13,8 @@ class Correspondence < CaseflowRecord
 
   has_many :correspondence_documents, dependent: :destroy
   has_many :correspondence_intakes, dependent: :destroy
-  has_many :correspondences_appeals, dependent: :destroy
-  has_many :appeals, through: :correspondences_appeals
+  has_many :correspondence_appeals, dependent: :destroy
+  has_many :appeals, through: :correspondence_appeals
   has_many :correspondence_relations, dependent: :destroy
   has_many :related_correspondences, through: :correspondence_relations, dependent: :destroy
   belongs_to :correspondence_type
diff --git a/app/models/correspondences_appeal.rb b/app/models/correspondence_appeal.rb
similarity index 63%
rename from app/models/correspondences_appeal.rb
rename to app/models/correspondence_appeal.rb
index 907d172467b..c173ffad44b 100644
--- a/app/models/correspondences_appeal.rb
+++ b/app/models/correspondence_appeal.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class CorrespondencesAppeal < ApplicationRecord
+class CorrespondenceAppeal < ApplicationRecord
   belongs_to :correspondence
   belongs_to :appeal
 end
diff --git a/app/queries/appeals_updated_since_query.rb b/app/queries/appeals_updated_since_query.rb
index 58086203751..9cdd909fa22 100644
--- a/app/queries/appeals_updated_since_query.rb
+++ b/app/queries/appeals_updated_since_query.rb
@@ -26,7 +26,7 @@ def call
     request_decision_issues
     request_issues_updates
     vbms_uploaded_documents
-    correspondences_appeals
+    correspondence_appeals
     correspondences
   ].freeze
 
diff --git a/app/services/correspondence_intake_processor.rb b/app/services/correspondence_intake_processor.rb
index b7615ebf37b..5babb7b69a4 100644
--- a/app/services/correspondence_intake_processor.rb
+++ b/app/services/correspondence_intake_processor.rb
@@ -52,7 +52,7 @@ def create_correspondence_relations(intake_params, correspondence_id)
 
   def link_appeals_to_correspondence(intake_params, correspondence_id)
     intake_params[:related_appeal_ids]&.map do |appeal_id|
-      CorrespondencesAppeal.find_or_create_by(correspondence_id: correspondence_id, appeal_id: appeal_id)
+      CorrespondenceAppeal.find_or_create_by(correspondence_id: correspondence_id, appeal_id: appeal_id)
     end
   end
 
diff --git a/db/migrate/20240403154413_create_correspondence_appeals.rb b/db/migrate/20240403154413_create_correspondence_appeals.rb
new file mode 100644
index 00000000000..21b5fcfae54
--- /dev/null
+++ b/db/migrate/20240403154413_create_correspondence_appeals.rb
@@ -0,0 +1,26 @@
+class CreateCorrespondenceAppeals < ActiveRecord::Migration[6.0]
+  def change
+    revert do
+      reversible do |direction|
+        direction.up do
+          create_table :correspondences_appeals do |t|
+            t.references :correspondence, foreign_key: true, index: false
+            t.references :appeal, foreign_key: true, index: false
+
+            t.timestamps
+          end
+        end
+        direction.down do
+         drop_table :correspondences_appeals
+        end
+      end
+    end
+
+    create_table :correspondence_appeals do |t|
+      t.references :correspondence, foreign_key: true, index: false
+      t.references :appeal, foreign_key: true, index: false
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20240403160601_add_safe_indices_to_correspondence_appeals.rb b/db/migrate/20240403160601_add_safe_indices_to_correspondence_appeals.rb
new file mode 100644
index 00000000000..05a99f2e3b7
--- /dev/null
+++ b/db/migrate/20240403160601_add_safe_indices_to_correspondence_appeals.rb
@@ -0,0 +1,6 @@
+class AddSafeIndicesToCorrespondenceAppeals < Caseflow::Migration
+  def change
+    add_safe_index :correspondence_appeals, :correspondence_id, name: "index on correspondence_id"
+    add_safe_index :correspondence_appeals, :appeal_id, name: "index on appeal_id"
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 583bfe14357..40364582b66 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2024_02_29_165212) do
+ActiveRecord::Schema.define(version: 2024_04_03_160601) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -623,6 +623,15 @@
     t.index ["updated_by_id"], name: "index_updated_by_id"
   end
 
+  create_table "correspondence_appeals", force: :cascade do |t|
+    t.bigint "appeal_id"
+    t.bigint "correspondence_id"
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["appeal_id"], name: "index on appeal_id"
+    t.index ["correspondence_id"], name: "index on correspondence_id"
+  end
+
   create_table "correspondence_documents", force: :cascade do |t|
     t.bigint "correspondence_id"
     t.datetime "created_at", null: false, comment: "Date and Time of creation."
@@ -685,15 +694,6 @@
     t.index ["veteran_id"], name: "index_correspondences_on_veteran_id"
   end
 
-  create_table "correspondences_appeals", force: :cascade do |t|
-    t.bigint "appeal_id"
-    t.bigint "correspondence_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["appeal_id"], name: "index on appeal_id"
-    t.index ["correspondence_id"], name: "index on correspondence_id"
-  end
-
   create_table "decision_documents", force: :cascade do |t|
     t.bigint "appeal_id", null: false
     t.string "appeal_type"
@@ -2321,6 +2321,8 @@
   add_foreign_key "conference_links", "hearing_days"
   add_foreign_key "conference_links", "users", column: "created_by_id"
   add_foreign_key "conference_links", "users", column: "updated_by_id"
+  add_foreign_key "correspondence_appeals", "appeals"
+  add_foreign_key "correspondence_appeals", "correspondences"
   add_foreign_key "correspondence_documents", "correspondences"
   add_foreign_key "correspondence_intakes", "correspondences"
   add_foreign_key "correspondence_intakes", "users"
@@ -2331,8 +2333,6 @@
   add_foreign_key "correspondences", "users", column: "assigned_by_id"
   add_foreign_key "correspondences", "users", column: "updated_by_id"
   add_foreign_key "correspondences", "veterans"
-  add_foreign_key "correspondences_appeals", "appeals"
-  add_foreign_key "correspondences_appeals", "correspondences"
   add_foreign_key "dispatch_tasks", "legacy_appeals", column: "appeal_id"
   add_foreign_key "dispatch_tasks", "users"
   add_foreign_key "distributed_cases", "distributions"
diff --git a/spec/feature/queue/correspondence/submit_intake_form_spec.rb b/spec/feature/queue/correspondence/submit_intake_form_spec.rb
index 15f82f2c83f..a84ae693e83 100644
--- a/spec/feature/queue/correspondence/submit_intake_form_spec.rb
+++ b/spec/feature/queue/correspondence/submit_intake_form_spec.rb
@@ -163,7 +163,7 @@
           expect(page).to have_content("You have successfully submitted a correspondence record")
         end
 
-        eswt = EvidenceSubmissionWindowTask.find_by(appeal_id: CorrespondencesAppeal.first.appeal_id)
+        eswt = EvidenceSubmissionWindowTask.find_by(appeal_id: CorrespondenceAppeal.first.appeal_id)
         expect(eswt.status).to eq("completed")
       end
     end
diff --git a/spec/models/correspondences_appeal_spec.rb b/spec/models/correspondence_appeal_spec.rb
similarity index 81%
rename from spec/models/correspondences_appeal_spec.rb
rename to spec/models/correspondence_appeal_spec.rb
index 8f272b3da0f..4ebce92fcf5 100644
--- a/spec/models/correspondences_appeal_spec.rb
+++ b/spec/models/correspondence_appeal_spec.rb
@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
-RSpec.describe CorrespondencesAppeal, type: :model do
+RSpec.describe CorrespondenceAppeal, type: :model do
   let(:correspondence) { create(:correspondence) }
   let(:appeal) { create(:appeal, veteran: create(:veteran)) }
 
   before do
-    @subject = CorrespondencesAppeal.create!(
+    @subject = CorrespondenceAppeal.create!(
       correspondence_id: correspondence.id,
       appeal_id: appeal.id
     )
   end
 
   it "exists" do
-    expect(@subject).to be_a(CorrespondencesAppeal)
+    expect(@subject).to be_a(CorrespondenceAppeal)
   end
 
   it "belongs to a correspondence" do

From 19830081944c09b23e4e484f3a441369f5477c20 Mon Sep 17 00:00:00 2001
From: sulak-j <95875751+sulak-j@users.noreply.github.com>
Date: Thu, 4 Apr 2024 13:22:10 -0500
Subject: [PATCH 213/237] Justin/appeals 42114 (#21297)

* Moving the queue method to a new controller

* updating routing to the queue controller

* Creating a spec file but leaving it empty for future changes

* added a test for the correspondence_cases route

---------

Co-authored-by: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
---
 app/controllers/correspondence_controller.rb  | 15 -------------
 .../correspondence_queue_controller.rb        | 18 ++++++++++++++++
 config/routes.rb                              |  2 +-
 .../correspondence_queue_controller_spec.rb   | 21 +++++++++++++++++++
 4 files changed, 40 insertions(+), 16 deletions(-)
 create mode 100644 app/controllers/correspondence_queue_controller.rb
 create mode 100644 spec/controllers/correspondence_queue_controller_spec.rb

diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index 8e01924940b..f146263f07c 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -9,21 +9,6 @@ class CorrespondenceController < ApplicationController
   before_action :auto_texts
   before_action :veteran_information
 
-  def correspondence_cases
-    if current_user.mail_supervisor?
-      redirect_to "/queue/correspondence/team"
-    elsif current_user.mail_superuser? || current_user.mail_team_user?
-      respond_to do |format|
-        format.html { "your_correspondence" }
-        format.json do
-          render json: { correspondence_config: CorrespondenceConfig.new(assignee: current_user) }
-        end
-      end
-    else
-      redirect_to "/unauthorized"
-    end
-  end
-
   def mail_team_users
     mail_team_users = User.mail_team_users
     respond_to do |format|
diff --git a/app/controllers/correspondence_queue_controller.rb b/app/controllers/correspondence_queue_controller.rb
new file mode 100644
index 00000000000..4daa3aa10b2
--- /dev/null
+++ b/app/controllers/correspondence_queue_controller.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class CorrespondenceQueueController < CorrespondenceController
+  def correspondence_cases
+    if current_user.mail_supervisor?
+      redirect_to "/queue/correspondence/team"
+    elsif current_user.mail_superuser? || current_user.mail_team_user?
+      respond_to do |format|
+        format.html { "your_correspondence" }
+        format.json do
+          render json: { correspondence_config: CorrespondenceConfig.new(assignee: current_user) }
+        end
+      end
+    else
+      redirect_to "/unauthorized"
+    end
+  end
+end
diff --git a/config/routes.rb b/config/routes.rb
index 987744767cd..32f04f46747 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -323,7 +323,7 @@
 
   scope path: '/queue' do
     get '/', to: 'queue#index'
-    get '/correspondence', to: 'correspondence#correspondence_cases'
+    get '/correspondence', to: 'correspondence_queue#correspondence_cases'
     get '/correspondence/:correspondence_uuid/intake', to: 'correspondence_intake#intake', as: :queue_correspondence_intake
     post '/correspondence/:correspondence_uuid/current_step', to: 'correspondence_intake#current_step', as: :queue_correspondence_intake_current_step
     post '/correspondence/:correspondence_uuid/correspondence_intake_task', to: 'correspondence_tasks#create_correspondence_intake_task'
diff --git a/spec/controllers/correspondence_queue_controller_spec.rb b/spec/controllers/correspondence_queue_controller_spec.rb
new file mode 100644
index 00000000000..6f962d0b028
--- /dev/null
+++ b/spec/controllers/correspondence_queue_controller_spec.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+RSpec.describe CorrespondenceQueueController, :all_dbs, type: :controller do
+  let(:current_user) { create(:user) }
+
+  before do
+    FeatureToggle.enable!(:correspondence_queue)
+  end
+
+  describe "GET #correspondence_cases" do
+    before do
+      MailTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+      get :correspondence_cases
+    end
+
+    it "returns a successful response" do
+      expect(response).to have_http_status(:ok)
+    end
+  end
+end

From eae63f53bb02015c5f5ac5e6b253c06705943778 Mon Sep 17 00:00:00 2001
From: Dev-KRedd <134650238+Dev-KRedd@users.noreply.github.com>
Date: Thu, 4 Apr 2024 16:45:49 -0400
Subject: [PATCH 214/237] Review Package: Reassign Package APPEALS-36344
 (#21321)

* changed contents of correspondence seed notes (#21259)
<!-- Change JIRA-12345 to reflect the URL of the Jira item this PR is associated with -->
Resolves [Jira Issue Title](https://jira.devops.va.gov/browse/JIRA-12345)

# Description
Please explain the changes you made here.

## Acceptance Criteria
- [ ] Code compiles correctly

## Testing Plan
<!-- Change JIRA-12345 to reflect the URL of the location of the test plan(s) for this PR -->
1. Go to [Jira Issue/Test Plan Link](https://jira.devops.va.gov/browse/JIRA-12345) or list them below

- [ ] For feature branches merging into master: Was this deployed to UAT?

# Frontend
## User Facing Changes
 - [ ] Screenshots of UI changes added to PR & Original Issue

 BEFORE|AFTER
 ---|---

## Storybook Story
*For Frontend (Presentation) Components*
* [ ] Add a [Storybook](https://github.com/department-of-veterans-affairs/caseflow/wiki/Documenting-React-Components-with-Storybook) file alongside the component file (e.g. create `MyComponent.stories.js` alongside `MyComponent.jsx`)
* [ ] Give it a title that reflects the component's location within the overall Caseflow hierarchy
* [ ] Write a separate story (within the same file) for each discrete variation of the component

# Backend
## Database Changes
*Only for Schema Changes*

* [ ] Add typical timestamps (`created_at`, `updated_at`) for new tables
* [ ] Update column comments; include a "PII" prefix to indicate definite or potential [PII data content](https://github.com/department-of-veterans-affairs/appeals-team/blob/master/caseflow-team/0-how-we-work/pii-handbook.md#what-is-pii)
* [ ] Have your migration classes inherit from `Caseflow::Migration`, especially when adding indexes (use `add_safe_index`) (see [Writing DB migrations](https://github.com/department-of-veterans-affairs/caseflow/wiki/Writing-DB-migrations))
* [ ] Verify that `migrate:rollback` works as desired ([`change` supported functions](https://edgeguides.rubyonrails.org/active_record_migrations.html#using-the-change-method))
* [ ] Perform query profiling (eyeball Rails log, check bullet and fasterer output)
* [ ] For queries using raw sql was an explain plan run by System Team
* [ ] Add appropriate indexes (especially for foreign keys, polymorphic columns, unique constraints, and Rails scopes)
* [ ] Run `make check-fks`; add any missing foreign keys or add to `config/initializers/immigrant.rb` (see [Record associations and Foreign Keys](https://github.com/department-of-veterans-affairs/caseflow/wiki/Record-associations-and-Foreign-Keys))
* [ ] Add `belongs_to` for associations to enable the [schema diagrams](https://department-of-veterans-affairs.github.io/caseflow/task_trees/schema/schema_diagrams) to be automatically updated
* [ ] Document any non-obvious semantics or logic useful for interpreting database data at [Caseflow Data Model and Dictionary](https://github.com/department-of-veterans-affairs/caseflow/wiki/Caseflow-Data-Model-and-Dictionary)

## Integrations: Adding endpoints for external APIs
* [ ] Check that Caseflow's external API code for the endpoint matches the code in the relevant integration repo
  * [ ] Request: Service name, method name, input field names
  * [ ] Response: Check expected data structure
  * [ ] Check that calls are wrapped in MetricService record block
* [ ] Check that all configuration is coming from ENV variables
  * [ ] Listed all new ENV variables in description
  * [ ] Worked with or notified System Team that new ENV variables need to be set
* [ ] Update Fakes
* [ ] For feature branches: Was this tested in Caseflow UAT

# Best practices
## Code Documentation Updates
- [ ] Add or update code comments at the top of the class, module, and/or component.

## Tests
### Test Coverage
Did you include any test coverage for your code? Check below:
- [ ] RSpec
- [ ] Jest
- [ ] Other

### Code Climate
Your code does not add any new code climate offenses? If so why?
- [ ] No new code climate issues added

## Monitoring, Logging, Auditing, Error, and Exception Handling Checklist

### Monitoring
- [ ] Are performance metrics (e.g., response time, throughput) being tracked?
- [ ] Are key application components monitored (e.g., database, cache, queues)?
- [ ] Is there a system in place for setting up alerts based on performance thresholds?

### Logging
- [ ] Are logs being produced at appropriate log levels (debug, info, warn, error, fatal)?
- [ ] Are logs structured (e.g., using log tags) for easier querying and analysis?
- [ ] Are sensitive data (e.g., passwords, tokens) redacted or omitted from logs?
- [ ] Is log retention and rotation configured correctly?
- [ ] Are logs being forwarded to a centralized logging system if needed?

### Auditing
- [ ] Are user actions being logged for audit purposes?
- [ ] Are changes to critical data being tracked ?
- [ ] Are logs being securely stored and protected from tampering or exposing protected data?

### Error Handling
- [ ] Are errors being caught and handled gracefully?
- [ ] Are appropriate error messages being displayed to users?
- [ ] Are critical errors being reported to an error tracking system (e.g., Sentry, ELK)?
- [ ] Are unhandled exceptions being caught at the application level ?

### Exception Handling
- [ ] Are custom exceptions defined and used where appropriate?
- [ ] Is exception handling consistent throughout the codebase?
- [ ] Are exceptions logged with relevant context and stack trace information?
- [ ] Are exceptions being grouped and categorized for easier analysis and resolution?

* WIP

* Working as intended

* Spec tests

* Added instructions to modal

* Linting Errors

* Addressing comments

---------

Co-authored-by: Jim Foley <james.foley4@va.gov>
Co-authored-by: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
---
 app/controllers/correspondence_controller.rb  |   1 +
 .../correspondence/review_package.html.erb    |   1 +
 client/COPY.json                              |   2 +
 client/app/queue/QueueApp.jsx                 |   8 +-
 .../component/ReassignPackageModal.jsx        | 267 ++++++++++++++++++
 .../component/RemovePackageModal.jsx          |   6 +-
 .../reviewPackageActions.js                   |  20 ++
 .../reviewPackageConstants.js                 |   2 +
 .../reviewPackageReducer.js                   |  19 +-
 .../CorrespondenceReviewPackage.jsx           |  25 +-
 .../review_package/ReviewPackageCaseTitle.jsx |  65 ++++-
 .../correspondence_cases_spec.rb              |  23 ++
 12 files changed, 418 insertions(+), 21 deletions(-)
 create mode 100644 client/app/queue/correspondence/component/ReassignPackageModal.jsx

diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index f146263f07c..ae906a6895f 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -19,6 +19,7 @@ def mail_team_users
   end
 
   def review_package
+    @mail_team_users = User.mail_team_users.pluck(:css_id)
     render "correspondence/review_package"
   end
 
diff --git a/app/views/correspondence/review_package.html.erb b/app/views/correspondence/review_package.html.erb
index 0e8ae53b544..6dff91a560a 100644
--- a/app/views/correspondence/review_package.html.erb
+++ b/app/views/correspondence/review_package.html.erb
@@ -7,6 +7,7 @@
     organizations: current_user.selectable_organizations.map {|o| o.slice(:name, :url)},
     caseSearchHomePage: case_search_home_page,
     dropdownUrls: dropdown_urls,
+    mailTeamUsers: @mail_team_users,
     featureToggles: {
       correspondence_queue: FeatureToggle.enabled?(:correspondence_queue, user: current_user)
     }
diff --git a/client/COPY.json b/client/COPY.json
index 6d3e98d4c8e..65a8593d0b0 100644
--- a/client/COPY.json
+++ b/client/COPY.json
@@ -1442,7 +1442,9 @@
   "CORRESPONDENCE_DOC_UPLOAD_FAILED_MESSAGE": "You can upload it from this page to the veteran's eFolder at a later time.",
   "CORRESPONDENCE_HEADER_REMOVE_PACKAGE": "Review request",
   "CORRESPONDENCE_TITLE_REMOVE_PACKAGE": "Reason for removal:",
+  "CORRESPONDENCE_TITLE_REASSIGN_PACKAGE": "Reason for reassign:",
   "CORRRESPONDENCE_LABEL_OPTION_REMOVE_PACKAGE": " Choose whether to approve the request for removal or reject it.",
+  "CORRRESPONDENCE_LABEL_OPTION_REASSIGN_PACKAGE": " Choose whether to approve the request for reassign or reject it.",
   "CORRRESPONDENCE_TEXT_REMOVE_PACKAGE": "\nThis is the reason for removal provided by the general user.",
   "CORRRESPONDENCE_SECOND_TEXT_REMOVE_PACKAGE": "\nThis is the reason for removal provided by the user that submitted the request.",
   "CORRESPONDENCE_TITLE_REMOVE_PACKAGE_REASON_REJECT": "Provide a reason for rejection",
diff --git a/client/app/queue/QueueApp.jsx b/client/app/queue/QueueApp.jsx
index b457defbe28..a6589f6c2dc 100644
--- a/client/app/queue/QueueApp.jsx
+++ b/client/app/queue/QueueApp.jsx
@@ -633,8 +633,11 @@ class QueueApp extends React.PureComponent {
   );
 
   routedReviewPackage = (props) => (
-    <ReviewPackageLoadingScreen {...props.match.params}>
-      <CorrespondenceReviewPackage {...props.match.params} />
+    <ReviewPackageLoadingScreen mailTeamUsers= {props.mailTeamUsers} {...props.match.params}>
+      <CorrespondenceReviewPackage
+        mailTeamUsers= {this.props.mailTeamUsers}
+        {...props.match.params}
+      />
     </ReviewPackageLoadingScreen>
   );
 
@@ -1511,6 +1514,7 @@ QueueApp.propTypes = {
   isMailTeamUser: PropTypes.bool,
   isMailSupervisor: PropTypes.bool,
   isMailSuperUser: PropTypes.bool,
+  mailTeamUsers: PropTypes.array,
   organizations: PropTypes.array,
   setUserIsVsoEmployee: PropTypes.func,
   userIsVsoEmployee: PropTypes.bool,
diff --git a/client/app/queue/correspondence/component/ReassignPackageModal.jsx b/client/app/queue/correspondence/component/ReassignPackageModal.jsx
new file mode 100644
index 00000000000..6441ea6cafa
--- /dev/null
+++ b/client/app/queue/correspondence/component/ReassignPackageModal.jsx
@@ -0,0 +1,267 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ApiUtil from '../../../util/ApiUtil';
+import { sprintf } from 'sprintf-js';
+import { connect } from 'react-redux';
+import { bindActionCreators } from 'redux';
+import { updateLastReassignAction } from '../correspondenceReducer/reviewPackageActions';
+import TextareaField from '../../../components/TextareaField';
+import ReactSelectDropdown from '../../../components/ReactSelectDropdown';
+import COPY from '../../../../COPY';
+import Modal from '../../../components/Modal';
+import Button from '../../../components/Button';
+import { Redirect } from 'react-router-dom';
+import RadioFieldWithChildren from '../../../components/RadioFieldWithChildren';
+
+class ReassignPackageModal extends React.Component {
+
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      reasonForRemove: null,
+      disabledSaveButton: true,
+      reasonReject: '',
+      updateCancelSuccess: false,
+      selectedMailTeamUser: '',
+      selectedRequestChoice: '',
+      decisionReason: '',
+      vetName: ''
+    };
+  }
+
+  handleSelect(reasonForRemove) {
+    if (reasonForRemove === 'Approve request') {
+      this.setState({ reasonForRemove,
+        disabledSaveButton: false
+      });
+    } else {
+      this.setState({ reasonForRemove,
+        disabledSaveButton: true });
+    }
+  }
+
+  reasonChange = (value) => {
+    if (value.trim().length > 0) {
+      this.setState({
+        reasonReject: value,
+        disabledSaveButton: false
+      });
+    } else {
+      this.setState({
+        reasonReject: '',
+        disabledSaveButton: true
+      });
+    }
+  }
+
+  removePackage = async () => {
+    try {
+      ApiUtil.post(`/queue/correspondence/${this.props.correspondence_id}/remove_package`).
+        then(() => {
+          this.setState({
+            updateCancelSuccess: true
+          });
+          this.props.updateLastAction('DeleteReviewPackage');
+        });
+
+    } catch (error) {
+      console.error(error);
+    }
+  }
+
+  completePackage = async () => {
+    try {
+      const data = {
+        correspondence_id: this.props.correspondence_id,
+        instructions: []
+      };
+
+      data.instructions.push(this.state.reasonReject);
+
+      ApiUtil.post(`/queue/correspondence/${this.props.correspondence_id}/completed_package`, { data }).
+        then(() => {
+          this.setState({
+            updateCancelSuccess: true
+          });
+          this.props.updateLastAction('InProgressReviewPackage');
+        });
+
+    } catch (error) {
+      console.error(error);
+    }
+  }
+
+  render() {
+    const { onCancel } = this.props;
+    const submit = (operation) => {
+      let newUrl = new URL(window.location.href);
+      const modifyURL = newUrl.href;
+      const searchString = '/queue/correspondence';
+      const index = modifyURL.indexOf(searchString);
+      const updatedUrl = `${modifyURL.substring(0, index + searchString.length)}/team`;
+
+      newUrl = new URL(updatedUrl);
+      const searchParams = new URLSearchParams(newUrl.search);
+
+      // Encode and set the query parameters
+      searchParams.set('user', encodeURIComponent(this.state.selectedMailTeamUser));
+      searchParams.set('taskId', encodeURIComponent(this.props.veteranInformation.correspondence_tasks[2].id));
+      searchParams.set('userAction', encodeURIComponent(this.state.selectedRequestChoice));
+      searchParams.set('decisionReason', encodeURIComponent(this.state.decisionReason));
+      searchParams.set('operation', encodeURIComponent(operation));
+
+      // Construct the new URL with encoded query parameters
+      newUrl.search = searchParams.toString();
+      window.location.href = newUrl.href;
+    };
+
+    const confirmButtonDisabled = () => {
+      const selectedRequestChoice = this.state.selectedRequestChoice;
+      const selectedMailTeamUser = this.state.selectedMailTeamUser;
+      const reassignModalVisible = this.props.modalState;
+      const decisionReason = this.state.decisionReason;
+
+      if (selectedRequestChoice === 'approve' && selectedMailTeamUser === '' && reassignModalVisible) {
+        return true;
+      }
+
+      if (selectedRequestChoice === 'reject' && decisionReason === '') {
+        return true;
+      }
+
+      if (selectedRequestChoice === '') {
+        return true;
+      }
+
+      return false;
+    };
+
+    const buildMailUserData = (data) => {
+
+      if (typeof data === 'undefined') {
+        return [];
+      }
+
+      return data.map((user) => {
+        return {
+          value: user,
+          label: user
+        };
+      });
+    };
+
+    const handleSetSelectedMailTeamUser = (selectedUser) => {
+      this.setState({ selectedMailTeamUser: selectedUser });
+    };
+
+    const handleDecisionReason = (decisionText) => {
+      this.setState({ decisionReason: decisionText });
+    };
+
+    const resetState = () => {
+      this.setState({ selectedMailTeamUser: '' });
+      this.setState({ selectedRequestChoice: '' });
+      this.setState({ decisionReason: '' });
+    };
+
+    const handleSelectedRequestChoice = (selectedRequest) => {
+      resetState();
+      this.setState({ selectedRequestChoice: selectedRequest });
+    };
+
+    const approveElement = (<div style={{ width: '16vw' }}>
+      <ReactSelectDropdown
+        className="cf-margin-left-2rem img"
+        label="Assign to person"
+        onChangeMethod={(val) => handleSetSelectedMailTeamUser(val.value)}
+        options={buildMailUserData(this.props.mailTeamUsers)}
+      />
+    </div>);
+
+    const textAreaElement = (
+      <div style={{ width: '100%' }}>
+        <TextareaField label="Provide a reason for rejection"
+          onChange={handleDecisionReason}
+          value={this.state.decisionReason} />
+      </div>);
+
+    const reassignReasonOptions = [
+      {
+        displayText: 'Approve request',
+        value: 'approve',
+        element: approveElement,
+        displayElement: this.state.selectedRequestChoice === 'approve'
+      },
+      {
+        displayText: 'Reject request',
+        value: 'reject',
+        element: textAreaElement,
+        displayElement: this.state.selectedRequestChoice === 'reject'
+      }
+    ];
+
+    if (this.state.updateCancelSuccess) {
+      return <Redirect to="/queue/correspondence" />;
+    }
+
+    return (
+      <Modal
+        title= {sprintf(COPY.CORRESPONDENCE_HEADER_REMOVE_PACKAGE)}
+        closeHandler={onCancel}
+        confirmButton={<Button disabled={(confirmButtonDisabled())}
+          onClick={() => (submit('reassign'))}>Confirm</Button>}
+        cancelButton={<Button linkStyling onClick={onCancel}>Cancel</Button>}
+      >
+        <p>
+          <span style= {{ fontWeight: 'bold' }}>{sprintf(COPY.CORRESPONDENCE_TITLE_REASSIGN_PACKAGE)}</span><br />
+          {this.props.reasonRemovePackage[0]}
+        </p>
+
+        <p>{this.props.veteranInformation.correspondence_tasks[2].instructions[0]}</p>
+
+        <RadioFieldWithChildren
+          vertical
+          label= {sprintf(COPY.CORRRESPONDENCE_LABEL_OPTION_REASSIGN_PACKAGE)}
+          name="merge-package"
+          value={this.state.selectedRequestChoice}
+          options={reassignReasonOptions}
+          onChange={(val) => handleSelectedRequestChoice(val)}
+        />
+
+      </Modal>
+    );
+
+  }
+}
+
+const mapStateToProps = (state) => {
+  return { vetInfo: state.reviewPackage.lastAction,
+    reasonRemovePackage: state.reviewPackage.reasonForRemovePackage,
+    reassignModalVisible: state.intakeCorrespondence.showReassignPackageModal,
+    currentAction: state.reviewPackage.lastAction,
+    veteranInformation: state.reviewPackage.veteranInformation,
+    currentSelectedVeteran: state.intakeCorrespondence.selectedVeteranDetails
+  };
+};
+
+ReassignPackageModal.propTypes = {
+  modalState: PropTypes.bool,
+  onCancel: PropTypes.func,
+  mailTeamUsers: PropTypes.array,
+  setModalState: PropTypes.func,
+  correspondence_id: PropTypes.number,
+  vetInfo: PropTypes.object,
+  reasonRemovePackage: PropTypes.object,
+  veteranInformation: PropTypes.object,
+  updateLastAction: PropTypes.func,
+};
+
+const mapDispatchToProps = (dispatch) => bindActionCreators({
+  updateLastReassignAction
+}, dispatch);
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(ReassignPackageModal);
diff --git a/client/app/queue/correspondence/component/RemovePackageModal.jsx b/client/app/queue/correspondence/component/RemovePackageModal.jsx
index cee2e174bac..0c245a8cab7 100644
--- a/client/app/queue/correspondence/component/RemovePackageModal.jsx
+++ b/client/app/queue/correspondence/component/RemovePackageModal.jsx
@@ -91,15 +91,17 @@ class RemovePackageModal extends React.Component {
     const { onCancel } = this.props;
     const submit = () => {
       let selectedRequestChoice;
+
       if (this.state.reasonForRemove === 'Approve request') {
-        selectedRequestChoice ='approve';
+        selectedRequestChoice = 'approve';
       } else {
-        selectedRequestChoice ='reject';
+        selectedRequestChoice = 'reject';
       }
       const newUrl = new URL(window.location.href);
       const searchParams = new URLSearchParams(newUrl.search);
       const taskId = this.props.reviewDetails.taskId;
       const veteranName = this.props.reviewDetails.veteranName;
+
       // Encode and set the query parameters
       searchParams.set('taskId', encodeURIComponent(taskId));
       searchParams.set('veteranName', encodeURIComponent(veteranName));
diff --git a/client/app/queue/correspondence/correspondenceReducer/reviewPackageActions.js b/client/app/queue/correspondence/correspondenceReducer/reviewPackageActions.js
index 8ae8145b2e9..2c568723073 100644
--- a/client/app/queue/correspondence/correspondenceReducer/reviewPackageActions.js
+++ b/client/app/queue/correspondence/correspondenceReducer/reviewPackageActions.js
@@ -81,3 +81,23 @@ export const setReasonRemovePackage = (reasonForRemove) =>
       }
     });
   };
+
+export const updateLastReassignAction = (currentAction) =>
+  (dispatch) => {
+    dispatch({
+      type: ACTIONS.REASSIGN_PACKAGE_ACTION,
+      payload: {
+        currentAction
+      }
+    });
+  };
+
+export const setReasonReassignPackage = (reasonForReassign) =>
+  (dispatch) => {
+    dispatch({
+      type: ACTIONS.SET_REASON_REASSIGN_PACKAGE,
+      payload: {
+        reasonForReassign
+      }
+    });
+  };
diff --git a/client/app/queue/correspondence/correspondenceReducer/reviewPackageConstants.js b/client/app/queue/correspondence/correspondenceReducer/reviewPackageConstants.js
index b71bb87cd69..31ce852f1cd 100644
--- a/client/app/queue/correspondence/correspondenceReducer/reviewPackageConstants.js
+++ b/client/app/queue/correspondence/correspondenceReducer/reviewPackageConstants.js
@@ -7,4 +7,6 @@ export const ACTIONS = {
   UPDATE_DOCUMENT_TYPE_NAME: 'UPDATE_DOCUMENT_TYPE_NAME',
   REMOVE_PACKAGE_ACTION: 'REMOVE_PACKAGE_ACTION',
   SET_REASON_REMOVE_PACKAGE: 'SET_REASON_REMOVE_PACKAGE',
+  REASSIGN_PACKAGE_ACTION: 'REASSIGN_PACKAGE_ACTION',
+  SET_REASON_REASSIGN_PACKAGE: 'SET_REASON_REASSIGN_PACKAGE',
 };
diff --git a/client/app/queue/correspondence/correspondenceReducer/reviewPackageReducer.js b/client/app/queue/correspondence/correspondenceReducer/reviewPackageReducer.js
index 51083c7c98c..d532648fba5 100644
--- a/client/app/queue/correspondence/correspondenceReducer/reviewPackageReducer.js
+++ b/client/app/queue/correspondence/correspondenceReducer/reviewPackageReducer.js
@@ -7,7 +7,8 @@ export const initialState = {
   packageDocumentType: {},
   veteranInformation: {},
   lastAction: {},
-  reasonForRemovePackage: {}
+  reasonForRemovePackage: {},
+  reasonForReassignPackage: {}
 };
 
 export const reviewPackageReducer = (state = initialState, action = {}) => {
@@ -87,6 +88,22 @@ export const reviewPackageReducer = (state = initialState, action = {}) => {
       }
     });
 
+  case ACTIONS.REASSIGN_PACKAGE_ACTION:
+    return update(state, {
+      lastAction: {
+        action_type: {
+          $set: action.payload.currentAction
+        }
+      }
+    });
+
+  case ACTIONS.SET_REASON_REASSIGN_PACKAGE:
+    return update(state, {
+      reasonForReassignPackage: {
+        $set: action.payload.reasonForReassignPackage
+      }
+    });
+
   default:
     return state;
   }
diff --git a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
index 05851a9bd6b..5dfa32fb12b 100644
--- a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
+++ b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
@@ -38,6 +38,7 @@ export const CorrespondenceReviewPackage = (props) => {
   const [errorMessage, setErrorMessage] = useState('');
   const [selectedId, setSelectedId] = useState(0);
   const [isReadOnly, setIsReadOnly] = useState(false);
+  const [isReassignPackage, setIsReassignPackage] = useState(false);
   const [isInboundOpsTeam, setIsInboundOpsTeam] = useState(false);
   const [reviewPackageDetails, setReviewPackageDetails] = useState({
     veteranName: '',
@@ -50,11 +51,10 @@ export const CorrespondenceReviewPackage = (props) => {
 
   const fetchData = async () => {
     const correspondence = props;
-
+    const inboundOpsTeam = correspondence.organizations.find((org) => org.name === 'Inbound Ops Team');
     // When a remove package task is active and pending review, the page is read-only
     const isPageReadOnly = (tasks) => {
       const assignedRemoveTask = tasks.find((task) => task.status === 'assigned' && task.type === 'RemovePackageTask');
-      const inboundOpsTeam = correspondence.organizations.find((org) => org.name === 'Inbound Ops Team');
 
       setIsInboundOpsTeam(Boolean(inboundOpsTeam));
 
@@ -69,6 +69,15 @@ export const CorrespondenceReviewPackage = (props) => {
       return (typeof assignedRemoveTask !== 'undefined');
     };
 
+    // When a reassign package task is active and pending review, the page is read-only
+    const hasAssignedReassignPackageTask = (tasks) => {
+      const assignedReassignTask = tasks.find((task) => task.status === 'assigned' &&
+          task.type === 'ReassignPackageTask');
+
+      // Return true if a reassignPackageTask that is currently assigned is found, else false
+      return (typeof assignedReassignTask !== 'undefined') && inboundOpsTeam;
+    };
+
     try {
       const response = await ApiUtil.get(
         `/queue/correspondence/${correspondence.correspondence_uuid}`
@@ -108,6 +117,15 @@ export const CorrespondenceReviewPackage = (props) => {
         });
         setIsReadOnly(true);
       }
+      if (hasAssignedReassignPackageTask(data.correspondence_tasks)) {
+        setBannerInformation({
+          title: CORRESPONDENCE_READONLY_BANNER_HEADER,
+          message: CORRESPONDENCE_READONLY_BANNER_MESSAGE,
+          bannerType: 'info'
+        });
+        setIsReadOnly(true);
+        setIsReassignPackage(true);
+      }
     } catch (error) {
       console.error(error);
     }
@@ -196,6 +214,8 @@ export const CorrespondenceReviewPackage = (props) => {
             correspondence={props.correspondence}
             packageActionModal={packageActionModal}
             isReadOnly={isReadOnly}
+            isReassignPackage={isReassignPackage}
+            mailTeamUsers={props.mailTeamUsers}
             isInboundOpsTeam={isInboundOpsTeam}
           />
           <ReviewPackageData
@@ -270,6 +290,7 @@ export const CorrespondenceReviewPackage = (props) => {
 
 CorrespondenceReviewPackage.propTypes = {
   correspondence_uuid: PropTypes.string,
+  mailTeamUsers: PropTypes.array,
   correspondence: PropTypes.object,
   correspondenceDocuments: PropTypes.arrayOf(PropTypes.object),
   packageDocumentType: PropTypes.object,
diff --git a/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx b/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx
index cb2e4fabb8a..c64175d960f 100644
--- a/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx
+++ b/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx
@@ -5,6 +5,7 @@ import COPY from 'app/../COPY';
 import Button from '../../../components/Button';
 import SearchableDropdown from '../../../components/SearchableDropdown';
 import RemovePackageModal from '../component/RemovePackageModal';
+import ReassignPackageModal from '../component/ReassignPackageModal';
 
 const containingDivStyling = css({
   display: 'block',
@@ -58,25 +59,38 @@ const ReviewPackageCaseTitle = (props) => {
   return (
     <div>
       <CaseTitleScaffolding
+        correspondence_id = {props.correspondence.id}
+        isReadOnly={props.isReadOnly}
+        isReassignPackage={props.isReassignPackage}
+        mailTeamUsers={props.mailTeamUsers}
+      />
+      <CaseSubTitleScaffolding
+        {...props}
         reviewDetails={props.reviewDetails}
         correspondence_id={props.correspondence.id}
         isReadOnly={props.isReadOnly}
         isInboundOpsTeam={props.isInboundOpsTeam}
       />
-      <CaseSubTitleScaffolding {...props} isReadOnly={props.isReadOnly} isInboundOpsTeam={props.isInboundOpsTeam} />
     </div>
   );
 };
 
 const CaseTitleScaffolding = (props) => {
 
-  const [modalState, setModalState] = useState(false);
+  const [modalRemoveState, setRemoveModalState] = useState(false);
+  const [modalReassignState, setReassignModalState] = useState(false);
 
-  const openModal = () => {
-    setModalState(true);
+  const openRemoveModal = () => {
+    setRemoveModalState(true);
+  };
+  const closeRemoveModal = () => {
+    setRemoveModalState(false);
   };
-  const closeModal = () => {
-    setModalState(false);
+  const openReassignModal = () => {
+    setReassignModalState(true);
+  };
+  const closeReassignModal = () => {
+    setReassignModalState(false);
   };
 
   return (
@@ -84,25 +98,43 @@ const CaseTitleScaffolding = (props) => {
       <h1 {...headerStyling}>{COPY.CORRESPONDENCE_REVIEW_PACKAGE_TITLE}</h1>
 
       <span {...removebotton}>
-        { props.isReadOnly && props.isInboundOpsTeam &&
+        { (props.isReadOnly && !props.isReassignPackage && props.isInboundOpsTeam) &&
           <Button
             name="Review removal request"
             styling={{ style: { marginRight: '2rem', padding: '15px', fontSize: 'larger' } }}
             classNames={['usa-button-primary']}
-            onClick={() => {
-              openModal();
-            }}
+            onClick={
+              openRemoveModal
+            }
+          />
+        }
+        { (props.isReadOnly && props.isReassignPackage) &&
+          <Button
+            name="Review reassign request"
+            styling={{ style: { marginRight: '2rem', padding: '15px', fontSize: 'larger' } }}
+            classNames={['usa-button-primary']}
+            onClick={
+              openReassignModal
+            }
           />
         }
       </span>
-      { modalState &&
+      { modalRemoveState &&
       <RemovePackageModal
+        modalState={modalRemoveState}
+        setModalState={setRemoveModalState}
+        onCancel={closeRemoveModal}
         reviewDetails={props.reviewDetails}
-        modalState={modalState}
-        setModalState={setModalState}
-        onCancel={closeModal}
         correspondence_id = {props.correspondence_id} />
       }
+      { modalReassignState &&
+      <ReassignPackageModal
+        modalState={modalReassignState}
+        setModalState={setReassignModalState}
+        onCancel={closeReassignModal}
+        correspondence_id = {props.correspondence_id}
+        mailTeamUsers={props.mailTeamUsers} />
+      }
     </div>
   );
 
@@ -137,13 +169,16 @@ const CaseSubTitleScaffolding = (props) => (
 ReviewPackageCaseTitle.propTypes = {
   reviewDetails: PropTypes.object,
   handlePackageActionModal: PropTypes.func,
+  mailTeamUsers: PropTypes.array,
   correspondence: PropTypes.object,
   isReadOnly: PropTypes.bool,
+  isReassignPackage: PropTypes.bool,
   isInboundOpsTeam: PropTypes.bool
 };
 
 CaseSubTitleScaffolding.propTypes = {
   handlePackageActionModal: PropTypes.func,
+  mailTeamUsers: PropTypes.array,
   packageActionModal: PropTypes.string,
   isReadOnly: PropTypes.bool,
   isInboundOpsTeam: PropTypes.bool
@@ -151,8 +186,10 @@ CaseSubTitleScaffolding.propTypes = {
 
 CaseTitleScaffolding.propTypes = {
   correspondence_id: PropTypes.number,
+  mailTeamUsers: PropTypes.array,
   reviewDetails: PropTypes.object,
   isReadOnly: PropTypes.bool,
+  isReassignPackage: PropTypes.bool,
   isInboundOpsTeam: PropTypes.bool
 };
 
diff --git a/spec/feature/queue/correspondence/correspondence_cases_spec.rb b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
index b4177ae4285..03dba6c3c68 100644
--- a/spec/feature/queue/correspondence/correspondence_cases_spec.rb
+++ b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
@@ -1262,6 +1262,29 @@
       expect(page).to have_content("You have successfully rejected a package request for")
     end
 
+    it "approve request to reassign in review_package view" do
+      visit "queue/correspondence/team?tab=correspondence_action_required&page=1&sort_by=vaDor&order=asc"
+      all("[aria-label='Reassign Package Task Link']")[0].click
+      find("#Review-request-button-id-2").click
+      find("#button-Review-reassign-request").click
+      find('[for="merge-package_approve"]').click
+      find("#react-select-4-input").find(:xpath, "..").find(:xpath, "..").find(:xpath, "..").click
+      find("#react-select-4-option-0").click
+      click_button("Confirm")
+      expect(page).to have_content("You have successfully reassigned a mail record for")
+    end
+
+    it "deny request to reassign in review_package view" do
+      visit "queue/correspondence/team?tab=correspondence_action_required&page=1&sort_by=vaDor&order=asc"
+      all("[aria-label='Reassign Package Task Link']")[0].click
+      find("#Review-request-button-id-2").click
+      find("#button-Review-reassign-request").click
+      find('[for="merge-package_reject"]').click
+      find(".cf-form-textarea", match: :first).fill_in with: "this is a rejection reason"
+      click_button("Confirm")
+      expect(page).to have_content("You have successfully rejected a package request")
+    end
+
     it "approve request to remove" do
       visit "queue/correspondence/team?tab=correspondence_action_required&page=1&sort_by=vaDor&order=asc"
       all("[aria-label='Remove Package Task Link']")[0].click

From 0387cb09dd489a475a7efaec53fbe2c034e778ec Mon Sep 17 00:00:00 2001
From: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
Date: Fri, 5 Apr 2024 16:35:51 -0400
Subject: [PATCH 215/237] APPEALS-43678 and APPEALS-36344 (#21340)

* refactored props being passed down to child components

* refactored permissions checks for reassign and remove package tasks

* removed unecessary router useage

* addressed name change concerns for supervisor/superuser to be more in line with correspondence workflow
---
 .../correspondence/review_package.html.erb    |  2 ++
 client/app/queue/QueueApp.jsx                 | 12 ++++++----
 .../CorrespondenceReviewPackage.jsx           | 21 ++++++------------
 .../review_package/ReviewPackageCaseTitle.jsx | 22 ++++++++-----------
 4 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/app/views/correspondence/review_package.html.erb b/app/views/correspondence/review_package.html.erb
index 6dff91a560a..91457dd3b06 100644
--- a/app/views/correspondence/review_package.html.erb
+++ b/app/views/correspondence/review_package.html.erb
@@ -4,6 +4,8 @@
     userId: current_user.id,
     userRole: (current_user.vacols_roles.first || "").capitalize,
     userCssId: current_user.css_id,
+    userIsCorrespondenceSuperuser: current_user.mail_superuser?,
+    userIsCorrespondenceSupervisor: current_user.mail_supervisor?,
     organizations: current_user.selectable_organizations.map {|o| o.slice(:name, :url)},
     caseSearchHomePage: case_search_home_page,
     dropdownUrls: dropdown_urls,
diff --git a/client/app/queue/QueueApp.jsx b/client/app/queue/QueueApp.jsx
index a6589f6c2dc..72b71dd9661 100644
--- a/client/app/queue/QueueApp.jsx
+++ b/client/app/queue/QueueApp.jsx
@@ -633,11 +633,13 @@ class QueueApp extends React.PureComponent {
   );
 
   routedReviewPackage = (props) => (
-    <ReviewPackageLoadingScreen mailTeamUsers= {props.mailTeamUsers} {...props.match.params}>
+    <ReviewPackageLoadingScreen
+      {...props.match.params}>
       <CorrespondenceReviewPackage
-        mailTeamUsers= {this.props.mailTeamUsers}
-        {...props.match.params}
-      />
+        mailTeamUsers={this.props.mailTeamUsers}
+        userIsCorrespondenceSuperuser={this.props.userIsCorrespondenceSuperuser}
+        userIsCorrespondenceSupervisor={this.props.userIsCorrespondenceSupervisor}
+        {...props.match.params} />
     </ReviewPackageLoadingScreen>
   );
 
@@ -1531,6 +1533,8 @@ QueueApp.propTypes = {
   userCanViewOvertimeStatus: PropTypes.bool,
   userCanViewEditNodDate: PropTypes.bool,
   userCanAssignHearingSchedule: PropTypes.bool,
+  userIsCorrespondenceSupervisor: PropTypes.bool,
+  userIsCorrespondenceSuperuser: PropTypes.bool,
   canEditCavcRemands: PropTypes.bool,
   canEditCavcDashboards: PropTypes.bool,
   canViewCavcDashboards: PropTypes.bool,
diff --git a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
index 5dfa32fb12b..9e236c40cb6 100644
--- a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
+++ b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
@@ -39,7 +39,6 @@ export const CorrespondenceReviewPackage = (props) => {
   const [selectedId, setSelectedId] = useState(0);
   const [isReadOnly, setIsReadOnly] = useState(false);
   const [isReassignPackage, setIsReassignPackage] = useState(false);
-  const [isInboundOpsTeam, setIsInboundOpsTeam] = useState(false);
   const [reviewPackageDetails, setReviewPackageDetails] = useState({
     veteranName: '',
     taksId: [],
@@ -51,13 +50,10 @@ export const CorrespondenceReviewPackage = (props) => {
 
   const fetchData = async () => {
     const correspondence = props;
-    const inboundOpsTeam = correspondence.organizations.find((org) => org.name === 'Inbound Ops Team');
     // When a remove package task is active and pending review, the page is read-only
     const isPageReadOnly = (tasks) => {
       const assignedRemoveTask = tasks.find((task) => task.status === 'assigned' && task.type === 'RemovePackageTask');
 
-      setIsInboundOpsTeam(Boolean(inboundOpsTeam));
-
       if (assignedRemoveTask) {
         setReviewPackageDetails((prev) => {
           return { ...prev, taskId: assignedRemoveTask.id };
@@ -75,7 +71,7 @@ export const CorrespondenceReviewPackage = (props) => {
           task.type === 'ReassignPackageTask');
 
       // Return true if a reassignPackageTask that is currently assigned is found, else false
-      return (typeof assignedReassignTask !== 'undefined') && inboundOpsTeam;
+      return (typeof assignedReassignTask !== 'undefined') && (props.userIsCorrespondenceSuperuser || props.userIsCorrespondenceSupervisor);
     };
 
     try {
@@ -216,7 +212,8 @@ export const CorrespondenceReviewPackage = (props) => {
             isReadOnly={isReadOnly}
             isReassignPackage={isReassignPackage}
             mailTeamUsers={props.mailTeamUsers}
-            isInboundOpsTeam={isInboundOpsTeam}
+            userIsCorrespondenceSupervisor={props.userIsCorrespondenceSupervisor}
+            userIsCorrespondenceSuperuser={props.userIsCorrespondenceSuperuser}
           />
           <ReviewPackageData
             correspondence={props.correspondence}
@@ -297,12 +294,8 @@ CorrespondenceReviewPackage.propTypes = {
   veteranInformation: PropTypes.object,
   setFileNumberSearch: PropTypes.func,
   doFileNumberSearch: PropTypes.func,
-  organizations: PropTypes.arrayOf(
-    PropTypes.shape({
-      name: PropTypes.string,
-      url: PropTypes.string
-    })
-  )
+  userIsCorrespondenceSupervisor: PropTypes.bool,
+  userIsCorrespondenceSuperuser: PropTypes.bool
 };
 
 const mapStateToProps = (state) => ({
@@ -310,7 +303,6 @@ const mapStateToProps = (state) => ({
   correspondenceDocuments: state.reviewPackage.correspondenceDocuments,
   packageDocumentType: state.reviewPackage.packageDocumentType,
   veteranInformation: state.reviewPackage.veteranInformation,
-  organizations: state.ui.organizations
 });
 
 const mapDispatchToProps = (dispatch) => bindActionCreators({
@@ -318,7 +310,8 @@ const mapDispatchToProps = (dispatch) => bindActionCreators({
   doFileNumberSearch
 }, dispatch);
 
-export default connect(
+export default
+connect(
   mapStateToProps,
   mapDispatchToProps,
 )(CorrespondenceReviewPackage);
diff --git a/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx b/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx
index c64175d960f..24b8e5cc5c0 100644
--- a/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx
+++ b/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx
@@ -59,17 +59,10 @@ const ReviewPackageCaseTitle = (props) => {
   return (
     <div>
       <CaseTitleScaffolding
-        correspondence_id = {props.correspondence.id}
-        isReadOnly={props.isReadOnly}
-        isReassignPackage={props.isReassignPackage}
-        mailTeamUsers={props.mailTeamUsers}
+        {...props}
       />
       <CaseSubTitleScaffolding
         {...props}
-        reviewDetails={props.reviewDetails}
-        correspondence_id={props.correspondence.id}
-        isReadOnly={props.isReadOnly}
-        isInboundOpsTeam={props.isInboundOpsTeam}
       />
     </div>
   );
@@ -98,7 +91,7 @@ const CaseTitleScaffolding = (props) => {
       <h1 {...headerStyling}>{COPY.CORRESPONDENCE_REVIEW_PACKAGE_TITLE}</h1>
 
       <span {...removebotton}>
-        { (props.isReadOnly && !props.isReassignPackage && props.isInboundOpsTeam) &&
+        { (props.isReadOnly && !props.isReassignPackage && props.userIsCorrespondenceSupervisor) &&
           <Button
             name="Review removal request"
             styling={{ style: { marginRight: '2rem', padding: '15px', fontSize: 'larger' } }}
@@ -108,7 +101,7 @@ const CaseTitleScaffolding = (props) => {
             }
           />
         }
-        { (props.isReadOnly && props.isReassignPackage) &&
+        { (props.isReadOnly && props.isReassignPackage && (props.userIsCorrespondenceSuperuser || props.userIsCorrespondenceSupervisor)) &&
           <Button
             name="Review reassign request"
             styling={{ style: { marginRight: '2rem', padding: '15px', fontSize: 'larger' } }}
@@ -173,7 +166,8 @@ ReviewPackageCaseTitle.propTypes = {
   correspondence: PropTypes.object,
   isReadOnly: PropTypes.bool,
   isReassignPackage: PropTypes.bool,
-  isInboundOpsTeam: PropTypes.bool
+  userIsCorrespondenceSupervisor: PropTypes.bool,
+  userIsCorrespondenceSuperuser: PropTypes.bool
 };
 
 CaseSubTitleScaffolding.propTypes = {
@@ -181,7 +175,8 @@ CaseSubTitleScaffolding.propTypes = {
   mailTeamUsers: PropTypes.array,
   packageActionModal: PropTypes.string,
   isReadOnly: PropTypes.bool,
-  isInboundOpsTeam: PropTypes.bool
+  userIsCorrespondenceSupervisor: PropTypes.bool,
+  userIsCorrespondenceSuperuser: PropTypes.bool
 };
 
 CaseTitleScaffolding.propTypes = {
@@ -190,7 +185,8 @@ CaseTitleScaffolding.propTypes = {
   reviewDetails: PropTypes.object,
   isReadOnly: PropTypes.bool,
   isReassignPackage: PropTypes.bool,
-  isInboundOpsTeam: PropTypes.bool
+  userIsCorrespondenceSupervisor: PropTypes.bool,
+  userIsCorrespondenceSuperuser: PropTypes.bool
 };
 
 export default ReviewPackageCaseTitle;

From d055a2e434795343c35b5cbc6680b73df2d540ed Mon Sep 17 00:00:00 2001
From: piedram <110848569+piedram@users.noreply.github.com>
Date: Fri, 5 Apr 2024 16:38:02 -0400
Subject: [PATCH 216/237] Modified height for resolution 100% (#21338)

Co-authored-by: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
---
 client/app/components/ReceiptDatePicker.jsx                   | 4 ++--
 client/app/components/TaskCompletedDatePicker.jsx             | 4 ++--
 .../app/queue/correspondence/CorrespondenceTableBuilder.jsx   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/app/components/ReceiptDatePicker.jsx b/client/app/components/ReceiptDatePicker.jsx
index 8fe8bf74522..6230fcf3e42 100644
--- a/client/app/components/ReceiptDatePicker.jsx
+++ b/client/app/components/ReceiptDatePicker.jsx
@@ -138,12 +138,12 @@ const receiptDatePicker = (props) => {
         onChangeMethod={props.onChangeMethod}
       />
     </div>
-    <div style={{ width: '100%', margin: 'auto', paddingBottom: '14%' }}>
+    <div style={{ width: '100%', margin: 'auto', paddingBottom: '13%' }}>
       {getDatePickerElements()}
     </div>
 
     <div style={{ display: 'flex',
-      padding: '18px 10px 27px 0',
+      padding: '15.4px 10px 24px 0',
       justifyContent: 'right',
       width: '190px',
       borderTop: '1px solid #d6d7d9' }}>
diff --git a/client/app/components/TaskCompletedDatePicker.jsx b/client/app/components/TaskCompletedDatePicker.jsx
index 0593f5953ab..1602e3480e9 100644
--- a/client/app/components/TaskCompletedDatePicker.jsx
+++ b/client/app/components/TaskCompletedDatePicker.jsx
@@ -154,11 +154,11 @@ const TaskCompletedDatePicker = (props) => {
         onChangeMethod={props.onChangeMethod} />
     </div>
 
-    <div style={{ width: '100%', margin: 'auto', paddingBottom: '14%' }}>
+    <div style={{ width: '100%', margin: 'auto', paddingBottom: '12.5%' }}>
       {getDatePickerElements()}
     </div>
     <div style={{ display: 'flex',
-      padding: '18px 10px 27px 0',
+      padding: '16.5px 10px 24px 0',
       justifyContent: 'right',
       width: '190px',
       borderTop: '1px solid #d6d7d9' }}>
diff --git a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
index 5bc06e3cb51..0b74e2289e4 100644
--- a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
+++ b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
@@ -38,7 +38,7 @@ const rootStyles = css({
     marginTop: '1.5em'
   },
   '& .cf-tab-window-body-full-screen': {
-    padding: '26px 30px 30px 30px',
+    padding: '19px 30px 30px 30px',
     '& #tasks-tabwindow-tabpanel-3': {
       '& p.cf-margin-bottom-0rem': {
         marginTop: 0
@@ -224,7 +224,7 @@ const CorrespondenceTableBuilder = (props) => {
     const getBulkAssignArea = () => {
       return (<>
         <p className="cf-margin-bottom-0rem">Assign to mail team user</p>
-        <div style={{ display: 'flex', flexDirection: 'row', paddingBottom: '25px' }}>
+        <div style={{ display: 'flex', flexDirection: 'row', paddingBottom: '16px' }}>
           <SearchableDropdown
             className="cf-dropdown"
             name="Assign to mail team user"

From 6585b479ce3ccb1dd323e4e806271f300a92c150 Mon Sep 17 00:00:00 2001
From: piedram <110848569+piedram@users.noreply.github.com>
Date: Tue, 9 Apr 2024 11:53:13 -0400
Subject: [PATCH 217/237] change style in css (#21353)

---
 client/app/components/ReceiptDatePicker.jsx          | 12 +++++++-----
 client/app/components/TaskCompletedDatePicker.jsx    | 10 +++++-----
 .../correspondence/CorrespondenceTableBuilder.jsx    |  6 +++---
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/client/app/components/ReceiptDatePicker.jsx b/client/app/components/ReceiptDatePicker.jsx
index 6230fcf3e42..aafe25876d6 100644
--- a/client/app/components/ReceiptDatePicker.jsx
+++ b/client/app/components/ReceiptDatePicker.jsx
@@ -4,6 +4,7 @@ import ReactSelectDropdown from '../../../client/app/components/ReactSelectDropd
 import DateSelector from './DateSelector';
 import Button from './Button';
 import { css } from 'glamor';
+import { he } from 'date-fns/locale';
 
 const dateDropdownMap = [
   { value: 0, label: 'Between these dates' },
@@ -63,11 +64,12 @@ const receiptDatePicker = (props) => {
       width: 'inherit'
     },
     '& .cf-form-textinput': {
-      paddingTop: '7% !important',
+      paddingTop: '6.2% !important',
       marginBottom: 0,
       '& .input-container': {
         '& input': {
-          margin: 0
+          margin: 0,
+          height: '37.5px'
         }
       }
     }
@@ -130,7 +132,7 @@ const receiptDatePicker = (props) => {
   };
 
   return <div id="dropdown" {...selectContainerStyles}>
-    <div style={{ marginLeft: '5%', marginRight: '5%', marginTop: '3.5%' }}>
+    <div style={{ marginLeft: '5%', marginRight: '5%', marginTop: '2.7%' }}>
       <ReactSelectDropdown
         className = {`receiptDate ${styles.optSelect}`}
         label="Date filter parameters"
@@ -138,12 +140,12 @@ const receiptDatePicker = (props) => {
         onChangeMethod={props.onChangeMethod}
       />
     </div>
-    <div style={{ width: '100%', margin: 'auto', paddingBottom: '13%' }}>
+    <div style={{ width: '100%', margin: 'auto', paddingBottom: '12.7%' }}>
       {getDatePickerElements()}
     </div>
 
     <div style={{ display: 'flex',
-      padding: '15.4px 10px 24px 0',
+      padding: '16px 10px 24px 0',
       justifyContent: 'right',
       width: '190px',
       borderTop: '1px solid #d6d7d9' }}>
diff --git a/client/app/components/TaskCompletedDatePicker.jsx b/client/app/components/TaskCompletedDatePicker.jsx
index 1602e3480e9..974e64828b4 100644
--- a/client/app/components/TaskCompletedDatePicker.jsx
+++ b/client/app/components/TaskCompletedDatePicker.jsx
@@ -81,11 +81,11 @@ const TaskCompletedDatePicker = (props) => {
       width: 'inherit'
     },
     '& .cf-form-textinput': {
-      paddingTop: '11px !important',
+      paddingTop: '10px !important',
       marginBottom: 0,
       '& .input-container': {
         '& input': {
-          margin: 0
+          height: '37.5px'
         }
       }
     }
@@ -146,7 +146,7 @@ const TaskCompletedDatePicker = (props) => {
   };
 
   return <div id="dropdown" {...selectContainerStyles}>
-    <div style={{ marginLeft: '5%', marginRight: '5%', marginTop: '3.5%' }}>
+    <div style={{ marginLeft: '5%', marginRight: '5%', marginTop: '2.9%' }}>
       <ReactSelectDropdown
         className = {`receiptDate ${styles.optSelect}`}
         label="Date filter parameters"
@@ -154,11 +154,11 @@ const TaskCompletedDatePicker = (props) => {
         onChangeMethod={props.onChangeMethod} />
     </div>
 
-    <div style={{ width: '100%', margin: 'auto', paddingBottom: '12.5%' }}>
+    <div style={{ width: '100%', margin: 'auto', paddingBottom: '12.7%' }}>
       {getDatePickerElements()}
     </div>
     <div style={{ display: 'flex',
-      padding: '16.5px 10px 24px 0',
+      padding: '16px 10px 24px 0',
       justifyContent: 'right',
       width: '190px',
       borderTop: '1px solid #d6d7d9' }}>
diff --git a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
index 0b74e2289e4..fc39892fdb2 100644
--- a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
+++ b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
@@ -39,7 +39,7 @@ const rootStyles = css({
   },
   '& .cf-tab-window-body-full-screen': {
     padding: '19px 30px 30px 30px',
-    '& #tasks-tabwindow-tabpanel-3': {
+    '& #tasks-tabwindow-tabpanel-0, #tasks-tabwindow-tabpanel-3': {
       '& p.cf-margin-bottom-0rem': {
         marginTop: 0
       }
@@ -224,7 +224,7 @@ const CorrespondenceTableBuilder = (props) => {
     const getBulkAssignArea = () => {
       return (<>
         <p className="cf-margin-bottom-0rem">Assign to mail team user</p>
-        <div style={{ display: 'flex', flexDirection: 'row', paddingBottom: '16px' }}>
+        <div style={{ display: 'flex', flexDirection: 'row', paddingBottom: '15px' }}>
           <SearchableDropdown
             className="cf-dropdown"
             name="Assign to mail team user"
@@ -256,7 +256,7 @@ const CorrespondenceTableBuilder = (props) => {
             />
           }
         </div>
-        <hr></hr>
+        <hr style={{ marginBottom: '17px' }}></hr>
       </>);
 
     };

From b5ff1daec57501f78eb2a348ab254a0f7ecaf8c5 Mon Sep 17 00:00:00 2001
From: piedram <110848569+piedram@users.noreply.github.com>
Date: Tue, 9 Apr 2024 11:54:41 -0400
Subject: [PATCH 218/237] Fix corner and size font in dropdown (#21358)

Co-authored-by: Jim Foley <james.foley4@va.gov>
---
 .../queue/correspondence/CorrespondenceCases.jsx  | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/client/app/queue/correspondence/CorrespondenceCases.jsx b/client/app/queue/correspondence/CorrespondenceCases.jsx
index c510f9e9d53..da20729b3bb 100644
--- a/client/app/queue/correspondence/CorrespondenceCases.jsx
+++ b/client/app/queue/correspondence/CorrespondenceCases.jsx
@@ -15,6 +15,7 @@ import Modal from 'app/components/Modal';
 import RadioFieldWithChildren from '../../components/RadioFieldWithChildren';
 import ReactSelectDropdown from '../../components/ReactSelectDropdown';
 import TextareaField from '../../components/TextareaField';
+import { css } from 'glamor';
 
 const CorrespondenceCases = (props) => {
   const dispatch = useDispatch();
@@ -90,10 +91,22 @@ const CorrespondenceCases = (props) => {
     return false;
   };
 
+  const styles = {
+    optSelect: css({
+      '.reassign': {
+      },
+      '& .css-yk16xz-control, .css-1pahdxg-control': {
+        borderRadius: '0px',
+        fontSize: '17px'
+      }
+    })
+  };
+
   const approveElement = (
     <div style={{ width: '250%' }}>
       <ReactSelectDropdown
-        className="cf-margin-left-2rem img"
+        // className="cf-margin-left-2rem img"
+        className = {`cf-margin-left-2rem img reassign ${styles.optSelect}`}
         label="Assign to person"
         onChangeMethod={(val) => setSelectedMailTeamUser(val.value)}
         options={buildMailUserData(props.mailTeamUsers)}

From 393f20ddf1d6a0ea0a85129e8f77e8428373b7f3 Mon Sep 17 00:00:00 2001
From: Alex Smith <alex.smith.99@thunderyard.com>
Date: Tue, 9 Apr 2024 14:02:22 -0600
Subject: [PATCH 219/237] Reset BGS Service (#21352)

---
 app/services/auto_assignable_user_finder.rb   | 23 ++++----
 app/services/correspondence_auto_assigner.rb  |  2 +-
 app/services/external_api/bgs_service.rb      | 59 +++++++------------
 lib/fakes/bgs_service.rb                      | 18 +-----
 .../auto_assignable_user_finder_spec.rb       |  7 ++-
 5 files changed, 41 insertions(+), 68 deletions(-)

diff --git a/app/services/auto_assignable_user_finder.rb b/app/services/auto_assignable_user_finder.rb
index 60dbc39d447..a07c54dd3e8 100644
--- a/app/services/auto_assignable_user_finder.rb
+++ b/app/services/auto_assignable_user_finder.rb
@@ -7,6 +7,10 @@
 class AutoAssignableUserFinder
   AssignableUser = Struct.new(:user_obj, :last_assigned_date, :num_assigned, :nod?, keyword_init: true)
 
+  def initialize(current_user)
+    self.current_user = current_user
+  end
+
   def assignable_users_exist?
     return false if FeatureToggle.enabled?(:auto_assign_banner_max_queue)
 
@@ -21,15 +25,15 @@ def get_first_assignable_user(correspondence:)
 
   private
 
+  attr_accessor :current_user
+
   def run_auto_assign_algorithm(correspondence, vbms_id)
     assignable_users.each do |user|
       next if correspondence.nod && !user.nod?
 
-      user_obj = user.user_obj
-
       begin
-        if sensitivity_checker(user_obj).can_access?(vbms_id, user_to_check: user_obj)
-          return user_obj
+        if sensitivity_checker.can_access?(vbms_id)
+          return user.user_obj
         end
       rescue StandardError => error
         error_uuid = SecureRandom.uuid
@@ -115,14 +119,13 @@ def find_users
       .references(:tasks, :organizations, :organization_user_permissions)
   end
 
-  def sensitivity_checker(user)
-    @sensitivity_checker ||= ActiveSupport::HashWithIndifferentAccess.new
-
-    return @sensitivity_checker[user.css_id] if @sensitivity_checker.key?(user.css_id)
+  def sensitivity_checker
+    return @sensitivity_checker if @sensitivity_checker.present?
 
-    @sensitivity_checker[user.css_id] = BGSService.new(client: BGSService.init_client_for_user(user: user))
+    # Set for use by BGSService
+    RequestStore.store[:current_user] ||= current_user
 
-    @sensitivity_checker[user.css_id]
+    @sensitivity_checker = BGSService.new
   end
 
   def permission_checker
diff --git a/app/services/correspondence_auto_assigner.rb b/app/services/correspondence_auto_assigner.rb
index 973cbf34ee6..3dc848726f5 100644
--- a/app/services/correspondence_auto_assigner.rb
+++ b/app/services/correspondence_auto_assigner.rb
@@ -95,7 +95,7 @@ def logger
   end
 
   def assignable_user_finder
-    @assignable_user_finder ||= AutoAssignableUserFinder.new
+    @assignable_user_finder ||= AutoAssignableUserFinder.new(current_user)
   end
 
   def run_verifier
diff --git a/app/services/external_api/bgs_service.rb b/app/services/external_api/bgs_service.rb
index 4e5580dd5de..9ece1d0f259 100644
--- a/app/services/external_api/bgs_service.rb
+++ b/app/services/external_api/bgs_service.rb
@@ -10,41 +10,7 @@ class ExternalApi::BGSService
 
   attr_reader :client
 
-  class << self
-    def init_client_for_user(user:)
-      fail "User required" if user.blank?
-
-      BGS::Services.new(**BGSService.init_client_params(user: user))
-    end
-
-    # These are the params for initializing a BGS client;
-    # this method sets the passed user's data in the request header,
-    # and as a result the passed users permissions are what get
-    # checked by the BGS service when determining permissions for BGS
-    # resource access.
-    #
-    # If no user param is passed, the current user is used
-    def init_client_params(user:)
-      forward_proxy_url = FeatureToggle.enabled?(:bgs_forward_proxy) ? ENV["RUBY_BGS_PROXY_BASE_URL"] : nil
-
-      {
-        env: Rails.application.config.bgs_environment,
-        application: "CASEFLOW",
-        client_ip: ENV.fetch("USER_IP_ADDRESS", Rails.application.secrets.user_ip_address),
-        client_station_id: user.station_id,
-        client_username: user.css_id,
-        ssl_cert_key_file: ENV["BGS_KEY_LOCATION"],
-        ssl_cert_file: ENV["BGS_CERT_LOCATION"],
-        ssl_ca_cert: ENV["BGS_CA_CERT_LOCATION"],
-        forward_proxy_url: forward_proxy_url,
-        jumpbox_url: ENV["RUBY_BGS_JUMPBOX_URL"],
-        log: true,
-        logger: Rails.logger
-      }
-    end
-  end
-
-  def initialize(client: init_default_client)
+  def initialize(client: init_client)
     @client = client
 
     # These instance variables are used for caching their
@@ -312,8 +278,8 @@ def find_address_by_participant_id(participant_id)
   #
   # We cache at 2 levels: the boolean check per user, and the veteran record itself.
   # The veteran record is so that subsequent calls to fetch_veteran_info can read from cache.
-  def can_access?(vbms_id, user_to_check: current_user)
-    Rails.cache.fetch(can_access_cache_key(user_to_check, vbms_id), expires_in: 2.hours) do
+  def can_access?(vbms_id)
+    Rails.cache.fetch(can_access_cache_key(current_user, vbms_id), expires_in: 2.hours) do
       DBService.release_db_connections
 
       MetricsService.record("BGS: can_access? (find_by_file_number): #{vbms_id}",
@@ -550,8 +516,23 @@ def fetch_veteran_info_cache_key(vbms_id)
     "bgs_veteran_info_#{vbms_id}"
   end
 
-  def init_default_client
-    BGS::Services.new(**BGSService.init_client_params(user: current_user))
+  def init_client
+    forward_proxy_url = FeatureToggle.enabled?(:bgs_forward_proxy) ? ENV["RUBY_BGS_PROXY_BASE_URL"] : nil
+
+    BGS::Services.new(
+      env: Rails.application.config.bgs_environment,
+      application: "CASEFLOW",
+      client_ip: ENV.fetch("USER_IP_ADDRESS", Rails.application.secrets.user_ip_address),
+      client_station_id: current_user.station_id,
+      client_username: current_user.css_id,
+      ssl_cert_key_file: ENV["BGS_KEY_LOCATION"],
+      ssl_cert_file: ENV["BGS_CERT_LOCATION"],
+      ssl_ca_cert: ENV["BGS_CA_CERT_LOCATION"],
+      forward_proxy_url: forward_proxy_url,
+      jumpbox_url: ENV["RUBY_BGS_JUMPBOX_URL"],
+      log: true,
+      logger: Rails.logger
+    )
   end
 
   def formatted_start_and_end_dates(start_date, end_date)
diff --git a/lib/fakes/bgs_service.rb b/lib/fakes/bgs_service.rb
index aa5525ad223..38fe29a845e 100644
--- a/lib/fakes/bgs_service.rb
+++ b/lib/fakes/bgs_service.rb
@@ -118,18 +118,6 @@ def edit_veteran_record(file_number, attr, new_value)
       vet_record[attr] = new_value
       store_veteran_record(file_number, vet_record)
     end
-
-    def init_client_for_user(user:)
-      BGSService.init_client_params(user: user)
-    end
-
-    def init_client_params(user:)
-      { user: user } if user.is_a?(User)
-    end
-  end
-
-  def initialize(client: nil)
-    client
   end
 
   def get_end_products(file_number)
@@ -609,11 +597,11 @@ def station_conflict?(vbms_id, _veteran_participant_id)
     (self.class.inaccessible_appeal_vbms_ids || []).include?(vbms_id)
   end
 
-  def can_access?(vbms_id, user_to_check: current_user)
+  def can_access?(vbms_id)
     is_accessible = !(self.class.inaccessible_appeal_vbms_ids || []).include?(vbms_id)
 
-    if user_to_check
-      Rails.cache.fetch(can_access_cache_key(user_to_check, vbms_id), expires_in: 1.minute) do
+    if current_user
+      Rails.cache.fetch(can_access_cache_key(current_user, vbms_id), expires_in: 1.minute) do
         is_accessible
       end
     else
diff --git a/spec/services/auto_assignable_user_finder_spec.rb b/spec/services/auto_assignable_user_finder_spec.rb
index fdf4b34d9e3..f7e512045d1 100644
--- a/spec/services/auto_assignable_user_finder_spec.rb
+++ b/spec/services/auto_assignable_user_finder_spec.rb
@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 describe AutoAssignableUserFinder do
-  subject(:described) { described_class.new }
+  let!(:current_user) { create(:user) }
+  subject(:described) { described_class.new(current_user) }
 
   let(:veteran) { create(:veteran) }
 
@@ -194,7 +195,7 @@ def generate_assigned_review_package_tasks(amount:, user:)
       context "with no BGSService errors" do
         before do
           expect(mock_sensitivity_checker).to receive(:can_access?).twice.and_return(false)
-          expect(BGSService).to receive(:new).twice.and_return(mock_sensitivity_checker)
+          expect(BGSService).to receive(:new).and_return(mock_sensitivity_checker)
         end
 
         it "does not allow access for users without the correct sensitivity level" do
@@ -206,7 +207,7 @@ def generate_assigned_review_package_tasks(amount:, user:)
         before do
           expect(mock_sensitivity_checker).to receive(:can_access?).once.and_raise("Test BGS error")
           expect(mock_sensitivity_checker).to receive(:can_access?).once.and_return(true)
-          expect(BGSService).to receive(:new).twice.and_return(mock_sensitivity_checker)
+          expect(BGSService).to receive(:new).and_return(mock_sensitivity_checker)
         end
 
         it "continues iterating through all assignable users" do

From 49768477efa2f8aac8225b185dab65ed227ce400 Mon Sep 17 00:00:00 2001
From: Alex Smith <alex.smith.99@thunderyard.com>
Date: Tue, 9 Apr 2024 15:21:26 -0600
Subject: [PATCH 220/237] Use New BGS Gem Sensitivity Check Methods (#21356)

* Reset BGS Service

* Add New Sensitivity Check Method

- Create new method in BGSService for checking participant
sensitivity using the BGS gem.

- Update auto assign logic to use new method for checking
sensitivity for user/veteran pairs.

* Fix Lint Error

* Update Sensitivity Check Logic

- Use new method in BGS gem for checking user sensitivity levels.

- Update specs and supporting files accordingly.
---
 Gemfile                                       |  2 +-
 Gemfile.lock                                  |  6 +--
 app/services/auto_assignable_user_finder.rb   | 29 +++++++-----
 app/services/external_api/bgs_service.rb      | 44 +++++++++++++++++++
 lib/fakes/bgs_service.rb                      | 12 +++++
 .../auto_assignable_user_finder_spec.rb       | 26 +++++++++--
 .../services/external_api/bgs_service_spec.rb | 40 +++++++++++++++++
 7 files changed, 140 insertions(+), 19 deletions(-)

diff --git a/Gemfile b/Gemfile
index c9d13323b32..e55097e9be5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem "acts_as_tree"
 gem "amoeba"
 # BGS
 
-gem "bgs", git: "https://github.com/department-of-veterans-affairs/ruby-bgs.git", ref: "5f47e7b2656ef347d314ef43c93d38a9f20816ec"
+gem "bgs", git: "https://github.com/department-of-veterans-affairs/ruby-bgs.git", branch: "caseflow/add-new-security-endpoint"
 # Bootsnap speeds up app boot (and started to be a default gem in 5.2).
 gem "bootsnap", require: false
 gem "browser"
diff --git a/Gemfile.lock b/Gemfile.lock
index a939fb42d72..7409b6fa325 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -57,10 +57,10 @@ GIT
 
 GIT
   remote: https://github.com/department-of-veterans-affairs/ruby-bgs.git
-  revision: 5f47e7b2656ef347d314ef43c93d38a9f20816ec
-  ref: 5f47e7b2656ef347d314ef43c93d38a9f20816ec
+  revision: ebb9d8add944ce2125d1fb226494edabbc8adf1c
+  branch: caseflow/add-new-security-endpoint
   specs:
-    bgs (0.3)
+    bgs (0.3.1)
       httpclient
       nokogiri (>= 1.11.0.rc4)
       savon (~> 2.12)
diff --git a/app/services/auto_assignable_user_finder.rb b/app/services/auto_assignable_user_finder.rb
index a07c54dd3e8..744f95a556e 100644
--- a/app/services/auto_assignable_user_finder.rb
+++ b/app/services/auto_assignable_user_finder.rb
@@ -18,28 +18,21 @@ def assignable_users_exist?
   end
 
   def get_first_assignable_user(correspondence:)
-    vbms_id = correspondence.veteran.file_number
-
-    run_auto_assign_algorithm(correspondence, vbms_id)
+    run_auto_assign_algorithm(correspondence)
   end
 
   private
 
   attr_accessor :current_user
 
-  def run_auto_assign_algorithm(correspondence, vbms_id)
+  def run_auto_assign_algorithm(correspondence)
     assignable_users.each do |user|
       next if correspondence.nod && !user.nod?
 
-      begin
-        if sensitivity_checker.can_access?(vbms_id)
-          return user.user_obj
-        end
-      rescue StandardError => error
-        error_uuid = SecureRandom.uuid
-        Raven.capture_exception(error, extra: { error_uuid: error_uuid })
+      user_obj = user.user_obj
 
-        next
+      if sensitivity_levels_compatible?(user: user_obj, veteran: correspondence.veteran)
+        return user_obj
       end
     end
 
@@ -119,6 +112,18 @@ def find_users
       .references(:tasks, :organizations, :organization_user_permissions)
   end
 
+  def sensitivity_levels_compatible?(user:, veteran:)
+    begin
+      sensitivity_checker.sensitivity_level_for_user(user) >=
+        sensitivity_checker.sensitivity_level_for_veteran(veteran)
+    rescue StandardError => error
+      error_uuid = SecureRandom.uuid
+      Raven.capture_exception(error, extra: { error_uuid: error_uuid })
+
+      false
+    end
+  end
+
   def sensitivity_checker
     return @sensitivity_checker if @sensitivity_checker.present?
 
diff --git a/app/services/external_api/bgs_service.rb b/app/services/external_api/bgs_service.rb
index 9ece1d0f259..130a8fcdd2c 100644
--- a/app/services/external_api/bgs_service.rb
+++ b/app/services/external_api/bgs_service.rb
@@ -24,6 +24,50 @@ def initialize(client: init_client)
     @people_by_ssn = {}
   end
 
+  def sensitivity_level_for_user(user)
+    fail "Invalid user" if !user.instance_of?(User)
+
+    participant_id = get_participant_id_for_user(user)
+
+    Rails.cache.fetch("sensitivity_level_for_user_id_#{user.id}", expires_in: 1.hour) do
+      DBService.release_db_connections
+
+      MetricsService.record(
+        "BGS: sensitivity level for user #{user.id}",
+        service: :bgs,
+        name: "security.find_person_scrty_log_by_ptcpnt_id"
+      ) do
+        response = client.security.find_person_scrty_log_by_ptcpnt_id(participant_id)
+
+        response.key?(:scrty_level_type_cd) ? Integer(response[:scrty_level_type_cd]) : 0
+      rescue BGS::ShareError
+        0
+      end
+    end
+  end
+
+  def sensitivity_level_for_veteran(veteran)
+    fail "Invalid veteran" if !veteran.instance_of?(Veteran)
+
+    participant_id = veteran.participant_id
+
+    Rails.cache.fetch("sensitivity_level_for_veteran_id_#{veteran.id}", expires_in: 1.hour) do
+      DBService.release_db_connections
+
+      MetricsService.record(
+        "BGS: sensitivity level for veteran #{veteran.id}",
+        service: :bgs,
+        name: "security.find_sensitivity_level_by_participant_id"
+      ) do
+        response = client.security.find_sensitivity_level_by_participant_id(participant_id)
+
+        response.key?(:scrty_level_type_cd) ? Integer(response[:scrty_level_type_cd]) : 0
+      rescue BGS::ShareError
+        0
+      end
+    end
+  end
+
   # :nocov:
 
   def get_end_products(vbms_id)
diff --git a/lib/fakes/bgs_service.rb b/lib/fakes/bgs_service.rb
index 38fe29a845e..e8b3cd54e46 100644
--- a/lib/fakes/bgs_service.rb
+++ b/lib/fakes/bgs_service.rb
@@ -120,6 +120,18 @@ def edit_veteran_record(file_number, attr, new_value)
     end
   end
 
+  def sensitivity_level_for_user(user)
+    fail "Invalid user" if !user.instance_of?(User)
+
+    Random.new.rand(4..9)
+  end
+
+  def sensitivity_level_for_veteran(veteran)
+    fail "Invalid veteran" if !veteran.instance_of?(Veteran)
+
+    Random.new.rand(1..4)
+  end
+
   def get_end_products(file_number)
     store = self.class.end_product_store
     records = store.fetch_and_inflate(file_number) || store.fetch_and_inflate(:default) || {}
diff --git a/spec/services/auto_assignable_user_finder_spec.rb b/spec/services/auto_assignable_user_finder_spec.rb
index f7e512045d1..b1b6c4659c6 100644
--- a/spec/services/auto_assignable_user_finder_spec.rb
+++ b/spec/services/auto_assignable_user_finder_spec.rb
@@ -12,6 +12,14 @@
   before do
     allow(BGSService).to receive(:new).and_return(mock_sensitivity_checker)
 
+    allow(mock_sensitivity_checker).to receive(:sensitivity_level_for_user) do |user|
+      bgs.sensitivity_level_for_user(user)
+    end
+
+    allow(mock_sensitivity_checker).to receive(:sensitivity_level_for_veteran) do |vet|
+      bgs.sensitivity_level_for_veteran(vet)
+    end
+
     allow(mock_sensitivity_checker).to receive(:fetch_person_info) do |vbms_id|
       bgs.fetch_person_info(vbms_id)
     end
@@ -188,13 +196,21 @@ def generate_assigned_review_package_tasks(amount:, user:)
     end
 
     context "with sensitivity level check" do
+      let(:high_sensitivity_level) { 9 }
+      let(:low_sensitivity_level) { 1 }
+
       let!(:correspondence) { create(:correspondence, veteran_id: veteran.id) }
       let!(:user_1) { create(:correspondence_auto_assignable_user) }
       let!(:user_2) { create(:correspondence_auto_assignable_user) }
 
       context "with no BGSService errors" do
         before do
-          expect(mock_sensitivity_checker).to receive(:can_access?).twice.and_return(false)
+          expect(mock_sensitivity_checker).to receive(:sensitivity_level_for_user)
+            .with(user_1).and_return(low_sensitivity_level)
+          expect(mock_sensitivity_checker).to receive(:sensitivity_level_for_user)
+            .with(user_2).and_return(low_sensitivity_level)
+          expect(mock_sensitivity_checker).to receive(:sensitivity_level_for_veteran)
+            .with(correspondence.veteran).twice.and_return(high_sensitivity_level)
           expect(BGSService).to receive(:new).and_return(mock_sensitivity_checker)
         end
 
@@ -205,8 +221,12 @@ def generate_assigned_review_package_tasks(amount:, user:)
 
       context "when the BGSService raises an error" do
         before do
-          expect(mock_sensitivity_checker).to receive(:can_access?).once.and_raise("Test BGS error")
-          expect(mock_sensitivity_checker).to receive(:can_access?).once.and_return(true)
+          expect(mock_sensitivity_checker).to receive(:sensitivity_level_for_user)
+            .with(user_1).and_raise("Test BGS error")
+          expect(mock_sensitivity_checker).to receive(:sensitivity_level_for_user)
+            .with(user_2).and_return(high_sensitivity_level)
+          expect(mock_sensitivity_checker).to receive(:sensitivity_level_for_veteran)
+            .with(correspondence.veteran).and_return(high_sensitivity_level)
           expect(BGSService).to receive(:new).and_return(mock_sensitivity_checker)
         end
 
diff --git a/spec/services/external_api/bgs_service_spec.rb b/spec/services/external_api/bgs_service_spec.rb
index b048ad158b8..2ba1d99019f 100644
--- a/spec/services/external_api/bgs_service_spec.rb
+++ b/spec/services/external_api/bgs_service_spec.rb
@@ -25,6 +25,46 @@
     bgs.bust_fetch_veteran_info_cache(vbms_id)
   end
 
+  describe "#sensitivity_level_for_user" do
+    it "validates the user param" do
+      expect { bgs.sensitivity_level_for_user(nil) }.to raise_error(RuntimeError, "Invalid user")
+    end
+
+    it "calls the security service and caches the result" do
+      participant_id = "1234"
+      sensitivity_level = Random.new.rand(1..9)
+
+      expect(bgs).to receive(:get_participant_id_for_user).with(user).and_return(participant_id)
+      expect(bgs_client).to receive(:security).and_return(bgs_security_service)
+      expect(bgs_security_service).to receive(:find_person_scrty_log_by_ptcpnt_id)
+        .with(participant_id).and_return({ scrty_level_type_cd: "#{sensitivity_level}" })
+
+      expect(bgs.sensitivity_level_for_user(user)).to eq(sensitivity_level)
+
+      expect(Rails.cache.exist?("sensitivity_level_for_user_id_#{user.id}")).to be true
+    end
+  end
+
+  describe "#sensitivity_level_for_veteran" do
+    let(:veteran) { create(:veteran) }
+
+    it "validates the veteran param" do
+      expect { bgs.sensitivity_level_for_veteran(nil) }.to raise_error(RuntimeError, "Invalid veteran")
+    end
+
+    it "calls the security service and caches the result" do
+      sensitivity_level = Random.new.rand(1..9)
+
+      expect(bgs_client).to receive(:security).and_return(bgs_security_service)
+      expect(bgs_security_service).to receive(:find_sensitivity_level_by_participant_id)
+        .with(veteran.participant_id).and_return({ scrty_level_type_cd: "#{sensitivity_level}" })
+
+      expect(bgs.sensitivity_level_for_veteran(veteran)).to eq(sensitivity_level)
+
+      expect(Rails.cache.exist?("sensitivity_level_for_veteran_id_#{veteran.id}")).to be true
+    end
+  end
+
   describe "#fetch_poa_by_file_number" do
     let(:participant_id) { "1234" }
     let(:poa_participant_id) { "person-pid" }

From 1e1943f842264e8e1717425f8f75c215e0ed8591 Mon Sep 17 00:00:00 2001
From: Alex Smith <alex.smith.99@thunderyard.com>
Date: Wed, 10 Apr 2024 07:45:12 -0600
Subject: [PATCH 221/237] APPEALS-34964 -> APPEALS-13579 Merge (#21366)

* Move Auto Assign Button to Correspondence Queue (#21324)

* Move Auto Assign Button to Correspondence Queue

* Fix Lint Errors

* Reset BGS Service (#21352)

* Use New BGS Gem Sensitivity Check Methods (#21356)

* Reset BGS Service

* Add New Sensitivity Check Method

- Create new method in BGSService for checking participant
sensitivity using the BGS gem.

- Update auto assign logic to use new method for checking
sensitivity for user/veteran pairs.

* Fix Lint Error

* Update Sensitivity Check Logic

- Use new method in BGS gem for checking user sensitivity levels.

- Update specs and supporting files accordingly.

---------

Co-authored-by: cacevesva <109166981+cacevesva@users.noreply.github.com>
Co-authored-by: Christopher Aceves <christopher.aceves@va.gov>
---
 Gemfile                                       |   2 +-
 Gemfile.lock                                  |   6 +-
 app/services/auto_assignable_user_finder.rb   |  44 +++++---
 app/services/correspondence_auto_assigner.rb  |   2 +-
 app/services/external_api/bgs_service.rb      | 103 +++++++++++-------
 lib/fakes/bgs_service.rb                      |  22 ++--
 .../auto_assignable_user_finder_spec.rb       |  33 +++++-
 .../services/external_api/bgs_service_spec.rb |  40 +++++++
 8 files changed, 173 insertions(+), 79 deletions(-)

diff --git a/Gemfile b/Gemfile
index c9d13323b32..e55097e9be5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem "acts_as_tree"
 gem "amoeba"
 # BGS
 
-gem "bgs", git: "https://github.com/department-of-veterans-affairs/ruby-bgs.git", ref: "5f47e7b2656ef347d314ef43c93d38a9f20816ec"
+gem "bgs", git: "https://github.com/department-of-veterans-affairs/ruby-bgs.git", branch: "caseflow/add-new-security-endpoint"
 # Bootsnap speeds up app boot (and started to be a default gem in 5.2).
 gem "bootsnap", require: false
 gem "browser"
diff --git a/Gemfile.lock b/Gemfile.lock
index a939fb42d72..7409b6fa325 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -57,10 +57,10 @@ GIT
 
 GIT
   remote: https://github.com/department-of-veterans-affairs/ruby-bgs.git
-  revision: 5f47e7b2656ef347d314ef43c93d38a9f20816ec
-  ref: 5f47e7b2656ef347d314ef43c93d38a9f20816ec
+  revision: ebb9d8add944ce2125d1fb226494edabbc8adf1c
+  branch: caseflow/add-new-security-endpoint
   specs:
-    bgs (0.3)
+    bgs (0.3.1)
       httpclient
       nokogiri (>= 1.11.0.rc4)
       savon (~> 2.12)
diff --git a/app/services/auto_assignable_user_finder.rb b/app/services/auto_assignable_user_finder.rb
index 60dbc39d447..744f95a556e 100644
--- a/app/services/auto_assignable_user_finder.rb
+++ b/app/services/auto_assignable_user_finder.rb
@@ -7,6 +7,10 @@
 class AutoAssignableUserFinder
   AssignableUser = Struct.new(:user_obj, :last_assigned_date, :num_assigned, :nod?, keyword_init: true)
 
+  def initialize(current_user)
+    self.current_user = current_user
+  end
+
   def assignable_users_exist?
     return false if FeatureToggle.enabled?(:auto_assign_banner_max_queue)
 
@@ -14,28 +18,21 @@ def assignable_users_exist?
   end
 
   def get_first_assignable_user(correspondence:)
-    vbms_id = correspondence.veteran.file_number
-
-    run_auto_assign_algorithm(correspondence, vbms_id)
+    run_auto_assign_algorithm(correspondence)
   end
 
   private
 
-  def run_auto_assign_algorithm(correspondence, vbms_id)
+  attr_accessor :current_user
+
+  def run_auto_assign_algorithm(correspondence)
     assignable_users.each do |user|
       next if correspondence.nod && !user.nod?
 
       user_obj = user.user_obj
 
-      begin
-        if sensitivity_checker(user_obj).can_access?(vbms_id, user_to_check: user_obj)
-          return user_obj
-        end
-      rescue StandardError => error
-        error_uuid = SecureRandom.uuid
-        Raven.capture_exception(error, extra: { error_uuid: error_uuid })
-
-        next
+      if sensitivity_levels_compatible?(user: user_obj, veteran: correspondence.veteran)
+        return user_obj
       end
     end
 
@@ -115,14 +112,25 @@ def find_users
       .references(:tasks, :organizations, :organization_user_permissions)
   end
 
-  def sensitivity_checker(user)
-    @sensitivity_checker ||= ActiveSupport::HashWithIndifferentAccess.new
+  def sensitivity_levels_compatible?(user:, veteran:)
+    begin
+      sensitivity_checker.sensitivity_level_for_user(user) >=
+        sensitivity_checker.sensitivity_level_for_veteran(veteran)
+    rescue StandardError => error
+      error_uuid = SecureRandom.uuid
+      Raven.capture_exception(error, extra: { error_uuid: error_uuid })
+
+      false
+    end
+  end
 
-    return @sensitivity_checker[user.css_id] if @sensitivity_checker.key?(user.css_id)
+  def sensitivity_checker
+    return @sensitivity_checker if @sensitivity_checker.present?
 
-    @sensitivity_checker[user.css_id] = BGSService.new(client: BGSService.init_client_for_user(user: user))
+    # Set for use by BGSService
+    RequestStore.store[:current_user] ||= current_user
 
-    @sensitivity_checker[user.css_id]
+    @sensitivity_checker = BGSService.new
   end
 
   def permission_checker
diff --git a/app/services/correspondence_auto_assigner.rb b/app/services/correspondence_auto_assigner.rb
index 973cbf34ee6..3dc848726f5 100644
--- a/app/services/correspondence_auto_assigner.rb
+++ b/app/services/correspondence_auto_assigner.rb
@@ -95,7 +95,7 @@ def logger
   end
 
   def assignable_user_finder
-    @assignable_user_finder ||= AutoAssignableUserFinder.new
+    @assignable_user_finder ||= AutoAssignableUserFinder.new(current_user)
   end
 
   def run_verifier
diff --git a/app/services/external_api/bgs_service.rb b/app/services/external_api/bgs_service.rb
index 4e5580dd5de..130a8fcdd2c 100644
--- a/app/services/external_api/bgs_service.rb
+++ b/app/services/external_api/bgs_service.rb
@@ -10,41 +10,7 @@ class ExternalApi::BGSService
 
   attr_reader :client
 
-  class << self
-    def init_client_for_user(user:)
-      fail "User required" if user.blank?
-
-      BGS::Services.new(**BGSService.init_client_params(user: user))
-    end
-
-    # These are the params for initializing a BGS client;
-    # this method sets the passed user's data in the request header,
-    # and as a result the passed users permissions are what get
-    # checked by the BGS service when determining permissions for BGS
-    # resource access.
-    #
-    # If no user param is passed, the current user is used
-    def init_client_params(user:)
-      forward_proxy_url = FeatureToggle.enabled?(:bgs_forward_proxy) ? ENV["RUBY_BGS_PROXY_BASE_URL"] : nil
-
-      {
-        env: Rails.application.config.bgs_environment,
-        application: "CASEFLOW",
-        client_ip: ENV.fetch("USER_IP_ADDRESS", Rails.application.secrets.user_ip_address),
-        client_station_id: user.station_id,
-        client_username: user.css_id,
-        ssl_cert_key_file: ENV["BGS_KEY_LOCATION"],
-        ssl_cert_file: ENV["BGS_CERT_LOCATION"],
-        ssl_ca_cert: ENV["BGS_CA_CERT_LOCATION"],
-        forward_proxy_url: forward_proxy_url,
-        jumpbox_url: ENV["RUBY_BGS_JUMPBOX_URL"],
-        log: true,
-        logger: Rails.logger
-      }
-    end
-  end
-
-  def initialize(client: init_default_client)
+  def initialize(client: init_client)
     @client = client
 
     # These instance variables are used for caching their
@@ -58,6 +24,50 @@ def initialize(client: init_default_client)
     @people_by_ssn = {}
   end
 
+  def sensitivity_level_for_user(user)
+    fail "Invalid user" if !user.instance_of?(User)
+
+    participant_id = get_participant_id_for_user(user)
+
+    Rails.cache.fetch("sensitivity_level_for_user_id_#{user.id}", expires_in: 1.hour) do
+      DBService.release_db_connections
+
+      MetricsService.record(
+        "BGS: sensitivity level for user #{user.id}",
+        service: :bgs,
+        name: "security.find_person_scrty_log_by_ptcpnt_id"
+      ) do
+        response = client.security.find_person_scrty_log_by_ptcpnt_id(participant_id)
+
+        response.key?(:scrty_level_type_cd) ? Integer(response[:scrty_level_type_cd]) : 0
+      rescue BGS::ShareError
+        0
+      end
+    end
+  end
+
+  def sensitivity_level_for_veteran(veteran)
+    fail "Invalid veteran" if !veteran.instance_of?(Veteran)
+
+    participant_id = veteran.participant_id
+
+    Rails.cache.fetch("sensitivity_level_for_veteran_id_#{veteran.id}", expires_in: 1.hour) do
+      DBService.release_db_connections
+
+      MetricsService.record(
+        "BGS: sensitivity level for veteran #{veteran.id}",
+        service: :bgs,
+        name: "security.find_sensitivity_level_by_participant_id"
+      ) do
+        response = client.security.find_sensitivity_level_by_participant_id(participant_id)
+
+        response.key?(:scrty_level_type_cd) ? Integer(response[:scrty_level_type_cd]) : 0
+      rescue BGS::ShareError
+        0
+      end
+    end
+  end
+
   # :nocov:
 
   def get_end_products(vbms_id)
@@ -312,8 +322,8 @@ def find_address_by_participant_id(participant_id)
   #
   # We cache at 2 levels: the boolean check per user, and the veteran record itself.
   # The veteran record is so that subsequent calls to fetch_veteran_info can read from cache.
-  def can_access?(vbms_id, user_to_check: current_user)
-    Rails.cache.fetch(can_access_cache_key(user_to_check, vbms_id), expires_in: 2.hours) do
+  def can_access?(vbms_id)
+    Rails.cache.fetch(can_access_cache_key(current_user, vbms_id), expires_in: 2.hours) do
       DBService.release_db_connections
 
       MetricsService.record("BGS: can_access? (find_by_file_number): #{vbms_id}",
@@ -550,8 +560,23 @@ def fetch_veteran_info_cache_key(vbms_id)
     "bgs_veteran_info_#{vbms_id}"
   end
 
-  def init_default_client
-    BGS::Services.new(**BGSService.init_client_params(user: current_user))
+  def init_client
+    forward_proxy_url = FeatureToggle.enabled?(:bgs_forward_proxy) ? ENV["RUBY_BGS_PROXY_BASE_URL"] : nil
+
+    BGS::Services.new(
+      env: Rails.application.config.bgs_environment,
+      application: "CASEFLOW",
+      client_ip: ENV.fetch("USER_IP_ADDRESS", Rails.application.secrets.user_ip_address),
+      client_station_id: current_user.station_id,
+      client_username: current_user.css_id,
+      ssl_cert_key_file: ENV["BGS_KEY_LOCATION"],
+      ssl_cert_file: ENV["BGS_CERT_LOCATION"],
+      ssl_ca_cert: ENV["BGS_CA_CERT_LOCATION"],
+      forward_proxy_url: forward_proxy_url,
+      jumpbox_url: ENV["RUBY_BGS_JUMPBOX_URL"],
+      log: true,
+      logger: Rails.logger
+    )
   end
 
   def formatted_start_and_end_dates(start_date, end_date)
diff --git a/lib/fakes/bgs_service.rb b/lib/fakes/bgs_service.rb
index aa5525ad223..e8b3cd54e46 100644
--- a/lib/fakes/bgs_service.rb
+++ b/lib/fakes/bgs_service.rb
@@ -118,18 +118,18 @@ def edit_veteran_record(file_number, attr, new_value)
       vet_record[attr] = new_value
       store_veteran_record(file_number, vet_record)
     end
+  end
 
-    def init_client_for_user(user:)
-      BGSService.init_client_params(user: user)
-    end
+  def sensitivity_level_for_user(user)
+    fail "Invalid user" if !user.instance_of?(User)
 
-    def init_client_params(user:)
-      { user: user } if user.is_a?(User)
-    end
+    Random.new.rand(4..9)
   end
 
-  def initialize(client: nil)
-    client
+  def sensitivity_level_for_veteran(veteran)
+    fail "Invalid veteran" if !veteran.instance_of?(Veteran)
+
+    Random.new.rand(1..4)
   end
 
   def get_end_products(file_number)
@@ -609,11 +609,11 @@ def station_conflict?(vbms_id, _veteran_participant_id)
     (self.class.inaccessible_appeal_vbms_ids || []).include?(vbms_id)
   end
 
-  def can_access?(vbms_id, user_to_check: current_user)
+  def can_access?(vbms_id)
     is_accessible = !(self.class.inaccessible_appeal_vbms_ids || []).include?(vbms_id)
 
-    if user_to_check
-      Rails.cache.fetch(can_access_cache_key(user_to_check, vbms_id), expires_in: 1.minute) do
+    if current_user
+      Rails.cache.fetch(can_access_cache_key(current_user, vbms_id), expires_in: 1.minute) do
         is_accessible
       end
     else
diff --git a/spec/services/auto_assignable_user_finder_spec.rb b/spec/services/auto_assignable_user_finder_spec.rb
index fdf4b34d9e3..b1b6c4659c6 100644
--- a/spec/services/auto_assignable_user_finder_spec.rb
+++ b/spec/services/auto_assignable_user_finder_spec.rb
@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 describe AutoAssignableUserFinder do
-  subject(:described) { described_class.new }
+  let!(:current_user) { create(:user) }
+  subject(:described) { described_class.new(current_user) }
 
   let(:veteran) { create(:veteran) }
 
@@ -11,6 +12,14 @@
   before do
     allow(BGSService).to receive(:new).and_return(mock_sensitivity_checker)
 
+    allow(mock_sensitivity_checker).to receive(:sensitivity_level_for_user) do |user|
+      bgs.sensitivity_level_for_user(user)
+    end
+
+    allow(mock_sensitivity_checker).to receive(:sensitivity_level_for_veteran) do |vet|
+      bgs.sensitivity_level_for_veteran(vet)
+    end
+
     allow(mock_sensitivity_checker).to receive(:fetch_person_info) do |vbms_id|
       bgs.fetch_person_info(vbms_id)
     end
@@ -187,14 +196,22 @@ def generate_assigned_review_package_tasks(amount:, user:)
     end
 
     context "with sensitivity level check" do
+      let(:high_sensitivity_level) { 9 }
+      let(:low_sensitivity_level) { 1 }
+
       let!(:correspondence) { create(:correspondence, veteran_id: veteran.id) }
       let!(:user_1) { create(:correspondence_auto_assignable_user) }
       let!(:user_2) { create(:correspondence_auto_assignable_user) }
 
       context "with no BGSService errors" do
         before do
-          expect(mock_sensitivity_checker).to receive(:can_access?).twice.and_return(false)
-          expect(BGSService).to receive(:new).twice.and_return(mock_sensitivity_checker)
+          expect(mock_sensitivity_checker).to receive(:sensitivity_level_for_user)
+            .with(user_1).and_return(low_sensitivity_level)
+          expect(mock_sensitivity_checker).to receive(:sensitivity_level_for_user)
+            .with(user_2).and_return(low_sensitivity_level)
+          expect(mock_sensitivity_checker).to receive(:sensitivity_level_for_veteran)
+            .with(correspondence.veteran).twice.and_return(high_sensitivity_level)
+          expect(BGSService).to receive(:new).and_return(mock_sensitivity_checker)
         end
 
         it "does not allow access for users without the correct sensitivity level" do
@@ -204,9 +221,13 @@ def generate_assigned_review_package_tasks(amount:, user:)
 
       context "when the BGSService raises an error" do
         before do
-          expect(mock_sensitivity_checker).to receive(:can_access?).once.and_raise("Test BGS error")
-          expect(mock_sensitivity_checker).to receive(:can_access?).once.and_return(true)
-          expect(BGSService).to receive(:new).twice.and_return(mock_sensitivity_checker)
+          expect(mock_sensitivity_checker).to receive(:sensitivity_level_for_user)
+            .with(user_1).and_raise("Test BGS error")
+          expect(mock_sensitivity_checker).to receive(:sensitivity_level_for_user)
+            .with(user_2).and_return(high_sensitivity_level)
+          expect(mock_sensitivity_checker).to receive(:sensitivity_level_for_veteran)
+            .with(correspondence.veteran).and_return(high_sensitivity_level)
+          expect(BGSService).to receive(:new).and_return(mock_sensitivity_checker)
         end
 
         it "continues iterating through all assignable users" do
diff --git a/spec/services/external_api/bgs_service_spec.rb b/spec/services/external_api/bgs_service_spec.rb
index b048ad158b8..2ba1d99019f 100644
--- a/spec/services/external_api/bgs_service_spec.rb
+++ b/spec/services/external_api/bgs_service_spec.rb
@@ -25,6 +25,46 @@
     bgs.bust_fetch_veteran_info_cache(vbms_id)
   end
 
+  describe "#sensitivity_level_for_user" do
+    it "validates the user param" do
+      expect { bgs.sensitivity_level_for_user(nil) }.to raise_error(RuntimeError, "Invalid user")
+    end
+
+    it "calls the security service and caches the result" do
+      participant_id = "1234"
+      sensitivity_level = Random.new.rand(1..9)
+
+      expect(bgs).to receive(:get_participant_id_for_user).with(user).and_return(participant_id)
+      expect(bgs_client).to receive(:security).and_return(bgs_security_service)
+      expect(bgs_security_service).to receive(:find_person_scrty_log_by_ptcpnt_id)
+        .with(participant_id).and_return({ scrty_level_type_cd: "#{sensitivity_level}" })
+
+      expect(bgs.sensitivity_level_for_user(user)).to eq(sensitivity_level)
+
+      expect(Rails.cache.exist?("sensitivity_level_for_user_id_#{user.id}")).to be true
+    end
+  end
+
+  describe "#sensitivity_level_for_veteran" do
+    let(:veteran) { create(:veteran) }
+
+    it "validates the veteran param" do
+      expect { bgs.sensitivity_level_for_veteran(nil) }.to raise_error(RuntimeError, "Invalid veteran")
+    end
+
+    it "calls the security service and caches the result" do
+      sensitivity_level = Random.new.rand(1..9)
+
+      expect(bgs_client).to receive(:security).and_return(bgs_security_service)
+      expect(bgs_security_service).to receive(:find_sensitivity_level_by_participant_id)
+        .with(veteran.participant_id).and_return({ scrty_level_type_cd: "#{sensitivity_level}" })
+
+      expect(bgs.sensitivity_level_for_veteran(veteran)).to eq(sensitivity_level)
+
+      expect(Rails.cache.exist?("sensitivity_level_for_veteran_id_#{veteran.id}")).to be true
+    end
+  end
+
   describe "#fetch_poa_by_file_number" do
     let(:participant_id) { "1234" }
     let(:poa_participant_id) { "person-pid" }

From 98c7234bf54ca9d1dcfca944977a5f8ce8b05d3d Mon Sep 17 00:00:00 2001
From: divyadasari-va <135847343+divyadasari-va@users.noreply.github.com>
Date: Wed, 10 Apr 2024 10:09:40 -0600
Subject: [PATCH 222/237] Div/appeals 37797 (#21357)

* Initial commit for UI/UX changes

* Added the existing caseflow search properties

* Updated the checkboxes style fix

* Changes for spec file with the latest code changes

* Modified the seed data to check pagination
---
 client/app/queue/CaseListTable.jsx            | 24 ++++++++++--------
 .../AddCorrespondenceView.jsx                 | 24 +++++++++---------
 .../TasksAppeals/AddAppealRelatedTaskView.jsx | 25 +++++++++++++------
 .../components/TasksAppeals/AddTaskView.jsx   | 13 +++++-----
 client/app/styles/queue/_correspondence.scss  |  4 +++
 db/seeds/multi_correspondences.rb             |  4 +--
 ...asks_related_to_an_existing_appeal_spec.rb | 18 +++++++------
 spec/support/correspondence_helpers.rb        |  2 +-
 8 files changed, 66 insertions(+), 48 deletions(-)

diff --git a/client/app/queue/CaseListTable.jsx b/client/app/queue/CaseListTable.jsx
index ab1048ea3ab..38b1f43b914 100644
--- a/client/app/queue/CaseListTable.jsx
+++ b/client/app/queue/CaseListTable.jsx
@@ -33,13 +33,15 @@ class CaseListTable extends React.PureComponent {
           header: '',
           valueFunction: (appeal) => {
             return (
-              <Checkbox
-                name={`${appeal.id}`}
-                id={`${appeal.id}`}
-                defaultValue={this.props.taskRelatedAppealIds.includes(appeal.id)}
-                hideLabel
-                onChange={(checked) => this.props.checkboxOnChange(appeal.id, checked)}
-              />
+              <div className="checkbox-column-inline-style">
+                <Checkbox
+                  name={`${appeal.id}`}
+                  id={`${appeal.id}`}
+                  defaultValue={this.props.taskRelatedAppealIds.includes(appeal.id)}
+                  hideLabel
+                  onChange={(checked) => this.props.checkboxOnChange(appeal.id, checked)}
+                />
+              </div>
             );
           }
         }
@@ -141,15 +143,15 @@ class CaseListTable extends React.PureComponent {
         this.props.updatePageHandlerCallback(newCurrentPage);
       }
     };
-    const totalPages = Math.ceil(this.props.appeals.length / 5);
-    const startIndex = (this.state.currentPage * 5) - 5;
-    const endIndex = (this.state.currentPage * 5);
+    const totalPages = Math.ceil(this.props.appeals.length / 15);
+    const startIndex = (this.state.currentPage * 15) - 15;
+    const endIndex = (this.state.currentPage * 15);
 
     return (
       this.props.paginate ?
         <div>
           <Pagination
-            pageSize={5}
+            pageSize={15}
             currentPage={this.state.currentPage}
             currentCases={this.props.appeals.slice(startIndex, endIndex).length}
             totalPages={totalPages}
diff --git a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx
index 0dc18c96266..979e2e14d4c 100644
--- a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx
+++ b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx
@@ -64,18 +64,16 @@ class AddCorrespondenceView extends React.Component {
 
   onChangeCheckbox = (correspondence, isChecked) => {
     this.props.saveCheckboxState(correspondence, isChecked);
-    let selectedCheckboxes = this.props.checkboxes;
+    let selectedCheckboxes = [...this.props.checkboxes];
 
     if (isChecked) {
-      selectedCheckboxes.push(correspondence.id);
+      selectedCheckboxes.push(correspondence);
     } else {
-      selectedCheckboxes = selectedCheckboxes.filter((checkboxId) => checkboxId !== correspondence.id);
+      selectedCheckboxes = selectedCheckboxes.filter((checkbox) => checkbox.id !== correspondence.id);
     }
-
     const isAnyCheckboxSelected = selectedCheckboxes.length > 0;
 
     this.props.onCheckboxChange(isAnyCheckboxSelected);
-
   }
 
   getKeyForRow = (index, { id }) => {
@@ -88,13 +86,15 @@ class AddCorrespondenceView extends React.Component {
       {
         cellClass: 'checkbox-column',
         valueFunction: () => (
-          <Checkbox
-            name={correspondence.id.toString()}
-            id={correspondence.id.toString()}
-            hideLabel
-            defaultValue={this.props.checkboxes.some((el) => el.id === correspondence.id)}
-            onChange={(checked) => this.onChangeCheckbox(correspondence, checked)}
-          />
+          <div className="checkbox-column-inline-style">
+            <Checkbox
+              name={correspondence.id.toString()}
+              id={correspondence.id.toString()}
+              hideLabel
+              defaultValue={this.props.checkboxes.some((el) => el.id === correspondence.id)}
+              onChange={(checked) => this.onChangeCheckbox(correspondence, checked)}
+            />
+          </div>
         ),
       },
       {
diff --git a/client/app/queue/correspondence/intake/components/TasksAppeals/AddAppealRelatedTaskView.jsx b/client/app/queue/correspondence/intake/components/TasksAppeals/AddAppealRelatedTaskView.jsx
index 16ab359128b..a3e5d4f7518 100644
--- a/client/app/queue/correspondence/intake/components/TasksAppeals/AddAppealRelatedTaskView.jsx
+++ b/client/app/queue/correspondence/intake/components/TasksAppeals/AddAppealRelatedTaskView.jsx
@@ -97,16 +97,27 @@ export const AddAppealRelatedTaskView = (props) => {
   useEffect(() => {
     let canContinue = true;
 
-    newTasks.forEach((task) => {
-      canContinue = canContinue && ((task.content !== '') && (task.type !== ''));
-    });
+    // Check if radio button is selected
+    if (existingAppealRadio === '0') {
+      canContinue = true;
+    } else {
+      // Check if at least one checkbox is selected
+      if (taskRelatedAppeals.length === 0) {
+        canContinue = false;
+      } else {
+        // Check the conditions for each task and waived task
+        newTasks.forEach((task) => {
+          canContinue = canContinue && ((task.content !== '') && (task.type !== ''));
+        });
 
-    waivedTasks.forEach((task) => {
-      canContinue = canContinue && (task.isWaived ? (task.waiveReason !== '') : true);
-    });
+        waivedTasks.forEach((task) => {
+          canContinue = canContinue && (task.isWaived ? (task.waiveReason !== '') : true);
+        });
+      }
+    }
 
     props.setRelatedTasksCanContinue(canContinue);
-  }, [newTasks, waivedTasks]);
+  }, [existingAppealRadio, newTasks, waivedTasks, taskRelatedAppeals]);
 
   const veteranFileNumber = props.veteranInformation.file_number;
 
diff --git a/client/app/queue/correspondence/intake/components/TasksAppeals/AddTaskView.jsx b/client/app/queue/correspondence/intake/components/TasksAppeals/AddTaskView.jsx
index 65072c0df0b..9d0ee2b7a35 100644
--- a/client/app/queue/correspondence/intake/components/TasksAppeals/AddTaskView.jsx
+++ b/client/app/queue/correspondence/intake/components/TasksAppeals/AddTaskView.jsx
@@ -21,7 +21,8 @@ const customSelectStyless = {
   },
 
   menu: () => ({
-    boxShadow: '1px 1px 10px grey',
+    boxShadow: '0 0 0 1px hsla(0,0%,0%,0.1), 0 4px 11px hsla(0,0%,0%,0.1)',
+    marginTop: '8px'
   }),
 
   valueContainer: (styles) => ({
@@ -51,15 +52,13 @@ const customSelectStyless = {
 
   option: (styles, { isFocused }) => ({
     color: 'black',
-    fontSize: '25px',
-    paddingTop: '10px',
-    paddingBottom: '10px',
-    paddingLeft: '20px',
+    fontSize: '17px',
+    padding: '8px 12px',
     backgroundColor: isFocused ? 'white' : 'null',
     ':hover': {
       ...styles[':hover'],
-      backgroundColor: '#5c9ceb',
-      color: 'black',
+      backgroundColor: '#5b616b',
+      color: 'white',
     }
   })
 };
diff --git a/client/app/styles/queue/_correspondence.scss b/client/app/styles/queue/_correspondence.scss
index 5f5696161da..b32f8ff9aff 100644
--- a/client/app/styles/queue/_correspondence.scss
+++ b/client/app/styles/queue/_correspondence.scss
@@ -165,3 +165,7 @@
 .correspondence-doctype-edit-dropdown .cf-select .cf-select__control {
   max-width: 43rem;
 }
+
+.checkbox-column-inline-style {
+  margin-top: -1rem;
+}
diff --git a/db/seeds/multi_correspondences.rb b/db/seeds/multi_correspondences.rb
index 20fd5d66203..74f7655c004 100644
--- a/db/seeds/multi_correspondences.rb
+++ b/db/seeds/multi_correspondences.rb
@@ -58,14 +58,14 @@ def create_multi_correspondences(user = {}, veteran = {})
     # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
     def build_correspondences(veteran, user, iterations = 10)
-      5.times do
+      15.times do
         appeal = create(
           :appeal,
           veteran_file_number: veteran.file_number
         )
         InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
       end
-      5.times do
+      15.times do
         appeal = create(
           :appeal,
           veteran_file_number: veteran.file_number,
diff --git a/spec/feature/queue/correspondence/tasks_related_to_an_existing_appeal_spec.rb b/spec/feature/queue/correspondence/tasks_related_to_an_existing_appeal_spec.rb
index 1e3c03d1ed8..d63dec08c48 100644
--- a/spec/feature/queue/correspondence/tasks_related_to_an_existing_appeal_spec.rb
+++ b/spec/feature/queue/correspondence/tasks_related_to_an_existing_appeal_spec.rb
@@ -34,7 +34,7 @@
         visit_intake_form_step_2_with_appeals
 
         existing_appeal_radio_options[:yes].click
-        page.all(".cf-form-checkbox").last.click
+        page.all(".checkbox-column-inline-style").last.click
 
         expect(page.has_button?("Continue")).to be(true)
       end
@@ -47,7 +47,7 @@
         existing_appeal_radio_options[:yes].click
 
         using_wait_time(wait_time) do
-          expect(page).to have_content("Viewing 1-5 of 13 total")
+          expect(page).to have_content("Viewing 1-15 of 20 total")
         end
       end
 
@@ -81,14 +81,14 @@
         end
       end
 
-      it "table displays 5 items per page" do
+      it "table displays 15 items per page" do
         visit_intake_form_step_2_with_appeals
 
         existing_appeal_radio_options[:yes].click
 
         using_wait_time(wait_time) do
           within(page.all(".cf-pagination")[0]) do
-            expect(find_all(".cf-form-checkbox").count).to eq(5)
+            expect(find_all(".checkbox-column-inline-style").count).to eq(15)
           end
         end
       end
@@ -106,14 +106,16 @@
         click_button("Next")
 
         expect(page.has_button?("Previous")).to be(true)
-        expect(page.has_button?("Next")).to be(true)
-        expect(page).to have_content("Viewing 6-10 of 13 total")
+        expect(page.has_button?("Next")).to be(false)
+        expect(page).to have_content("Viewing 16-20 of 20 total")
 
-        click_button("3")
+        click_button("2")
 
         expect(page.has_button?("Next")).to be(false)
         expect(page.has_button?("Previous")).to be(true)
-        expect(page).to have_content("Viewing 11-13 of 13 total")
+
+        click_button("1")
+        expect(page).to have_content("Viewing 1-15 of 20 total")
       end
 
       it "Checkbox values are reset if user clicks No and then Yes" do
diff --git a/spec/support/correspondence_helpers.rb b/spec/support/correspondence_helpers.rb
index 389452e3de2..3edf4838c6b 100644
--- a/spec/support/correspondence_helpers.rb
+++ b/spec/support/correspondence_helpers.rb
@@ -50,7 +50,7 @@ def visit_intake_form
   def visit_intake_form_step_2_with_appeals
     setup_access
     veteran = create(:veteran, last_name: "Smith", file_number: "12345678")
-    appeals = (1..13).map { create(:appeal, veteran_file_number: veteran.file_number, docket_type: "direct_review") }
+    appeals = (1..20).map { create(:appeal, veteran_file_number: veteran.file_number, docket_type: "direct_review") }
     appeals.each do |appeal|
       InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
     end

From 6feac9e54d3c60fcebf000845bb56f707c79ed0a Mon Sep 17 00:00:00 2001
From: divyadasari-va <135847343+divyadasari-va@users.noreply.github.com>
Date: Wed, 10 Apr 2024 11:53:43 -0600
Subject: [PATCH 223/237] Div/appeals 37797 fix lint error (#21368)

* Initial commit for UI/UX changes

* Added the existing caseflow search properties

* Updated the checkboxes style fix

* Changes for spec file with the latest code changes

* Modified the seed data to check pagination

* Modified the lint issue change for if condition

* Modified the lint issue change for if condition
---
 .../TasksAppeals/AddAppealRelatedTaskView.jsx       | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/client/app/queue/correspondence/intake/components/TasksAppeals/AddAppealRelatedTaskView.jsx b/client/app/queue/correspondence/intake/components/TasksAppeals/AddAppealRelatedTaskView.jsx
index a3e5d4f7518..75425f4cf99 100644
--- a/client/app/queue/correspondence/intake/components/TasksAppeals/AddAppealRelatedTaskView.jsx
+++ b/client/app/queue/correspondence/intake/components/TasksAppeals/AddAppealRelatedTaskView.jsx
@@ -98,21 +98,14 @@ export const AddAppealRelatedTaskView = (props) => {
     let canContinue = true;
 
     // Check if radio button is selected
-    if (existingAppealRadio === '0') {
-      canContinue = true;
-    } else {
+    if (existingAppealRadio !== '0') {
       // Check if at least one checkbox is selected
       if (taskRelatedAppeals.length === 0) {
         canContinue = false;
       } else {
         // Check the conditions for each task and waived task
-        newTasks.forEach((task) => {
-          canContinue = canContinue && ((task.content !== '') && (task.type !== ''));
-        });
-
-        waivedTasks.forEach((task) => {
-          canContinue = canContinue && (task.isWaived ? (task.waiveReason !== '') : true);
-        });
+        canContinue = newTasks.every((task) => task.content !== '' && task.type !== '') &&
+                waivedTasks.every((task) => task.isWaived ? task.waiveReason !== '' : true);
       }
     }
 

From 19f66dd185f5383845fa214ccf51bfac8cadae5d Mon Sep 17 00:00:00 2001
From: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
Date: Thu, 11 Apr 2024 11:03:36 -0400
Subject: [PATCH 224/237] APPEALS-43927: Create Correspondence Admin Page CMP
 Seed Data Logic (#21371)

* create CMP rake task to generate correspondence data in UAT

* added vbms doc types to rake task

* removed useless method
---
 lib/tasks/correspondence.rake | 103 +++++++++++++++++++++++++++++++++-
 1 file changed, 102 insertions(+), 1 deletion(-)

diff --git a/lib/tasks/correspondence.rake b/lib/tasks/correspondence.rake
index f9f3bcd986b..e0b9ffdd602 100644
--- a/lib/tasks/correspondence.rake
+++ b/lib/tasks/correspondence.rake
@@ -21,7 +21,7 @@ namespace :correspondence do
     create_package_document_types
   end
 
-  desc "create correspondence test data in UAT given a veteran file number"
+  desc "create correspondence test data in demo given a veteran file number (does not work in UAT due to FactoryBot)"
   task :create_correspondence_test_data, [] => :environment do |_|
     catch(:error) do
       throw :error, STDOUT.puts("Please add a user to the request store") if RequestStore[:current_user].blank?
@@ -43,6 +43,55 @@ namespace :correspondence do
       STDOUT.puts("Success!! Correspondences have been seeded. Well done friend!")
     end
   end
+
+  desc "create mock CMP correspondence data for UAT testing"
+  task :seed_cmp_correspondences, [:vet_file_number, :number_of_correspondence] => :environment do |_, args|
+    catch(:error) do
+      num_cor = args.number_of_correspondence.to_i
+      veteran = Veteran.find_by_file_number_or_ssn(args.vet_file_number.to_s)
+      cmp_packet_number = create_cmp_packet_number
+      user = RequestStore[:current_user]
+
+      throw :error, STDOUT.puts("Correspondences created must be greater than 0") if num_cor <= 0
+      throw :error, STDOUT.puts("Veteran not found") if veteran.blank?
+      throw :error, STDOUT.puts("No user in the request store") if user.blank?
+
+      (1..num_cor).each do |cmp_queue_id|
+        package_doc_type = PackageDocumentType.all.sample
+        corr_type = CorrespondenceType.all.sample
+        receipt_date = rand(1.month.ago..1.day.ago)
+
+        nod = [true, false].sample
+
+        doc_type = generate_vbms_doc_type(nod)
+
+        cor = ::Correspondence.create!(
+          uuid: SecureRandom.uuid,
+          portal_entry_date: Time.zone.now,
+          source_type: "Mail",
+          package_document_type_id: package_doc_type&.id,
+          correspondence_type_id: corr_type&.id,
+          cmp_queue_id: cmp_queue_id,
+          cmp_packet_number: create_cmp_packet_number,
+          va_date_of_receipt: receipt_date,
+          notes: doc_type[:description],
+          assigned_by_id: user.id,
+          updated_by_id: user.id,
+          veteran_id: veteran.id,
+          nod: nod
+        ).tap { cmp_packet_number += 1 }
+
+        CorrespondenceDocument.find_or_create_by(
+          document_file_number: veteran.file_number,
+          uuid: SecureRandom.uuid,
+          vbms_document_type_id: doc_type[:id],
+          document_type: doc_type[:id],
+          pages: rand(1..30),
+          correspondence_id: cor.id
+        )
+      end
+    end
+  end
 end
 
 # rubocop:disable Metrics/MethodLength
@@ -144,3 +193,55 @@ def create_package_document_types
     PackageDocumentType.find_or_create_by(name: package_document_type)
   end
 end
+
+# default packet number to 1_000_000 or increment the list of current correspondences
+def create_cmp_packet_number
+  packet_number = Correspondence.last.blank? ? 1_000_000_000 : (Correspondence.last.cmp_packet_number + 1)
+
+  packet_number
+end
+
+# generate the doctype and description from VBMS doc type list
+def generate_vbms_doc_type(nod)
+  return nod_doc if nod
+
+  non_nod_docs.sample
+end
+
+def nod_doc
+  {
+    id: 1250,
+    description: "VA Form 10182, Decision Review Request: Board Appeal (Notice of Disagreement)"
+  }
+end
+
+# rubocop:disable Metrics/MethodLength
+def non_nod_docs
+  [
+    {
+      id: 1419,
+      description: "Reissuance Beneficiary Notification Letter"
+    },
+    {
+      id: 1430,
+      description: "Bank Letter Beneficiary"
+    },
+    {
+      id: 1448,
+      description: "VR-69 Chapter 36 Decision Letter"
+    },
+    {
+      id: 1452,
+      description: "Apportionment - notice to claimant"
+    },
+    {
+      id: 1505,
+      description: "Higher-Level Review (HLR) Not Timely Letter"
+    },
+    {
+      id: 1578,
+      description: "Pension End of Day Letter"
+    }
+  ]
+end
+# rubocop:enable Metrics/MethodLength

From 978eb2d5638370eecbc75f4645034dbfc1dd8d9c Mon Sep 17 00:00:00 2001
From: HunJerBAH <Jeremy.Hunton@va.gov>
Date: Thu, 11 Apr 2024 11:40:15 -0400
Subject: [PATCH 225/237] updated makefile naming convention

---
 Makefile.example | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile.example b/Makefile.example
index c2e79ec3473..2df6ac6f044 100644
--- a/Makefile.example
+++ b/Makefile.example
@@ -116,7 +116,6 @@ realclean: clean ## TODO
 precompile: ## Precompiles assets for testing
 	bundle exec rake assets:precompile
 
-yeet: clean precompile ## Cleans and precompiles assets for testing
 
 facols-bash:  ## Connect to the docker FACOLS instance
 	docker exec --tty -i VACOLS_DB bash
@@ -288,7 +287,7 @@ client-build-all client-all: client-test client-demo ## Builds webpack for both
 one-test:  ## run the rspec test passed in
 	bundle exec rspec $(RUN_ARGS)
 
-yeet-test: yeet one-test ## Cleans and precompiles assets for testing, then runs spec test passed in
+clean-test: clean precompile one-test ## Cleans and precompiles assets for testing, then runs spec test passed in
 
 run-all-queues: ## start shoryuken with all queues
 	bundle exec shoryuken -q caseflow_development_send_notifications caseflow_development_high_priority caseflow_development_low_priority  -R

From 6376e8661bb47cba61a7bce6c35b36b7e4849c1d Mon Sep 17 00:00:00 2001
From: piedram <110848569+piedram@users.noreply.github.com>
Date: Thu, 11 Apr 2024 14:39:25 -0400
Subject: [PATCH 226/237] change eFolderUploadFailedTask Routing (#21372)

* change eFolderUploadFailedTask Routing

* change condicion for efolder

---------

Co-authored-by: Jim Foley <james.foley4@va.gov>
---
 app/models/tasks/efolder_upload_failed_task.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/models/tasks/efolder_upload_failed_task.rb b/app/models/tasks/efolder_upload_failed_task.rb
index 3cfae9fd4ae..ade36ed81e1 100644
--- a/app/models/tasks/efolder_upload_failed_task.rb
+++ b/app/models/tasks/efolder_upload_failed_task.rb
@@ -1,4 +1,11 @@
 # frozen_string_literal: true
 
 class EfolderUploadFailedTask < CorrespondenceTask
+  def task_url
+    if (parent.type == ReviewPackageTask.name)
+      Constants.CORRESPONDENCE_TASK_URL.REVIEW_PACKAGE_TASK_URL.sub("uuid", correspondence.uuid)
+    elsif (parent.type == CorrespondenceIntakeTask.name)
+      Constants.CORRESPONDENCE_TASK_URL.INTAKE_TASK_URL.sub("uuid", correspondence.uuid)
+    end
+  end
 end

From 1579d2bf2ea1a20679b291d2175b6f0571c412a7 Mon Sep 17 00:00:00 2001
From: sulak-j <95875751+sulak-j@users.noreply.github.com>
Date: Thu, 11 Apr 2024 13:40:06 -0500
Subject: [PATCH 227/237] 
 Justin/APPEALS-42113_CorrespondenceReviewPackageController (#21348)

* creating review package controller, moving methods, editing routing

* Moving review package spec tests to new RP Spec file

* cleaning up code from intake controller spec
---
 app/controllers/correspondence_controller.rb  | 100 ------------
 ...orrespondence_review_package_controller.rb | 107 +++++++++++++
 config/routes.rb                              |  14 +-
 .../correspondence_controller_spec.rb         | 144 ------------------
 .../correspondence_intake_controller_spec.rb  |   3 -
 ...pondence_review_package_controller_spec.rb | 134 ++++++++++++++++
 6 files changed, 248 insertions(+), 254 deletions(-)
 create mode 100644 app/controllers/correspondence_review_package_controller.rb
 create mode 100644 spec/controllers/correspondence_review_package_controller_spec.rb

diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index c877d17520d..cddb52c5220 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -17,19 +17,10 @@ def correspondence_cases
     end
   end
 
-  def review_package
-    render "correspondence/review_package"
-  end
-
   def veteran
     render json: { veteran_id: veteran_by_correspondence&.id, file_number: veteran_by_correspondence&.file_number }
   end
 
-  def package_documents
-    packages = PackageDocumentType.all
-    render json: { package_document_types: packages }
-  end
-
   def current_correspondence
     @current_correspondence ||= correspondence
   end
@@ -38,99 +29,8 @@ def veteran_information
     @veteran_information ||= veteran_by_correspondence
   end
 
-  def show
-    corres_docs = correspondence.correspondence_documents
-    reason_remove = if RemovePackageTask.find_by(appeal_id: correspondence.id, type: RemovePackageTask.name).nil?
-                      ""
-                    else
-                      RemovePackageTask.find_by(appeal_id: correspondence.id, type: RemovePackageTask.name).instructions
-                    end
-    response_json = {
-      correspondence: correspondence,
-      package_document_type: correspondence&.package_document_type,
-      general_information: general_information,
-      user_can_edit_vador: InboundOpsTeam.singleton.user_is_admin?(current_user),
-      correspondence_documents: corres_docs.map do |doc|
-        WorkQueue::CorrespondenceDocumentSerializer.new(doc).serializable_hash[:data][:attributes]
-      end,
-      efolder_upload_failed_before: EfolderUploadFailedTask.where(
-        appeal_id: correspondence.id, type: "EfolderUploadFailedTask"
-      ),
-      reasonForRemovePackage: reason_remove
-    }
-    render({ json: response_json }, status: :ok)
-  end
-
-  def update
-    veteran = Veteran.find_by(file_number: veteran_params["file_number"])
-    if veteran && correspondence.update(
-      correspondence_params.merge(
-        veteran_id: veteran.id,
-        updated_by_id: RequestStore.store[:current_user].id
-      )
-    )
-      correspondence.tasks.map do |task|
-        if task.type == "ReviewPackageTask"
-          task.status = "in_progress"
-          task.save
-        end
-      end
-      render json: { status: :ok }
-    else
-      render json: { error: "Please enter a valid Veteran ID" }, status: :unprocessable_entity
-    end
-  end
-
-  def update_cmp
-    correspondence.update(
-      va_date_of_receipt: params["VADORDate"].in_time_zone,
-      package_document_type_id: params["packageDocument"]["value"].to_i
-    )
-    correspondence.tasks.map do |task|
-      if task.type == "ReviewPackageTask"
-        task.status = "in_progress"
-        task.save
-      end
-    end
-    render json: { status: 200, correspondence: correspondence }
-  end
-
-  def document_type_correspondence
-    data = vbms_document_types
-    render json: { data: data }
-  end
-
-  def pdf
-    # Hard-coding Document access until CorrespondenceDocuments are uploaded to S3Bucket
-    document = Document.limit(200)[params[:pdf_id].to_i]
-
-    document_disposition = "inline"
-    if params[:download]
-      document_disposition = "attachment; filename='#{params[:type]}-#{params[:id]}.pdf'"
-    end
-
-    # The line below enables document caching for a month.
-    expires_in 30.days, public: true
-    send_file(
-      document.serve,
-      type: "application/pdf",
-      disposition: document_disposition
-    )
-  end
-
   private
 
-  # :reek:FeatureEnvy
-  def vbms_document_types
-    begin
-      data = ExternalApi::ClaimEvidenceService.document_types
-    rescue StandardError => error
-      Rails.logger.error(error.full_message)
-      data ||= demo_data
-    end
-    data.map { |document_type| { id: document_type["id"], name: document_type["description"] } }
-  end
-
   def demo_data
     json_file_path = "vbms doc types.json"
     JSON.parse(File.read(json_file_path))
diff --git a/app/controllers/correspondence_review_package_controller.rb b/app/controllers/correspondence_review_package_controller.rb
new file mode 100644
index 00000000000..a4ae76128fe
--- /dev/null
+++ b/app/controllers/correspondence_review_package_controller.rb
@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+class CorrespondenceReviewPackageController < CorrespondenceController
+
+  def review_package
+    render "correspondence/review_package"
+  end
+
+  def package_documents
+    packages = PackageDocumentType.all
+    render json: { package_document_types: packages }
+  end
+
+  def show
+    corres_docs = correspondence.correspondence_documents
+    reason_remove = if RemovePackageTask.find_by(appeal_id: correspondence.id, type: RemovePackageTask.name).nil?
+                      ""
+                    else
+                      RemovePackageTask.find_by(appeal_id: correspondence.id, type: RemovePackageTask.name).instructions
+                    end
+    response_json = {
+      correspondence: correspondence,
+      package_document_type: correspondence&.package_document_type,
+      general_information: general_information,
+      user_can_edit_vador: InboundOpsTeam.singleton.user_is_admin?(current_user),
+      correspondence_documents: corres_docs.map do |doc|
+        WorkQueue::CorrespondenceDocumentSerializer.new(doc).serializable_hash[:data][:attributes]
+      end,
+      efolder_upload_failed_before: EfolderUploadFailedTask.where(
+        appeal_id: correspondence.id, type: "EfolderUploadFailedTask"
+      ),
+      reasonForRemovePackage: reason_remove
+    }
+    render({ json: response_json }, status: :ok)
+  end
+
+  def update
+    veteran = Veteran.find_by(file_number: veteran_params["file_number"])
+    if veteran && correspondence.update(
+      correspondence_params.merge(
+        veteran_id: veteran.id,
+        updated_by_id: RequestStore.store[:current_user].id
+      )
+    )
+      correspondence.tasks.map do |task|
+        if task.type == "ReviewPackageTask"
+          task.status = "in_progress"
+          task.save
+        end
+      end
+      render json: { status: :ok }
+    else
+      render json: { error: "Please enter a valid Veteran ID" }, status: :unprocessable_entity
+    end
+  end
+
+  def update_cmp
+    correspondence.update(
+      va_date_of_receipt: params["VADORDate"].in_time_zone,
+      package_document_type_id: params["packageDocument"]["value"].to_i
+    )
+    correspondence.tasks.map do |task|
+      if task.type == "ReviewPackageTask"
+        task.status = "in_progress"
+        task.save
+      end
+    end
+    render json: { status: 200, correspondence: correspondence }
+  end
+
+  def document_type_correspondence
+    data = vbms_document_types
+    render json: { data: data }
+  end
+
+  def pdf
+    # Hard-coding Document access until CorrespondenceDocuments are uploaded to S3Bucket
+    document = Document.limit(200)[params[:pdf_id].to_i]
+
+    document_disposition = "inline"
+    if params[:download]
+      document_disposition = "attachment; filename='#{params[:type]}-#{params[:id]}.pdf'"
+    end
+
+    # The line below enables document caching for a month.
+    expires_in 30.days, public: true
+    send_file(
+      document.serve,
+      type: "application/pdf",
+      disposition: document_disposition
+    )
+  end
+
+  private
+
+  # :reek:FeatureEnvy
+  def vbms_document_types
+    begin
+      data = ExternalApi::ClaimEvidenceService.document_types
+    rescue StandardError => error
+      Rails.logger.error(error.full_message)
+      data ||= demo_data
+    end
+    data.map { |document_type| { id: document_type["id"], name: document_type["description"] } }
+  end
+
+end
diff --git a/config/routes.rb b/config/routes.rb
index 3823085ce54..576c8fbc80f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -331,15 +331,15 @@
     post '/correspondence/:correspondence_uuid/correspondence_intake_task', to: 'correspondence_tasks#create_correspondence_intake_task'
     post '/correspondence/:id/remove_package', to: 'correspondence_tasks#remove_package'
     post '/correspondence/:id/completed_package', to: 'correspondence_tasks#completed_package'
-    get '/correspondence/:correspondence_uuid/review_package', to: 'correspondence#review_package'
-    get '/correspondence/edit_document_type_correspondence', to: 'correspondence#document_type_correspondence'
+    get '/correspondence/:correspondence_uuid/review_package', to: 'correspondence_review_package#review_package'
+    get '/correspondence/edit_document_type_correspondence', to: 'correspondence_review_package#document_type_correspondence'
     patch '/correspondence/:correspondence_uuid/intake_update', to: 'correspondence_intake#intake_update'
     get '/correspondence/:correspondence_uuid/veteran', to: 'correspondence#veteran'
-    put '/correspondence/:correspondence_uuid/update_cmp', to: 'correspondence#update_cmp'
-    get '/correspondence/packages', to: 'correspondence#package_documents'
-    get '/correspondence/:correspondence_uuid', to: 'correspondence#show'
-    get '/correspondence/:pdf_id/pdf', to: 'correspondence#pdf'
-    patch '/correspondence/:correspondence_uuid', to: 'correspondence#update'
+    put '/correspondence/:correspondence_uuid/update_cmp', to: 'correspondence_review_package#update_cmp'
+    get '/correspondence/packages', to: 'correspondence_review_package#package_documents'
+    get '/correspondence/:correspondence_uuid', to: 'correspondence_review_package#show'
+    get '/correspondence/:pdf_id/pdf', to: 'correspondence_review_package#pdf'
+    patch '/correspondence/:correspondence_uuid', to: 'correspondence_review_package#update'
     patch '/correspondence/:id/update_document', to: 'correspondence_document#update_document'
     post '/correspondence/:correspondence_uuid', to: 'correspondence_intake#process_intake', as: :queue_correspondence_intake_process_intake
     post "/correspondence/:correspondence_uuid/task", to: "correspondence_tasks#create_package_action_task"
diff --git a/spec/controllers/correspondence_controller_spec.rb b/spec/controllers/correspondence_controller_spec.rb
index d3d0ce65104..4f5392a2bbe 100644
--- a/spec/controllers/correspondence_controller_spec.rb
+++ b/spec/controllers/correspondence_controller_spec.rb
@@ -1,149 +1,5 @@
 # frozen_string_literal: true
 
 RSpec.describe CorrespondenceController, :all_dbs, type: :controller do
-  let(:veteran) { create(:veteran) }
-  let(:correspondence_type) { create(:correspondence_type) }
-  let(:correspondence) { create(:correspondence, veteran: veteran) }
 
-  let(:related_correspondence_uuids) do
-    (1..3).map { create(:correspondence) }.pluck(:uuid)
-  end
-  let(:esw_tasks) do
-    (1..3).map do
-      appeal = create(:appeal)
-      InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
-      {
-        task_id: EvidenceSubmissionWindowTask.find_by(appeal: appeal).id,
-        waive_reason: "This is a waive reason."
-      }
-    end
-  end
-  let(:veteran) { create(:veteran) }
-  let(:valid_params) { { notes: "Updated notes", correspondence_type_id: correspondence_type.id } }
-  let(:new_file_number) { "50000005" }
-  let(:current_user) { create(:user) }
-  let!(:parent_task) { create(:correspondence_intake_task, appeal: correspondence, assigned_to: current_user) }
-
-  let(:mock_doc_uploader) { instance_double(CorrespondenceDocumentsEfolderUploader) }
-
-  before do
-    Fakes::Initializer.load!
-    FeatureToggle.enable!(:correspondence_queue)
-    User.authenticate!(roles: ["Mail Intake"])
-    correspondence.update(veteran: veteran)
-
-    allow(CorrespondenceDocumentsEfolderUploader).to receive(:new).and_return(mock_doc_uploader)
-    allow(mock_doc_uploader).to receive(:upload_documents_to_claim_evidence).and_return(true)
-  end
-
-  describe "GET #show" do
-    before do
-      MailTeam.singleton.add_user(current_user)
-      User.authenticate!(user: current_user)
-      get :show, params: { correspondence_uuid: correspondence.uuid }
-    end
-
-    it "returns a successful response" do
-      expect(response).to have_http_status(:ok)
-    end
-
-    it "returns the general information" do
-      json_response = JSON.parse(response.body)
-      correspondence_data = json_response["correspondence"]
-      general_info = json_response["general_information"]
-      expect(correspondence_data["notes"]).to eq(correspondence.notes)
-      expect(general_info["file_number"]).to eq(veteran.file_number)
-      expect(general_info["correspondence_type_id"]).to eq(correspondence.correspondence_type_id)
-    end
-  end
-
-  describe "GET #show" do
-    it "returns an unauthorized response" do
-      get :show, params: { correspondence_uuid: correspondence.uuid }
-      expect(response.status).to eq 302
-      expect(response.body).to match(/unauthorized/)
-    end
-
-    it "returns a success response when current user is part of InboundOpsTeam" do
-      InboundOpsTeam.singleton.add_user(current_user)
-      User.authenticate!(user: current_user)
-      get :show, params: { correspondence_uuid: correspondence.uuid }
-      expect(response).to have_http_status(:ok)
-    end
-  end
-
-  describe "PATCH #update" do
-    let(:veteran) { create(:veteran, file_number: new_file_number) }
-    before do
-      MailTeam.singleton.add_user(current_user)
-      User.authenticate!(user: current_user)
-      correspondence.update(veteran: veteran)
-      patch :update, params: {
-        correspondence_uuid: correspondence.uuid,
-        veteran: { file_number: new_file_number },
-        correspondence: valid_params
-      }
-    end
-
-    it "updates the general information" do
-      expect(response).to have_http_status(:ok)
-      expect(veteran.reload.file_number).to eq(new_file_number)
-      expect(correspondence.reload.notes).to eq("Updated notes")
-      expect(correspondence.reload.correspondence_type_id).to eq(correspondence_type.id)
-      expect(correspondence.reload.updated_by_id).to eq(current_user.id)
-    end
-  end
-
-  describe "document_type_correspondence" do
-    let(:document_types_response) do
-      [
-        {
-          "id" => 150,
-          "createDateTime" => "2011-12-09",
-          "modifiedDateTime" => "2023-07-30T21:04:14",
-          "name" => "L141",
-          "description" => "VA Form 21-8056",
-          "isUserUploadable" => true,
-          "is526" => false,
-          "documentCategory" => {
-            "id" => 70,
-            "createDateTime" => "2011-12-09",
-            "modifiedDateTime" => "2014-04-21T11:49:07",
-            "description" => "Correspondence",
-            "subDescription" => "Miscellaneous"
-          }
-        },
-        {
-          "id" => 152,
-          "createDateTime" => "2011-12-09",
-          "modifiedDateTime" => "2023-07-30T21:04:14",
-          "name" => "L143",
-          "description" => "VA Form 21-8358",
-          "isUserUploadable" => true,
-          "is526" => false,
-          "documentCategory" => {
-            "id" => 70,
-            "createDateTime" => "2011-12-09",
-            "modifiedDateTime" => "2014-04-21T11:49:07",
-            "description" => "Correspondence",
-            "subDescription" => "Miscellaneous"
-          }
-        }
-      ]
-    end
-
-    before do
-      allow(ExternalApi::ClaimEvidenceService).to receive(:document_types).and_return(document_types_response)
-    end
-
-    it "returns an array of hashes with id and name" do
-      result = controller.send(:vbms_document_types)
-      expect(result).to eq(
-        [
-          { id: 150, name: "VA Form 21-8056" },
-          { id: 152, name: "VA Form 21-8358" }
-        ]
-      )
-    end
-  end
 end
diff --git a/spec/controllers/correspondence_intake_controller_spec.rb b/spec/controllers/correspondence_intake_controller_spec.rb
index 648f56101a2..a0bbdf62012 100644
--- a/spec/controllers/correspondence_intake_controller_spec.rb
+++ b/spec/controllers/correspondence_intake_controller_spec.rb
@@ -18,9 +18,6 @@
       }
     end
   end
-  let(:veteran) { create(:veteran) }
-  let(:valid_params) { { notes: "Updated notes", correspondence_type_id: correspondence_type.id } }
-  let(:new_file_number) { "50000005" }
   let(:current_user) { create(:user) }
   let!(:parent_task) { create(:correspondence_intake_task, appeal: correspondence, assigned_to: current_user) }
 
diff --git a/spec/controllers/correspondence_review_package_controller_spec.rb b/spec/controllers/correspondence_review_package_controller_spec.rb
new file mode 100644
index 00000000000..a56a4bd2d7c
--- /dev/null
+++ b/spec/controllers/correspondence_review_package_controller_spec.rb
@@ -0,0 +1,134 @@
+# frozen_string_literal: true
+
+RSpec.describe CorrespondenceReviewPackageController, :all_dbs, type: :controller do
+  let(:veteran) { create(:veteran) }
+  let(:correspondence_type) { create(:correspondence_type) }
+  let(:correspondence) { create(:correspondence, veteran: veteran) }
+  let(:valid_params) { { notes: "Updated notes", correspondence_type_id: correspondence_type.id } }
+  let(:new_file_number) { "50000005" }
+  let(:current_user) { create(:user) }
+  let!(:parent_task) { create(:correspondence_intake_task, appeal: correspondence, assigned_to: current_user) }
+
+  let(:mock_doc_uploader) { instance_double(CorrespondenceDocumentsEfolderUploader) }
+
+  before do
+    Fakes::Initializer.load!
+    FeatureToggle.enable!(:correspondence_queue)
+    User.authenticate!(roles: ["Mail Intake"])
+    correspondence.update(veteran: veteran)
+
+    allow(CorrespondenceDocumentsEfolderUploader).to receive(:new).and_return(mock_doc_uploader)
+    allow(mock_doc_uploader).to receive(:upload_documents_to_claim_evidence).and_return(true)
+  end
+
+  describe "GET #show" do
+    before do
+      MailTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+      get :show, params: { correspondence_uuid: correspondence.uuid }
+    end
+
+    it "returns a successful response" do
+      expect(response).to have_http_status(:ok)
+    end
+
+    it "returns the general information" do
+      json_response = JSON.parse(response.body)
+      correspondence_data = json_response["correspondence"]
+      general_info = json_response["general_information"]
+      expect(correspondence_data["notes"]).to eq(correspondence.notes)
+      expect(general_info["file_number"]).to eq(veteran.file_number)
+      expect(general_info["correspondence_type_id"]).to eq(correspondence.correspondence_type_id)
+    end
+  end
+
+  describe "GET #show" do
+    it "returns an unauthorized response" do
+      get :show, params: { correspondence_uuid: correspondence.uuid }
+      expect(response.status).to eq 302
+      expect(response.body).to match(/unauthorized/)
+    end
+
+    it "returns a success response when current user is part of InboundOpsTeam" do
+      InboundOpsTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+      get :show, params: { correspondence_uuid: correspondence.uuid }
+      expect(response).to have_http_status(:ok)
+    end
+  end
+
+  describe "PATCH #update" do
+    let(:veteran) { create(:veteran, file_number: new_file_number) }
+    before do
+      MailTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+      correspondence.update(veteran: veteran)
+      patch :update, params: {
+        correspondence_uuid: correspondence.uuid,
+        veteran: { file_number: new_file_number },
+        correspondence: valid_params
+      }
+    end
+
+    it "updates the general information" do
+      expect(response).to have_http_status(:ok)
+      expect(veteran.reload.file_number).to eq(new_file_number)
+      expect(correspondence.reload.notes).to eq("Updated notes")
+      expect(correspondence.reload.correspondence_type_id).to eq(correspondence_type.id)
+      expect(correspondence.reload.updated_by_id).to eq(current_user.id)
+    end
+  end
+
+  describe "document_type_correspondence" do
+    let(:document_types_response) do
+      [
+        {
+          "id" => 150,
+          "createDateTime" => "2011-12-09",
+          "modifiedDateTime" => "2023-07-30T21:04:14",
+          "name" => "L141",
+          "description" => "VA Form 21-8056",
+          "isUserUploadable" => true,
+          "is526" => false,
+          "documentCategory" => {
+            "id" => 70,
+            "createDateTime" => "2011-12-09",
+            "modifiedDateTime" => "2014-04-21T11:49:07",
+            "description" => "Correspondence",
+            "subDescription" => "Miscellaneous"
+          }
+        },
+        {
+          "id" => 152,
+          "createDateTime" => "2011-12-09",
+          "modifiedDateTime" => "2023-07-30T21:04:14",
+          "name" => "L143",
+          "description" => "VA Form 21-8358",
+          "isUserUploadable" => true,
+          "is526" => false,
+          "documentCategory" => {
+            "id" => 70,
+            "createDateTime" => "2011-12-09",
+            "modifiedDateTime" => "2014-04-21T11:49:07",
+            "description" => "Correspondence",
+            "subDescription" => "Miscellaneous"
+          }
+        }
+      ]
+    end
+
+    before do
+      allow(ExternalApi::ClaimEvidenceService).to receive(:document_types).and_return(document_types_response)
+    end
+
+    it "returns an array of hashes with id and name" do
+      result = controller.send(:vbms_document_types)
+      expect(result).to eq(
+        [
+          { id: 150, name: "VA Form 21-8056" },
+          { id: 152, name: "VA Form 21-8358" }
+        ]
+      )
+    end
+  end
+end

From 5c5c7f5f21ed58be551139b2fd0e8601de0dab04 Mon Sep 17 00:00:00 2001
From: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
Date: Thu, 11 Apr 2024 18:13:09 -0400
Subject: [PATCH 228/237] added supervisor only banner as default for review
 package banner (#21380)

Co-authored-by: Jim Foley <james.foley4@va.gov>
---
 client/COPY.json                                               | 1 +
 .../review_package/CorrespondenceReviewPackage.jsx             | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/COPY.json b/client/COPY.json
index d9453e7d492..8f53f717d6c 100644
--- a/client/COPY.json
+++ b/client/COPY.json
@@ -1462,6 +1462,7 @@
   "UNDER_CONSTRUCTION_MESSAGE": "This page is under construction.",
   "CORRESPONDENCE_READONLY_BANNER_HEADER": "This package has a pending request",
   "CORRESPONDENCE_READONLY_BANNER_MESSAGE": "Any further actions cannot be made on this package until a supervisor or superuser reviews the request.",
+  "CORRESPONDENCE_READONLY_SUPERVISOR_BANNER_MESSAGE": "Any further actions cannot be made on this package until a supervisor reviews the request.",
   "ASSOCIATED_WITH_CLAIMS_FOLDER_MAIL_TASK_LABEL": "Associated with claims folder",
   "CORRESPONDENCE_CASES_REMOVE_PACKAGE_MODAL_TITLE": "Review request",
   "CORRESPONDENCE_CASES_REASSIGN_PACKAGE_MODAL_TITLE": "Review request",
diff --git a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
index 9e236c40cb6..78b9c7be1ac 100644
--- a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
+++ b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
@@ -16,6 +16,7 @@ import ReviewPackageNotificationBanner from './ReviewPackageNotificationBanner';
 import {
   CORRESPONDENCE_READONLY_BANNER_HEADER,
   CORRESPONDENCE_READONLY_BANNER_MESSAGE,
+  CORRESPONDENCE_READONLY_SUPERVISOR_BANNER_MESSAGE,
   CORRESPONDENCE_DOC_UPLOAD_FAILED_HEADER,
   CORRESPONDENCE_DOC_UPLOAD_FAILED_MESSAGE }
   from '../../../../COPY';
@@ -108,7 +109,7 @@ export const CorrespondenceReviewPackage = (props) => {
       if (isPageReadOnly(data.correspondence_tasks)) {
         setBannerInformation({
           title: CORRESPONDENCE_READONLY_BANNER_HEADER,
-          message: CORRESPONDENCE_READONLY_BANNER_MESSAGE,
+          message: CORRESPONDENCE_READONLY_SUPERVISOR_BANNER_MESSAGE,
           bannerType: 'info'
         });
         setIsReadOnly(true);

From da2fa65210a940fe6f65f980ce366112ee20705c Mon Sep 17 00:00:00 2001
From: Alex Smith <alex.smith.99@thunderyard.com>
Date: Fri, 12 Apr 2024 15:03:18 -0600
Subject: [PATCH 229/237] Fix Auto Assign VA DOR Bug (#21385)

- Fix bug causing correspondences not be sorted by VA DOR in
ascending (oldest -> newest) order.

- Update specs to test this scenario.
---
 app/services/correspondence_auto_assigner.rb  |  2 +-
 .../correspondence_auto_assigner_spec.rb      | 54 ++++++++++++++++---
 2 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/app/services/correspondence_auto_assigner.rb b/app/services/correspondence_auto_assigner.rb
index 3dc848726f5..6a9b412b81b 100644
--- a/app/services/correspondence_auto_assigner.rb
+++ b/app/services/correspondence_auto_assigner.rb
@@ -71,7 +71,7 @@ def unassigned_review_package_tasks
       .preload(:appeal, :assigned_by, :assigned_to, :parent)
       .includes(:correspondence, correspondence: :veteran)
       .references(:correspondence, correspondence: :veteran)
-      .merge(Correspondence.order(va_date_of_receipt: :desc))
+      .order(va_date_of_receipt: :asc)
   end
 
   def validate_run!(current_user_id, batch_auto_assignment_attempt_id)
diff --git a/spec/services/correspondence_auto_assigner_spec.rb b/spec/services/correspondence_auto_assigner_spec.rb
index 34c0a2f84ed..54636e90460 100644
--- a/spec/services/correspondence_auto_assigner_spec.rb
+++ b/spec/services/correspondence_auto_assigner_spec.rb
@@ -25,30 +25,72 @@
       end
 
       context "with unassigned ReviewPackageTasks" do
-        let!(:correspondence) { create(:correspondence, veteran_id: veteran.id) }
-
         context "when assignable users exist" do
           let(:intake_user) { create(:intake_user) }
           let!(:org_user) { create(:organizations_user, organization: InboundOpsTeam.singleton, user: intake_user) }
 
           before do
             expect(mock_assignable_user_finder).to receive(:assignable_users_exist?).and_return(true)
-            expect(mock_assignable_user_finder).to receive(:get_first_assignable_user).and_return(intake_user)
           end
 
           it "assigns review package tasks to assignable users" do
+            correspondence = create(:correspondence, veteran_id: veteran.id, va_date_of_receipt: 1.day.ago)
+            expect(mock_assignable_user_finder).to receive(:get_first_assignable_user).and_return(intake_user)
+
             described.perform(
               current_user_id: current_user.id,
               batch_auto_assignment_attempt_id: batch.id
             )
 
-            task = ReviewPackageTask.last
-            expect(task.assigned_to).to eq(intake_user)
-            expect(task.status).to eq("assigned")
+            expect(correspondence.review_package_task.assigned_to).to eq(intake_user)
+            expect(correspondence.review_package_task.status).to eq("assigned")
+          end
+
+          context "with varying va_date_of_receipt values" do
+            let!(:new_correspondence) { create(:correspondence, veteran_id: veteran.id, va_date_of_receipt: 1.day.ago) }
+            let!(:old_correspondence) do
+              create(:correspondence, veteran_id: veteran.id, va_date_of_receipt: 1.year.ago)
+            end
+
+            let(:mock_run_logger) { instance_double(CorrespondenceAutoAssignLogger, begin: nil, end: nil) }
+
+            before do
+              allow(CorrespondenceAutoAssignLogger).to receive(:new).and_return(mock_run_logger)
+            end
+
+            it "assigns the correspondence with the oldest va_date_of_receipt first" do
+              expect(mock_assignable_user_finder).to receive(:get_first_assignable_user).and_return(intake_user)
+              expect(mock_assignable_user_finder).to receive(:get_first_assignable_user).and_return(nil)
+
+              expect(mock_run_logger).to receive(:no_eligible_assignees)
+                .with(
+                  task: new_correspondence.review_package_task,
+                  started_at: instance_of(ActiveSupport::TimeWithZone)
+                )
+              expect(mock_run_logger).to receive(:assigned)
+                .with(
+                  task: old_correspondence.review_package_task,
+                  started_at: instance_of(ActiveSupport::TimeWithZone),
+                  assigned_to: intake_user
+                )
+
+              described.perform(
+                current_user_id: current_user.id,
+                batch_auto_assignment_attempt_id: batch.id
+              )
+
+              expect(old_correspondence.review_package_task.assigned_to).to eq(intake_user)
+              expect(old_correspondence.review_package_task.status).to eq("assigned")
+
+              expect(new_correspondence.review_package_task.assigned_to).to eq(InboundOpsTeam.singleton)
+              expect(new_correspondence.review_package_task.status).to eq("unassigned")
+            end
           end
         end
 
         context "when assignable users do NOT exist" do
+          let!(:correspondence) { create(:correspondence, veteran_id: veteran.id, va_date_of_receipt: 1.day.ago) }
+
           before do
             expect(mock_assignable_user_finder).to receive(:assignable_users_exist?).and_return(false)
           end

From 8cfe1598aaaf8586b57d495688ae2892c5521196 Mon Sep 17 00:00:00 2001
From: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
Date: Mon, 22 Apr 2024 13:25:15 -0400
Subject: [PATCH 230/237] Merging Feature/APPEALS-32900 into Integration Branch
 (#21426)

* Added a join clause of appeal_type = 'Appeal' to the with_original_appeal_and_judge_task method in the distribution_scopes.rb to prevent a sequential table scan which was causing a database timeout with large datasets in the tasks table in production and prod test. (#21386)

Co-authored-by: = <tyler.broyles@va.gov>

* Hotfix/appeals 21696 (#21343)

* fix(create conference): update test for nil appellant email

* fix(create conference): nil appellant email check

* fix(conference job): lint

* fix(create conference): minor

* null

* null

* null

---------

Co-authored-by: Raymond Hughes <131811099+raymond-hughes@users.noreply.github.com>

* Hotfix/appeals 23420 v3 (#21347)

* Add LegacyAppealSearchSerializer to rendering

* Make additional improvements to the Legacy Serializer

* Add MST and PACT to both search serializers respectively

* schema check-in

---------

Co-authored-by: raymond-hughes <raymond.hughes2@va.gov>
Co-authored-by: Raymond Hughes <131811099+raymond-hughes@users.noreply.github.com>

* hotfix/APPEALS-27522 (#21326)

* update erroneous db cleaner syntax and add temp fix to changeset_at_index_for_task method

* update changeset_at_index_for_task method to account for lint error

* fix lint error and code climate error

---------

Co-authored-by: Raymond Hughes <131811099+raymond-hughes@users.noreply.github.com>

* Hotfix/appeals 10993 v2 (#21349)

* added logic for deciding aod on attorney claimant

* added tests

* refactored test to return true when motion is granted

---------

Co-authored-by: Andrew Hadley <hadley_andrew@bah.com>
Co-authored-by: Raymond Hughes <131811099+raymond-hughes@users.noreply.github.com>

* Fixed a bug where some of the Specialty Case Team assign queue settings would take priority over judge assign queue settings for judges who were also members of the specialty case team organization. (#21387)

Co-authored-by: = <tyler.broyles@va.gov>

* Merge hotfix/APPEALS-43956 into release/FY24Q2.7.0 (#21389)

* Added additional logic checks to the attorney task cancel to fix a bug where the cancel attorney task would attempt to update a non existing SpecialtyCaseTeamAssignTask when the appeal matches the sct_appeal? criteria of a 'vha' benefit type.

* Removed feature toggle from the checks since the cancel task should work properly for appeals that were disributed while the feature toggle used in distribution was turned on.

* Added a regression test.

---------

Co-authored-by: = <tyler.broyles@va.gov>

* Merge hotfix/APPEALS-43990 into release/FY24Q2.7.0 (#21388)

* Added a nil value to the inclusion field of the distributed case validation for the sct_appeal boolean that was causing an error when calling the rename_for_redistribution! on a distributed case where the value was not already set to true and false

* Added a regression test for the sct_appeal validation.

---------

Co-authored-by: = <tyler.broyles@va.gov>

* Added a null coalesce to prevent a javascript error caused by a race condition where remaining users could be nil instead of an array if the user is searching for a user at the same time they are adding a user. (#19487)

* APPEALS-43712, APPEALS-43835: Open VeteranRecordRequest and QualityReviewTask are causing distributions to fail (#21354)

* remove Appeal.can_redistribute_appeal? from JudgeAssignTask creation during normal distribution

* update test

* re-add tests for validating each bug scenario

* disable mail task test that is failing due to how it is written

* updating hearing_shift_date to prevent future hearing dates from occuring in local/demo (#21306)

Co-authored-by: Craig Reese <109101548+craigrva@users.noreply.github.com>

* Lint fixes (#21383)

* APPEALS-43423 - AssignedReassignPackageTask remove user limitation (#21400)

* Ryandwill/appeals 43393 (#21339)

* refactored correspondence_controller_util into correspondence_controller_concern

* refactor correspondence_controller

* updated method to be class level and in CorrespondenceTask model

* Updating the class methods from controller to model

* Updated the correspondence_task.rb

* Update intake endpoint with custom serialization and move logic to models

* update QueueApp with new props

* remove controller passed props from redux

* update frontend components for correspondence objects new data shape

* Update test for controller changes

* update test for new controller changes

* update test for controller changes

* fix typo in error msg and related tests

* remove unused argument

* remove unneeded prop validation

* move task update logic and banner presentation to correspondence tasks controller

* move team action to queue controller

* rubocop fix

* remove review package methods to prepare for feature merge

* clean up review package veteran update

* fix test to follow assertion

* update spec for new pagination requirements

* fix typo

* refactor reassign/remove package modals for RP page

* fix test setup to create RemovePackageTask properly

* fix test selector

* fix test - quotation marks and hyphen character in string

* fix style issues

* rspec fixes

* update rp controller inbound ops team check

* remove pry

* removed leftover binding pry

* remove pry

* remove previously deleted code

* fix flaky test

* fix tests

---------

Co-authored-by: Ryan Marshall <rnmarshall1993@gmail.com>
Co-authored-by: divyadasari-va <divya.dasari@va.gov>
Co-authored-by: HunJerBAH <Jeremy.Hunton@va.gov>

* Move Correspondence ART CSS Styling Into a Single Stylesheet- Queue - APPEALS-43392 (#21384)

* WIP

* All styling has meen moved to scss

* Small fixes

* fixed inbound ops team being listed in queuetable dropdown (#21405)

* fixed inbound ops team being listed in queuetable dropdown

* refactored isMailTeamAffiliated

* removed commented out code

---------

Co-authored-by: HunJerBAH <Jeremy.Hunton@va.gov>
Co-authored-by: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>

* Reassign Correspondence Allows Reassignment over 60 Limit (#21403)

* Reassign Correspondence Allows Reassignment over 60 Limit

* Reassign Correspondence Allows Reassignment over 60 Limit

* added limit check to banner message and resolve linting error with safety operator

* remove file app/models/concerns/correspondence_controller_util.rb

---------

Co-authored-by: HunJerBAH <Jeremy.Hunton@va.gov>

* Kamalam7/appeals 35469 (#21407)

* Return to queue from the Intake form

* specs for Return to queue from Intake form

* Resolved merge conflicts for Return to queue Intake form

* Lint fix in Correspondence intake file

---------

Co-authored-by: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>

* Wmedders21/appeals 44301 (#21413)

* correspondence controller specs live in spec/requests

* Remove unused veteran endpoint

* Add request tests for user access and feature flag

* add tests for review package controller

* remove unnecessary line

* refactor test for simplecov coverage

* remove unneeded test

* add intake spec

* add controller tests

* add erroneously removed method

* Fix rubocop style

* fix selector in flaky test

* add error class to rescue

---------

Co-authored-by: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>

* Justin/appeals 43606 (#21399)

* lining up misaligned brackets

* CorrespondencePdfFooter inline styles removed

* removing unused class and styling

* CmpDocuments.jsx styles into a stylesheet

* CorrespondenceReviewPackage.jsx styles into a stylesheet

* ReviewForm.jsx WIP

* moving css out of ReviewPackageCaseTitle

* ReviewForm.jsx styles into a stylesheet

* scss fix

* CorrespondencePdfToolBar.jsx  styles into a stylesheet

* ReviewPackageData file scss

* removing excess styling to keep textarea at application default sizing

* updated test on intake spec

* cleaned up old binding pry

---------

Co-authored-by: Dev-KRedd <khalin.redding@va.gov>
Co-authored-by: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
Co-authored-by: HunJerBAH <Jeremy.Hunton@va.gov>

* Add unit tests (#21421)

* added completed_by_date

* APPEALS-44300 - Prior Mail test

* created approve unit test on ReassignPackageTask model.

* added tests

* added remove package tasks approve and reject methods

* Reassign Correspondence Allows Reassignment over 60 Limit (#21403)

* Reassign Correspondence Allows Reassignment over 60 Limit

* Reassign Correspondence Allows Reassignment over 60 Limit

* added limit check to banner message and resolve linting error with safety operator

* remove file app/models/concerns/correspondence_controller_util.rb

---------

Co-authored-by: HunJerBAH <Jeremy.Hunton@va.gov>

* Kamalam7/appeals 35469 (#21407)

* Return to queue from the Intake form

* specs for Return to queue from Intake form

* Resolved merge conflicts for Return to queue Intake form

* Lint fix in Correspondence intake file

---------

Co-authored-by: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>

* Wmedders21/appeals 44301 (#21413)

* correspondence controller specs live in spec/requests

* Remove unused veteran endpoint

* Add request tests for user access and feature flag

* add tests for review package controller

* remove unnecessary line

* refactor test for simplecov coverage

* remove unneeded test

* add intake spec

* add controller tests

* add erroneously removed method

* Fix rubocop style

* fix selector in flaky test

* add error class to rescue

---------

Co-authored-by: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>

---------

Co-authored-by: KiMauVA <Ki.Mau@va.gov>
Co-authored-by: piedram <110848569+piedram@users.noreply.github.com>
Co-authored-by: HunJerBAH <Jeremy.Hunton@va.gov>
Co-authored-by: Kamala Madamanchi <110078646+kamala-07@users.noreply.github.com>
Co-authored-by: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
Co-authored-by: Will Medders <93014155+wmedders21@users.noreply.github.com>

---------

Co-authored-by: Robert Travis Pierce <robert@roberttravispierce.com>
Co-authored-by: = <tyler.broyles@va.gov>
Co-authored-by: Christian Cain <149622375+christian-cain-bah@users.noreply.github.com>
Co-authored-by: Raymond Hughes <131811099+raymond-hughes@users.noreply.github.com>
Co-authored-by: Aiman Kayad <Akaya005@fiu.edu>
Co-authored-by: raymond-hughes <raymond.hughes2@va.gov>
Co-authored-by: Dani Coleman <60626984+dcoleman21@users.noreply.github.com>
Co-authored-by: Drew Hadley <50673809+VandelayUtd@users.noreply.github.com>
Co-authored-by: Andrew Hadley <hadley_andrew@bah.com>
Co-authored-by: Tyler Broyles <109369527+TylerBroyles@users.noreply.github.com>
Co-authored-by: Craig Reese <109101548+craigrva@users.noreply.github.com>
Co-authored-by: Isaiah Saucedo <irsaucedo5@gmail.com>
Co-authored-by: divyadasari-va <135847343+divyadasari-va@users.noreply.github.com>
Co-authored-by: Ki Mau <ki.mau@va.gov>
Co-authored-by: Will Medders <93014155+wmedders21@users.noreply.github.com>
Co-authored-by: Ryan Marshall <rnmarshall1993@gmail.com>
Co-authored-by: divyadasari-va <divya.dasari@va.gov>
Co-authored-by: Dev-KRedd <134650238+Dev-KRedd@users.noreply.github.com>
Co-authored-by: Rnmarshall93 <110805785+Rnmarshall93@users.noreply.github.com>
Co-authored-by: piedram <110848569+piedram@users.noreply.github.com>
Co-authored-by: Kamala Madamanchi <110078646+kamala-07@users.noreply.github.com>
Co-authored-by: sulak-j <95875751+sulak-j@users.noreply.github.com>
Co-authored-by: Dev-KRedd <khalin.redding@va.gov>
---
 .../correspondence_controller_concern.rb      | 146 +++++++
 app/controllers/correspondence_controller.rb  |  59 +--
 .../correspondence_intake_controller.rb       |  45 +-
 .../correspondence_queue_controller.rb        |  46 +-
 ...orrespondence_review_package_controller.rb |  54 +--
 .../correspondence_tasks_controller.rb        |  43 ++
 app/jobs/hearings/send_email.rb               |  12 +-
 app/models/attorney_claimant.rb               |   8 +-
 .../correspondence_controller_util.rb         | 405 ------------------
 app/models/concerns/distribution_concern.rb   |   2 +-
 app/models/concerns/distribution_scopes.rb    |   1 +
 .../concerns/hearing_request_type_concern.rb  |   5 +-
 app/models/correspondence.rb                  |  13 +
 app/models/distributed_case.rb                |   2 +-
 app/models/organizations/inbound_ops_team.rb  |   2 +-
 .../work_queue/appeal_search_serializer.rb    |  14 +-
 .../work_queue/correspondence_serializer.rb   |  33 ++
 .../legacy_appeal_search_serializer.rb        |  31 +-
 app/models/task_sorter.rb                     |   2 +-
 app/models/tasks/attorney_task.rb             |   8 +-
 .../correspondence/reassign_package_task.rb   |  34 ++
 app/models/tasks/correspondence_task.rb       |   8 +-
 .../tasks/correspondence_task_filter.rb       |  38 +-
 .../tasks/efolder_upload_failed_task.rb       |   4 +-
 app/models/tasks/remove_package_task.rb       |  19 +
 .../correspondence_intake_processor.rb        |  72 ++--
 .../correspondence_cases.html.erb             |   3 +
 app/views/correspondence/intake.html.erb      |   3 +-
 app/workflows/case_search_results_base.rb     |   2 +-
 client/COPY.json                              |  26 ++
 client/app/components/ReceiptDatePicker.jsx   |   1 -
 client/app/nonComp/components/Alerts.jsx      |   2 +
 client/app/queue/OrganizationUsers.jsx        |   2 +-
 client/app/queue/QueueApp.jsx                 |  13 +-
 client/app/queue/QueueDropdownFilter.jsx      |   2 +-
 client/app/queue/TeamAssignTaskListView.jsx   |  12 +-
 .../editCavcRemandTasksView.jsx               |   4 +-
 .../components/QueueOrganizationDropdown.jsx  |  17 +-
 .../correspondence/CorrespondenceCases.jsx    |  36 +-
 .../CorrespondenceTableBuilder.jsx            |  85 ++--
 .../component/EditDocumentTypeModal.jsx       |   2 +-
 .../component/ReassignPackageModal.jsx        | 315 ++++----------
 .../component/RemovePackageModal.jsx          |  44 +-
 .../correspondenceActions.js                  |  34 +-
 .../correspondenceConstants.js                |   2 -
 .../correspondenceReducer.js                  |  24 +-
 .../reviewPackageActions.js                   |  16 +-
 .../reviewPackageConstants.js                 |   2 +-
 .../reviewPackageReducer.js                   |  14 +-
 .../AddCorrespondenceView.jsx                 |  77 +---
 .../intake/components/CheckboxModal.jsx       |  20 +-
 .../ConfirmCorrespondenceView.jsx             |  75 +---
 .../ConfirmTasksRelatedToAnAppeal.jsx         |   3 +-
 .../CorrespondenceDetailsTable.jsx            |  30 +-
 .../SubmitCorrespondenceModal.jsx             |  10 +-
 .../components/CorrespondenceIntake.jsx       |  84 +++-
 .../intake/components/ReturnToQueueModal.jsx  |  69 +++
 .../TasksAppeals/AddAppealRelatedTaskView.jsx |   5 +-
 .../TasksAppeals/AddTasksAppealsView.jsx      |   6 +-
 .../modals/PackageActionModal.jsx             |  10 +-
 .../queue/correspondence/modals/editModal.jsx |   6 +-
 .../pdfPreview/CorrespondencePdfFooter.jsx    |   2 +-
 .../pdfPreview/CorrespondencePdfToolBar.jsx   |  37 +-
 .../review_package/CmpDocuments.jsx           |  37 +-
 .../CorrespondenceReviewPackage.jsx           |  13 +-
 .../review_package/ReviewForm.jsx             | 142 ++----
 .../review_package/ReviewPackageCaseTitle.jsx |  82 +---
 .../review_package/ReviewPackageData.jsx      |  28 +-
 .../ReviewPackageLoadingScreen.jsx            |  10 +-
 client/app/queue/utils.js                     |   4 +
 client/app/styles/_noncomp.scss               |   2 +
 client/app/styles/queue/_correspondence.scss  | 399 ++++++++++++++++-
 .../modals/ReturnToQueueModal.test.js         |  48 +++
 config/routes.rb                              |   5 +-
 db/seeds/facols.rb                            |   2 +-
 .../correspondence_controller_spec.rb         |   5 -
 .../correspondence_intake_controller_spec.rb  |  50 +++
 .../correspondence_queue_controller_spec.rb   |  62 +++
 ...pondence_review_package_controller_spec.rb |  79 +++-
 spec/factories/appeal.rb                      |  29 ++
 .../add_related_correspondence_spec.rb        |   9 +-
 .../correspondence_cases_spec.rb              |  17 +-
 .../edit_cmp_information_spec.rb              |  10 +-
 .../queue/correspondence/intake_form_spec.rb  |   6 +-
 .../queue/correspondence/intake_spec.rb       |  70 ++-
 .../correspondence/review_package_spec.rb     |  25 +-
 .../correspondence/submit_intake_form_spec.rb |  10 +-
 spec/feature/queue/judge_assignment_spec.rb   |  20 +
 spec/feature/queue/mail_task_spec.rb          |   2 +-
 .../create_conference_job_spec.rb             |  34 +-
 spec/lib/helpers/association_wrapper_spec.rb  |  10 +-
 spec/models/appeal_spec.rb                    |  13 +
 spec/models/claimant_spec.rb                  |   9 +-
 .../concerns/distribution_concern_spec.rb     |  45 +-
 .../hearing_request_type_concern_spec.rb      |   2 -
 spec/models/correspondence_spec.rb            |  26 ++
 spec/models/distributed_case_spec.rb          |  28 ++
 spec/models/task_spec.rb                      | 109 +++++
 spec/models/tasks/attorney_task_spec.rb       |  25 ++
 .../correspondence_controller_spec.rb         |  27 ++
 spec/seeds/users_spec.rb                      |   4 +-
 spec/support/correspondence_helpers.rb        |  11 +-
 spec/support/database_cleaner.rb              |   2 +-
 103 files changed, 2099 insertions(+), 1613 deletions(-)
 create mode 100644 app/controllers/concerns/correspondence_controller_concern.rb
 delete mode 100644 app/models/concerns/correspondence_controller_util.rb
 create mode 100644 app/models/serializers/work_queue/correspondence_serializer.rb
 create mode 100644 client/app/queue/correspondence/intake/components/ReturnToQueueModal.jsx
 create mode 100644 client/test/app/queue/correspondences/modals/ReturnToQueueModal.test.js
 delete mode 100644 spec/controllers/correspondence_controller_spec.rb

diff --git a/app/controllers/concerns/correspondence_controller_concern.rb b/app/controllers/concerns/correspondence_controller_concern.rb
new file mode 100644
index 00000000000..6b724d70e30
--- /dev/null
+++ b/app/controllers/concerns/correspondence_controller_concern.rb
@@ -0,0 +1,146 @@
+# frozen_string_literal: true
+
+# rubocop:disable Metrics/ModuleLength
+
+# Contains most of the logic inside of CorrespondenceController
+module CorrespondenceControllerConcern
+  private
+
+  MAX_QUEUED_ITEMS = 60
+
+  def process_tasks_if_applicable(mail_team_user, task_ids, tab)
+    # candidate for refactor using PATCH request
+    return unless mail_team_user && task_ids.present?
+
+    set_banner_params(mail_team_user, task_ids.count, tab)
+    update_tasks(mail_team_user, task_ids)
+  end
+
+  def update_tasks(mail_team_user, task_ids)
+    return unless @response_type == "success"
+
+    tasks = Task.where(id: task_ids)
+    tasks.update_all(assigned_to_id: mail_team_user.id, assigned_to_type: "User", status: "assigned")
+  end
+
+  def set_banner_params(user, task_count, tab)
+    template = message_template(user, task_count, tab)
+    response_type(user, task_count)
+    @response_header = template[:header]
+    @response_message = template[:message]
+  end
+
+  def message_template(user, task_count, tab)
+    case tab
+    when "correspondence_unassigned"
+      bulk_assignment_banner_text(user, task_count)
+    when "correspondence_team_assigned"
+      bulk_assignment_banner_text(user, task_count, action_prefix: "re")
+    end
+  end
+
+  def bulk_assignment_banner_text(user, task_count, action_prefix: "")
+    success_header_unassigned = "You have successfully #{action_prefix}"\
+      "assigned #{task_count} Correspondence to #{user.css_id}."
+    failure_header_unassigned = "Correspondence #{action_prefix}assignment to #{user.css_id} could not be completed"
+    success_message = "Please go to your individual queue to see any self-assigned correspondence."
+    failure_message = "Queue volume has reached maximum capacity for this user."
+    user_tasks = user&.tasks&.length
+    {
+      header: (user_tasks + task_count <= MAX_QUEUED_ITEMS) ? success_header_unassigned : failure_header_unassigned,
+      message: (user_tasks + task_count <= MAX_QUEUED_ITEMS) ? success_message : failure_message
+    }
+  end
+
+  def response_type(user, task_count)
+    current_user_tasks = user&.tasks&.length
+    @response_type = (current_user_tasks + task_count <= MAX_QUEUED_ITEMS) ? "success" : "warning"
+  end
+
+  def set_flash_intake_success_message
+    # intake error message is handled in client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx
+    vet = veteran_by_correspondence
+    flash[:correspondence_intake_success] = [
+      "You have successfully submitted a correspondence record for #{vet.name}(#{vet.file_number})",
+      "The mail package has been uploaded to the Veteran's eFolder as well."
+    ]
+  end
+
+  def intake_cancel_message(action_type)
+    vet = veteran_by_correspondence
+    if action_type == "cancel_intake"
+      @response_header = "You have successfully cancelled the intake form"
+      @response_message = "#{vet.name}'s correspondence (ID: #{correspondence.id}) has been returned to the supervisor's queue for assignment."
+    else
+      @response_header = "You have successfully saved the intake form"
+      @response_message = "You can continue from step three of the intake form for #{vet.name}'s correspondence (ID: #{correspondence.id}) at a later date."
+    end
+    @response_type = "success"
+  end
+
+  def general_information
+    vet = veteran_by_correspondence
+    {
+      notes: correspondence.notes,
+      file_number: vet.file_number,
+      veteran_name: vet.name,
+      correspondence_type_id: correspondence.correspondence_type_id,
+      correspondence_types: CorrespondenceType.all,
+      correspondence_tasks: correspondence.tasks.map do |task|
+        WorkQueue::CorrespondenceTaskSerializer.new(task).serializable_hash[:data][:attributes]
+      end
+    }
+  end
+
+  def correspondence_params
+    params.require(:correspondence).permit(:notes, :correspondence_type_id)
+  end
+
+  def veteran_params
+    params.require(:veteran).permit(:file_number)
+  end
+
+  def correspondence
+    @correspondence = Correspondence.find_by(uuid: params[:correspondence_uuid])
+  end
+
+  def veteran_by_correspondence
+    return nil if correspondence&.veteran_id.blank?
+
+    @veteran_by_correspondence ||= Veteran.find_by(id: correspondence.veteran_id)
+  end
+
+  def veterans_with_correspondences
+    veterans = Veteran.includes(:correspondences).where(correspondences: { id: Correspondence.select(:id) })
+    veterans.map { |veteran| vet_info_serializer(veteran, veteran.correspondences.last) }
+  end
+
+  def auto_texts
+    @auto_texts ||= AutoText.all.pluck(:name)
+  end
+
+  def vet_info_serializer(veteran, correspondence)
+    {
+      firstName: veteran.first_name,
+      lastName: veteran.last_name,
+      fileNumber: veteran.file_number,
+      cmPacketNumber: correspondence.cmp_packet_number,
+      correspondenceUuid: correspondence.uuid,
+      packageDocumentType: correspondence.correspondence_type_id
+    }
+  end
+
+  def correspondence_intake_processor
+    @correspondence_intake_processor ||= CorrespondenceIntakeProcessor.new
+  end
+
+  def correspondence_documents_efolder_uploader
+    @correspondence_documents_efolder_uploader ||= CorrespondenceDocumentsEfolderUploader.new
+  end
+
+  def upload_documents_to_claim_evidence
+    rpt = ReviewPackageTask.find_by(appeal_id: correspondence.id, type: ReviewPackageTask.name)
+    correspondence_documents_efolder_uploader.upload_documents_to_claim_evidence(correspondence, current_user, rpt)
+  end
+end
+# rubocop:enable Metrics/ModuleLength
diff --git a/app/controllers/correspondence_controller.rb b/app/controllers/correspondence_controller.rb
index 079ce21a3b9..1de29477204 100644
--- a/app/controllers/correspondence_controller.rb
+++ b/app/controllers/correspondence_controller.rb
@@ -2,47 +2,13 @@
 
 # :reek:RepeatedConditional
 class CorrespondenceController < ApplicationController
-  include CorrespondenceControllerUtil
+  include CorrespondenceControllerConcern
   include RunAsyncable
 
   before_action :verify_correspondence_access
   before_action :verify_feature_toggle
   before_action :correspondence
   before_action :auto_texts
-  before_action :veteran_information
-
-  def mail_team_users
-    mail_team_users = User.mail_team_users
-    respond_to do |format|
-      format.json do
-        render json: { mail_team_users: mail_team_users }
-      end
-    end
-  end
-
-  def veteran
-    render json: { veteran_id: veteran_by_correspondence&.id, file_number: veteran_by_correspondence&.file_number }
-  end
-
-  def current_correspondence
-    @current_correspondence ||= correspondence
-  end
-
-  def veteran_information
-    @veteran_information ||= veteran_by_correspondence
-  end
-
-  def handle_mail_superuser_or_supervisor
-    set_handle_mail_superuser_or_supervisor_params(current_user, params)
-    mail_team_user = User.find_by(css_id: params[:user].strip) if params[:user].present?
-    task_ids = params[:taskIds]&.split(",") if params[:taskIds].present?
-    tab = params[:tab] if params[:tab].present?
-
-    respond_to do |format|
-      format.html { handle_html_response(mail_team_user, task_ids, tab) }
-      format.json { handle_json_response(mail_team_user, task_ids, tab) }
-    end
-  end
 
   def auto_assign_correspondences
     batch = BatchAutoAssignmentAttempt.create!(
@@ -83,29 +49,6 @@ def auto_assign_status
 
   private
 
-  def handle_reassign_or_remove_task(mail_team_user)
-    return unless @reassign_remove_task_id.present? && @action_type.present?
-
-    task = Task.find(@reassign_remove_task_id)
-    mail_team_user ||= task.assigned_by
-
-    reassign_remove_banner_action(mail_team_user)
-    render "correspondence_team"
-  end
-
-  def demo_data
-    json_file_path = "vbms doc types.json"
-    JSON.parse(File.read(json_file_path))
-  end
-
-  def handle_json_response(mail_team_user, task_ids, tab)
-    if mail_team_user && task_ids.present?
-      set_banner_params(mail_team_user, task_ids&.count, tab)
-    else
-      render json: { correspondence_config: CorrespondenceConfig.new(assignee: InboundOpsTeam.singleton) }
-    end
-  end
-
   def verify_correspondence_access
     return true if InboundOpsTeam.singleton.user_has_access?(current_user) ||
                    MailTeam.singleton.user_has_access?(current_user) ||
diff --git a/app/controllers/correspondence_intake_controller.rb b/app/controllers/correspondence_intake_controller.rb
index afbe86182ab..1d429b80c0c 100644
--- a/app/controllers/correspondence_intake_controller.rb
+++ b/app/controllers/correspondence_intake_controller.rb
@@ -5,23 +5,18 @@ def intake
     # If correspondence intake was started, json data from the database will
     # be loaded into the page when user returns to intake
     @redux_store ||= CorrespondenceIntake.find_by(user: current_user,
-                                                  correspondence: current_correspondence)&.redux_store
-
-    respond_to do |format|
-      format.html { return render "correspondence/intake" }
-      format.json do
-        render json: {
-          currentCorrespondence: current_correspondence,
-          correspondence: correspondence_load,
-          veteranInformation: veteran_information
-        }
-      end
+                                                  correspondence: correspondence)&.redux_store
+    @prior_mail = prior_mail.map do |correspondence|
+      WorkQueue::CorrespondenceSerializer.new(correspondence).serializable_hash[:data][:attributes]
     end
+    @correspondence = WorkQueue::CorrespondenceSerializer
+      .new(correspondence)
+      .serializable_hash[:data][:attributes]
   end
 
   def current_step
-    intake = CorrespondenceIntake.find_by(user: current_user, correspondence: current_correspondence) ||
-             CorrespondenceIntake.new(user: current_user, correspondence: current_correspondence)
+    intake = CorrespondenceIntake.find_by(user: current_user, correspondence: correspondence) ||
+             CorrespondenceIntake.new(user: current_user, correspondence: correspondence)
 
     intake.update(
       current_step: params[:current_step],
@@ -39,7 +34,7 @@ def current_step
 
   def intake_update
     begin
-      intake_appeal_update_tasks
+      correspondence.cancel_task_tree_for_appeal_intake
       upload_documents_to_claim_evidence if FeatureToggle.enabled?(:ce_api_demo_toggle)
       render json: { correspondence: correspondence }
     rescue StandardError => error
@@ -58,9 +53,27 @@ def process_intake
     end
   end
 
+  def cancel_intake
+    begin
+      intake_task = Task.where("appeal_id = ? and appeal_type = 'Correspondence' and type = 'CorrespondenceIntakeTask'",
+                               correspondence.id).first
+      intake_task.update!(status: "cancelled")
+      ReviewPackageTask.create!(
+        assigned_to: User.find(correspondence.assigned_by_id),
+        assigned_to_id: correspondence.assigned_by_id,
+        status: "assigned",
+        appeal_id: correspondence.id,
+        appeal_type: "Correspondence"
+      )
+      render json: {}, status: :ok
+    rescue StandardError
+      render json: { error: "Failed to update records" }, status: :bad_request
+    end
+  end
+
   private
 
-  def correspondence_load
-    Correspondence.where(veteran_id: veteran_by_correspondence.id).where.not(uuid: params[:correspondence_uuid])
+  def prior_mail
+    Correspondence.prior_mail(veteran_by_correspondence.id, params[:correspondence_uuid])
   end
 end
diff --git a/app/controllers/correspondence_queue_controller.rb b/app/controllers/correspondence_queue_controller.rb
index 4daa3aa10b2..36901808ef8 100644
--- a/app/controllers/correspondence_queue_controller.rb
+++ b/app/controllers/correspondence_queue_controller.rb
@@ -5,8 +5,9 @@ def correspondence_cases
     if current_user.mail_supervisor?
       redirect_to "/queue/correspondence/team"
     elsif current_user.mail_superuser? || current_user.mail_team_user?
+      intake_cancel_message(action_type) if %w[continue_later cancel_intake].include?(action_type)
       respond_to do |format|
-        format.html { "your_correspondence" }
+        format.html {}
         format.json do
           render json: { correspondence_config: CorrespondenceConfig.new(assignee: current_user) }
         end
@@ -15,4 +16,47 @@ def correspondence_cases
       redirect_to "/unauthorized"
     end
   end
+
+  def correspondence_team
+    if current_user.mail_superuser? || current_user.mail_supervisor?
+      correspondence_team_response
+    elsif current_user.mail_team_user?
+      redirect_to "/queue/correspondence"
+    else
+      redirect_to "/unauthorized"
+    end
+  end
+
+  private
+
+  def correspondence_team_response
+    mail_team_user = User.find_by(css_id: params[:user].strip) if params[:user].present?
+    task_ids = params[:task_ids]&.split(",") if params[:task_ids].present?
+    tab = params[:tab] if params[:tab].present?
+
+    respond_to do |format|
+      format.html do
+        @mail_team_users = User.mail_team_users.pluck(:css_id)
+        correspondence_team_html_response(mail_team_user, task_ids, tab)
+      end
+      format.json { correspondence_team_json_response }
+    end
+  end
+
+  def correspondence_team_json_response
+    render json: { correspondence_config: CorrespondenceConfig.new(assignee: InboundOpsTeam.singleton) }
+  end
+
+  def correspondence_team_html_response(mail_team_user, task_ids, tab)
+    if mail_team_user && task_ids.present?
+      # candidate for refactor using PATCH request
+      process_tasks_if_applicable(mail_team_user, task_ids, tab)
+    elsif %w[continue_later cancel_intake].include?(action_type)
+      intake_cancel_message(action_type)
+    end
+  end
+
+  def action_type
+    params[:userAction].strip if params[:userAction].present?
+  end
 end
diff --git a/app/controllers/correspondence_review_package_controller.rb b/app/controllers/correspondence_review_package_controller.rb
index a4ae76128fe..d8bee58e055 100644
--- a/app/controllers/correspondence_review_package_controller.rb
+++ b/app/controllers/correspondence_review_package_controller.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
 class CorrespondenceReviewPackageController < CorrespondenceController
-
   def review_package
-    render "correspondence/review_package"
+    @mail_team_users = User.mail_team_users.select(:css_id).pluck(:css_id)
   end
 
   def package_documents
@@ -13,45 +12,30 @@ def package_documents
 
   def show
     corres_docs = correspondence.correspondence_documents
-    reason_remove = if RemovePackageTask.find_by(appeal_id: correspondence.id, type: RemovePackageTask.name).nil?
-                      ""
-                    else
-                      RemovePackageTask.find_by(appeal_id: correspondence.id, type: RemovePackageTask.name).instructions
-                    end
+    task_instructions = CorrespondenceTask.package_action_tasks.open
+      .find_by(appeal_id: correspondence.id)&.instructions || ""
     response_json = {
       correspondence: correspondence,
       package_document_type: correspondence&.package_document_type,
       general_information: general_information,
-      user_can_edit_vador: InboundOpsTeam.singleton.user_is_admin?(current_user),
+      user_can_edit_vador: current_user.mail_supervisor?,
       correspondence_documents: corres_docs.map do |doc|
         WorkQueue::CorrespondenceDocumentSerializer.new(doc).serializable_hash[:data][:attributes]
       end,
       efolder_upload_failed_before: EfolderUploadFailedTask.where(
         appeal_id: correspondence.id, type: "EfolderUploadFailedTask"
       ),
-      reasonForRemovePackage: reason_remove
+      taskInstructions: task_instructions
     }
     render({ json: response_json }, status: :ok)
   end
 
   def update
-    veteran = Veteran.find_by(file_number: veteran_params["file_number"])
-    if veteran && correspondence.update(
-      correspondence_params.merge(
-        veteran_id: veteran.id,
-        updated_by_id: RequestStore.store[:current_user].id
-      )
-    )
-      correspondence.tasks.map do |task|
-        if task.type == "ReviewPackageTask"
-          task.status = "in_progress"
-          task.save
-        end
-      end
-      render json: { status: :ok }
-    else
-      render json: { error: "Please enter a valid Veteran ID" }, status: :unprocessable_entity
+    unless update_veteran_on_correspondence
+      return render(json: { error: "Please enter a valid Veteran ID" }, status: :unprocessable_entity)
     end
+
+    update_open_review_package_tasks ? render(json: { status: :ok }) : render(json: { status: 500 })
   end
 
   def update_cmp
@@ -93,6 +77,22 @@ def pdf
 
   private
 
+  def update_veteran_on_correspondence
+    veteran = Veteran.find_by(file_number: veteran_params["file_number"])
+    veteran && correspondence.update(
+      correspondence_params.merge(
+        veteran_id: veteran.id,
+        updated_by_id: RequestStore.store[:current_user].id
+      )
+    )
+  end
+
+  def update_open_review_package_tasks
+    correspondence.tasks.open.where(type: ReviewPackageTask.name).each do |task|
+      task.update(status: Constants.TASK_STATUSES.in_progress)
+    end
+  end
+
   # :reek:FeatureEnvy
   def vbms_document_types
     begin
@@ -104,4 +104,8 @@ def vbms_document_types
     data.map { |document_type| { id: document_type["id"], name: document_type["description"] } }
   end
 
+  def demo_data
+    json_file_path = "vbms doc types.json"
+    JSON.parse(File.read(json_file_path))
+  end
 end
diff --git a/app/controllers/correspondence_tasks_controller.rb b/app/controllers/correspondence_tasks_controller.rb
index 35a771cac09..777b76e8850 100644
--- a/app/controllers/correspondence_tasks_controller.rb
+++ b/app/controllers/correspondence_tasks_controller.rb
@@ -78,8 +78,51 @@ def completed_package
     review_package_task.update!(status: Constants.TASK_STATUSES.in_progress)
   end
 
+  def update
+    process_package_action_decision(params[:decision])
+  end
+
   private
 
+  def process_package_action_decision(decision)
+    task = CorrespondenceTask.find(params[:task_id])
+    requesting_user_name = task.assigned_by&.display_name
+    begin
+      case decision
+      when COPY::CORRESPONDENCE_QUEUE_PACKAGE_ACTION_DECISION_OPTIONS["APPROVE"]
+        if task.is_a?(ReassignPackageTask)
+          task.approve(current_user, User.find_by(css_id: params[:new_assignee]))
+        elsif task.is_a?(RemovePackageTask)
+          task.approve(current_user)
+        end
+      when COPY::CORRESPONDENCE_QUEUE_PACKAGE_ACTION_DECISION_OPTIONS["REJECT"]
+        task.reject(current_user, params[:decision_reason])
+      end
+      package_action_flash(decision.upcase, requesting_user_name)
+    rescue StandardError
+      flash_error_banner(requesting_user_name)
+    end
+  end
+
+  def package_action_flash(decision, user_name)
+    action = params[:action_type].upcase
+    flash[:custom] = {
+      title: format(
+        COPY::CORRESPONDENCE_QUEUE_PACKAGE_ACTION_SUCCESS[action][decision]["TITLE"],
+        user_name
+      ),
+      message: COPY::CORRESPONDENCE_QUEUE_PACKAGE_ACTION_SUCCESS[action][decision]["MESSAGE"]
+    }
+  end
+
+  def flash_error_banner(user_name)
+    operation_verb = params[:action_type] == "approve" ? "approved" : "rejected"
+    flash[:custom_error] = {
+      title: "Package request for #{user_name} could not be #{operation_verb}",
+      message: "Please try again at a later time or contact the Help Desk."
+    }
+  end
+
   def task_to_create
     case params[:type]
     when "removePackage"
diff --git a/app/jobs/hearings/send_email.rb b/app/jobs/hearings/send_email.rb
index 02dd0badd6e..d6fffbd4195 100644
--- a/app/jobs/hearings/send_email.rb
+++ b/app/jobs/hearings/send_email.rb
@@ -29,7 +29,7 @@ def call
     # already been sent too.
     return if send_reminder
 
-    if !appellant_recipient.email_sent
+    if should_appellant_receive_email?
       appellant_recipient.update!(email_sent: send_email(appellant_recipient_info))
     end
 
@@ -37,7 +37,7 @@ def call
       judge_recipient.update!(email_sent: send_email(judge_recipient_info))
     end
 
-    if representative_recipient&.email_address.present? && !representative_recipient.email_sent
+    if should_representative_receive_email?
       representative_recipient.update!(email_sent: send_email(representative_recipient_info))
     end
   end
@@ -238,4 +238,12 @@ def should_judge_receive_email?
       !hearing.judge_recipient&.email_sent &&
       %w[confirmation updated_time_confirmation].include?(type)
   end
+
+  def should_appellant_receive_email?
+    appellant_recipient&.email_address.present? && !appellant_recipient&.email_sent
+  end
+
+  def should_representative_receive_email?
+    representative_recipient&.email_address.present? && !representative_recipient&.email_sent
+  end
 end
diff --git a/app/models/attorney_claimant.rb b/app/models/attorney_claimant.rb
index 663649f16eb..4a258cdb8f1 100644
--- a/app/models/attorney_claimant.rb
+++ b/app/models/attorney_claimant.rb
@@ -9,16 +9,16 @@ class AttorneyClaimant < Claimant
 
   delegate :name, to: :bgs_attorney
 
-  def advanced_on_docket?(_appeal)
-    false
+  def advanced_on_docket?(appeal)
+    advanced_on_docket_motion_granted?(appeal)
   end
 
   def advanced_on_docket_based_on_age?
     false
   end
 
-  def advanced_on_docket_motion_granted?(_appeal)
-    false
+  def advanced_on_docket_motion_granted?(appeal)
+    AdvanceOnDocketMotion.granted.for_appeal(appeal).any?
   end
 
   def relationship
diff --git a/app/models/concerns/correspondence_controller_util.rb b/app/models/concerns/correspondence_controller_util.rb
deleted file mode 100644
index a413ed68796..00000000000
--- a/app/models/concerns/correspondence_controller_util.rb
+++ /dev/null
@@ -1,405 +0,0 @@
-# frozen_string_literal: true
-
-# rubocop:disable Metrics/ModuleLength
-
-# Contains most of the logic inside of CorrespondenceController
-module CorrespondenceControllerUtil
-
-  MAX_QUEUED_ITEMS = 60
-
-  def current_correspondence
-    @current_correspondence ||= correspondence
-  end
-
-  def veteran_information
-    @veteran_information ||= veteran_by_correspondence
-  end
-
-  def pdf
-    # Hard-coding Document access until CorrespondenceDocuments are uploaded to S3Bucket
-    document = Document.limit(200)[params[:pdf_id].to_i]
-
-    document_disposition = "inline"
-    if params[:download]
-      document_disposition = "attachment; filename='#{params[:type]}-#{params[:id]}.pdf'"
-    end
-
-    # The line below enables document caching for a month.
-    expires_in 30.days, public: true
-    send_file(
-      document.serve,
-      type: "application/pdf",
-      disposition: document_disposition
-    )
-  end
-
-  def set_handle_mail_superuser_or_supervisor_params(current_user, params)
-    @mail_team_users = User.mail_team_users.pluck(:css_id)
-    @is_superuser = current_user.mail_superuser?
-    @is_supervisor = current_user.mail_supervisor?
-    @reassign_remove_task_id = params[:taskId].strip if params[:taskId].present?
-    @action_type = params[:userAction].strip if params[:userAction].present?
-    @veteran_name = URI.decode(params[:veteranName].strip) if params[:veteranName].present?
-  end
-
-  def correspondence_team
-    if current_user.mail_superuser? || current_user.mail_supervisor?
-      handle_mail_superuser_or_supervisor
-    elsif current_user.mail_team_user?
-      redirect_to "/queue/correspondence/team"
-    else
-      redirect_to "/unauthorized"
-    end
-  end
-
-  private
-
-  def reassign_remove_banner_action(mail_team_user)
-    operation_type = params[:operation]
-    begin
-      case operation_type
-      when "reassign"
-        update_reassign_task(mail_team_user)
-      when "remove"
-        update_remove_task(mail_team_user)
-      end
-      set_reassign_remove_banner_params(mail_team_user, operation_type)
-    rescue StandardError
-      handle_error_banner_params(mail_team_user)
-    end
-  end
-
-  def reassign_remove_task_id_and_action_type_present?
-    if @reassign_remove_task_id.present? && @action_type.present?
-      return true
-    end
-
-    false
-  end
-
-  def handle_html_response(mail_team_user, task_ids, tab)
-    if reassign_remove_task_id_and_action_type_present?
-      task = Task.find(@reassign_remove_task_id)
-      if mail_team_user.nil?
-        mail_team_user = task.assigned_by
-      end
-    end
-
-    if mail_team_user && (task_ids.present? || @reassign_remove_task_id.present?)
-      process_tasks_if_applicable(mail_team_user, task_ids, tab)
-      handle_reassign_or_remove_task(mail_team_user)
-    end
-  end
-
-  def process_tasks_if_applicable(mail_team_user, task_ids, tab)
-    return unless mail_team_user && task_ids.present?
-
-    set_banner_params(mail_team_user, task_ids.count, tab)
-    update_tasks(mail_team_user, task_ids)
-  end
-
-  def update_tasks(mail_team_user, task_ids)
-    return unless @response_type == "success"
-
-    tasks = Task.where(id: task_ids)
-    tasks.update_all(assigned_to_id: mail_team_user.id, assigned_to_type: "User", status: "assigned")
-  end
-
-  def approve_reassign_task(task, current_user, mail_team_user)
-    task.update!(
-      completed_by: current_user,
-      assigned_to_id: current_user,
-      assigned_to: current_user,
-      closed_at: Time.zone.now,
-      status: "completed"
-    )
-    parent_task = ReviewPackageTask.find(task.parent_id)
-    parent_task.update!(
-      status: "completed",
-      closed_at: Time.zone.now,
-      completed_by: current_user
-    )
-    ReviewPackageTask.create!(
-      assigned_to: mail_team_user,
-      assigned_to_id: mail_team_user.id,
-      status: "assigned",
-      appeal_id: task.appeal_id,
-      appeal_type: "Correspondence"
-    )
-  end
-
-  def approve_remove_task(task_id, current_user, mail_team_user)
-    Task.find_by(id: task_id).update!(
-      completed_by_id: current_user,
-      assigned_to_id: mail_team_user,
-      assigned_to: mail_team_user,
-      status: "cancelled"
-    )
-  end
-
-  def reject_remove_task(task_id, current_user, decision_reason)
-    Task.find_by(id: task_id).update!(
-      completed_by_id: current_user,
-      closed_at: Time.zone.now,
-      status: "completed",
-      instructions: decision_reason
-    )
-    ReviewPackageTask.find(Task.find_by(id: task_id).parent_id).update!(status: "in_progress")
-  end
-
-  def reject_reassign_task(task, current_user)
-    decision_reason = params[:decisionReason].strip
-    task.update(
-      completed_by_id: current_user,
-      closed_at: Time.zone.now,
-      status: "completed",
-      instructions: decision_reason
-    )
-    parent_task = ReviewPackageTask.find(task.parent_id)
-    parent_task.update(assigned_to_type: "User", status: "in_progress")
-  end
-
-  def update_reassign_task(mail_team_user)
-    task_id = params[:taskId].strip
-
-    task = Task.find_by(id: task_id)
-    case @action_type
-    when "approve"
-      approve_reassign_task(task, current_user, mail_team_user)
-    when "reject"
-      reject_reassign_task(task, current_user)
-    end
-  end
-
-  def update_remove_task(mail_team_user)
-    task_id = params[:taskId].strip
-    decision_reason = params[:decisionReason].strip
-    case @action_type
-    when "approve"
-      approve_remove_task(task_id, current_user, mail_team_user)
-    when "reject"
-      reject_remove_task(task_id, current_user, decision_reason)
-    end
-  end
-
-  def set_banner_params(user, task_count, tab)
-    template = message_template(user, task_count, tab)
-    response_type(user)
-    @response_header = template[:header]
-    @response_message = template[:message]
-  end
-
-  def set_reassign_remove_banner_params(user, operation_type)
-    case operation_type
-    when "remove"
-      template = remove_message_template
-      @response_header = template[:header]
-      @response_message = template[:message]
-      @response_type = "success"
-    when "reassign"
-      template = reassign_message_template(user)
-      @response_header = template[:header]
-      @response_message = template[:message]
-      @response_type = "success"
-    end
-  end
-
-  def handle_error_banner_params(mail_team_user)
-    operation_verb = @action_type == "approve" ? "approved" : "rejected"
-    @response_header = "Package request for #{@veteran_name} could not be #{operation_verb}"
-    @response_message = "Please try again at a later time or contact the Help Desk."
-    @response_type = "error"
-  end
-
-  def handle_correspondence_unassigned_response(user, task_count)
-    success_header_unassigned = "You have successfully assigned #{task_count} Correspondence to #{user.css_id}."
-    failure_header_unassigned = "Correspondence assignment to #{user.css_id} could not be completed"
-    success_message = "Please go to your individual queue to see any self-assigned correspondence."
-    failure_message = "Queue volume has reached maximum capacity for this user."
-    {
-      header: (user.tasks.length < MAX_QUEUED_ITEMS) ? success_header_unassigned : failure_header_unassigned,
-      message: (user.tasks.length < MAX_QUEUED_ITEMS) ? success_message : failure_message
-    }
-  end
-
-  def handle_correspondence_assigned_response(user, task_count)
-    success_header_assigned = "You have successfully reassigned #{task_count} Correspondence to #{user.css_id}."
-    failure_header_assigned = "Correspondence reassignment to #{user.css_id} could not be completed"
-    success_message = "Please go to your individual queue to see any self-assigned correspondence."
-    failure_message = "Queue volume has reached maximum capacity for this user."
-    {
-      header: (user.tasks.length < MAX_QUEUED_ITEMS) ? success_header_assigned : failure_header_assigned,
-      message: (user.tasks.length < MAX_QUEUED_ITEMS) ? success_message : failure_message
-    }
-  end
-
-  def message_template(user, task_count, tab)
-    case tab
-    when "correspondence_unassigned"
-      handle_correspondence_unassigned_response(user, task_count)
-    when "correspondence_team_assigned"
-      handle_correspondence_assigned_response(user, task_count)
-    end
-  end
-
-  def reassign_message_template(user)
-    success_header_reassigned = "You have successfully reassigned a mail record for #{user.css_id}"
-    success_message_reassigned = "Please go to your individual queue to see any self assigned correspondence."
-    success_header_rejected = "You have successfully rejected a package request for #{user.css_id}"
-    success_message_rejected = "The package will be re-assigned to the user that sent the request."
-    case @action_type
-    when "approve"
-      {
-        header: success_header_reassigned,
-        message: success_message_reassigned
-      }
-    when "reject"
-      {
-        header: success_header_rejected,
-        message: success_message_rejected
-      }
-    end
-  end
-
-  def remove_message_template
-    success_header_approved = "You have successfully removed a mail package for #{@veteran_name}"
-    success_message_approved = "The package has been removed from Caseflow and must be manually uploaded again
-     from the Centralized Mail Portal, if it needs to be processed."
-    success_header_rejected = "You have successfully rejected a package request for #{@veteran_name}"
-    success_message_rejected = "The package will be re-assigned to the user that sent the request."
-
-    case @action_type
-    when "approve"
-      {
-        header: success_header_approved,
-        message: success_message_approved
-      }
-    when "reject"
-      {
-        header: success_header_rejected,
-        message: success_message_rejected
-      }
-    end
-  end
-
-  def response_type(user)
-    @response_type = (user.tasks.length < MAX_QUEUED_ITEMS) ? "success" : "warning"
-  end
-
-  # :reek:FeatureEnvy
-  def vbms_document_types
-    begin
-      data = ExternalApi::ClaimEvidenceService.document_types
-    rescue StandardError => error
-      Rails.logger.error(error.full_message)
-      data ||= demo_data
-    end
-    data.map { |document_type| { id: document_type["id"], name: document_type["description"] } }
-  end
-
-  def demo_data
-    json_file_path = "vbms doc types.json"
-    JSON.parse(File.read(json_file_path))
-  end
-
-  def set_flash_intake_success_message
-    # intake error message is handled in client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx
-    vet = veteran_by_correspondence
-    flash[:correspondence_intake_success] = [
-      "You have successfully submitted a correspondence record for #{vet.name}(#{vet.file_number})",
-      "The mail package has been uploaded to the Veteran's eFolder as well."
-    ]
-  end
-
-  def general_information
-    vet = veteran_by_correspondence
-    {
-      notes: correspondence.notes,
-      file_number: vet.file_number,
-      veteran_name: vet.name,
-      correspondence_type_id: correspondence.correspondence_type_id,
-      correspondence_types: CorrespondenceType.all,
-      correspondence_tasks: correspondence.tasks.map do |task|
-        WorkQueue::CorrespondenceTaskSerializer.new(task).serializable_hash[:data][:attributes]
-      end
-    }
-  end
-
-  def correspondence_params
-    params.require(:correspondence).permit(:notes, :correspondence_type_id)
-  end
-
-  def veteran_params
-    params.require(:veteran).permit(:file_number)
-  end
-
-  def correspondence
-    return @correspondence if @correspondence.present?
-
-    if params[:id].present?
-      @correspondence = Correspondence.find(params[:id])
-    elsif params[:correspondence_uuid].present?
-      @correspondence = Correspondence.find_by(uuid: params[:correspondence_uuid])
-    end
-
-    @correspondence
-  end
-
-  def correspondence_load
-    Correspondence.where(veteran_id: veteran_by_correspondence.id).where.not(uuid: params[:correspondence_uuid])
-  end
-
-  def veteran_by_correspondence
-    return nil if correspondence&.veteran_id.blank?
-
-    @veteran_by_correspondence ||= Veteran.find_by(id: correspondence.veteran_id)
-  end
-
-  def veterans_with_correspondences
-    veterans = Veteran.includes(:correspondences).where(correspondences: { id: Correspondence.select(:id) })
-    veterans.map { |veteran| vet_info_serializer(veteran, veteran.correspondences.last) }
-  end
-
-  def auto_texts
-    @auto_texts ||= AutoText.all.pluck(:name)
-  end
-
-  def vet_info_serializer(veteran, correspondence)
-    {
-      firstName: veteran.first_name,
-      lastName: veteran.last_name,
-      fileNumber: veteran.file_number,
-      cmPacketNumber: correspondence.cmp_packet_number,
-      correspondenceUuid: correspondence.uuid,
-      packageDocumentType: correspondence.correspondence_type_id
-    }
-  end
-
-  def correspondence_intake_processor
-    @correspondence_intake_processor ||= CorrespondenceIntakeProcessor.new
-  end
-
-  def correspondence_documents_efolder_uploader
-    @correspondence_documents_efolder_uploader ||= CorrespondenceDocumentsEfolderUploader.new
-  end
-
-  # :reek:FeatureEnvy
-  def intake_appeal_update_tasks
-    tasks = Task.where("appeal_id = ? and appeal_type = ?", correspondence.id, "Correspondence")
-    tasks.map do |task|
-      if task.type == "ReviewPackageTask"
-        task.instructions.push("An appeal intake was started because this Correspondence is a 10182")
-        task.assigned_to_id = correspondence.assigned_by_id
-        task.assigned_to = User.find(correspondence.assigned_by_id)
-      end
-      task.status = "cancelled"
-      task.save
-    end
-  end
-
-  def upload_documents_to_claim_evidence
-    rpt = ReviewPackageTask.find_by(appeal_id: correspondence.id, type: ReviewPackageTask.name)
-    correspondence_documents_efolder_uploader.upload_documents_to_claim_evidence(correspondence, current_user, rpt)
-  end
-end
-# rubocop:enable Metrics/ModuleLength
diff --git a/app/models/concerns/distribution_concern.rb b/app/models/concerns/distribution_concern.rb
index a5ba87f1d1b..564064b07f1 100644
--- a/app/models/concerns/distribution_concern.rb
+++ b/app/models/concerns/distribution_concern.rb
@@ -10,7 +10,7 @@ def assign_judge_tasks_for_appeals(appeals, judge)
       # If an appeal does not have an open DistributionTask, then it has already been distributed by automatic
       # case distribution and a new JudgeAssignTask should not be created. This should only occur if two users
       # request a distribution simultaneously.
-      if appeal.tasks.open.of_type(:DistributionTask).any? && appeal.can_redistribute_appeal?
+      if appeal.tasks.open.of_type(:DistributionTask).any?
         distribution_task_assignee_id = appeal.tasks.of_type(:DistributionTask).first.assigned_to_id
         Rails.logger.info("Calling JudgeAssignTaskCreator for appeal #{appeal.id} with judge #{judge.css_id}")
         JudgeAssignTaskCreator.new(appeal: appeal,
diff --git a/app/models/concerns/distribution_scopes.rb b/app/models/concerns/distribution_scopes.rb
index b2067ba97d8..c6485012127 100644
--- a/app/models/concerns/distribution_scopes.rb
+++ b/app/models/concerns/distribution_scopes.rb
@@ -78,6 +78,7 @@ def with_original_appeal_and_judge_task
       .joins("LEFT JOIN appeals AS original_cavc_appeal ON original_cavc_appeal.id = cavc_remands.source_appeal_id")
       .joins(
         "LEFT JOIN tasks AS original_judge_task ON original_judge_task.appeal_id = original_cavc_appeal.id
+        AND original_judge_task.appeal_type = 'Appeal'
         AND original_judge_task.type = 'JudgeDecisionReviewTask'
         AND original_judge_task.status = 'completed'"
       )
diff --git a/app/models/concerns/hearing_request_type_concern.rb b/app/models/concerns/hearing_request_type_concern.rb
index ee715a4ca40..9eb3118a700 100644
--- a/app/models/concerns/hearing_request_type_concern.rb
+++ b/app/models/concerns/hearing_request_type_concern.rb
@@ -91,8 +91,9 @@ def changeset_at_index_for_task(task_id)
     return nil if request_type_index.blank?
 
     # support versions that were recorded before the column name changed
-    versions[request_type_index].changeset["changed_hearing_request_type"] ||
-      versions[request_type_index].changeset["changed_request_type"]
+    versions[request_type_index] &&
+      (versions[request_type_index].changeset["changed_hearing_request_type"] ||
+        versions[request_type_index].changeset["changed_request_type"])
   end
 
   def format_or_formatted_original_hearing_request_type(request_type)
diff --git a/app/models/correspondence.rb b/app/models/correspondence.rb
index 9f78568e89e..56d8353ba89 100644
--- a/app/models/correspondence.rb
+++ b/app/models/correspondence.rb
@@ -45,6 +45,14 @@ def root_task
     Task.find_by(appeal_id: id, appeal_type: type, type: CorrespondenceRootTask.name)
   end
 
+  def cancel_task_tree_for_appeal_intake
+    tasks.where(type: ReviewPackageTask.name).update_all(
+      instructions: "An appeal intake was started because this Correspondence is a 10182",
+      assigned_to_id: assigned_by_id
+    )
+    tasks.update_all(status: Constants.TASK_STATUSES.cancelled)
+  end
+
   # Methods below are included to allow Correspondences to render in explain page
 
   # Alias for cmp_packet_number
@@ -60,4 +68,9 @@ def docket_name
   def veteran_full_name
     veteran.name
   end
+
+  def self.prior_mail(veteran_id, uuid)
+    includes([:veteran, :package_document_type, :correspondence_type])
+      .where(veteran_id: veteran_id).where.not(uuid: uuid)
+  end
 end
diff --git a/app/models/distributed_case.rb b/app/models/distributed_case.rb
index d44f24ee181..b963c45e1ea 100644
--- a/app/models/distributed_case.rb
+++ b/app/models/distributed_case.rb
@@ -10,7 +10,7 @@ class DistributedCase < CaseflowRecord
   validates :task_id, presence: true, if: :ama_docket
   validates :docket_index, presence: true, if: :legacy_nonpriority
   validates :priority, inclusion: [true, false]
-  validates :sct_appeal, inclusion: [true, false], if: :ama_docket
+  validates :sct_appeal, inclusion: [true, false, nil], if: :ama_docket
 
   def rename_for_redistribution!
     ymd = Time.zone.today.strftime("%F")
diff --git a/app/models/organizations/inbound_ops_team.rb b/app/models/organizations/inbound_ops_team.rb
index cac267dd5c3..aa09af11b5c 100644
--- a/app/models/organizations/inbound_ops_team.rb
+++ b/app/models/organizations/inbound_ops_team.rb
@@ -24,6 +24,6 @@ def super_users
 
   # :reek:UtilityFunction
   def selectable_in_queue?
-    FeatureToggle.enabled?(:correspondence_queue, user: RequestStore.store[:current_user])
+    false
   end
 end
diff --git a/app/models/serializers/work_queue/appeal_search_serializer.rb b/app/models/serializers/work_queue/appeal_search_serializer.rb
index d3e7fee9ea8..987faaf4745 100644
--- a/app/models/serializers/work_queue/appeal_search_serializer.rb
+++ b/app/models/serializers/work_queue/appeal_search_serializer.rb
@@ -8,6 +8,10 @@ class WorkQueue::AppealSearchSerializer
 
   attribute :contested_claim, &:contested_claim?
 
+  attribute :mst, &:mst?
+
+  attribute :pact, &:pact?
+
   attribute :issues do |object|
     object.request_issues.active_or_decided_or_withdrawn.includes(:remand_reasons).map do |issue|
       {
@@ -18,7 +22,11 @@ class WorkQueue::AppealSearchSerializer
         diagnostic_code: issue.contested_rating_issue_diagnostic_code,
         remand_reasons: issue.remand_reasons,
         closed_status: issue.closed_status,
-        decision_date: issue.decision_date
+        decision_date: issue.decision_date,
+        mst_status: FeatureToggle.enabled?(:mst_identification) ? issue.mst_status : false,
+        pact_status: FeatureToggle.enabled?(:pact_identification) ? issue.pact_status : false,
+        mst_justification: issue&.mst_status_update_reason_notes,
+        pact_justification: issue&.pact_status_update_reason_notes
       }
     end
   end
@@ -39,7 +47,9 @@ class WorkQueue::AppealSearchSerializer
         benefit_type: issue.benefit_type,
         remand_reasons: issue.remand_reasons,
         diagnostic_code: issue.diagnostic_code,
-        request_issue_ids: issue.request_decision_issues.pluck(:request_issue_id)
+        request_issue_ids: issue.request_decision_issues.pluck(:request_issue_id),
+        mst_status: FeatureToggle.enabled?(:mst_identification) ? issue.mst_status : false,
+        pact_status: FeatureToggle.enabled?(:pact_identification) ? issue.pact_status : false
       }
     end
   end
diff --git a/app/models/serializers/work_queue/correspondence_serializer.rb b/app/models/serializers/work_queue/correspondence_serializer.rb
new file mode 100644
index 00000000000..0cd46e1359a
--- /dev/null
+++ b/app/models/serializers/work_queue/correspondence_serializer.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+class WorkQueue::CorrespondenceSerializer
+  include FastJsonapi::ObjectSerializer
+
+  set_key_transform :camel_lower
+
+  attribute :uuid
+  attribute :id
+  attribute :cmp_packet_number
+  attribute :notes
+  attribute :portal_entry_date
+  attribute :source_type
+  attribute :va_date_of_receipt
+  # Is this a future table?
+  attribute :cmp_queue_id
+
+  attribute :correspondence_type do |object|
+    object.correspondence_type&.name
+  end
+
+  attribute :veteran_full_name do |object|
+    [object.veteran_full_name&.first_name, object.veteran_full_name&.last_name].join(" ")
+  end
+
+  attribute :package_document_type do |object|
+    object.package_document_type&.name
+  end
+
+  attribute :veteran_file_number do |object|
+    object.veteran&.file_number
+  end
+end
diff --git a/app/models/serializers/work_queue/legacy_appeal_search_serializer.rb b/app/models/serializers/work_queue/legacy_appeal_search_serializer.rb
index 7cd374f20e6..5a1dbaaa76c 100644
--- a/app/models/serializers/work_queue/legacy_appeal_search_serializer.rb
+++ b/app/models/serializers/work_queue/legacy_appeal_search_serializer.rb
@@ -21,19 +21,11 @@ class WorkQueue::LegacyAppealSearchSerializer
 
   attribute :completed_hearing_on_previous_appeal?
 
-  attribute :appellant_is_not_veteran, &:appellant_is_not_veteran
-
   attribute :appellant_full_name, &:appellant_name
 
-  attribute :appellant_address, &:appellant_address
-
-  attribute :appellant_tz, &:appellant_tz
-
-  attribute :appellant_relationship
   attribute :assigned_to_location
   attribute :vbms_id, &:sanitized_vbms_id
   attribute :veteran_full_name
-  attribute :veteran_death_date
   attribute :veteran_appellant_deceased, &:veteran_appellant_deceased?
   # Aliasing the vbms_id to make it clear what we're returning.
   attribute :veteran_file_number, &:sanitized_vbms_id
@@ -59,27 +51,16 @@ class WorkQueue::LegacyAppealSearchSerializer
     object.veteran ? object.veteran.id : nil
   end
 
+  attribute :mst, &:mst?
+
+  attribute :pact, &:pact?
+
   attribute(:available_hearing_locations) { |object| available_hearing_locations(object) }
 
   attribute :docket_name do
     "legacy"
   end
 
-  attribute :document_id do |object|
-    latest_vacols_attorney_case_review(object)&.document_id
-  end
-
-  attribute :can_edit_document_id do |object, params|
-    LegacyDocumentIdPolicy.new(
-      user: params[:user],
-      case_review: latest_vacols_attorney_case_review(object)
-    ).editable?
-  end
-
-  attribute :attorney_case_review_id do |object|
-    latest_vacols_attorney_case_review(object)&.vacols_id
-  end
-
   attribute :current_user_email do |_, params|
     params[:user]&.email
   end
@@ -93,8 +74,4 @@ class WorkQueue::LegacyAppealSearchSerializer
       WorkQueue::PriorlocSerializer.new(location).serializable_hash[:data][:attributes]
     end
   end
-
-  def self.latest_vacols_attorney_case_review(object)
-    VACOLS::CaseAssignment.latest_task_for_appeal(object.vacols_id)
-  end
 end
diff --git a/app/models/task_sorter.rb b/app/models/task_sorter.rb
index 460340be93f..6ae085350f8 100644
--- a/app/models/task_sorter.rb
+++ b/app/models/task_sorter.rb
@@ -36,7 +36,7 @@ def sorted_tasks
       tasks.joins(:appeal).order(notes: sort_order.to_sym)
     when Constants.QUEUE_CONFIG.COLUMNS.VA_DATE_OF_RECEIPT.name
       tasks.joins(:appeal).order(va_date_of_receipt: sort_order.to_sym)
-    when Constants.QUEUE_CONFIG.COLUMNS.DAYS_WAITING.name
+    when Constants.QUEUE_CONFIG.COLUMNS.DAYS_WAITING_CORRESPONDENCE.name
       tasks.joins(:appeal).order(assigned_at: reverse_sort_order.to_sym)
     when Constants.QUEUE_CONFIG.COLUMNS.CORRESPONDENCE_TASK_CLOSED_DATE.name
       tasks.joins(:appeal).order(closed_at: sort_order.to_sym)
diff --git a/app/models/tasks/attorney_task.rb b/app/models/tasks/attorney_task.rb
index e279ab58660..15e24545fbb 100644
--- a/app/models/tasks/attorney_task.rb
+++ b/app/models/tasks/attorney_task.rb
@@ -105,7 +105,7 @@ def update_params_will_cancel_attorney_task?(params)
   end
 
   def update_params_will_move_appeal_back_to_sct_queue?(params)
-    update_params_will_cancel_attorney_task?(params) && appeal.sct_appeal?
+    update_params_will_cancel_attorney_task?(params) && assigned_to_sct_appeal?
   end
 
   def can_be_moved_by_user?(user)
@@ -146,6 +146,12 @@ def reopen_sct_assign_task
     sct_task
   end
 
+  def assigned_to_sct_appeal?
+    ama? &&
+      appeal.specialty_case_team_assign_task? &&
+      appeal.sct_appeal?
+  end
+
   def attorney_cancel_action
     if ama? && appeal.completed_specialty_case_team_assign_task?
       Constants.TASK_ACTIONS.CANCEL_TASK_AND_RETURN_TO_SCT_QUEUE.to_h
diff --git a/app/models/tasks/correspondence/reassign_package_task.rb b/app/models/tasks/correspondence/reassign_package_task.rb
index 8fb51fa32a6..8e2bc84d1d7 100644
--- a/app/models/tasks/correspondence/reassign_package_task.rb
+++ b/app/models/tasks/correspondence/reassign_package_task.rb
@@ -7,4 +7,38 @@ class ReassignPackageTask < CorrespondenceTask
   def task_url
     Constants.CORRESPONDENCE_TASK_URL.REASSIGN_PACKAGE_TASK_MODAL_URL
   end
+
+  def approve(current_user, new_assignee)
+    update!(
+      completed_by: current_user,
+      assigned_to_id: current_user,
+      assigned_to: current_user,
+      closed_at: Time.zone.now,
+      status: Constants.TASK_STATUSES.completed
+    )
+    parent.update!(
+      status: Constants.TASK_STATUSES.completed,
+      closed_at: Time.zone.now,
+      completed_by: current_user
+    )
+    ReviewPackageTask.create!(
+      assigned_to: new_assignee,
+      status: Constants.TASK_STATUSES.assigned,
+      appeal_id: appeal_id,
+      appeal_type: Correspondence.name
+    )
+  end
+
+  def reject(current_user, reason)
+    update!(
+      completed_by_id: current_user.id,
+      closed_at: Time.zone.now,
+      status: Constants.TASK_STATUSES.completed,
+      instructions: instructions.push(reason)
+    )
+    parent.update!(
+      assigned_to_type: "User",
+      status: Constants.TASK_STATUSES.in_progress
+    )
+  end
 end
diff --git a/app/models/tasks/correspondence_task.rb b/app/models/tasks/correspondence_task.rb
index 2273118c954..ac71f968e67 100644
--- a/app/models/tasks/correspondence_task.rb
+++ b/app/models/tasks/correspondence_task.rb
@@ -5,12 +5,14 @@ class CorrespondenceTask < Task
   self.abstract_class = true
 
   before_create :verify_org_task_unique
-  belongs_to :appeal, class_name: "Correspondence", foreign_key: :appeal_id
+  belongs_to :appeal, class_name: "Correspondence"
   validate :status_is_valid_on_create, on: :create
   validate :assignee_status_is_valid_on_create, on: :create
 
   scope :package_action_tasks, -> { where(type: package_action_task_names) }
 
+  delegate :nod, to: :correspondence
+
   def self.package_action_task_names
     [
       ReassignPackageTask.name,
@@ -20,10 +22,6 @@ def self.package_action_task_names
     ]
   end
 
-  def nod
-    correspondence.nod
-  end
-
   def verify_org_task_unique
     if Task.where(
       appeal_id: appeal_id,
diff --git a/app/models/tasks/correspondence_task_filter.rb b/app/models/tasks/correspondence_task_filter.rb
index c008b612523..5d0f9246b96 100644
--- a/app/models/tasks/correspondence_task_filter.rb
+++ b/app/models/tasks/correspondence_task_filter.rb
@@ -2,39 +2,25 @@
 
 class CorrespondenceTaskFilter < TaskFilter
   def filtered_tasks
-    va_dor_params = filter_params.select { |param| param.include?("col=vaDor") }
-    date_completed_params = filter_params.select { |param| param.include?("col=correspondenceCompletedDateColumn") }
-    task_column_params = filter_params.select { |param| param.include?("col=taskColumn") }
-    nod_column_params = filter_params.select { |param| param.include?("col=packageDocTypeColumn") }
-
-    # task_column_params comes in as a single string, delimited by |. Updates task_column_params
-    # to be an array of the incoming values.
-    unless task_column_params == []
-      task_column_params[0].slice!("col=taskColumn&val=")[0]
-      task_column_params = task_column_params[0].split("|")
-    end
-
     result = tasks.all
-    va_dor_params.each do |param|
-      value_hash = Rack::Utils.parse_nested_query(param).deep_symbolize_keys
-      result = result.merge(filter_by_va_dor(value_hash[:val]))
-    end
 
-    unless nod_column_params.empty?
-      nod_column_params.each do |param|
+    filter_params.each do |param|
+      case param
+      when /col=vaDor/
+        value_hash = Rack::Utils.parse_nested_query(param).deep_symbolize_keys
+        result = result.merge(filter_by_va_dor(value_hash[:val]))
+      when /col=packageDocTypeColumn/
         value_hash = Rack::Utils.parse_nested_query(param).deep_symbolize_keys
         result = result.merge(filter_by_nod(value_hash[:val]))
+      when /col=taskColumn/
+        task_column_params = param.sub("col=taskColumn&val=", "").split("|")
+        result = result.merge(filter_by_task(task_column_params))
+      when /col=correspondenceCompletedDateColumn/
+        value_hash = Rack::Utils.parse_nested_query(param).deep_symbolize_keys
+        result = result.merge(filter_by_date_completed(value_hash[:val]))
       end
     end
 
-    unless task_column_params.empty?
-      result = result.merge(filter_by_task(task_column_params))
-    end
-
-    unless date_completed_params.empty?
-      date_completed_params[0].slice!("col=correspondenceCompletedDateColumn&val=")
-      result = result.merge(filter_by_date_completed(date_completed_params[0]))
-    end
     result
   end
 
diff --git a/app/models/tasks/efolder_upload_failed_task.rb b/app/models/tasks/efolder_upload_failed_task.rb
index ade36ed81e1..251b69364b5 100644
--- a/app/models/tasks/efolder_upload_failed_task.rb
+++ b/app/models/tasks/efolder_upload_failed_task.rb
@@ -2,9 +2,9 @@
 
 class EfolderUploadFailedTask < CorrespondenceTask
   def task_url
-    if (parent.type == ReviewPackageTask.name)
+    if parent.type == ReviewPackageTask.name
       Constants.CORRESPONDENCE_TASK_URL.REVIEW_PACKAGE_TASK_URL.sub("uuid", correspondence.uuid)
-    elsif (parent.type == CorrespondenceIntakeTask.name)
+    elsif parent.type == CorrespondenceIntakeTask.name
       Constants.CORRESPONDENCE_TASK_URL.INTAKE_TASK_URL.sub("uuid", correspondence.uuid)
     end
   end
diff --git a/app/models/tasks/remove_package_task.rb b/app/models/tasks/remove_package_task.rb
index 7e4ab28fb8e..f8845748e59 100644
--- a/app/models/tasks/remove_package_task.rb
+++ b/app/models/tasks/remove_package_task.rb
@@ -7,4 +7,23 @@ class RemovePackageTask < CorrespondenceTask
   def task_url
     Constants.CORRESPONDENCE_TASK_URL.REMOVE_PACKAGE_TASK_MODAL_URL
   end
+
+  def approve(user)
+    update!(
+      completed_by_id: user.id,
+      status: Constants.TASK_STATUSES.cancelled
+    )
+  end
+
+  def reject(user, reason)
+    update!(
+      completed_by_id: user.id,
+      closed_at: Time.zone.now,
+      status: Constants.TASK_STATUSES.completed,
+      instructions: instructions.push(reason)
+    )
+    parent.update!(
+      status: Constants.TASK_STATUSES.in_progress
+    )
+  end
 end
diff --git a/app/services/correspondence_intake_processor.rb b/app/services/correspondence_intake_processor.rb
index 23dbf5e5d58..6594ee7b6e3 100644
--- a/app/services/correspondence_intake_processor.rb
+++ b/app/services/correspondence_intake_processor.rb
@@ -162,45 +162,43 @@ def mail_task_class_for_type(task_type)
     mail_task_types[task_type]&.constantize
   end
 
-  # rubocop:disable Metrics/MethodLength
-  def task_class_for_type(task_type)
-    task_types = {
-      "AddressChangeMailTask": AddressChangeMailTask.name,
-      "AodMotionMailTask": AodMotionMailTask.name,
-      "AppealWithdrawalMailTask": AppealWithdrawalMailTask.name,
-      "CavcCorrespondenceMailTask": CavcCorrespondenceMailTask.name,
-      "ClearAndUnmistakeableErrorMailTask": ClearAndUnmistakeableErrorMailTask.name,
-      "CongressionalInterestMailTask": CongressionalInterestMailTask.name,
-      "ControlledCorrespondenceMailTask": ControlledCorrespondenceMailTask.name,
-      "DeathCertificateMailTask": DeathCertificateMailTask.name,
-      "DocketSwitchMailTask": DocketSwitchMailTask.name,
-      "EvidenceOrArgumentMailTask": EvidenceOrArgumentMailTask.name,
-      "ExtensionRequestMailTask": ExtensionRequestMailTask.name,
-      "FoiaRequestMailTask": FoiaRequestMailTask.name,
-      "HearingPostponementRequestMailTask": HearingPostponementRequestMailTask.name,
-      "HearingRelatedMailTask": HearingRelatedMailTask.name,
-      "HearingWithdrawalRequestMailTask": HearingWithdrawalRequestMailTask.name,
-      "OtherMotionMailTask": OtherMotionMailTask.name,
-      "PowerOfAttorneyRelatedMailTask": PowerOfAttorneyRelatedMailTask.name,
-      "PrivacyActRequestMailTask": PrivacyActRequestMailTask.name,
-      "PrivacyComplaintMailTask": PrivacyComplaintMailTask.name,
-      "ReconsiderationMotionMailTask": ReconsiderationMotionMailTask.name,
-      "ReturnedUndeliverableCorrespondenceMailTask": ReturnedUndeliverableCorrespondenceMailTask.name,
-      "StatusInquiryMailTask": StatusInquiryMailTask.name,
-      "DeathCertificateCorrespondenceTask": DeathCertificateCorrespondenceTask.name,
-      "FoiaRequestCorrespondenceTask": FoiaRequestCorrespondenceTask.name,
-      "StatusInquiryCorrespondenceTask": StatusInquiryCorrespondenceTask.name,
-      "OtherMotionCorrespondenceTask": OtherMotionCorrespondenceTask.name,
-      "PrivacyComplaintCorrespondenceTask": PrivacyComplaintCorrespondenceTask.name,
-      "PowerOfAttorneyRelatedCorrespondenceTask": PowerOfAttorneyRelatedCorrespondenceTask.name,
-      "CavcCorrespondenceCorrespondenceTask": CavcCorrespondenceCorrespondenceTask.name,
-      "CongressionalInterestCorrespondenceTask": CongressionalInterestCorrespondenceTask.name,
-      "PrivacyActRequestCorrespondenceTask": PrivacyActRequestCorrespondenceTask.name
-    }.with_indifferent_access
+  TASK_TYPE_MAPPINGS = {
+    "AddressChangeMailTask": AddressChangeMailTask.name,
+    "AodMotionMailTask": AodMotionMailTask.name,
+    "AppealWithdrawalMailTask": AppealWithdrawalMailTask.name,
+    "CavcCorrespondenceMailTask": CavcCorrespondenceMailTask.name,
+    "ClearAndUnmistakeableErrorMailTask": ClearAndUnmistakeableErrorMailTask.name,
+    "CongressionalInterestMailTask": CongressionalInterestMailTask.name,
+    "ControlledCorrespondenceMailTask": ControlledCorrespondenceMailTask.name,
+    "DeathCertificateMailTask": DeathCertificateMailTask.name,
+    "DocketSwitchMailTask": DocketSwitchMailTask.name,
+    "EvidenceOrArgumentMailTask": EvidenceOrArgumentMailTask.name,
+    "ExtensionRequestMailTask": ExtensionRequestMailTask.name,
+    "FoiaRequestMailTask": FoiaRequestMailTask.name,
+    "HearingPostponementRequestMailTask": HearingPostponementRequestMailTask.name,
+    "HearingRelatedMailTask": HearingRelatedMailTask.name,
+    "HearingWithdrawalRequestMailTask": HearingWithdrawalRequestMailTask.name,
+    "OtherMotionMailTask": OtherMotionMailTask.name,
+    "PowerOfAttorneyRelatedMailTask": PowerOfAttorneyRelatedMailTask.name,
+    "PrivacyActRequestMailTask": PrivacyActRequestMailTask.name,
+    "PrivacyComplaintMailTask": PrivacyComplaintMailTask.name,
+    "ReconsiderationMotionMailTask": ReconsiderationMotionMailTask.name,
+    "ReturnedUndeliverableCorrespondenceMailTask": ReturnedUndeliverableCorrespondenceMailTask.name,
+    "StatusInquiryMailTask": StatusInquiryMailTask.name,
+    "DeathCertificateCorrespondenceTask": DeathCertificateCorrespondenceTask.name,
+    "FoiaRequestCorrespondenceTask": FoiaRequestCorrespondenceTask.name,
+    "StatusInquiryCorrespondenceTask": StatusInquiryCorrespondenceTask.name,
+    "OtherMotionCorrespondenceTask": OtherMotionCorrespondenceTask.name,
+    "PrivacyComplaintCorrespondenceTask": PrivacyComplaintCorrespondenceTask.name,
+    "PowerOfAttorneyRelatedCorrespondenceTask": PowerOfAttorneyRelatedCorrespondenceTask.name,
+    "CavcCorrespondenceCorrespondenceTask": CavcCorrespondenceCorrespondenceTask.name,
+    "CongressionalInterestCorrespondenceTask": CongressionalInterestCorrespondenceTask.name,
+    "PrivacyActRequestCorrespondenceTask": PrivacyActRequestCorrespondenceTask.name
+  }.with_indifferent_access
 
-    task_types[task_type]&.constantize
+  def task_class_for_type(task_type)
+    TASK_TYPE_MAPPINGS[task_type]&.constantize
   end
-  # rubocop:enable Metrics/MethodLength
 
   def class_for_assigned_to(assigned_to)
     available_assignees = {
diff --git a/app/views/correspondence/correspondence_cases.html.erb b/app/views/correspondence/correspondence_cases.html.erb
index 14f74e14e4d..79a9b07416a 100644
--- a/app/views/correspondence/correspondence_cases.html.erb
+++ b/app/views/correspondence/correspondence_cases.html.erb
@@ -12,6 +12,9 @@
     dropdownUrls: dropdown_urls,
     applicationUrls: application_urls,
     feedbackUrl: feedback_url,
+    responseType: @response_type,
+    responseHeader: @response_header,
+    responseMessage: @response_message,
     configUrl: '/queue/correspondence?json',
     flash: flash,
     featureToggles: {
diff --git a/app/views/correspondence/intake.html.erb b/app/views/correspondence/intake.html.erb
index ec17b4e0dcc..a10c4aa23cf 100644
--- a/app/views/correspondence/intake.html.erb
+++ b/app/views/correspondence/intake.html.erb
@@ -11,9 +11,10 @@
     featureToggles: {
       correspondence_queue: FeatureToggle.enabled?(:correspondence_queue, user: current_user)
     },
+    priorMail: @prior_mail,
     correspondence: @correspondence,
+    isMailSupervisor: current_user.mail_supervisor?,
     reduxStore: @redux_store,
     autoTexts: @auto_texts,
-    veteranInformation: @veteran_information
   }) %>
 <% end %>
diff --git a/app/workflows/case_search_results_base.rb b/app/workflows/case_search_results_base.rb
index 46abed53883..ea30ccd739e 100644
--- a/app/workflows/case_search_results_base.rb
+++ b/app/workflows/case_search_results_base.rb
@@ -90,7 +90,7 @@ def search_page_json_appeals(appeals)
       ama_appeals, is_collection: true, params: { user: user }
     ).serializable_hash
 
-    legacy_hash = WorkQueue::LegacyAppealSerializer.new(
+    legacy_hash = WorkQueue::LegacyAppealSearchSerializer.new(
       legacy_appeals, is_collection: true, params: { user: user }
     ).serializable_hash
 
diff --git a/client/COPY.json b/client/COPY.json
index b9c01bbb988..e09378fcdc7 100644
--- a/client/COPY.json
+++ b/client/COPY.json
@@ -87,6 +87,32 @@
   "CORRESPONDENCE_INTAKE_FORM_SUBMIT_MODAL_BODY": "Submitting the correspondence record will upload the mail package to the eFolder.  Make sure that all information is correct before submitting.",
   "CORRESPONDENCE_INTAKE_FORM_ERROR_BANNER_TITLE": "The correspondence's documents have failed to upload to the eFolder",
   "CORRESPONDENCE_INTAKE_FORM_ERROR_BANNER_TEXT": "You can upload it from this page to the veteran's eFolder at a later time.",
+  "CORRESPONDENCE_QUEUE_PACKAGE_ACTION_SUCCESS": {
+    "REASSIGN": {
+      "APPROVE": {
+        "TITLE": "You have successfully reassigned a mail record for %s",
+        "MESSAGE": "Please go to your individual queue to see any self assigned correspondence."
+      },
+      "REJECT": {
+        "TITLE": "You have successfully rejected a package request for %s",
+        "MESSAGE": "The package will be re-assigned to the user that sent the request."
+      }
+    },
+    "REMOVE": {
+      "APPROVE": {
+        "TITLE": "You have successfully removed a mail package for %s",
+        "MESSAGE": "The package has been removed from Caseflow and must be manually uploaded again from the Centralized Mail Portal, if it needs to be processed."
+      },
+      "REJECT": {
+        "TITLE": "You have successfully rejected a package request for %s",
+        "MESSAGE": "The package will be re-assigned to the user that sent the request."
+      }
+    }
+  },
+  "CORRESPONDENCE_QUEUE_PACKAGE_ACTION_DECISION_OPTIONS": {
+    "APPROVE": "approve",
+    "REJECT": "reject"
+  },
   "DOCUMENT_PREVIEW": "Document Preview",
   "TASK_SNAPSHOT_ABOUT_BOX_TITLE": "About the case",
   "TASK_SNAPSHOT_ABOUT_BOX_HEARING_REQUEST_TYPE_LABEL": "Hearing Type",
diff --git a/client/app/components/ReceiptDatePicker.jsx b/client/app/components/ReceiptDatePicker.jsx
index aafe25876d6..0b0a6a4dc93 100644
--- a/client/app/components/ReceiptDatePicker.jsx
+++ b/client/app/components/ReceiptDatePicker.jsx
@@ -4,7 +4,6 @@ import ReactSelectDropdown from '../../../client/app/components/ReactSelectDropd
 import DateSelector from './DateSelector';
 import Button from './Button';
 import { css } from 'glamor';
-import { he } from 'date-fns/locale';
 
 const dateDropdownMap = [
   { value: 0, label: 'Between these dates' },
diff --git a/client/app/nonComp/components/Alerts.jsx b/client/app/nonComp/components/Alerts.jsx
index a01e62687cb..30e37115873 100644
--- a/client/app/nonComp/components/Alerts.jsx
+++ b/client/app/nonComp/components/Alerts.jsx
@@ -70,6 +70,8 @@ export class FlashAlerts extends React.PureComponent {
         flashMsg = <Alert key={idx} title="You have successfully updated issues on this appeal" type="success" lowerMargin>{listChanges(flash[1])}</Alert>;
       } else if (flash[0] === 'custom') {
         flashMsg = <Alert key={idx} title={flash[1].title} type="success" lowerMargin>{flash[1].message}</Alert>;
+      } else if (flash[0] === 'custom_error') {
+        flashMsg = <Alert key={idx} title={flash[1].title} type="error" lowerMargin>{flash[1].message}</Alert>;
       } else if (flash[0] === 'show_vha_org_join_info') {
         flashMsg = <VhaJoinOrgAlert />;
       } else if (flash[0] === 'correspondence_intake_success') {
diff --git a/client/app/queue/OrganizationUsers.jsx b/client/app/queue/OrganizationUsers.jsx
index 3497cf30792..b72db661f92 100644
--- a/client/app/queue/OrganizationUsers.jsx
+++ b/client/app/queue/OrganizationUsers.jsx
@@ -111,7 +111,7 @@ export default class OrganizationUsers extends React.PureComponent {
 
       this.setState({
         organizationUsers: [...this.state.organizationUsers, response.body.users.data[0]],
-        remainingUsers: this.state.remainingUsers.filter((user) => user.id !== value.id),
+        remainingUsers: (this.state.remainingUsers ?? []).filter((user) => user.id !== value.id),
         membershipRequests: this.state.membershipRequests.filter((mr) => parseInt(mr.userId, 10) !== parseInt(value.id, 10)),
         addingUser: null
       });
diff --git a/client/app/queue/QueueApp.jsx b/client/app/queue/QueueApp.jsx
index 6bcd5c44004..e11106e91cf 100644
--- a/client/app/queue/QueueApp.jsx
+++ b/client/app/queue/QueueApp.jsx
@@ -699,7 +699,15 @@ class QueueApp extends React.PureComponent {
   );
 
   routedCorrespondenceIntake = (props) => (
-    <CorrespondenceIntake reduxStore={this.props.reduxStore} autoTexts={this.props.autoTexts} {...props.match.params} veteranInformation={this.props.veteranInformation} />
+    <CorrespondenceIntake
+      {...props.match.params}
+      reduxStore={this.props.reduxStore}
+      autoTexts={this.props.autoTexts}
+      correspondence={this.props.correspondence}
+      priorMail={this.props.priorMail}
+      veteranInformation={this.props.veteranInformation}
+      isMailSupervisor={this.props.isMailSupervisor}
+    />
   );
 
   routedCorrespondenceCases = () => (
@@ -1556,8 +1564,9 @@ QueueApp.propTypes = {
   canViewCavcDashboards: PropTypes.bool,
   userIsCobAdmin: PropTypes.bool,
   correspondence: PropTypes.object,
+  priorMail: PropTypes.array,
+  veteranInformation: PropTypes.string,
   autoTexts: PropTypes.array,
-  veteranInformation: PropTypes.object,
   reduxStore: PropTypes.object
 };
 
diff --git a/client/app/queue/QueueDropdownFilter.jsx b/client/app/queue/QueueDropdownFilter.jsx
index bfec107511d..ba2037816ad 100644
--- a/client/app/queue/QueueDropdownFilter.jsx
+++ b/client/app/queue/QueueDropdownFilter.jsx
@@ -100,7 +100,7 @@ class QueueDropdownFilter extends React.PureComponent {
 
     // Prevent the date from being picked past the current day.
     if (convertStringToDate(date) > new Date()) {
-      foundErrors = [...foundErrors, { key: type, message: `${messageText} cannot occur in the the future.` }];
+      foundErrors = [...foundErrors, { key: type, message: `${messageText} cannot occur in the future.` }];
     }
 
     if (type === 'fromDate') {
diff --git a/client/app/queue/TeamAssignTaskListView.jsx b/client/app/queue/TeamAssignTaskListView.jsx
index 79b88efa956..ae49c03c938 100644
--- a/client/app/queue/TeamAssignTaskListView.jsx
+++ b/client/app/queue/TeamAssignTaskListView.jsx
@@ -18,7 +18,9 @@ import {
   judgeAssignTasksSelector,
   camoAssignTasksSelector,
   getTasksByUserId,
-  specialtyCaseTeamAssignTasksSelector
+  specialtyCaseTeamAssignTasksSelector,
+  isVhaCamoOrg,
+  isSpecialtyCaseTeamOrg
 } from './selectors';
 import PageRoute from '../components/PageRoute';
 import AssignedCasesPage from './AssignedCasesPage';
@@ -134,11 +136,11 @@ const mapStateToProps = (state) => {
 
   let taskSelector = judgeAssignTasksSelector(state);
 
-  if (userIsCamoEmployee) {
+  if (userIsCamoEmployee && isVhaCamoOrg(state)) {
     taskSelector = camoAssignTasksSelector(state);
   }
 
-  if (userIsSCTCoordinator) {
+  if (userIsSCTCoordinator && isSpecialtyCaseTeamOrg(state)) {
     taskSelector = specialtyCaseTeamAssignTasksSelector(state);
   }
 
@@ -148,7 +150,9 @@ const mapStateToProps = (state) => {
     targetUserId: state.ui.targetUser?.id,
     targetUserCssId: state.ui.targetUser?.cssId,
     tasksByUserId: getTasksByUserId(state),
-    attorneysOfJudge
+    attorneysOfJudge,
+    userIsSCTCoordinator: userIsSCTCoordinator && isSpecialtyCaseTeamOrg(state),
+    userIsCamoEmployee: userIsCamoEmployee && isVhaCamoOrg(state),
   };
 };
 
diff --git a/client/app/queue/cavc/editCavcRemandTasks/editCavcRemandTasksView.jsx b/client/app/queue/cavc/editCavcRemandTasks/editCavcRemandTasksView.jsx
index 3fba256ded7..37fa658043b 100644
--- a/client/app/queue/cavc/editCavcRemandTasks/editCavcRemandTasksView.jsx
+++ b/client/app/queue/cavc/editCavcRemandTasks/editCavcRemandTasksView.jsx
@@ -50,7 +50,7 @@ export const EditCavcRemandTasksView = () => {
   const cancelTaskIds = activeTasks.filter((task) => task.disabled && task.type !== 'MdrTask').map(
     (disTask) => disTask.id);
 
-  const getReActivateTaksIds = () => {
+  const getReActivateTaskIds = () => {
     if (closedSendCavcRemandProcessedLetterTask) {
       return [closedSendCavcRemandProcessedLetterTask.id];
     } else if (openSendCavcRemandProcessedLetterTask) {
@@ -60,7 +60,7 @@ export const EditCavcRemandTasksView = () => {
     return [];
   };
 
-  const reActivateTaskIds = getReActivateTaksIds();
+  const reActivateTaskIds = getReActivateTaskIds();
   const [selectedCancelTaskIds, setSelectedCancelTaskIds] = useState(existingValues?.cancelTaskIds || []);
   const [selectedReActivateTaskIds, setSelectedReActivateTaskIds] = useState(reActivateTaskIds);
 
diff --git a/client/app/queue/components/QueueOrganizationDropdown.jsx b/client/app/queue/components/QueueOrganizationDropdown.jsx
index 71f381c081d..c80b863e7b2 100644
--- a/client/app/queue/components/QueueOrganizationDropdown.jsx
+++ b/client/app/queue/components/QueueOrganizationDropdown.jsx
@@ -17,7 +17,15 @@ export default class QueueOrganizationDropdown extends React.Component {
     const queueHref = (location === 'queue') ? '#' : '/queue';
     let correspondenceItems = {};
 
-    if (organizations.length < 1) {
+    const isMailTeamAffiliated = () => {
+      if (isMailSuperUser || isMailSupervisor || isMailTeamUser) {
+        return true;
+      }
+
+      return false;
+    };
+
+    if (organizations.length < 1 && !isMailTeamAffiliated()) {
       return null;
     }
 
@@ -64,13 +72,6 @@ export default class QueueOrganizationDropdown extends React.Component {
       const items2 = items.slice(1);
 
       items = [...items1, correspondenceItems, ...items2];
-
-      // const browserLocation = useLocation();
-
-      // console.log(browserLocation);
-      // if (browserLocation === '/queue/correspondence/team') {
-      //   return <Redirect to= "/queue/correspondence" />;
-      // }
     }
 
     return <QueueSelectorDropdown items={items} />;
diff --git a/client/app/queue/correspondence/CorrespondenceCases.jsx b/client/app/queue/correspondence/CorrespondenceCases.jsx
index d3ea67c67a6..36233686d53 100644
--- a/client/app/queue/correspondence/CorrespondenceCases.jsx
+++ b/client/app/queue/correspondence/CorrespondenceCases.jsx
@@ -8,6 +8,7 @@ import {
 import AppSegment from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/AppSegment';
 import PropTypes, { string } from 'prop-types';
 import COPY from '../../../COPY';
+import ApiUtil from '../../util/ApiUtil';
 import { sprintf } from 'sprintf-js';
 import CorrespondenceTableBuilder from './CorrespondenceTableBuilder';
 import Alert from '../../components/Alert';
@@ -17,6 +18,7 @@ import ReactSelectDropdown from '../../components/ReactSelectDropdown';
 import TextareaField from '../../components/TextareaField';
 import AutoAssignAlertBanner from '../correspondence/component/AutoAssignAlertBanner';
 import { css } from 'glamor';
+import WindowUtil from '../../util/WindowUtil';
 
 const CorrespondenceCases = (props) => {
   const dispatch = useDispatch();
@@ -153,23 +155,23 @@ const CorrespondenceCases = (props) => {
       displayElement: selectedRequestChoice === 'reject'
     }
   ];
-  const handleConfirmReassignRemoveClick = (operation) => {
-    const newUrl = new URL(window.location.href);
-    const searchParams = new URLSearchParams(newUrl.search);
-    // Encode and set the query parameters
-
-    searchParams.set('user', encodeURIComponent(selectedMailTeamUser));
-    searchParams.set('taskId', encodeURIComponent(currentSelectedVeteran.uniqueId));
-    searchParams.set('veteranName', encodeURIComponent(currentSelectedVeteran.veteranDetails.split('(')[0].trim()));
-    searchParams.set('userAction', encodeURIComponent(selectedRequestChoice));
-    searchParams.set('decisionReason', encodeURIComponent(decisionReason));
-    searchParams.set('operation', encodeURIComponent(operation));
-    searchParams.set('tab', encodeURIComponent('correspondence_unassigned'));
-    searchParams.set('page', encodeURIComponent('1'));
-
-    // Construct the new URL with encoded query parameters
-    newUrl.search = searchParams.toString();
-    window.location.href = newUrl.href;
+  const handleConfirmReassignRemoveClick = (actionType) => {
+    try {
+      const data = {
+        action_type: actionType,
+        new_assignee: selectedMailTeamUser,
+        decision: selectedRequestChoice,
+        decision_reason: decisionReason,
+      };
+
+      ApiUtil.patch(`/queue/correspondence/tasks/${currentSelectedVeteran.uniqueId}/update`, { data }).
+        then(() => {
+          WindowUtil.reloadPage();
+        });
+
+    } catch (error) {
+      console.error(error);
+    }
   };
 
   const reassignModalButtons = [
diff --git a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
index 465dadd7368..ffa7a9e4413 100644
--- a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
+++ b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
@@ -31,31 +31,8 @@ import { tasksWithCorrespondenceFromRawTasks } from '../utils';
 
 import COPY from '../../../COPY';
 import QUEUE_CONFIG from '../../../constants/QUEUE_CONFIG';
-import { css } from 'glamor';
 import { isActiveOrganizationVHA } from '../selectors';
 
-const rootStyles = css({
-  '.usa-alert + &': {
-    marginTop: '1.5em'
-  },
-  '& .cf-tab-window-body-full-screen': {
-    padding: '19px 30px 30px 30px',
-    '& #tasks-tabwindow-tabpanel-0, #tasks-tabwindow-tabpanel-3': {
-      '& p.cf-margin-bottom-0rem': {
-        marginTop: 0
-      }
-    }
-  },
-  '& #case-table-description': {
-    '& tr td:nth-child(1):focus': {
-      outline: 'none',
-    },
-    '& .cf-form-checkboxes': {
-      marginLeft: '0.5rem'
-    }
-  }
-});
-
 /**
  * A component to create a queue table's tabs and columns from a queue config or the assignee's tasks
  * The props are:
@@ -100,13 +77,14 @@ const CorrespondenceTableBuilder = (props) => {
 
   const handleAssignButtonClick = () => {
     // Logic to handle assigning tasks to the selected mail team user
+    // candidate for refactor using PATCH request
     if (selectedMailTeamUser && isDropdownItemSelected && isAnyCheckboxSelected) {
       const mailTeamUser = selectedMailTeamUser.value;
       const taskIds = selectedTasks.map((task) => task);
       let newUrl = window.location.href;
 
-      newUrl += newUrl.includes('?') ? `&user=${mailTeamUser}&taskIds=${taskIds}` :
-        `?user=${mailTeamUser}&taskIds=${taskIds}`;
+      newUrl += newUrl.includes('?') ? `&user=${mailTeamUser}&task_ids=${taskIds}` :
+        `?user=${mailTeamUser}&task_ids=${taskIds}`;
       window.location.href = newUrl;
     }
   };
@@ -224,35 +202,38 @@ const CorrespondenceTableBuilder = (props) => {
 
     const getBulkAssignArea = () => {
       return (<>
-        <p className="cf-margin-bottom-0rem">Assign to mail team user</p>
-        <div style={{ display: 'flex', flexDirection: 'row', paddingBottom: '15px' }}>
-          <SearchableDropdown
-            className="cf-dropdown"
-            name="Assign to mail team user"
-            hideLabel
-            styling={{ width: '200px', marginRight: '2rem' }}
-            dropdownStyling={{ width: '200px' }}
-            options={buildMailUserData(props.mailTeamUsers)}
-            onChange={handleMailTeamUserChange}
-          />
+        <p className="correspondence-table-builder-margin">Assign to mail team user</p>
+        <div className="correspondence-table-builder-searchable-dropdown-position">
+          <div className= "correspondence-table-builder-searchable-dropdown-style">
+            <SearchableDropdown
+              name="Assign to mail team user"
+              hideLabel
+              options={buildMailUserData(props.mailTeamUsers)}
+              onChange={handleMailTeamUserChange}
+            />
+          </div>
           {tabConfig.name === QUEUE_CONFIG.CORRESPONDENCE_UNASSIGNED_TASKS_TAB_NAME &&
               <>
-                <Button
-                  name="Assign"
-                  onClick={handleAssignButtonClick}
-                  disabled={!isDropdownItemSelected || !isAnyCheckboxSelected}
-                />
-                <span style={{ marginLeft: 'auto' }}>
+                <span className="correspondence-table-builder-searchable-button-position">
+                  <Button
+                    name="Assign"
+                    onClick={handleAssignButtonClick}
+                    disabled={!isDropdownItemSelected || !isAnyCheckboxSelected}
+                  />
+                </span>
+                <span className="correspondence-table-builder-searchable-auto-assign-button-position">
                   <BatchAutoAssignButton />
                 </span>
               </>
           }
           {tabConfig.name === QUEUE_CONFIG.CORRESPONDENCE_TEAM_ASSIGNED_TASKS_TAB_NAME &&
-            <Button
-              name="Reassign"
-              onClick={handleAssignButtonClick}
-              disabled={!isDropdownItemSelected || !isAnyCheckboxSelected}
-            />
+            <span className="correspondence-table-builder-searchable-button-position">
+              <Button
+                name="Reassign"
+                onClick={handleAssignButtonClick}
+                disabled={!isDropdownItemSelected || !isAnyCheckboxSelected}
+              />
+            </span>
           }
         </div>
         <hr style={{ marginBottom: '17px' }}></hr>
@@ -287,11 +268,11 @@ const CorrespondenceTableBuilder = (props) => {
           </>
 
           }
-          <div style={{ display: 'flex', flexDirection: 'row' }}>
-            <p className="cf-margin-top-0" style={{ float: 'left' }}>
+          <div className="correspondence-table-builder-filter-bar-position">
+            <p className="correspondence-table-builder-margin">
               {noCasesMessage || tabConfig.description}
             </p>
-            <div className="cf-noncomp-search" style={{ marginLeft: 'auto' }}>
+            <div className="cf-noncomp-search">
               <SearchBar
                 id="searchBar"
                 size="small"
@@ -342,8 +323,8 @@ const CorrespondenceTableBuilder = (props) => {
 
   const config = queueConfig();
 
-  return <div className={rootStyles}>
-    <h1 {...css({ display: 'inline-block' })}>{config.table_title}</h1>
+  return <div>
+    <h1 className="correspondence-table-builder-title">{config.table_title}</h1>
     <QueueOrganizationDropdown
       isMailTeamUser={props.isMailTeamUser}
       isMailSupervisor={props.isMailSupervisor}
diff --git a/client/app/queue/correspondence/component/EditDocumentTypeModal.jsx b/client/app/queue/correspondence/component/EditDocumentTypeModal.jsx
index dfa496b4b0f..723bf69167a 100644
--- a/client/app/queue/correspondence/component/EditDocumentTypeModal.jsx
+++ b/client/app/queue/correspondence/component/EditDocumentTypeModal.jsx
@@ -76,7 +76,7 @@ class EditDocumentTypeModal extends React.Component {
         cancelButton={<Button linkStyling onClick={onCancel}>Cancel</Button>}
       >
         <p>{sprintf(COPY.TEXT_MODAL_EDIT_DOCUMENT_TYPE_CORRESPONDENCE)}</p>
-        <div style={{ fontWeight: 'bold' }}>
+        <div className="modal-fwb">
           {sprintf(COPY.ORIGINAL_DOC_EDIT_DOCUMENT_TYPE_CORRESPONDENCE)}
         </div>
         <p>{originalDocumentTitle}</p>
diff --git a/client/app/queue/correspondence/component/ReassignPackageModal.jsx b/client/app/queue/correspondence/component/ReassignPackageModal.jsx
index 6441ea6cafa..1e55611d4f1 100644
--- a/client/app/queue/correspondence/component/ReassignPackageModal.jsx
+++ b/client/app/queue/correspondence/component/ReassignPackageModal.jsx
@@ -1,248 +1,127 @@
-import React from 'react';
+import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import ApiUtil from '../../../util/ApiUtil';
 import { sprintf } from 'sprintf-js';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-import { updateLastReassignAction } from '../correspondenceReducer/reviewPackageActions';
+import { useSelector } from 'react-redux';
 import TextareaField from '../../../components/TextareaField';
 import ReactSelectDropdown from '../../../components/ReactSelectDropdown';
 import COPY from '../../../../COPY';
 import Modal from '../../../components/Modal';
 import Button from '../../../components/Button';
-import { Redirect } from 'react-router-dom';
 import RadioFieldWithChildren from '../../../components/RadioFieldWithChildren';
 
-class ReassignPackageModal extends React.Component {
+const ReassignPackageModal = (props) => {
+  const [selectedRequestChoice, setSelectedRequestChoice] = useState('');
+  const [selectedMailTeamUser, setSelectedMailTeamUser] = useState('');
+  const [decisionReason, setDecisionReason] = useState('');
+  const taskInstructions = useSelector((state) => state.reviewPackage.taskInstructions);
 
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      reasonForRemove: null,
-      disabledSaveButton: true,
-      reasonReject: '',
-      updateCancelSuccess: false,
-      selectedMailTeamUser: '',
-      selectedRequestChoice: '',
-      decisionReason: '',
-      vetName: ''
-    };
-  }
-
-  handleSelect(reasonForRemove) {
-    if (reasonForRemove === 'Approve request') {
-      this.setState({ reasonForRemove,
-        disabledSaveButton: false
-      });
-    } else {
-      this.setState({ reasonForRemove,
-        disabledSaveButton: true });
-    }
-  }
-
-  reasonChange = (value) => {
-    if (value.trim().length > 0) {
-      this.setState({
-        reasonReject: value,
-        disabledSaveButton: false
-      });
-    } else {
-      this.setState({
-        reasonReject: '',
-        disabledSaveButton: true
-      });
-    }
-  }
-
-  removePackage = async () => {
-    try {
-      ApiUtil.post(`/queue/correspondence/${this.props.correspondence_id}/remove_package`).
-        then(() => {
-          this.setState({
-            updateCancelSuccess: true
-          });
-          this.props.updateLastAction('DeleteReviewPackage');
-        });
-
-    } catch (error) {
-      console.error(error);
-    }
-  }
-
-  completePackage = async () => {
+  const { onCancel } = props;
+  const submit = () => {
     try {
       const data = {
-        correspondence_id: this.props.correspondence_id,
-        instructions: []
+        action_type: 'reassign',
+        new_assignee: selectedMailTeamUser,
+        decision: selectedRequestChoice,
+        decision_reason: decisionReason,
       };
 
-      data.instructions.push(this.state.reasonReject);
-
-      ApiUtil.post(`/queue/correspondence/${this.props.correspondence_id}/completed_package`, { data }).
+      ApiUtil.patch(`/queue/correspondence/tasks/${props.reviewDetails.taskId}/update`, { data }).
         then(() => {
-          this.setState({
-            updateCancelSuccess: true
-          });
-          this.props.updateLastAction('InProgressReviewPackage');
+          window.location.href = '/queue/correspondence/team';
         });
 
     } catch (error) {
       console.error(error);
     }
-  }
-
-  render() {
-    const { onCancel } = this.props;
-    const submit = (operation) => {
-      let newUrl = new URL(window.location.href);
-      const modifyURL = newUrl.href;
-      const searchString = '/queue/correspondence';
-      const index = modifyURL.indexOf(searchString);
-      const updatedUrl = `${modifyURL.substring(0, index + searchString.length)}/team`;
-
-      newUrl = new URL(updatedUrl);
-      const searchParams = new URLSearchParams(newUrl.search);
-
-      // Encode and set the query parameters
-      searchParams.set('user', encodeURIComponent(this.state.selectedMailTeamUser));
-      searchParams.set('taskId', encodeURIComponent(this.props.veteranInformation.correspondence_tasks[2].id));
-      searchParams.set('userAction', encodeURIComponent(this.state.selectedRequestChoice));
-      searchParams.set('decisionReason', encodeURIComponent(this.state.decisionReason));
-      searchParams.set('operation', encodeURIComponent(operation));
-
-      // Construct the new URL with encoded query parameters
-      newUrl.search = searchParams.toString();
-      window.location.href = newUrl.href;
-    };
-
-    const confirmButtonDisabled = () => {
-      const selectedRequestChoice = this.state.selectedRequestChoice;
-      const selectedMailTeamUser = this.state.selectedMailTeamUser;
-      const reassignModalVisible = this.props.modalState;
-      const decisionReason = this.state.decisionReason;
-
-      if (selectedRequestChoice === 'approve' && selectedMailTeamUser === '' && reassignModalVisible) {
-        return true;
-      }
-
-      if (selectedRequestChoice === 'reject' && decisionReason === '') {
-        return true;
-      }
-
-      if (selectedRequestChoice === '') {
-        return true;
-      }
-
-      return false;
-    };
+  };
 
-    const buildMailUserData = (data) => {
+  const confirmButtonDisabled = () => {
+    if (selectedRequestChoice === 'approve' && selectedMailTeamUser === '') {
+      return true;
+    }
 
-      if (typeof data === 'undefined') {
-        return [];
-      }
+    if (selectedRequestChoice === 'reject' && decisionReason === '') {
+      return true;
+    }
 
-      return data.map((user) => {
-        return {
-          value: user,
-          label: user
-        };
-      });
-    };
+    if (selectedRequestChoice === '') {
+      return true;
+    }
 
-    const handleSetSelectedMailTeamUser = (selectedUser) => {
-      this.setState({ selectedMailTeamUser: selectedUser });
-    };
+    return false;
+  };
 
-    const handleDecisionReason = (decisionText) => {
-      this.setState({ decisionReason: decisionText });
-    };
+  const buildMailUserData = (data) => {
 
-    const resetState = () => {
-      this.setState({ selectedMailTeamUser: '' });
-      this.setState({ selectedRequestChoice: '' });
-      this.setState({ decisionReason: '' });
-    };
+    if (typeof data === 'undefined') {
+      return [];
+    }
 
-    const handleSelectedRequestChoice = (selectedRequest) => {
-      resetState();
-      this.setState({ selectedRequestChoice: selectedRequest });
-    };
+    return data.map((user) => {
+      return {
+        value: user,
+        label: user
+      };
+    });
+  };
 
-    const approveElement = (<div style={{ width: '16vw' }}>
+  const approveElement = (
+    <div style={{ width: '16vw' }}>
       <ReactSelectDropdown
         className="cf-margin-left-2rem img"
         label="Assign to person"
-        onChangeMethod={(val) => handleSetSelectedMailTeamUser(val.value)}
-        options={buildMailUserData(this.props.mailTeamUsers)}
+        onChangeMethod={(val) => setSelectedMailTeamUser(val.value)}
+        options={buildMailUserData(props.mailTeamUsers)}
       />
-    </div>);
-
-    const textAreaElement = (
-      <div style={{ width: '100%' }}>
-        <TextareaField label="Provide a reason for rejection"
-          onChange={handleDecisionReason}
-          value={this.state.decisionReason} />
-      </div>);
-
-    const reassignReasonOptions = [
-      {
-        displayText: 'Approve request',
-        value: 'approve',
-        element: approveElement,
-        displayElement: this.state.selectedRequestChoice === 'approve'
-      },
-      {
-        displayText: 'Reject request',
-        value: 'reject',
-        element: textAreaElement,
-        displayElement: this.state.selectedRequestChoice === 'reject'
-      }
-    ];
-
-    if (this.state.updateCancelSuccess) {
-      return <Redirect to="/queue/correspondence" />;
+    </div>
+  );
+
+  const textAreaElement = (
+    <div style={{ width: '100%' }}>
+      <TextareaField label="Provide a reason for rejection"
+        onChange={setDecisionReason}
+        name="reason-text-area"
+        value={decisionReason} />
+    </div>
+  );
+
+  const reassignOptions = [
+    { displayText: 'Approve request',
+      value: 'approve',
+      element: approveElement,
+      displayElement: selectedRequestChoice === 'approve'
+    },
+    { displayText: 'Reject request',
+      value: 'reject',
+      element: textAreaElement,
+      displayElement: selectedRequestChoice === 'reject'
     }
-
-    return (
-      <Modal
-        title= {sprintf(COPY.CORRESPONDENCE_HEADER_REMOVE_PACKAGE)}
-        closeHandler={onCancel}
-        confirmButton={<Button disabled={(confirmButtonDisabled())}
-          onClick={() => (submit('reassign'))}>Confirm</Button>}
-        cancelButton={<Button linkStyling onClick={onCancel}>Cancel</Button>}
-      >
-        <p>
-          <span style= {{ fontWeight: 'bold' }}>{sprintf(COPY.CORRESPONDENCE_TITLE_REASSIGN_PACKAGE)}</span><br />
-          {this.props.reasonRemovePackage[0]}
-        </p>
-
-        <p>{this.props.veteranInformation.correspondence_tasks[2].instructions[0]}</p>
-
-        <RadioFieldWithChildren
-          vertical
-          label= {sprintf(COPY.CORRRESPONDENCE_LABEL_OPTION_REASSIGN_PACKAGE)}
-          name="merge-package"
-          value={this.state.selectedRequestChoice}
-          options={reassignReasonOptions}
-          onChange={(val) => handleSelectedRequestChoice(val)}
-        />
-
-      </Modal>
-    );
-
-  }
-}
-
-const mapStateToProps = (state) => {
-  return { vetInfo: state.reviewPackage.lastAction,
-    reasonRemovePackage: state.reviewPackage.reasonForRemovePackage,
-    reassignModalVisible: state.intakeCorrespondence.showReassignPackageModal,
-    currentAction: state.reviewPackage.lastAction,
-    veteranInformation: state.reviewPackage.veteranInformation,
-    currentSelectedVeteran: state.intakeCorrespondence.selectedVeteranDetails
-  };
+  ];
+
+  return (
+    <Modal
+      title= {sprintf(COPY.CORRESPONDENCE_HEADER_REMOVE_PACKAGE)}
+      closeHandler={onCancel}
+      confirmButton={<Button disabled={(confirmButtonDisabled())}
+        onClick={() => (submit())}>Confirm</Button>}
+      cancelButton={<Button linkStyling onClick={onCancel}>Cancel</Button>}
+    >
+      <p>
+        <span style= {{ fontWeight: 'bold' }}>{sprintf(COPY.CORRESPONDENCE_TITLE_REASSIGN_PACKAGE)}</span><br />
+        {taskInstructions[0]}
+      </p>
+
+      <RadioFieldWithChildren
+        vertical
+        label={sprintf(COPY.CORRRESPONDENCE_LABEL_OPTION_REASSIGN_PACKAGE)}
+        name="reassign-package"
+        value={selectedRequestChoice}
+        options={reassignOptions}
+        onChange={(val) => setSelectedRequestChoice(val)}
+      />
+    </Modal>
+  );
 };
 
 ReassignPackageModal.propTypes = {
@@ -251,17 +130,9 @@ ReassignPackageModal.propTypes = {
   mailTeamUsers: PropTypes.array,
   setModalState: PropTypes.func,
   correspondence_id: PropTypes.number,
-  vetInfo: PropTypes.object,
-  reasonRemovePackage: PropTypes.object,
-  veteranInformation: PropTypes.object,
+  taskInstructions: PropTypes.array,
+  reviewDetails: PropTypes.object,
   updateLastAction: PropTypes.func,
 };
 
-const mapDispatchToProps = (dispatch) => bindActionCreators({
-  updateLastReassignAction
-}, dispatch);
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(ReassignPackageModal);
+export default ReassignPackageModal;
diff --git a/client/app/queue/correspondence/component/RemovePackageModal.jsx b/client/app/queue/correspondence/component/RemovePackageModal.jsx
index 0c245a8cab7..1954897b505 100644
--- a/client/app/queue/correspondence/component/RemovePackageModal.jsx
+++ b/client/app/queue/correspondence/component/RemovePackageModal.jsx
@@ -97,24 +97,22 @@ class RemovePackageModal extends React.Component {
       } else {
         selectedRequestChoice = 'reject';
       }
-      const newUrl = new URL(window.location.href);
-      const searchParams = new URLSearchParams(newUrl.search);
-      const taskId = this.props.reviewDetails.taskId;
-      const veteranName = this.props.reviewDetails.veteranName;
-
-      // Encode and set the query parameters
-      searchParams.set('taskId', encodeURIComponent(taskId));
-      searchParams.set('veteranName', encodeURIComponent(veteranName));
-      searchParams.set('userAction', encodeURIComponent(selectedRequestChoice));
-      searchParams.set('decisionReason', encodeURIComponent(this.state.reasonReject));
-      searchParams.set('operation', encodeURIComponent('remove'));
-      searchParams.set('tab', encodeURIComponent('correspondence_unassigned'));
-      searchParams.set('page', encodeURIComponent('1'));
-
-      // Construct the new URL with encoded query parameters
-      newUrl.search = searchParams.toString();
-      newUrl.pathname = '/queue/correspondence/team';
-      window.location.href = newUrl.href;
+
+      try {
+        const data = {
+          action_type: 'remove',
+          decision: selectedRequestChoice,
+          decision_reason: this.state.reasonReject,
+        };
+
+        ApiUtil.patch(`/queue/correspondence/tasks/${this.props.reviewDetails.taskId}/update`, { data }).
+          then(() => {
+            window.location.href = '/queue/correspondence/team';
+          });
+
+      } catch (error) {
+        console.error(error);
+      }
     };
 
     const removeReasonOptions = [
@@ -137,13 +135,13 @@ class RemovePackageModal extends React.Component {
         cancelButton={<Button linkStyling onClick={onCancel}>Cancel</Button>}
       >
         <p>
-          <span style= {{ fontWeight: 'bold' }}>{sprintf(COPY.CORRESPONDENCE_TITLE_REMOVE_PACKAGE)}</span><br />
-          {this.props.reasonRemovePackage[0]}
+          <span className="modal-fwb">{sprintf(COPY.CORRESPONDENCE_TITLE_REMOVE_PACKAGE)}</span><br />
+          {this.props.taskInstructions[0]}
         </p>
 
         <RadioField
           vertical
-          label= {sprintf(COPY.CORRRESPONDENCE_LABEL_OPTION_REMOVE_PACKAGE)}
+          label={sprintf(COPY.CORRRESPONDENCE_LABEL_OPTION_REMOVE_PACKAGE)}
           name="merge-package"
           value={this.state.reasonForRemove}
           options={removeReasonOptions}
@@ -166,7 +164,7 @@ class RemovePackageModal extends React.Component {
 
 const mapStateToProps = (state) => {
   return { vetInfo: state.reviewPackage.lastAction,
-    reasonRemovePackage: state.reviewPackage.reasonForRemovePackage };
+    taskInstructions: state.reviewPackage.taskInstructions };
 };
 
 RemovePackageModal.propTypes = {
@@ -176,7 +174,7 @@ RemovePackageModal.propTypes = {
   setModalState: PropTypes.func,
   correspondence_id: PropTypes.number,
   vetInfo: PropTypes.object,
-  reasonRemovePackage: PropTypes.object,
+  taskInstructions: PropTypes.array,
   updateLastAction: PropTypes.func,
 };
 
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
index 0889e630066..22893d08ff4 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceActions.js
@@ -1,35 +1,6 @@
 import { ACTIONS } from './correspondenceConstants';
 import ApiUtil from '../../../util/ApiUtil';
 
-export const loadCurrentCorrespondence = (currentCorrespondence) =>
-  (dispatch) => {
-    dispatch({
-      type: ACTIONS.LOAD_CURRENT_CORRESPONDENCE,
-      payload: {
-        currentCorrespondence
-      }
-    });
-  };
-
-export const loadCorrespondences = (correspondences) =>
-  (dispatch) => {
-    dispatch({
-      type: ACTIONS.LOAD_CORRESPONDENCES,
-      payload: {
-        correspondences
-      }
-    });
-  };
-
-export const loadCorrespondenceInformation = (correspondenceInformation) =>
-  (dispatch) => {
-    dispatch({
-      type: ACTIONS.LOAD_CORRESPONDENCE_INFORMATION,
-      payload: {
-        correspondenceInformation
-      }
-    })
-  };
 export const loadSavedIntake = (savedStore) =>
   (dispatch) => {
     dispatch({
@@ -40,7 +11,7 @@ export const loadSavedIntake = (savedStore) =>
     });
   };
 
-export const saveCurrentIntake = (currentIntake, data) => (dispatch) => {
+export const saveCurrentIntake = (currentIntake, data, onSave) => (dispatch) => {
   ApiUtil.post(`/queue/correspondence/${data.correspondence_uuid}/current_step`, { data }).
     then((response) => {
       if (!response.ok) {
@@ -53,6 +24,9 @@ export const saveCurrentIntake = (currentIntake, data) => (dispatch) => {
           currentIntake
         }
       });
+      if (onSave) {
+        onSave();
+      }
     }).
     catch((err) => {
       console.error(new Error(`Problem with GET ${currentIntake} ${err}`));
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
index 40e672c7f3e..edfed7e4c4c 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceConstants.js
@@ -1,6 +1,4 @@
 export const ACTIONS = {
-  LOAD_CURRENT_CORRESPONDENCE: 'LOAD_CURRENT_CORRESPONDENCE',
-  LOAD_CORRESPONDENCES: 'LOAD_CORRESPONDENCES',
   LOAD_SAVED_INTAKE: 'LOAD_SAVED_INTAKE',
   LOAD_VETERAN_INFORMATION: 'LOAD_VETERAN_INFORMATION',
   LOAD_VET_CORRESPONDENCE: 'LOAD_VET_CORRESPONDENCE',
diff --git a/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js b/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
index abeff5cbc8a..7882f7192e6 100644
--- a/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
+++ b/client/app/queue/correspondence/correspondenceReducer/correspondenceReducer.js
@@ -5,13 +5,11 @@ export const initialState = {
   taskRelatedAppealIds: [],
   newAppealRelatedTasks: [],
   fetchedAppeals: [],
-  correspondences: [],
   radioValue: '0',
   relatedCorrespondences: [],
   selectedTasks: [],
   mailTasks: [],
   unrelatedTasks: [],
-  currentCorrespondence: [],
   veteranInformation: [],
   waivedEvidenceTasks: [],
   responseLetters: {},
@@ -24,26 +22,6 @@ export const initialState = {
 
 export const intakeCorrespondenceReducer = (state = initialState, action = {}) => {
   switch (action.type) {
-  case ACTIONS.LOAD_CURRENT_CORRESPONDENCE:
-    return update(state, {
-      currentCorrespondence: {
-        $set: action.payload.currentCorrespondence
-      }
-    });
-
-  case ACTIONS.LOAD_CORRESPONDENCES:
-    return update(state, {
-      correspondences: {
-        $set: action.payload.correspondences
-      }
-    });
-
-  case ACTIONS.LOAD_CORRESPONDENCE_INFORMATION:
-    return update(state, {
-      correspondenceInformation: {
-        $set: action.payload.correspondenceInformation
-      }
-    });
   case ACTIONS.LOAD_SAVED_INTAKE:
     return action.payload.savedStore;
 
@@ -96,7 +74,7 @@ export const intakeCorrespondenceReducer = (state = initialState, action = {}) =
 
     return update(state, {
       relatedCorrespondences: {
-        $set: state.relatedCorrespondences.filter((corr) => corr.id !== action.payload.correspondence.id)
+        $set: state.relatedCorrespondences.filter((corr) => corr.uuid !== action.payload.correspondence.uuid)
       }
     });
 
diff --git a/client/app/queue/correspondence/correspondenceReducer/reviewPackageActions.js b/client/app/queue/correspondence/correspondenceReducer/reviewPackageActions.js
index 8b82ed18fcd..15d54c4e094 100644
--- a/client/app/queue/correspondence/correspondenceReducer/reviewPackageActions.js
+++ b/client/app/queue/correspondence/correspondenceReducer/reviewPackageActions.js
@@ -72,12 +72,12 @@ export const updateLastAction = (currentAction) =>
     });
   };
 
-export const setReasonRemovePackage = (reasonForRemove) =>
+export const setTaskInstructions = (taskInstructions) =>
   (dispatch) => {
     dispatch({
-      type: ACTIONS.SET_REASON_REMOVE_PACKAGE,
+      type: ACTIONS.SET_TASK_INSTRUCTIONS,
       payload: {
-        reasonForRemove
+        taskInstructions
       }
     });
   };
@@ -123,13 +123,3 @@ export const setAutoAssignButtonDisabled = (isButtonDisabled) =>
       }
     });
   };
-
-export const setReasonReassignPackage = (reasonForReassign) =>
-  (dispatch) => {
-    dispatch({
-      type: ACTIONS.SET_REASON_REASSIGN_PACKAGE,
-      payload: {
-        reasonForReassign
-      }
-    });
-  };
diff --git a/client/app/queue/correspondence/correspondenceReducer/reviewPackageConstants.js b/client/app/queue/correspondence/correspondenceReducer/reviewPackageConstants.js
index 133ddde31b6..3bc260be80d 100644
--- a/client/app/queue/correspondence/correspondenceReducer/reviewPackageConstants.js
+++ b/client/app/queue/correspondence/correspondenceReducer/reviewPackageConstants.js
@@ -6,10 +6,10 @@ export const ACTIONS = {
   UPDATE_CMP_INFORMATION: 'UPDATE_CMP_INFORMATION',
   UPDATE_DOCUMENT_TYPE_NAME: 'UPDATE_DOCUMENT_TYPE_NAME',
   REMOVE_PACKAGE_ACTION: 'REMOVE_PACKAGE_ACTION',
+  SET_TASK_INSTRUCTIONS: 'SET_TASK_INSTRUCTIONS',
   SET_REASON_REMOVE_PACKAGE: 'SET_REASON_REMOVE_PACKAGE',
   SET_AUTO_ASSIGN_BANNER: 'SET_AUTO_ASSIGN_BANNER',
   SET_BATCH_AUTO_ASSIGN_ATTEMPT_ID: 'SET_BATCH_AUTO_ASSIGN_ATTEMPT_ID',
   SET_AUTO_ASSIGN_BUTTON_DISABLED: 'AUTO_ASSIGN_BUTTON_DISABLED',
   REASSIGN_PACKAGE_ACTION: 'REASSIGN_PACKAGE_ACTION',
-  SET_REASON_REASSIGN_PACKAGE: 'SET_REASON_REASSIGN_PACKAGE',
 };
diff --git a/client/app/queue/correspondence/correspondenceReducer/reviewPackageReducer.js b/client/app/queue/correspondence/correspondenceReducer/reviewPackageReducer.js
index b2fbd4cfe78..1a62271c63e 100644
--- a/client/app/queue/correspondence/correspondenceReducer/reviewPackageReducer.js
+++ b/client/app/queue/correspondence/correspondenceReducer/reviewPackageReducer.js
@@ -7,6 +7,7 @@ export const initialState = {
   packageDocumentType: {},
   veteranInformation: {},
   lastAction: {},
+  taskInstructions: [],
   reasonForRemovePackage: {},
   autoAssign: {
     isButtonDisabled: false,
@@ -86,10 +87,10 @@ export const reviewPackageReducer = (state = initialState, action = {}) => {
       }
     });
 
-  case ACTIONS.SET_REASON_REMOVE_PACKAGE:
+  case ACTIONS.SET_TASK_INSTRUCTIONS:
     return update(state, {
-      reasonForRemovePackage: {
-        $set: action.payload.reasonForRemove
+      taskInstructions: {
+        $set: action.payload.taskInstructions
       }
     });
 
@@ -131,13 +132,6 @@ export const reviewPackageReducer = (state = initialState, action = {}) => {
       }
     });
 
-  case ACTIONS.SET_REASON_REASSIGN_PACKAGE:
-    return update(state, {
-      reasonForReassignPackage: {
-        $set: action.payload.reasonForReassignPackage
-      }
-    });
-
   default:
     return state;
   }
diff --git a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx
index 7d1ccc1ac48..6f1c39a6fc4 100644
--- a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx
+++ b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx
@@ -5,14 +5,9 @@ import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import Checkbox from '../../../../../components/Checkbox';
 import RadioField from '../../../../../components/RadioField';
-import ApiUtil from '../../../../../util/ApiUtil';
 import CorrespondencePaginationWrapper from '../../../CorrespondencePaginationWrapper';
 import { AddLetter } from '../AddCorrespondence/AddLetter';
 import {
-  loadCurrentCorrespondence,
-  loadCorrespondences,
-  loadVeteranInformation,
-  loadCorrespondenceInformation,
   updateRadioValue,
   saveCheckboxState,
   clearCheckboxState,
@@ -26,39 +21,16 @@ class AddCorrespondenceView extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
-      veteran_id: '',
-      va_date_of_receipt: '',
-      source_type: '',
-      package_document_type: '',
-      correspondence_type_id: '',
+      veteranId: '',
+      vaDateOfReceipt: '',
+      sourceType: '',
+      packageDocumentType: '',
+      correspondenceType: '',
       notes: '',
       selectedCheckboxes: []
     };
   }
 
-  // grabs correspondences and loads into intakeCorrespondence redux store.
-  getRowObjects(correspondenceUuid) {
-    return ApiUtil.get(`/queue/correspondence/${correspondenceUuid}/intake?json`).then((response) => {
-      const returnedObject = response.body;
-      const currentCorrespondence = returnedObject.currentCorrespondence;
-      const correspondences = returnedObject.correspondence;
-      const veteranInformation = returnedObject.veteranInformation;
-
-      this.props.loadCurrentCorrespondence(currentCorrespondence);
-      this.props.loadCorrespondences(correspondences);
-      this.props.loadVeteranInformation(veteranInformation);
-      this.props.loadCorrespondenceInformation(returnedObject.correspondenceInformation);
-    }).
-      catch((err) => {
-        // allow HTTP errors to fall on the floor via the console.
-        console.error(new Error(`Problem with GET /queue/correspondence/${correspondenceUuid}/intake?json ${err}`));
-      });
-  }
-
-  componentDidMount() {
-    this.getRowObjects(this.props.correspondenceUuid);
-  }
-
   onChange = (value) => {
     this.props.updateRadioValue({ radioValue: value });
     this.props.onContinueStatusChange(value === RELATED_NO);
@@ -111,7 +83,7 @@ class AddCorrespondenceView extends React.Component {
           </div>
         ),
         valueFunction: () => {
-          const date = new Date(correspondence.va_date_of_receipt);
+          const date = new Date(correspondence.vaDateOfReceipt);
 
           return (
             <span className="va-dor-item">
@@ -132,7 +104,7 @@ class AddCorrespondenceView extends React.Component {
         ),
         valueFunction: () => (
           <span className="va-source-type-item">
-            <p>{correspondence.source_type}</p>
+            <p>{correspondence.sourceType}</p>
           </span>
         )
       },
@@ -148,7 +120,7 @@ class AddCorrespondenceView extends React.Component {
         ),
         valueFunction: () => (
           <span className="va-package-document-type-item">
-            <p>{correspondence.package_document_type_id}</p>
+            <p>{correspondence.packageDocumentType}</p>
           </span>
         )
       },
@@ -164,7 +136,7 @@ class AddCorrespondenceView extends React.Component {
         ),
         valueFunction: () => (
           <span className="va-correspondence-type-item">
-            <p>{correspondence.correspondence_type_id}</p>
+            <p>{correspondence.correspondenceType}</p>
           </span>
         )
       },
@@ -196,18 +168,18 @@ class AddCorrespondenceView extends React.Component {
     ];
 
     return (
-      <div className="gray-border" style={{ marginBottom: '2rem', padding: '3rem 4rem' }}>
-        <h1 style={{ marginBottom: '20px' }}>Add Related Correspondence</h1>
-        <p style={{ marginTop: '0px' }}>Add any related correspondence to the mail package that is in progress.</p>
+      <div className="add-related-correspondence">
+        <h1 className="a-r-h1">Add Related Correspondence</h1>
+        <p className="a-r-p1">Add any related correspondence to the mail package that is in progress.</p>
         <h2 style={{ margin: '0px', padding: '0px' }}>Response Letter</h2>
         {/* add letter here */}
         <AddLetter
           onContinueStatusChange={this.props.onContinueStatusChange}
         />
         <hr style={{ borderTop: '1px solid #d6d7d9' }} />
-        <h2 style={{ margin: '30px auto 20px auto' }}>Associate with prior Mail</h2>
-        <p style={{ marginTop: '0px', marginBottom: '-7px' }}>Is this correspondence related to prior mail?</p>
-        <RadioField style={{}}
+        <h2 className="a-r-h2">Associate with prior Mail</h2>
+        <p className="a-r-p2">Is this correspondence related to prior mail?</p>
+        <RadioField
           name=""
           options={priorMailAnswer}
           value={this.props.radioValue}
@@ -215,12 +187,11 @@ class AddCorrespondenceView extends React.Component {
         {this.props.radioValue === RELATED_YES && (
           <div className="cf-app-segment cf-app-segment--alt">
             <p>Please select the prior mail to link to this correspondence</p>
-            {/* <p>Viewing {this.props.correspondences.length} out of {this.props.correspondences.length} total</p> */}
             <div>
               <CorrespondencePaginationWrapper
                 columns={this.getDocumentColumns}
                 columnsToDisplay={15}
-                rowObjects={this.props.correspondences}
+                rowObjects={this.props.priorMail}
                 summary="Correspondence list"
                 className="correspondence-table"
                 headerClassName="cf-correspondence-list-header-row"
@@ -238,17 +209,13 @@ class AddCorrespondenceView extends React.Component {
 }
 
 AddCorrespondenceView.propTypes = {
-  correspondence: PropTypes.arrayOf(PropTypes.object),
+  correspondence: PropTypes.object,
+  priorMail: PropTypes.arrayOf(PropTypes.object),
   featureToggles: PropTypes.object,
   correspondenceUuid: PropTypes.string,
-  loadVeteranInformation: PropTypes.func,
-  loadCorrespondenceInformation: PropTypes.func,
-  loadCurrentCorrespondence: PropTypes.func,
-  loadCorrespondences: PropTypes.func,
   updateRadioValue: PropTypes.func,
   radioValue: PropTypes.string,
   saveCheckboxState: PropTypes.func,
-  correspondences: PropTypes.array,
   onContinueStatusChange: PropTypes.func,
   onCheckboxChange: PropTypes.func.isRequired,
   clearCheckboxState: PropTypes.func.isRequired,
@@ -258,10 +225,6 @@ AddCorrespondenceView.propTypes = {
 };
 
 const mapStateToProps = (state) => ({
-  currentCorrespondence: state.intakeCorrespondence.currentCorrespondence,
-  veteranInformation: state.intakeCorrespondence.veteranInformation,
-  correspondenceInformation: state.intakeCorrespondence.correspondenceInformation,
-  correspondences: state.intakeCorrespondence.correspondences,
   radioValue: state.intakeCorrespondence.radioValue,
   checkboxes: state.intakeCorrespondence.relatedCorrespondences,
   currentLetters: state.intakeCorrespondence.responseLetters,
@@ -269,10 +232,6 @@ const mapStateToProps = (state) => ({
 
 const mapDispatchToProps = (dispatch) => (
   bindActionCreators({
-    loadCurrentCorrespondence,
-    loadCorrespondences,
-    loadVeteranInformation,
-    loadCorrespondenceInformation,
     updateRadioValue,
     saveCheckboxState,
     clearCheckboxState,
diff --git a/client/app/queue/correspondence/intake/components/CheckboxModal.jsx b/client/app/queue/correspondence/intake/components/CheckboxModal.jsx
index 214777b5489..68fb129c241 100644
--- a/client/app/queue/correspondence/intake/components/CheckboxModal.jsx
+++ b/client/app/queue/correspondence/intake/components/CheckboxModal.jsx
@@ -2,7 +2,6 @@ import React, { useState } from 'react';
 import PropTypes, { string } from 'prop-types';
 import Modal from '../../../../components/Modal';
 import Checkbox from '../../../../components/Checkbox';
-import { css } from 'glamor';
 
 const CheckboxModal = (props) => {
 
@@ -25,16 +24,11 @@ const CheckboxModal = (props) => {
     setToggledCheckboxes([]);
   };
 
-  const checkboxSizeStyling = css({
-    transform: 'scale(1.3)',
-    translate: '11%',
-  });
-
   return (
     <Modal
+      className= "checkbox-modal-style"
       id="autotextModal"
       title="Add autotext"
-      customStyles={{ style: { width: '50%', minWidth: '750px' } }}
       closeHandler={props.closeHandler}
       buttons={[
         {
@@ -59,20 +53,10 @@ const CheckboxModal = (props) => {
           disabled: false,
         }
       ]}>
-      <div style={{
-        display: 'flex',
-        flexDirection: 'column',
-        overflowY: 'scroll',
-        maxHeight: '500px',
-        paddingLeft: '5%',
-        marginLeft: '1%',
-        paddingRight: '5%',
-        width: '100%',
-        overflowX: 'hidden' }}>
+      <div className="checkbox-modal-size">
         {props.checkboxData.map((checkboxText, index) => (
           <Checkbox
             name={checkboxText}
-            styling={checkboxSizeStyling}
             onChange={() => handleToggleCheckbox(index)}
             value={toggledCheckBoxes.indexOf(index) > -1}
           />))
diff --git a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmCorrespondenceView.jsx b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmCorrespondenceView.jsx
index a5b6592c4cc..dbaf49ed6e9 100644
--- a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmCorrespondenceView.jsx
+++ b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmCorrespondenceView.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { css } from 'glamor';
+import PropTypes from 'prop-types';
 import { PencilIcon } from '../../../../../components/icons/PencilIcon';
 import Button from '../../../../../components/Button';
 import { useSelector } from 'react-redux';
@@ -11,21 +11,6 @@ import ConfirmTasksRelatedToAnAppeal from './ConfirmTasksRelatedToAnAppeal';
 import { COLORS } from '../../../../../constants/AppConstants';
 import { formatDateStr } from 'app/util/DateUtil';
 
-const bodyStyling = css({
-  '& > tr > td': {
-    backgroundColor: COLORS.GREY_BACKGROUND,
-    borderBottom: 'none',
-    borderColor: COLORS.GREY_LIGHT,
-    paddingTop: '0vh',
-    paddingBottom: '0vh',
-  },
-});
-
-const tableStyling = css({
-  marginBottom: '-1vh',
-  marginTop: '1vh'
-});
-
 export const ConfirmCorrespondenceView = (props) => {
 
   const checkedMailTasks = props.mailTasks;
@@ -51,7 +36,7 @@ export const ConfirmCorrespondenceView = (props) => {
           </div>
         ),
         valueFunction: () => {
-          const date = new Date(correspondence.va_date_of_receipt);
+          const date = new Date(correspondence.vaDateOfReceipt);
 
           return (
             <span className="va-dor-item">
@@ -72,7 +57,7 @@ export const ConfirmCorrespondenceView = (props) => {
         ),
         valueFunction: () => (
           <span className="va-source-type-item">
-            <p>{correspondence.source_type}</p>
+            <p>{correspondence.sourceType}</p>
           </span>
         )
       },
@@ -88,7 +73,7 @@ export const ConfirmCorrespondenceView = (props) => {
         ),
         valueFunction: () => (
           <span className="va-package-document-type-item">
-            <p>{correspondence.package_document_type_id}</p>
+            <p>{correspondence.packageDocumentType}</p>
           </span>
         )
       },
@@ -104,7 +89,7 @@ export const ConfirmCorrespondenceView = (props) => {
         ),
         valueFunction: () => (
           <span className="va-correspondence-type-item">
-            <p>{correspondence.correspondence_type_id}</p>
+            <p>{correspondence.correspondenceType}</p>
           </span>
         )
       },
@@ -129,49 +114,36 @@ export const ConfirmCorrespondenceView = (props) => {
 
   if (relatedCorrespondences.length === 0) {
     correspondenceTable =
-    <div {...css({
-      marginBottom: '150px',
-      fontWeight: 'bold'
-    })}> Correspondence is not related to prior mail </div>;
+    <div className= "associated-prior-mail-empty"> Correspondence is not related to prior mail </div>;
   } else {
 
     correspondenceTable = <Table
+      className= "table-latitude"
       columns={getDocumentColumns}
-      // columnsToDisplay={15}
       rowObjects={relatedCorrespondences}
-      styling={tableStyling}
-      bodyStyling={bodyStyling}
     />;
   }
 
   if (checkedMailTasks.length === 0) {
-    mailTaskTable = <div {...css({
-      marginBottom: '150px',
-      fontWeight: 'bold'
-    })}>  </div>;
+    mailTaskTable = <div className= "completed-mail-tasks-empty"></div>;
   } else {
     mailTaskTable = checkedMailTasks.map((name, index) => (
-      <div
-        key={index}
-        {...css({
-          borderBottom: index === checkedMailTasks.length - 1 ? 'none' : '1px solid #d6d7d9',
-          padding: '10px 10px',
-          marginBottom: '10px',
-        })}
-      >
-        <span>{name}</span>
-      </div>
+      <ul key={index} className="completed-mail-tasks">
+
+        <li>{name}</li>
+
+      </ul>
     ));
   }
 
   return (
-    <div className="gray-border corr" style={{ marginBottom: '2rem' }}>
+    <div className="confirm-correspondence-view-border corr">
       <h1 className="corr-h1">Review and Confirm Correspondence</h1>
-      <p style={{ fontSize: '.85em' }}>
+      <p className="p-review-and-confirm">
         Review the details below to make sure the information is correct before submitting.
         If you need to make changes, please go back to the associated section.
       </p>
-      <CorrespondenceDetailsTable />
+      <CorrespondenceDetailsTable correspondence={props.correspondence} />
       <div>
         <div className="corr-flex">
           <h2 className="corr-h2">Response Letters</h2>
@@ -232,8 +204,8 @@ export const ConfirmCorrespondenceView = (props) => {
             </Button>
           </div>
         </div>
-        <div {...css({ backgroundColor: COLORS.GREY_BACKGROUND })}>
-          <div {...css({ backgroundColor: COLORS.GREY_BACKGROUND, padding: '20px' })}>
+        <div className= "review-and-confirm-title-div-color">
+          <div className="review-and-confirm-title-div-style">
             {correspondenceTable}
           </div>
         </div>
@@ -247,13 +219,9 @@ export const ConfirmCorrespondenceView = (props) => {
               <span className="corr-sectionlink">Edit Section</span>
             </Button>
           </div>
-        </div><div {...css({ backgroundColor: COLORS.GREY_BACKGROUND, padding: '20px' })}>
-          <div {...css({
-            borderBottom: '1px solid #d6d7d9',
-            padding: '10px 0px',
-            marginBottom: '20px',
-            fontWeight: 'bold'
-          })}>
+        </div>
+        <div className="review-and-confirm-title-div-style">
+          <div className="completed-mail-tasks-title">
             Completed Mail Tasks
           </div>
           {mailTaskTable}
@@ -288,6 +256,7 @@ export const ConfirmCorrespondenceView = (props) => {
 
 ConfirmCorrespondenceView.propTypes = {
   goToStep: PropTypes.func,
+  correspondence: PropTypes.object,
   mailTasks: PropTypes.arrayOf(PropTypes.string)
 };
 export default ConfirmCorrespondenceView;
diff --git a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmTasksRelatedToAnAppeal.jsx b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmTasksRelatedToAnAppeal.jsx
index e11923e2cc6..f2b2c266eb4 100644
--- a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmTasksRelatedToAnAppeal.jsx
+++ b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/ConfirmTasksRelatedToAnAppeal.jsx
@@ -166,8 +166,7 @@ const ConfirmTasksRelatedToAnAppeal = () => {
 };
 
 ConfirmTasksRelatedToAnAppeal.propTypes = {
-  bottonStyling: PropTypes.object,
-  goToStepTwo: PropTypes.func.isRequired
+  bottonStyling: PropTypes.object
 };
 
 export default ConfirmTasksRelatedToAnAppeal;
diff --git a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/CorrespondenceDetailsTable.jsx b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/CorrespondenceDetailsTable.jsx
index a8cecb4c0bf..8120ba3cce5 100644
--- a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/CorrespondenceDetailsTable.jsx
+++ b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/CorrespondenceDetailsTable.jsx
@@ -1,12 +1,8 @@
 import React from 'react';
 import moment from 'moment';
-import { useSelector } from 'react-redux';
+import PropTypes from 'prop-types';
 
-export const CorrespondenceDetailsTable = () => {
-
-  const currentCorrespondence = useSelector((state) => state.intakeCorrespondence.currentCorrespondence);
-  const veteranInformation = useSelector((state) => state.intakeCorrespondence.veteranInformation);
-  const correspondenceInformation = useSelector((state) => state.intakeCorrespondence.correspondenceInformation);
+export const CorrespondenceDetailsTable = (props) => {
 
   return (
     <div>
@@ -22,12 +18,12 @@ export const CorrespondenceDetailsTable = () => {
             <th><strong>VA DOR</strong></th>
           </tr>
           <tr>
-            <td>{moment(currentCorrespondence.portal_entry_date).format('MM/DD/YYYY')}</td>
-            <td>{currentCorrespondence.source_type}</td>
-            <td>{currentCorrespondence.package_document_type_id}</td>
-            <td>{currentCorrespondence.cmp_packet_number}</td>
-            <td>{currentCorrespondence.cmp_queue_id}</td>
-            <td>{moment(currentCorrespondence.va_date_of_receipt).format('MM/DD/YYYY')}</td>
+            <td>{moment(props.correspondence.portalEntryDate).format('MM/DD/YYYY')}</td>
+            <td>{props.correspondence.sourceType}</td>
+            <td>{props.correspondence.packageDocumentType}</td>
+            <td>{props.correspondence.cmpPacketNumber}</td>
+            <td>{props.correspondence.cmpQueueId}</td>
+            <td>{moment(props.correspondence.vaDateOfReceipt).format('MM/DD/YYYY')}</td>
           </tr>
           <tr>
             <th colSpan={2}><strong>Veteran</strong></th>
@@ -35,15 +31,15 @@ export const CorrespondenceDetailsTable = () => {
           </tr>
           <tr>
             <td colSpan={2}>
-              {veteranInformation.first_name} {veteranInformation.last_name} ({veteranInformation.file_number})
+              {props.correspondence.veteranFullName} ({props.correspondence.veteranFileNumber})
             </td>
-            <td>{correspondenceInformation.name}</td>
+            <td>{props.correspondence.correspondenceType}</td>
           </tr>
           <tr>
             <th colSpan={6}><strong>Notes</strong></th>
           </tr>
           <tr>
-            <td colSpan={6}>{currentCorrespondence.notes}</td>
+            <td colSpan={6}>{props.correspondence.notes}</td>
           </tr>
         </tbody>
       </table>
@@ -51,4 +47,8 @@ export const CorrespondenceDetailsTable = () => {
   );
 };
 
+CorrespondenceDetailsTable.propTypes = {
+  correspondence: PropTypes.object
+};
+
 export default CorrespondenceDetailsTable;
diff --git a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/SubmitCorrespondenceModal.jsx b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/SubmitCorrespondenceModal.jsx
index e8161db5bcc..16370784e8c 100644
--- a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/SubmitCorrespondenceModal.jsx
+++ b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/SubmitCorrespondenceModal.jsx
@@ -8,9 +8,12 @@ import {
   CORRESPONDENCE_INTAKE_FORM_SUBMIT_MODAL_BODY,
 } from 'app/../COPY';
 
-export const SubmitCorrespondenceModal = ({ setSubmitCorrespondenceModalVisible, setErrorBannerVisible }) => {
+export const SubmitCorrespondenceModal = ({
+  setSubmitCorrespondenceModalVisible,
+  setErrorBannerVisible,
+  correspondence
+}) => {
 
-  const correspondence = useSelector((state) => state.intakeCorrespondence.currentCorrespondence);
   const relatedCorrespondences = useSelector((state) => state.intakeCorrespondence.relatedCorrespondences);
   const waivedEvidenceTasks = useSelector((state) => state.intakeCorrespondence.waivedEvidenceTasks);
   const relatedAppealIds = useSelector((state) => state.intakeCorrespondence.taskRelatedAppealIds);
@@ -32,7 +35,7 @@ export const SubmitCorrespondenceModal = ({ setSubmitCorrespondenceModalVisible,
 
   const handleRouting = (status) => {
     if (status === 201) {
-      window.location.href = '/queue/correspondence?tab=correspondence_assigned&page=1&sort_by=vaDor&order=asc';
+      window.location.href = '/queue/correspondence';
     } else {
       setErrorBannerVisible(true);
       onCancel();
@@ -112,6 +115,7 @@ export const SubmitCorrespondenceModal = ({ setSubmitCorrespondenceModalVisible,
 };
 
 SubmitCorrespondenceModal.propTypes = {
+  correspondence: PropTypes.object,
   onCancel: PropTypes.func,
   onSubmit: PropTypes.func,
   loading: PropTypes.bool,
diff --git a/client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx b/client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx
index 418a0dad308..433c49aa050 100644
--- a/client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx
+++ b/client/app/queue/correspondence/intake/components/CorrespondenceIntake.jsx
@@ -20,6 +20,8 @@ import {
   CORRESPONDENCE_INTAKE_FORM_ERROR_BANNER_TITLE,
   CORRESPONDENCE_INTAKE_FORM_ERROR_BANNER_TEXT
 } from '../../../../../COPY';
+import ReturnToQueueModal from './ReturnToQueueModal';
+import ApiUtil from '../../../../util/ApiUtil';
 
 const progressBarSections = [
   {
@@ -43,6 +45,7 @@ export const CorrespondenceIntake = (props) => {
   const [currentStep, setCurrentStep] = useState(1);
   const [isContinueEnabled, setContinueEnabled] = useState(true);
   const [addTasksVisible, setAddTasksVisible] = useState(false);
+  const [returnToQueueModal, setReturnToQueueModal] = useState(false);
   const [submitCorrespondenceModalVisible, setSubmitCorrespondenceModalVisible] = useState(false);
   const history = useHistory();
 
@@ -64,13 +67,6 @@ export const CorrespondenceIntake = (props) => {
     setContinueEnabled(isSelected);
   };
 
-  const handleCancel = () => {
-    // Redirect the user to the previous page
-    // then needed to allow POST to complete first
-    props.saveCurrentIntake(intakeCorrespondence, exportStoredata).
-      then(history.goBack());
-  };
-
   const nextStep = () => {
     if (currentStep < 3) {
       setCurrentStep(currentStep + 1);
@@ -83,6 +79,43 @@ export const CorrespondenceIntake = (props) => {
     setContinueEnabled(true);
   };
 
+  const redirectToPage = (userAction) => {
+    const newUrl = new URL(window.location.href);
+    const searchParams = new URLSearchParams(newUrl.search);
+
+    // Encode and set the query parameters
+    searchParams.set('correspondence_uuid', encodeURIComponent(exportStoredata.correspondence_uuid));
+    searchParams.set('userAction', encodeURIComponent(userAction));
+    searchParams.set('tab', encodeURIComponent('correspondence_unassigned'));
+    searchParams.set('page', encodeURIComponent('1'));
+
+    // Construct the new URL with encoded query parameters
+    newUrl.search = searchParams.toString();
+    newUrl.pathname = props.isMailSupervisor ? '/queue/correspondence/team' : '/queue/correspondence';
+    window.location.href = newUrl.href;
+  };
+
+  const handleContinueIntakeLater = () => {
+    props.saveCurrentIntake(intakeCorrespondence, exportStoredata, () => {
+      redirectToPage('continue_later');
+    });
+
+  };
+
+  const handleCancelIntake = () => {
+    ApiUtil.post(`/queue/correspondence/${exportStoredata.correspondence_uuid}/cancel_intake`, { exportStoredata }).
+      then((response) => {
+        if (!response.ok) {
+          console.error(response);
+        }
+        redirectToPage('cancel_intake');
+
+      }).
+      catch((err) => {
+        console.error(new Error(`Problem with GET ${intakeCorrespondence} ${err}`));
+      });
+  };
+
   const prevStep = () => {
     if (currentStep > 1) {
       setCurrentStep(currentStep - 1);
@@ -124,6 +157,7 @@ export const CorrespondenceIntake = (props) => {
       styling={{ style: { marginBottom: '5rem', float: 'right' } }} />
     {currentStep === 1 &&
       <AddCorrespondenceView
+        priorMail={props.priorMail}
         correspondenceUuid={props.correspondence_uuid}
         onContinueStatusChange={handleContinueStatusChange}
         onCheckboxChange={handleCheckboxChange}
@@ -136,32 +170,36 @@ export const CorrespondenceIntake = (props) => {
         disableContinue={handleContinueStatusChange}
         unrelatedTasks={props.unrelatedTasks}
         setUnrelatedTasks={props.setUnrelatedTasks}
-        correspondenceUuid={props.correspondence_uuid}
+        correspondence={props.correspondence}
         onContinueStatusChange={handleContinueStatusChange}
         autoTexts={props.autoTexts}
-        veteranInformation={props.veteranInformation}
       />
     }
     {currentStep === 3 &&
       <div>
         <ConfirmCorrespondenceView
+          correspondence={props.correspondence}
           mailTasks={props.mailTasks}
           goToStep={setCurrentStep}
           toggledCorrespondences={props.toggledCorrespondences}
-          selectedCorrespondences={props.correspondences.filter((currentCorrespondence) =>
-            props.toggledCorrespondences.indexOf(String(currentCorrespondence.id)) !== -1)}
+          selectedCorrespondences={props.priorMail.filter((correspondence) =>
+            props.toggledCorrespondences.indexOf(String(correspondence.uuid)) !== -1)}
         />
       </div>
     }
     <div>
-      <a href="/queue/correspondence">
-        <Button
-          name="Cancel"
-          styling={{ style: { paddingLeft: '0rem', paddingRight: '0rem' } }}
-          href="/queue/correspondence"
-          classNames={['cf-btn-link', 'cf-left-side']}
-          onClick={handleCancel} />
-      </a>
+      {returnToQueueModal &&
+        <ReturnToQueueModal
+          onCancel={() => setReturnToQueueModal(false)}
+          handleContinueIntakeLater={handleContinueIntakeLater}
+          handleCancelIntake={handleCancelIntake}
+        />
+      }
+      <Button
+        name="Return to queue"
+        styling={{ style: { paddingLeft: '0rem', paddingRight: '0rem' } }}
+        classNames={['cf-btn-link', 'cf-left-side']}
+        onClick={() => setReturnToQueueModal(true)} />
       {currentStep < 3 &&
       <Button
         type="button"
@@ -189,6 +227,7 @@ export const CorrespondenceIntake = (props) => {
       </Button>}
       {currentStep === 3 && submitCorrespondenceModalVisible &&
         <SubmitCorrespondenceModal
+          correspondence={props.correspondence}
           setSubmitCorrespondenceModalVisible={setSubmitCorrespondenceModalVisible}
           setErrorBannerVisible={handleBannerState}
         />
@@ -199,21 +238,20 @@ export const CorrespondenceIntake = (props) => {
 
 CorrespondenceIntake.propTypes = {
   correspondence_uuid: PropTypes.string,
-  currentCorrespondence: PropTypes.object,
-  veteranInformation: PropTypes.object,
+  correspondence: PropTypes.object,
   toggledCorrespondences: PropTypes.array,
-  correspondences: PropTypes.array,
+  priorMail: PropTypes.array,
   unrelatedTasks: PropTypes.arrayOf(Object),
   setUnrelatedTasks: PropTypes.func,
   mailTasks: PropTypes.arrayOf(PropTypes.string),
   autoTexts: PropTypes.arrayOf(PropTypes.string),
   reduxStore: PropTypes.object,
+  isMailSupervisor: PropTypes.bool,
   loadSavedIntake: PropTypes.func,
   saveCurrentIntake: PropTypes.func
 };
 
 const mapStateToProps = (state) => ({
-  correspondences: state.intakeCorrespondence.correspondences,
   unrelatedTasks: state.intakeCorrespondence.unrelatedTasks,
   mailTasks: state.intakeCorrespondence.mailTasks,
   toggledCorrespondences: state.intakeCorrespondence.relatedCorrespondences
diff --git a/client/app/queue/correspondence/intake/components/ReturnToQueueModal.jsx b/client/app/queue/correspondence/intake/components/ReturnToQueueModal.jsx
new file mode 100644
index 00000000000..82ada92dc77
--- /dev/null
+++ b/client/app/queue/correspondence/intake/components/ReturnToQueueModal.jsx
@@ -0,0 +1,69 @@
+import React, { useState } from 'react';
+import Modal from '../../../../components/Modal';
+import PropTypes from 'prop-types';
+import RadioField from '../../../../components/RadioField';
+import Alert from '../../../../components/Alert';
+
+const ReturnToQueueModal = (props) => {
+  const [selectedRadio, setSelectedRadio] = useState('');
+
+  const radioOptions = [
+    { displayText: 'Cancel intake',
+      value: 'cancel_intake' },
+    { displayText: 'Continue intake at a later date',
+      value: 'continue_later' }
+  ];
+
+  const onRadioChange = (value) => {
+    setSelectedRadio(value);
+  };
+
+  const handleConfirm = () => {
+    if (selectedRadio === 'continue_later') {
+      props.handleContinueIntakeLater();
+    } else if (selectedRadio === 'cancel_intake') {
+      props.handleCancelIntake();
+    }
+  };
+
+  return (
+    <Modal
+      title="Return To Queue"
+      buttons={[
+        {
+          classNames: ['cf-modal-link', 'cf-btn-link'],
+          name: 'Close',
+          onClick: props.onCancel
+        },
+        {
+          classNames: ['usa-button'],
+          name: 'Confirm',
+          disabled: !selectedRadio,
+          onClick: handleConfirm,
+        }
+      ]}
+      closeHandler={props.onCancel}
+    >
+      <RadioField
+        label="Select whether to cancel the intake of this mail package or resume the intake process at a later date."
+        name="return-to-queue"
+        value={selectedRadio}
+        options={radioOptions}
+        onChange={onRadioChange}
+        vertical
+      />
+      {selectedRadio === 'continue_later' && <Alert
+        message="Saving the intake form to continue it at a later date will resume the intake form at step three of the process."
+        type="info"
+      />}
+    </Modal>
+  )
+}
+
+ReturnToQueueModal.propTypes = {
+  onCancel: PropTypes.func,
+  handleContinueIntakeLater: PropTypes.func,
+  handleCancelIntake: PropTypes.func
+};
+
+export default ReturnToQueueModal;
diff --git a/client/app/queue/correspondence/intake/components/TasksAppeals/AddAppealRelatedTaskView.jsx b/client/app/queue/correspondence/intake/components/TasksAppeals/AddAppealRelatedTaskView.jsx
index 75425f4cf99..0d0f5a366a5 100644
--- a/client/app/queue/correspondence/intake/components/TasksAppeals/AddAppealRelatedTaskView.jsx
+++ b/client/app/queue/correspondence/intake/components/TasksAppeals/AddAppealRelatedTaskView.jsx
@@ -112,7 +112,7 @@ export const AddAppealRelatedTaskView = (props) => {
     props.setRelatedTasksCanContinue(canContinue);
   }, [existingAppealRadio, newTasks, waivedTasks, taskRelatedAppeals]);
 
-  const veteranFileNumber = props.veteranInformation.file_number;
+  const veteranFileNumber = props.correspondence.veteranFileNumber;
 
   useEffect(() => {
   // Don't refetch (use cache)
@@ -214,12 +214,11 @@ export const AddAppealRelatedTaskView = (props) => {
 };
 
 AddAppealRelatedTaskView.propTypes = {
-  correspondenceUuid: PropTypes.string.isRequired,
+  correspondence: PropTypes.object.isRequired,
   setRelatedTasksCanContinue: PropTypes.func.isRequired,
   filterUnavailableTaskTypeOptions: PropTypes.func.isRequired,
   allTaskTypeOptions: PropTypes.array.isRequired,
   autoTexts: PropTypes.arrayOf(PropTypes.string).isRequired,
-  veteranInformation: PropTypes.object.isRequired
 };
 
 export default AddAppealRelatedTaskView;
diff --git a/client/app/queue/correspondence/intake/components/TasksAppeals/AddTasksAppealsView.jsx b/client/app/queue/correspondence/intake/components/TasksAppeals/AddTasksAppealsView.jsx
index ca78b3b4e81..a0c1ae0f2f4 100644
--- a/client/app/queue/correspondence/intake/components/TasksAppeals/AddTasksAppealsView.jsx
+++ b/client/app/queue/correspondence/intake/components/TasksAppeals/AddTasksAppealsView.jsx
@@ -112,12 +112,11 @@ export const AddTasksAppealsView = (props) => {
           <h2 style={{ margin: '30px auto 20px auto' }}>Tasks related to an existing Appeal</h2>
           <p style={{ marginBottom: '-7px' }}>Is this correspondence related to an existing appeal?</p>
           <AddAppealRelatedTaskView
-            correspondenceUuid={props.correspondenceUuid}
+            correspondence={props.correspondence}
             setRelatedTasksCanContinue={setRelatedTasksCanContinue}
             filterUnavailableTaskTypeOptions={filterUnavailableTaskTypeOptions}
             allTaskTypeOptions={relatedTaskTypes}
             autoTexts={props.autoTexts}
-            veteranInformation={props.veteranInformation}
           />
         </div>
 
@@ -144,10 +143,9 @@ export const AddTasksAppealsView = (props) => {
 };
 
 AddTasksAppealsView.propTypes = {
-  correspondenceUuid: PropTypes.string.isRequired,
+  correspondence: PropTypes.object.isRequired,
   onContinueStatusChange: PropTypes.func.isRequired,
   autoTexts: PropTypes.arrayOf(PropTypes.string).isRequired,
-  veteranInformation: PropTypes.object.isRequired
 };
 
 export default AddTasksAppealsView;
diff --git a/client/app/queue/correspondence/modals/PackageActionModal.jsx b/client/app/queue/correspondence/modals/PackageActionModal.jsx
index 3d7c74835ea..e6f48f9bf51 100644
--- a/client/app/queue/correspondence/modals/PackageActionModal.jsx
+++ b/client/app/queue/correspondence/modals/PackageActionModal.jsx
@@ -7,7 +7,7 @@ import Table from '../../../components/Table';
 import { connect } from 'react-redux';
 import ApiUtil from '../../../util/ApiUtil';
 import { bindActionCreators } from 'redux';
-import { setReasonRemovePackage } from '../correspondenceReducer/reviewPackageActions';
+import { setTaskInstructions } from '../correspondenceReducer/reviewPackageActions';
 import { getPackageActionColumns, getModalInformation } from '../review_package/utils';
 import { useHistory } from 'react-router';
 
@@ -125,7 +125,7 @@ const PackageActionModal = (props) => {
       props.closeHandler(null);
       if (response.ok) {
         if (packageActionModal === 'removePackage') {
-          props.setReasonRemovePackage(textInputReason);
+          props.setTaskInstructions(textInputReason);
         }
         history.push('/queue/correspondence');
       }
@@ -155,7 +155,7 @@ const PackageActionModal = (props) => {
       ]}
       closeHandler={() => props.closeHandler(null)}
     >
-      <span className="usa-input" style={{ marginBottom: '5px' }}>
+      <span>
         {modalInfo.description}
       </span>
       <Table
@@ -204,7 +204,7 @@ PackageActionModal.propTypes = {
   modalInfo: PropTypes.object,
   packageActionModal: PropTypes.string,
   closeHandler: PropTypes.func,
-  setReasonRemovePackage: PropTypes.func
+  setTaskInstructions: PropTypes.func
 };
 
 const mapStateToProps = (state) => ({
@@ -214,7 +214,7 @@ const mapStateToProps = (state) => ({
 });
 
 const mapDispatchToProps = (dispatch) => bindActionCreators({
-  setReasonRemovePackage
+  setTaskInstructions
 }, dispatch);
 
 export default connect(
diff --git a/client/app/queue/correspondence/modals/editModal.jsx b/client/app/queue/correspondence/modals/editModal.jsx
index 49a3dd78533..4a6b258225e 100644
--- a/client/app/queue/correspondence/modals/editModal.jsx
+++ b/client/app/queue/correspondence/modals/editModal.jsx
@@ -25,7 +25,7 @@ class EditModal extends React.Component {
       defaultVADORDate: '',
       defaultPackageDocument: '',
       saveButtonDisabled: true,
-      canEditVADOR: true
+      isVaDorReadOnly: true
     };
   }
 
@@ -45,7 +45,7 @@ class EditModal extends React.Component {
 
       if (response.body.user_can_edit_vador) {
         this.setState({
-          canEditVADOR: false
+          isVaDorReadOnly: false
         });
       }
 
@@ -173,7 +173,7 @@ class EditModal extends React.Component {
                 <DateSelector
                   name="va-dor-input"
                   label="VA DOR"
-                  readOnly={this.state.canEditVADOR}
+                  readOnly={this.state.isVaDorReadOnly}
                   value={VADORDate}
                   errorMessage={this.state.dateError}
                   onChange={this.VADORDateOnChange}
diff --git a/client/app/queue/correspondence/pdfPreview/CorrespondencePdfFooter.jsx b/client/app/queue/correspondence/pdfPreview/CorrespondencePdfFooter.jsx
index 2c74b5e312f..cff06f61b04 100644
--- a/client/app/queue/correspondence/pdfPreview/CorrespondencePdfFooter.jsx
+++ b/client/app/queue/correspondence/pdfPreview/CorrespondencePdfFooter.jsx
@@ -20,7 +20,7 @@ export const CorrespondencePdfFooter = ({
         <span className="page-progress-indicator">
           {pdfDocProxy.numPages ? (
             <>
-              <div id="pdf-preview-footer-input-field" style={{ display: 'inline-block' }}>
+              <div id="pdf-preview-footer-input-field">
                 <NumberField
                   maxLength={4}
                   name="page-progress-indicator-input"
diff --git a/client/app/queue/correspondence/pdfPreview/CorrespondencePdfToolBar.jsx b/client/app/queue/correspondence/pdfPreview/CorrespondencePdfToolBar.jsx
index 1cf28b6ada0..c32b0d9197b 100644
--- a/client/app/queue/correspondence/pdfPreview/CorrespondencePdfToolBar.jsx
+++ b/client/app/queue/correspondence/pdfPreview/CorrespondencePdfToolBar.jsx
@@ -1,4 +1,3 @@
-import { css } from 'glamor';
 import React from 'react';
 import PropTypes from 'prop-types';
 import Link from '../../../components/Link';
@@ -17,40 +16,6 @@ const CorrespondencePdfToolBar = (props) => {
     handleDocumentRotation
   } = props;
 
-  // In-Line CSS Styles
-  // PDF Document Viewer is 800px wide or less.
-  const pdfWrapperSmall = 1165;
-  const pdfToolbarStyles = {
-    toolbar: css({ width: '33%' }),
-    toolbarLeft: css({
-      '&&': { [`@media(max-width:${pdfWrapperSmall}px)`]: {
-        width: '18%' }
-      }
-    }),
-    toolbarCenter: css({
-      '&&': { [`@media(max-width:${pdfWrapperSmall}px)`]: {
-        width: '24%' }
-      }
-    }),
-    toolbarRight: css({
-      textAlign: 'right',
-      '&&': { [`@media(max-width:${pdfWrapperSmall}px)`]: {
-        width: '44%',
-        '& .cf-pdf-button-text': { display: 'none' } }
-      }
-    }),
-    footer: css({
-      position: 'absolute',
-      bottom: 0,
-      display: 'flex',
-      alignItems: 'center',
-      '&&': { [`@media(max-width:${pdfWrapperSmall}px)`]: {
-        '& .left-button-label': { display: 'none' },
-        '& .right-button-label': { display: 'none' }
-      } }
-    })
-  };
-
   return (
     <div className="cf-pdf-preview-header cf-pdf-toolbar">
       <span className="cf-pdf-preview-doc-type-button-container">
@@ -66,7 +31,7 @@ const CorrespondencePdfToolBar = (props) => {
           </h1>
         </Link>
       </span>
-      <span {...pdfToolbarStyles.toolbar} {...pdfToolbarStyles.toolbarRight}>
+      <span className="correspondence-pdf-tool-bar toolbar-right">
         <span className="cf-pdf-button-text">Zoom:</span>
         <Button
           name="zoomOut"
diff --git a/client/app/queue/correspondence/review_package/CmpDocuments.jsx b/client/app/queue/correspondence/review_package/CmpDocuments.jsx
index 77f79202a85..7bb2a7062ea 100644
--- a/client/app/queue/correspondence/review_package/CmpDocuments.jsx
+++ b/client/app/queue/correspondence/review_package/CmpDocuments.jsx
@@ -1,6 +1,5 @@
 /* eslint-disable camelcase */
 
-import { css } from 'glamor';
 import PropTypes from 'prop-types';
 import React, { useState } from 'react';
 import COPY from 'app/../COPY';
@@ -8,19 +7,6 @@ import Button from 'app/components/Button';
 import EditDocumentTypeModal from '../component/EditDocumentTypeModal';
 import CorrespondencePdfUI from '../pdfPreview/CorrespondencePdfUI';
 
-const cmpDocumentStyling = css({
-  marginTop: '2%'
-});
-
-const correspondenceStyling = css({
-  border: '1px solid #dee2e6'
-});
-
-const paginationStyle = css({
-  marginTop: '2%',
-  marginLeft: '1.5%'
-});
-
 export const CmpDocuments = (props) => {
   const { documents, isReadOnly } = props;
 
@@ -41,11 +27,23 @@ export const CmpDocuments = (props) => {
     setModalState(false);
   };
 
+  const tableStyle = (index, document) => {
+    if (selectedId === index) {
+      return <td className="correspondence-document-table-data-filled"
+        onClick={() => setCurrentDocument(index)}> {document?.document_title}
+      </td>;
+    }
+
+    return <td className="correspondence-document-table-data-empty"
+      onClick={() => setCurrentDocument(index)}> {document?.document_title}
+    </td>;
+  };
+
   return (
-    <div {...cmpDocumentStyling} >
+    <div>
       <h2> {COPY.DOCUMENT_PREVIEW} </h2>
-      <div {...correspondenceStyling}>
-        <div {...paginationStyle}> {paginationText} </div>
+      <div className="cmp-document-border">
+        <div className="cmp-document-pagination-style"> {paginationText} </div>
         <table className="correspondence-document-table">
           <tbody>
             <tr>
@@ -66,10 +64,7 @@ export const CmpDocuments = (props) => {
             return (
               <tbody key={index}>
                 <tr>
-                  <td style={{ background: selectedId === index ? '#0071bc' : 'white',
-                    color: selectedId === index ? 'white' : '#0071bc' }}
-                  onClick={() => setCurrentDocument(index)}> {document?.document_title}
-                  </td>
+                  {tableStyle(index, document)}
                   <td className="cf-txt-c">
                     <Button
                       disabled={isReadOnly}
diff --git a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
index f4d9cf76a20..568d3e7909e 100644
--- a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
+++ b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
@@ -42,7 +42,7 @@ export const CorrespondenceReviewPackage = (props) => {
   const [isReassignPackage, setIsReassignPackage] = useState(false);
   const [reviewPackageDetails, setReviewPackageDetails] = useState({
     veteranName: '',
-    taksId: [],
+    taskId: [],
   });
 
   // Banner Information takes in the following object:
@@ -71,8 +71,14 @@ export const CorrespondenceReviewPackage = (props) => {
       const assignedReassignTask = tasks.find((task) => task.status === 'assigned' &&
           task.type === 'ReassignPackageTask');
 
+      if (assignedReassignTask) {
+        setReviewPackageDetails({ taskId: assignedReassignTask.id });
+      }
+
       // Return true if a reassignPackageTask that is currently assigned is found, else false
-      return (typeof assignedReassignTask !== 'undefined') && (props.userIsCorrespondenceSuperuser || props.userIsCorrespondenceSupervisor);
+      return (
+        (typeof assignedReassignTask !== 'undefined')
+      );
     };
 
     try {
@@ -266,8 +272,7 @@ export const CorrespondenceReviewPackage = (props) => {
             { (props.packageDocumentType.name === '10182') && (
               <Button
                 name="Intake appeal"
-                styling={{ style: { marginRight: '2rem' } }}
-                classNames={['usa-button-secondary']}
+                classNames={['usa-button-secondary', 'correspondence-intake-appeal-button']}
                 onClick={intakeAppeal}
                 disabled={disableButton || isReadOnly}
               />
diff --git a/client/app/queue/correspondence/review_package/ReviewForm.jsx b/client/app/queue/correspondence/review_package/ReviewForm.jsx
index 6042174b61a..c5a84bf2cda 100644
--- a/client/app/queue/correspondence/review_package/ReviewForm.jsx
+++ b/client/app/queue/correspondence/review_package/ReviewForm.jsx
@@ -1,6 +1,5 @@
 import AppSegment from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/AppSegment';
 import React from 'react';
-import { css } from 'glamor';
 import TextField from '../../../components/TextField';
 import SearchableDropdown from '../../../components/SearchableDropdown';
 import TextareaField from '../../../components/TextareaField';
@@ -9,82 +8,6 @@ import ApiUtil from '../../../util/ApiUtil';
 import PropTypes from 'prop-types';
 import Modal from '../../../components/Modal';
 
-const flexDivStyling = css({
-  display: 'flex',
-});
-
-const mainDiv = css(flexDivStyling, {
-  justifyContent: 'space-between',
-  width: '100%',
-  gap: '3%',
-  '@media (max-width: 600px)': {
-    flexDirection: 'column'
-  }
-});
-
-const divideStyling = css(flexDivStyling, {
-  width: '50%',
-  flexDirection: 'column',
-  gap: '12%',
-  '@media (max-width: 600px)': {
-    width: '100%'
-  }
-});
-
-const divideTextareaStyling = css(flexDivStyling, {
-  width: '50%',
-  flexDirection: 'column',
-  '@media (max-width: 600px)': {
-    width: '100%'
-  }
-});
-
-const veternalFileStyling = css({
-  width: '40%',
-  '@media (max-width: 1081px)': {
-    width: '100%',
-  }
-});
-
-const errorVeternalFileStyling = css({
-  width: '48%',
-  marginTop: '-6.4rem',
-  '@media (max-width: 1599px)': {
-    width: '58%'
-  }
-});
-
-const veternalNameStyling = css({
-  width: '60%',
-  '@media (max-width: 1081px)': {
-    width: '100%'
-  }
-});
-
-const inputStyling = css(flexDivStyling, {
-  gap: '5%',
-  '@media (max-width: 1081px)': {
-    flexDirection: 'column'
-  },
-});
-
-const tagStyling = css({
-  '& .cf-select__control': {
-    maxWidth: '63rem !important',
-  },
-});
-
-const textareaStyling = css({
-  maxWidth: '60rem'
-
-});
-
-const textareaWidth = css({
-  height: '15rem',
-  resize: 'none'
-
-});
-
 export const ReviewForm = (props) => {
   const handleFileNumber = (value) => {
     const isNumeric = value === '' || (/^\d{0,9}$/).test(value);
@@ -168,9 +91,38 @@ export const ReviewForm = (props) => {
     }
   };
 
+  const veteranFileNumStyle = () => {
+    if (props.errorMessage) {
+      return <div className="error-veternal-file-styling-review-form">
+        <TextField
+          label="Veteran file number"
+          value={props.editableData.veteran_file_number}
+          onChange={handleFileNumber}
+          name="veteran-file-number-input"
+          useAriaLabel
+          errorMessage={props.errorMessage}
+          readOnly={props.isReadOnly}
+        />
+      </div>;
+    }
+
+    return <div className="veternal-file-styling-review-form">
+      <TextField
+        label="Veteran file number"
+        value={props.editableData.veteran_file_number}
+        onChange={handleFileNumber}
+        name="veteran-file-number-input"
+        useAriaLabel
+        errorMessage={props.errorMessage}
+        readOnly={props.isReadOnly}
+      />
+    </div>;
+
+  };
+
   return (
     <React.Fragment>
-      <div {...flexDivStyling} style={{ gap: '20px', marginTop: '20px' }}>
+      <div className="review-form-title-style">
         <h2>General Information</h2>
         <Button
           name="Save changes"
@@ -181,22 +133,11 @@ export const ReviewForm = (props) => {
         />
       </div>
       <AppSegment filledBackground noMarginTop>
-        <main {...mainDiv}>
-          <div {...divideStyling}>
-            <div {...inputStyling}>
-              <div {...props.errorMessage ? { ...errorVeternalFileStyling } : { ...veternalFileStyling }}>
-                <TextField
-                  label="Veteran file number"
-                  value={props.editableData.veteran_file_number}
-                  onChange={handleFileNumber}
-                  name="veteran-file-number-input"
-                  useAriaLabel
-                  errorMessage={props.errorMessage}
-                  readOnly={props.isReadOnly}
-                />
-              </div>
-
-              <div {...veternalNameStyling}>
+        <main className="main-div-review-form">
+          <div className="divide-styling-review-form">
+            <div className="input-styling-review-form" >
+              {veteranFileNumStyle()}
+              <div className="veternal-name-styling-review-form ">
                 <TextField
                   label="Veteran name"
                   value={fullName(props.reviewDetails.veteran_name)}
@@ -207,13 +148,11 @@ export const ReviewForm = (props) => {
               </div>
 
             </div>
-            <div >
+            <div className= "tag-styling-review-form">
 
               <SearchableDropdown
                 name="correspondence-dropdown"
                 label="Correspondence type"
-                styling={tagStyling}
-                value={props.reviewDetails.correspondence_type_id}
                 options={generateOptions(props.reviewDetails.dropdown_values)}
                 onChange={handleSelect}
                 readOnly={props.isReadOnly}
@@ -222,12 +161,11 @@ export const ReviewForm = (props) => {
             </div>
 
           </div>
-          <div {...divideTextareaStyling}>
-            <div>
+          <div className="divide-textarea-styling-review-form">
+            <div >
               <TextareaField
+                id= "textarea-styling-review-form"
                 name="Notes"
-                styling={textareaStyling}
-                textAreaStyling={textareaWidth}
                 value={props.editableData.notes}
                 onChange={handleChangeNotes}
                 disabled={props.isReadOnly}
@@ -249,7 +187,7 @@ export const ReviewForm = (props) => {
               ]}
               title="Return to queue"
               closeHandler={props.handleModalClose}>
-              <span className="usa-input" style={{ marginBottom: '5px' }} tabIndex={0}>
+              <span tabIndex={0}>
                 All unsaved changes made to this mail package will be lost<br />upon returning to your queue.
               </span>
             </Modal>
diff --git a/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx b/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx
index 24b8e5cc5c0..7cdddea965b 100644
--- a/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx
+++ b/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx
@@ -1,4 +1,4 @@
-import { css } from 'glamor';
+
 import PropTypes from 'prop-types';
 import React, { useState } from 'react';
 import COPY from 'app/../COPY';
@@ -7,53 +7,6 @@ import SearchableDropdown from '../../../components/SearchableDropdown';
 import RemovePackageModal from '../component/RemovePackageModal';
 import ReassignPackageModal from '../component/ReassignPackageModal';
 
-const containingDivStyling = css({
-  display: 'block',
-  // Offsets the padding from .cf-app-segment--alt to make the bottom border full width.
-  margin: '-2rem -4rem 0 -4rem',
-  padding: '0 0 1.5rem 4rem',
-
-  '& > *': {
-    display: 'inline-block',
-    margin: '0'
-  }
-});
-
-const removebotton = css({
-  float: 'right',
-  marginRight: '2rem !important'
-
-});
-
-const headerStyling = css({
-  paddingRight: '2.5rem'
-});
-
-const listStyling = css({
-  listStyleType: 'none',
-  verticalAlign: 'super',
-  padding: '0 0 4rem 0',
-  display: 'flex',
-  flexWrap: 'wrap'
-});
-
-const columnStyling = css({
-  flexBasis: '0',
-  webkitBoxFlex: '1',
-  msFlexPositive: '1',
-  flexGrow: '1',
-  maxWidth: '100%'
-});
-
-const dropDownDiv = css({
-  marginTop: '-10px',
-  flexBasis: '0',
-  webkitBoxFlex: '1',
-  msFlexPositive: '1',
-  flexGrow: '1',
-  maxWidth: '100%'
-});
-
 const ReviewPackageCaseTitle = (props) => {
 
   return (
@@ -87,25 +40,30 @@ const CaseTitleScaffolding = (props) => {
   };
 
   return (
-    <div {...containingDivStyling}>
-      <h1 {...headerStyling}>{COPY.CORRESPONDENCE_REVIEW_PACKAGE_TITLE}</h1>
-
-      <span {...removebotton}>
-        { (props.isReadOnly && !props.isReassignPackage && props.userIsCorrespondenceSupervisor) &&
+    <div className="correspondence-case-title-header-containing-div-styling">
+      <h1 className="correspondence-review-package-case-title-header-styling">
+        {COPY.CORRESPONDENCE_REVIEW_PACKAGE_TITLE}
+      </h1>
+
+      <span className="correspondence-review-package-case-title-remove-button">
+        { (
+          props.isReadOnly && !props.isReassignPackage &&
+          props.userIsCorrespondenceSupervisor) &&
           <Button
             name="Review removal request"
-            styling={{ style: { marginRight: '2rem', padding: '15px', fontSize: 'larger' } }}
-            classNames={['usa-button-primary']}
+            classNames={['usa-button-primary', 'correspondence-review-package-case-title-button-styling']}
             onClick={
               openRemoveModal
             }
           />
         }
-        { (props.isReadOnly && props.isReassignPackage && (props.userIsCorrespondenceSuperuser || props.userIsCorrespondenceSupervisor)) &&
+        { (
+          props.isReadOnly &&
+          props.isReassignPackage &&
+          (props.userIsCorrespondenceSuperuser || props.userIsCorrespondenceSupervisor)) &&
           <Button
             name="Review reassign request"
-            styling={{ style: { marginRight: '2rem', padding: '15px', fontSize: 'larger' } }}
-            classNames={['usa-button-primary']}
+            classNames={['usa-button-primary, correspondence-review-package-case-title-button-styling']}
             onClick={
               openReassignModal
             }
@@ -126,6 +84,7 @@ const CaseTitleScaffolding = (props) => {
         setModalState={setReassignModalState}
         onCancel={closeReassignModal}
         correspondence_id = {props.correspondence_id}
+        reviewDetails={props.reviewDetails}
         mailTeamUsers={props.mailTeamUsers} />
       }
     </div>
@@ -134,12 +93,11 @@ const CaseTitleScaffolding = (props) => {
 };
 
 const CaseSubTitleScaffolding = (props) => (
-  <div {...listStyling}>
-    <div {...columnStyling}>
+  <div className="correspondence-list-styling">
+    <div className="correspondence-column-styling">
       {COPY.CORRESPONDENCE_REVIEW_PACKAGE_SUB_TITLE}
     </div>
-
-    <div {...dropDownDiv} style = {{ maxWidth: '25%' }}>
+    <div className="correspondence-drop-down-div">
       { !props.isReadOnly &&
       <SearchableDropdown
         options={[
diff --git a/client/app/queue/correspondence/review_package/ReviewPackageData.jsx b/client/app/queue/correspondence/review_package/ReviewPackageData.jsx
index 799014eee40..05d0b99f174 100644
--- a/client/app/queue/correspondence/review_package/ReviewPackageData.jsx
+++ b/client/app/queue/correspondence/review_package/ReviewPackageData.jsx
@@ -1,6 +1,5 @@
 /* eslint-disable camelcase */
 
-import { css } from 'glamor';
 import PropTypes from 'prop-types';
 import React from 'react';
 import COPY from 'app/../COPY';
@@ -9,29 +8,8 @@ import EditModal from '../modals/editModal';
 import { useSelector } from 'react-redux';
 import moment from 'moment';
 
-const listItemStyling = css({
-  display: 'inline-block',
-  padding: '0.5rem 1.5rem 0.5rem 0',
-  ':not(:last-child)': {
-    '& > div': {
-    },
-    '& > *': {
-      paddingRight: '1.5rem'
-    }
-  },
-  '& > p': {
-    fontWeight: 'bold',
-    fontSize: '17px',
-    marginBottom: '12px',
-    marginTop: '0',
-    color: '#323a45',
-    lineHeight: '1.3'
-  },
-  '& > div': { minHeight: '22px' }
-});
-
 export const TitleDetailsSubheaderSection = ({ title, children }) => (
-  <div {...listItemStyling}>
+  <div className="correspondence-rp-list-item-styling">
     <p>{title}</p>
     <div>
       {children}
@@ -65,8 +43,8 @@ const CmpInfoScaffolding = ({ isReadOnly }) => {
 
   return (
     <div>
-      <div style={{ display: 'inline-flex' }}>
-        <h2 style={{ marginRight: '20px' }}> {COPY.CORRESPONDENCE_REVIEW_CMP_INFO_TITLE}</h2>
+      <div className="correspondence-rp-outer-div-style">
+        <h2 className="correspondence-rp-h2-right-style"> {COPY.CORRESPONDENCE_REVIEW_CMP_INFO_TITLE}</h2>
         <EditModal isReadOnly={isReadOnly} />
       </div>
 
diff --git a/client/app/queue/correspondence/review_package/ReviewPackageLoadingScreen.jsx b/client/app/queue/correspondence/review_package/ReviewPackageLoadingScreen.jsx
index c1e01a8b7b3..e28fd000036 100644
--- a/client/app/queue/correspondence/review_package/ReviewPackageLoadingScreen.jsx
+++ b/client/app/queue/correspondence/review_package/ReviewPackageLoadingScreen.jsx
@@ -12,7 +12,7 @@ import {
   setCorrespondenceDocuments,
   setPackageDocumentType,
   setVeteranInformation,
-  setReasonRemovePackage
+  setTaskInstructions
 } from '../correspondenceReducer/reviewPackageActions';
 import WindowUtil from '../../../util/WindowUtil';
 
@@ -28,14 +28,14 @@ class ReviewPackageLoadingScreen extends React.PureComponent {
           correspondence_documents,
           package_document_type,
           general_information,
-          reasonForRemovePackage
+          taskInstructions
         } = response.body;
 
         this.props.setCorrespondence(correspondence);
         this.props.setCorrespondenceDocuments(correspondence_documents);
         this.props.setPackageDocumentType(package_document_type);
         this.props.setVeteranInformation(general_information);
-        this.props.setReasonRemovePackage(reasonForRemovePackage);
+        this.props.setTaskInstructions(taskInstructions);
       }
     );
   }
@@ -72,7 +72,7 @@ ReviewPackageLoadingScreen.propTypes = {
   setCorrespondenceDocuments: PropTypes.func,
   setPackageDocumentType: PropTypes.func,
   setVeteranInformation: PropTypes.func,
-  setReasonRemovePackage: PropTypes.func
+  settaskInstructions: PropTypes.func
 };
 
 const mapDispatchToProps = (dispatch) => bindActionCreators({
@@ -80,7 +80,7 @@ const mapDispatchToProps = (dispatch) => bindActionCreators({
   setCorrespondenceDocuments,
   setPackageDocumentType,
   setVeteranInformation,
-  setReasonRemovePackage
+  setTaskInstructions
 }, dispatch);
 
 export default (connect(null, mapDispatchToProps)(ReviewPackageLoadingScreen));
diff --git a/client/app/queue/utils.js b/client/app/queue/utils.js
index de741b565fb..d37d81db780 100644
--- a/client/app/queue/utils.js
+++ b/client/app/queue/utils.js
@@ -609,6 +609,8 @@ export const prepareAppealForSearchStore = (appeals) => {
       vacateType: appeal.attributes.vacate_type,
       evidenceSubmissionTask: appeal.attributes.evidence_submission_task,
       hasEvidenceSubmissionTask: appeal.attributes.evidence_submission_task !== null,
+      mst: appeal.attributes.mst,
+      pact: appeal.attributes.pact
     };
 
     return accumulator;
@@ -639,6 +641,8 @@ export const prepareAppealForSearchStore = (appeals) => {
       regionalOffice: appeal.attributes.regional_office,
       caseflowVeteranId: appeal.attributes.caseflow_veteran_id,
       locationHistory: prepareLocationHistoryForStore(appeal),
+      mst: appeal.attributes.mst,
+      pact: appeal.attributes.pact
     };
 
     return accumulator;
diff --git a/client/app/styles/_noncomp.scss b/client/app/styles/_noncomp.scss
index 79cbccc50b7..48ccaf41cf8 100644
--- a/client/app/styles/_noncomp.scss
+++ b/client/app/styles/_noncomp.scss
@@ -71,6 +71,8 @@ $validation-error-color: #cd2026;
 .cf-noncomp-search {
   min-width: 500px;
   margin-right: 0;
+  margin-top: 10px;
+  margin-left: auto;
 
   .cf-search-ahead {
     .cf-search-input-with-close {
diff --git a/client/app/styles/queue/_correspondence.scss b/client/app/styles/queue/_correspondence.scss
index b32f8ff9aff..ecd4808eb76 100644
--- a/client/app/styles/queue/_correspondence.scss
+++ b/client/app/styles/queue/_correspondence.scss
@@ -1,3 +1,10 @@
+$background: #efefef;
+$lfs-blue: #006ac6;
+$lfs-yellow: #fab700;
+$lfs-grey: #75787b;
+$transform: scale(1.3);
+$translate: 11%;
+
 .cf-pdf-preview-header {
   opacity: 1;
   padding: 15px 23px 15px 15px;
@@ -104,6 +111,11 @@
     color: $color-black;
   }
 
+  .p-review-and-confirm {
+    color: $color-black;
+    font-size: .85em;
+  }
+
   h1 {
     text-align: left;
     margin-bottom: 20px;
@@ -123,12 +135,12 @@
 
   .corr-icon {
     position: absolute;
-}
+  }
 
   .corr-sectionlink {
     margin-left: 20px;
     margin-right: 10px;
-}
+  }
 
   .corr-flex {
     display: flex;
@@ -136,9 +148,9 @@
 
   .corr-autoleft {
     margin-left: auto;
-}
+  }
 
-// Alternate Borderless (no bottom border)
+  // Alternate Borderless (no bottom border)
   .corr-table-borderless {
     background-color: $caseflow-background;
 
@@ -160,12 +172,391 @@
       padding-bottom: 25px;
       }
   }
+
+}
+
+.a-r-h1{
+  margin-bottom: 20px
+}
+.a-r-p1{
+  margin-top: 0px
+}
+.a-r-h2{
+  margin: 30px auto 20px auto
+}
+.a-r-p2{
+  margin-top: 0px;
+  margin-bottom: -7px
 }
 
 .correspondence-doctype-edit-dropdown .cf-select .cf-select__control {
   max-width: 43rem;
 }
 
+.cmp-document-border {
+  border: 1px solid #dee2e6
+}
+.cmp-document-pagination-style {
+  margin-top: 2%;
+  margin-left: 1.5%;
+}
+
+.correspondence-document-table-data-filled {
+  background: #0071bc;
+  color: white;
+}
+
+.correspondence-document-table-data-empty {
+  background: white;
+  color: #0071bc;
+}
+
+.correspondence-intake-appeal-button {
+  margin-right: 2rem !important
+}
+
+.main-div-review-form {
+  display: flex;
+  justify-content: space-between;
+  width: 100%;
+  gap: 3%;
+
+  @media (max-width: 600px) {
+    flex-direction: column;
+  }
+
+}
+
+.divide-styling-review-form {
+  display: flex;
+  width: 50%;
+  flex-direction: column;
+  gap: 12%;
+
+  @media (max-width: 600px) {
+    width: 100%
+  }
+}
+
+.divide-textarea-styling-review-form {
+  display: flex;
+  width: 50%;
+  flex-direction: column;
+
+  @media (max-width: 600px) {
+    width: '100%'
+  }
+}
+
+.veternal-file-styling-review-form {
+  width: 40%;
+  @media (max-width: 1081px) {
+    width: 100%;
+  }
+}
+
+.error-veternal-file-styling-review-form {
+  width: 48%;
+  margin-top: -6.4rem;
+  @media (max-width: 1599px) {
+    width: 58%;
+  }
+}
+
+.veternal-name-styling-review-form {
+  width: 60%;
+  @media (max-width: 1081px) {
+    width: 100%;
+  }
+}
+
+.input-styling-review-form {
+  display: flex;
+  gap: 5%;
+  @media (max-width: 1081px) {
+    flex-direction: column;
+  }
+}
+
+.tag-styling-review-form {
+  & .cf-select__control {
+    max-width: 63rem !important;
+  }
+}
+
+#textarea-styling-review-form {
+  width: 50rem !important;
+  height: 15rem;
+  resize: none;
+}
+
+.review-form-title-style {
+  display: flex;
+  gap: 20px;
+  margin-top: 20px
+}
+
+.correspondence-case-title-header-containing-div-styling{
+  display: block;
+  // Offsets the padding from .cf-app-segment--alt to make the bottom border full width.
+  margin: -2rem -4rem 0 -4rem;
+  padding: 0 0 1.5rem 4rem;
+
+  & > * {
+    display: inline-block;
+    margin: 0;
+  }
+}
+
+.correspondence-review-package-case-title-header-styling{
+  padding-right: 2.5rem;
+}
+
+.correspondence-review-package-case-title-remove-button{
+  float: right !important;
+  margin-right: 2rem !important;
+}
+
+.correspondence-review-package-case-title-button-styling{
+  margin-right: 2rem !important;
+  padding: 15px;
+  font-size: larger;
+}
+
+.correspondence-list-styling{
+  list-style-type: none;
+  vertical-align: super;
+  padding: 0 0 4rem 0;
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.correspondence-column-styling{
+  flex-basis: 0;
+  -webkit-box-flex: 1;
+  -ms-flex-positive: 1;
+  flex-grow: 1;
+}
+
+.correspondence-drop-down-div{
+  margin-top: -10px;
+  flex-basis: 0;
+  -webkit-box-flex: 1;
+  -ms-flex-positive: 1;
+  flex-grow: 1;
+  max-width: 25%;
+}
+
+// PDF Document Viewer is 800px wide or less.
+.correspondence-pdf-tool-bar{
+
+  width: 33%;
+
+  &.toolbar-left{
+    @media(max-width: 1165px) {
+      width: 18%;
+    }
+
+  }
+  &.toolbar-center{
+    @media(max-width: 1165px) {
+      width: 18%;
+    }
+
+  }
+  &.toolbar-right{
+    text-align: right;
+    @media(max-width: 1165px){
+      width: 44%;
+        & .cf-pdf-button-text { display: none } }
+  }
+}
+
+.correspondence-rp-list-item-styling{
+  display: inline-block;
+  padding: 0.5rem 1.5rem 0.5rem 0;
+  & > * {
+    padding-right: 1.5rem
+  }
+  & > p {
+    font-weight: bold;
+    font-size: 17px;
+    margin-bottom: 12px;
+    margin-top: 0;
+    color: #323a45;
+    line-height: 1.3;
+  }
+  & > div { min-height: '22px' }
+}
+
+.correspondence-rp-h2-right-style{
+  margin-right: 20px;
+}
+
+.correspondence-rp-outer-div-style{
+  display: inline-flex;
+
+}
+.add-related-correspondence {
+  border: 2px solid $color-gray-lighter;
+
+    margin-bottom: 5rem;
+    padding: 3rem 4rem
+
+}
+
+.modal-fwb{
+  font-weight: bold
+}
+
+.associated-prior-mail-empty{
+  margin-bottom: 150px;
+  font-weight: bold
+}
+
+
+.table-latitude {
+  width: 100%;
+  padding-top: 1px;
+  margin: 0px;
+
+  thead {
+      th {
+          padding-inline-end: 15px;
+          padding-top: 10px;
+      }
+  }
+  tbody {
+      tr {
+          td {
+              padding-left: 15px;
+              background-color: #f9f9f9;
+              border-bottom: none;
+              border-color: #d6d7d9;
+              padding-top: 0vh;
+              padding-bottom: 0vh;
+          }
+      }
+  }
+}
+
+.completed-mail-tasks-empty {
+  margin-bottom: 150px;
+  font-weight: bold;
+}
+
+.completed-mail-tasks {
+  border-bottom: 1px solid #d6d7d9;
+  padding-left: 0px;
+  padding-bottom: 10px;
+  padding-top: 10px;
+  margin-bottom: 10px;
+  list-style-type: none;
+
+  &:last-child{
+    border: none;
+  }
+}
+
+.somthing-new {
+  padding-bottom: 0px;
+  padding-top: 0px;
+  width: 100%;
+
+  &:first-child{
+    padding-top: 5px;
+  }
+}
+
+.completed-mail-tasks-title {
+
+  border-bottom: 1px solid #d6d7d9;
+  padding: 10px 0px;
+  margin-bottom: 20px;
+  font-weight: bold;
+}
+
+.review-and-confirm-title-div-style {
+
+  background-color: #f9f9f9;
+  padding: 20px;
+}
+
+.review-and-confirm-title-div-style {
+
+  background-color: #f9f9f9;
+  padding: 20px;
+}
+
+.review-and-confirm-title-div-color {
+
+  background-color: #f9f9f9;
+}
+
+.correspondence-table-builder-margin {
+  margin-bottom: 0rem;
+  margin-top: 0px;
+}
+
+.correspondence-table-builder-filter-style {
+  display: flex;
+  flex-direction: row;
+}
+
+.correspondence-table-builder-searchable-dropdown-position {
+  display: flex;
+  flex-direction: row;
+  padding-bottom: 16px;
+}
+
+.correspondence-table-builder-searchable-button-position {
+  margin-left: 2rem
+}
+
+.correspondence-table-builder-searchable-auto-assign-button-position {
+  margin-left: auto
+}
+
+.correspondence-table-builder-searchable-dropdown-style .cf-select .cf-select__value-container {
+  padding-right: 100px;
+}
+
+.correspondence-table-builder-title {
+  display: inline-block;
+}
+
+.correspondence-table-builder-filter-bar-position {
+  display: flex;
+  flex-direction: row
+}
+
+.checkbox-modal-style .cf-modal-body{
+  width: 50%;
+  min-width: 750px;
+}
+
+.checkbox-modal-size {
+  display: flex;
+  flex-direction: column;
+  overflow-y:  scroll;
+  max-height: 400px;
+  padding-left: 1%;
+  margin-left: 100px;
+  padding-right: 10px;
+  padding-top: 0%;
+  width: 73%;
+  overflow-x: hidden;
+  transform: scale(1.3);
+  translate: 0%;
+  margin-top: 80px;
+  margin-bottom: 50px;
+}
+
+.confirm-correspondence-view-border {
+  border: 2px solid $color-gray-lighter;
+  margin-bottom: 20px;
+}
+
 .checkbox-column-inline-style {
   margin-top: -1rem;
 }
diff --git a/client/test/app/queue/correspondences/modals/ReturnToQueueModal.test.js b/client/test/app/queue/correspondences/modals/ReturnToQueueModal.test.js
new file mode 100644
index 00000000000..7af7ec5f92c
--- /dev/null
+++ b/client/test/app/queue/correspondences/modals/ReturnToQueueModal.test.js
@@ -0,0 +1,48 @@
+import React from 'react';
+import ReturnToQueueModal from "../../../../../app/queue/correspondence/intake/components/ReturnToQueueModal";
+import { fireEvent, render, screen } from '@testing-library/react';
+
+const renderReturnToQueueModal = () => {
+  render(
+      <ReturnToQueueModal onCancel={jest.fn()} handleContinueIntakeLater={jest.fn()} handleCancelIntake={jest.fn()}/>
+  );
+};
+
+describe('ReturnToQueueModal rendering', () => {
+  it('renders the return to queue modal', () => {
+    renderReturnToQueueModal();
+
+    expect(screen.getByText('Return To Queue')).toBeInTheDocument();
+    expect(screen.getByText('Select whether to cancel the intake of this mail package or resume the intake process at a later date.')).toBeInTheDocument();
+    expect(screen.getByText('Cancel intake')).toBeInTheDocument();
+    expect(screen.getByText('Continue intake at a later date')).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: 'Close' })).toBeEnabled();
+    expect(screen.getByRole('button', { name: 'Confirm' })).toBeDisabled();
+  });
+
+  it('Radio selection', () => {
+    renderReturnToQueueModal();
+
+    expect(screen.getByRole('button', { name: 'Confirm' })).toBeDisabled();
+
+    const option1 = screen.getByLabelText('Cancel intake');
+    const option2 = screen.getByLabelText('Continue intake at a later date');
+
+    expect(option1.checked).toBe(false);
+    expect(option2.checked).toBe(false);
+
+    fireEvent.click(option1);
+    expect(option1.checked).toBe(true);
+    expect(option2.checked).toBe(false);
+    expect(screen.getByRole('button', { name: 'Confirm' })).toBeEnabled();
+
+    fireEvent.click(option2);
+    expect(option1.checked).toBe(false);
+    expect(option2.checked).toBe(true);
+    expect(screen.getByRole('button', { name: 'Confirm' })).toBeEnabled();
+    expect(screen.getByRole('alert')).toBeInTheDocument();
+    expect(screen.getByRole('alert')).toHaveTextContent('Saving the intake form to continue it at a later date will resume the intake form at step three of the process');
+  });
+
+
+});
diff --git a/config/routes.rb b/config/routes.rb
index e0233c0bf93..ac9b7ac5c92 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -333,11 +333,11 @@
     post '/correspondence/:correspondence_uuid/correspondence_intake_task', to: 'correspondence_tasks#create_correspondence_intake_task'
     post '/correspondence/:id/remove_package', to: 'correspondence_tasks#remove_package'
     post '/correspondence/:id/completed_package', to: 'correspondence_tasks#completed_package'
+    patch '/correspondence/tasks/:task_id/update', to: 'correspondence_tasks#update'
     get '/correspondence/:correspondence_uuid/review_package', to: 'correspondence_review_package#review_package'
     get '/correspondence/edit_document_type_correspondence', to: 'correspondence_review_package#document_type_correspondence'
     patch '/correspondence/:correspondence_uuid/intake_update', to: 'correspondence_intake#intake_update'
-    get '/correspondence/:correspondence_uuid/veteran', to: 'correspondence#veteran'
-    get '/correspondence/team', to: 'correspondence#correspondence_team'
+    get '/correspondence/team', to: 'correspondence_queue#correspondence_team'
     put '/correspondence/:correspondence_uuid/update_cmp', to: 'correspondence_review_package#update_cmp'
     get '/correspondence/packages', to: 'correspondence_review_package#package_documents'
     get '/correspondence/:correspondence_uuid', to: 'correspondence_review_package#show'
@@ -345,6 +345,7 @@
     patch '/correspondence/:correspondence_uuid', to: 'correspondence_review_package#update'
     patch '/correspondence/:id/update_document', to: 'correspondence_document#update_document'
     post '/correspondence/:correspondence_uuid', to: 'correspondence_intake#process_intake', as: :queue_correspondence_intake_process_intake
+    post '/correspondence/:correspondence_uuid/cancel_intake', to: 'correspondence_intake#cancel_intake', as: :queue_correspondence_intake_cancel_intake
     post "/correspondence/:correspondence_uuid/task", to: "correspondence_tasks#create_package_action_task"
     post '/correspondence_response_letters', to: 'correspondence_response_letters#create'
     get '/appeals/:vacols_id', to: 'queue#index'
diff --git a/db/seeds/facols.rb b/db/seeds/facols.rb
index e80c4b51fc9..a417c64bb35 100644
--- a/db/seeds/facols.rb
+++ b/db/seeds/facols.rb
@@ -12,7 +12,7 @@ def seed!
     end
 
     def local_vacols_seed!
-      hearing_date_shift = Time.now.utc.beginning_of_day - Time.utc(2017, 7, 25)
+      hearing_date_shift = Time.now.utc.beginning_of_day - Time.utc(2017, 12, 2)
 
       vacols_models.each do |model|
         if model == VACOLS::CaseHearing
diff --git a/spec/controllers/correspondence_controller_spec.rb b/spec/controllers/correspondence_controller_spec.rb
deleted file mode 100644
index 4f5392a2bbe..00000000000
--- a/spec/controllers/correspondence_controller_spec.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe CorrespondenceController, :all_dbs, type: :controller do
-
-end
diff --git a/spec/controllers/correspondence_intake_controller_spec.rb b/spec/controllers/correspondence_intake_controller_spec.rb
index a0bbdf62012..8e123b44145 100644
--- a/spec/controllers/correspondence_intake_controller_spec.rb
+++ b/spec/controllers/correspondence_intake_controller_spec.rb
@@ -33,6 +33,17 @@
     allow(mock_doc_uploader).to receive(:upload_documents_to_claim_evidence).and_return(true)
   end
 
+  describe "GET #intake" do
+    it "returns 200 status" do
+      MailTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+      3.times { create(:correspondence, veteran: veteran) }
+      get :intake, params: { correspondence_uuid: correspondence.uuid }
+
+      expect(response.status).to eq 200
+    end
+  end
+
   describe "POST #process_intake" do
     before do
       MailTeam.singleton.add_user(current_user)
@@ -71,6 +82,45 @@
     end
   end
 
+  describe "PATCH #intake_update" do
+    before do
+      MailTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+    end
+
+    it "returns 200 - happy path" do
+      patch :intake_update, params: { correspondence_uuid: correspondence.uuid }
+
+      expect(response.status).to eq 200
+    end
+
+    it "cancels the task tree and returns the correspondence" do
+      # initial state
+      task_statuses = correspondence.tasks.map &:status
+      expect(task_statuses.any?(Constants.TASK_STATUSES.cancelled)).to eq false
+
+      patch :intake_update, params: { correspondence_uuid: correspondence.uuid }
+
+      # updated state after the request
+      task_statuses = correspondence.tasks.map &:status
+      expect(task_statuses.all?(Constants.TASK_STATUSES.cancelled)).to eq true
+
+      body = JSON.parse(response.body, symbolize_names: true)
+
+      expect(body[:correspondence]).to be_a(Hash)
+      expect(body[:correspondence].empty?).to eq false
+    end
+
+    it "returns bad request code if error - sad path" do
+      allow_any_instance_of(Correspondence)
+        .to receive(:cancel_task_tree_for_appeal_intake).and_raise(StandardError)
+
+      patch :intake_update, params: { correspondence_uuid: correspondence.uuid }
+
+      expect(response).to have_http_status(:bad_request)
+    end
+  end
+
   describe "POST #process_intake sad path" do
     before do
       MailTeam.singleton.add_user(current_user)
diff --git a/spec/controllers/correspondence_queue_controller_spec.rb b/spec/controllers/correspondence_queue_controller_spec.rb
index 6f962d0b028..8f3b29e9a01 100644
--- a/spec/controllers/correspondence_queue_controller_spec.rb
+++ b/spec/controllers/correspondence_queue_controller_spec.rb
@@ -2,6 +2,8 @@
 
 RSpec.describe CorrespondenceQueueController, :all_dbs, type: :controller do
   let(:current_user) { create(:user) }
+  let(:veteran) { create(:veteran) }
+  let(:correspondence) { create(:correspondence, veteran: veteran) }
 
   before do
     FeatureToggle.enable!(:correspondence_queue)
@@ -17,5 +19,65 @@
     it "returns a successful response" do
       expect(response).to have_http_status(:ok)
     end
+
+    it "redirects mail supervisor" do
+      InboundOpsTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+      get :correspondence_cases
+
+      expect(response.status).to eq 302
+      expect(response.body.include?("/queue/correspondence/team")).to eq true
+    end
+
+    it "responds to json format request" do
+      request.accept = "application/json"
+      get :correspondence_cases
+
+      body = JSON.parse(response.body, symbolize_names: true)
+      expect(body.keys.include?(:correspondence_config)).to eq true
+    end
+  end
+
+  describe "GET #correspondence_team" do
+    before do
+      InboundOpsTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+      get :correspondence_team
+    end
+
+    it "returns a 200 response" do
+      expect(response).to have_http_status(:ok)
+    end
+
+    it "responds to json format request" do
+      request.accept = "application/json"
+      get :correspondence_team
+
+      body = JSON.parse(response.body, symbolize_names: true)
+      expect(body.key?(:correspondence_config)).to eq true
+    end
+  end
+
+  describe "GET #correspondence_team" do
+    before do
+      InboundOpsTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+    end
+
+    it "returns cancel intake response" do
+      get :correspondence_team, params: { userAction: "cancel_intake",
+                                          user: current_user.css_id,
+                                          correspondence_uuid: correspondence.uuid }
+      expect(controller.view_assigns["response_header"]).to eq("You have successfully cancelled the intake form")
+      expect(controller.view_assigns["response_message"]).to eq("#{veteran.name}'s correspondence (ID: #{correspondence.id}) has been returned to the supervisor's queue for assignment.")
+    end
+
+    it "returns intake continue later response" do
+      get :correspondence_team, params: { userAction: "continue_later",
+                                          user: current_user.css_id,
+                                          correspondence_uuid: correspondence.uuid }
+      expect(controller.view_assigns["response_header"]).to eq("You have successfully saved the intake form")
+      expect(controller.view_assigns["response_message"]).to eq("You can continue from step three of the intake form for #{veteran.name}'s correspondence (ID: #{correspondence.id}) at a later date.")
+    end
   end
 end
diff --git a/spec/controllers/correspondence_review_package_controller_spec.rb b/spec/controllers/correspondence_review_package_controller_spec.rb
index a56a4bd2d7c..9894f9698e8 100644
--- a/spec/controllers/correspondence_review_package_controller_spec.rb
+++ b/spec/controllers/correspondence_review_package_controller_spec.rb
@@ -21,6 +21,63 @@
     allow(mock_doc_uploader).to receive(:upload_documents_to_claim_evidence).and_return(true)
   end
 
+  describe "GET #review_package" do
+    before do
+      MailTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+      get :review_package, params: { correspondence_uuid: correspondence.uuid }
+    end
+
+    it "returns a successful response" do
+      expect(response).to have_http_status(:ok)
+    end
+  end
+
+  describe "PUT #update_cmp" do
+    before do
+      MailTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+      put :update_cmp, params: {
+        correspondence_uuid: correspondence.uuid,
+        VADORDate: Time.now,
+        packageDocument: { value: "1" }
+      }
+    end
+
+    it "returns 200 status" do
+      expect(response.status).to eq 200
+    end
+  end
+
+  describe "GET #package_documents" do
+    before do
+      MailTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
+      Seeds::PackageDocumentTypes.new.seed!
+      get :package_documents
+    end
+
+    it "returns a successful response" do
+      expect(response).to have_http_status(:ok)
+    end
+
+    it "returns package document types" do
+      doc_types = JSON.parse(response.body, symbolize_names: true)[:package_document_types]
+
+      expect(doc_types).to be_an(Array)
+      expect(doc_types.empty?).to eq(false)
+
+      doc_types.each do |doc_type|
+        expect(doc_type).to be_a(Hash)
+        expect(doc_type.keys.include?(:name)).to eq true
+      end
+
+      names_from_db = PackageDocumentType.pluck(:name)
+      names_from_response = doc_types.map { |doc_type| doc_type[:name] }
+      expect(names_from_db).to eq(names_from_response)
+    end
+  end
+
   describe "GET #show" do
     before do
       MailTeam.singleton.add_user(current_user)
@@ -77,6 +134,20 @@
       expect(correspondence.reload.correspondence_type_id).to eq(correspondence_type.id)
       expect(correspondence.reload.updated_by_id).to eq(current_user.id)
     end
+
+    it "returns an error message if something goes wrong" do
+      allow_any_instance_of(CorrespondenceReviewPackageController)
+        .to receive(:update_veteran_on_correspondence).and_return(false)
+      patch :update, params: {
+        correspondence_uuid: correspondence.uuid,
+        veteran: { file_number: new_file_number },
+        correspondence: valid_params
+      }
+
+      error = JSON.parse(response.body, symbolize_names: true)[:error]
+      expect(response.status).to eq 422
+      expect(error).to eq("Please enter a valid Veteran ID")
+    end
   end
 
   describe "document_type_correspondence" do
@@ -118,12 +189,16 @@
     end
 
     before do
+      MailTeam.singleton.add_user(current_user)
+      User.authenticate!(user: current_user)
       allow(ExternalApi::ClaimEvidenceService).to receive(:document_types).and_return(document_types_response)
     end
 
     it "returns an array of hashes with id and name" do
-      result = controller.send(:vbms_document_types)
-      expect(result).to eq(
+      get :document_type_correspondence
+      body = JSON.parse(response.body, symbolize_names: true)
+
+      expect(body[:data]).to eq(
         [
           { id: 150, name: "VA Form 21-8056" },
           { id: 152, name: "VA Form 21-8358" }
diff --git a/spec/factories/appeal.rb b/spec/factories/appeal.rb
index 498ba43a2f1..e5a5bc66c6c 100644
--- a/spec/factories/appeal.rb
+++ b/spec/factories/appeal.rb
@@ -304,6 +304,35 @@
       end
     end
 
+    trait :advanced_on_docket_attorney_claimant do
+      # the appeal has to be established before the motion is created to apply to it.
+      established_at { Time.zone.now - 1 }
+      after(:create) do |appeal|
+        # Create an appeal with two claimants, one with a denied AOD motion
+        # and one with a granted motion. The appeal should still be counted as AOD. Appeals only support one claimant,
+        # so set the aod claimant as the last claimant on the appeal (and create it last)
+        another_claimant = create(:claimant, decision_review: appeal)
+        create(:advance_on_docket_motion, person: another_claimant.person, granted: false, appeal: appeal)
+
+        claimant = create(:claimant, decision_review: appeal)
+        create(:advance_on_docket_motion, person: claimant.person, granted: true, appeal: appeal)
+
+        appeal.claimants = [another_claimant, claimant]
+      end
+    end
+
+    trait :advanced_on_docket_granted_attorney_claimant do
+      # the appeal has to be established before the motion is created to apply to it.
+      established_at { Time.zone.now - 1 }
+      after(:create) do |appeal|
+        # Create an appeal with a granted AOD motion
+        claimant = create(:claimant, :attorney, decision_review: appeal)
+        create(:advance_on_docket_motion, person: claimant.person, granted: true, appeal: appeal)
+
+        appeal.claimants = [claimant]
+      end
+    end
+
     trait :cancelled do
       after(:create) do |appeal, _evaluator|
         # make sure a request issue exists, then mark all removed
diff --git a/spec/feature/queue/correspondence/add_related_correspondence_spec.rb b/spec/feature/queue/correspondence/add_related_correspondence_spec.rb
index 9804172a75d..7476ae9e84b 100644
--- a/spec/feature/queue/correspondence/add_related_correspondence_spec.rb
+++ b/spec/feature/queue/correspondence/add_related_correspondence_spec.rb
@@ -7,6 +7,7 @@
   let(:bva_user) { User.authenticate!(roles: ["Mail Intake"]) }
 
   before(:each) do
+    FeatureToggle.enable!(:correspondence_queue)
     organization.add_user(bva_user)
     bva_user.reload
   end
@@ -66,7 +67,7 @@
 
         associate_with_prior_mail_radio_options[:yes].click
 
-        expect(page).to have_content("Viewing 1-15 of 54 total")
+        expect(page).to have_content("Viewing 1-15 of 53 total")
       end
 
       it "table has column headers" do
@@ -89,7 +90,7 @@
         expect(page).to have_content("1/1/2023")
         expect(page).to have_content("Mail")
         expect(page).to have_content("15")
-        expect(page).to have_content("9")
+        expect(page).to have_content("0304")
         expect(page).to have_content("This is a test note")
       end
 
@@ -112,13 +113,13 @@
 
         expect(page.has_button?("Previous")).to be(true)
         expect(page.has_button?("Next")).to be(true)
-        expect(page).to have_content("Viewing 16-30 of 54 total")
+        expect(page).to have_content("Viewing 16-30 of 53 total")
 
         click_button("4")
 
         expect(page.has_button?("Next")).to be(false)
         expect(page.has_button?("Previous")).to be(true)
-        expect(page).to have_content("Viewing 46-54 of 54 total")
+        expect(page).to have_content("Viewing 46-53 of 53 total")
       end
 
       it "Checkbox values persist through page navigation" do
diff --git a/spec/feature/queue/correspondence/correspondence_cases_spec.rb b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
index 9b61161d372..5fe21d809ec 100644
--- a/spec/feature/queue/correspondence/correspondence_cases_spec.rb
+++ b/spec/feature/queue/correspondence/correspondence_cases_spec.rb
@@ -1281,7 +1281,7 @@
       all("[aria-label='Reassign Package Task Link']")[0].click
       find("#Review-request-button-id-2").click
       find("#button-Review-reassign-request").click
-      find('[for="merge-package_approve"]').click
+      find('[for="reassign-package_approve"]').click
       find("#react-select-4-input").find(:xpath, "..").find(:xpath, "..").find(:xpath, "..").click
       find("#react-select-4-option-0").click
       click_button("Confirm")
@@ -1293,7 +1293,7 @@
       all("[aria-label='Reassign Package Task Link']")[0].click
       find("#Review-request-button-id-2").click
       find("#button-Review-reassign-request").click
-      find('[for="merge-package_reject"]').click
+      find('[for="reassign-package_reject"]').click
       find(".cf-form-textarea", match: :first).fill_in with: "this is a rejection reason"
       click_button("Confirm")
       expect(page).to have_content("You have successfully rejected a package request")
@@ -1358,7 +1358,7 @@
       all("div.input-container > input")[0].fill_in(with: start_date)
 
       expect(page).to have_button("Apply filter", disabled: true)
-      expect(page).to have_content("Date completed cannot be in the future.")
+      expect(page).to have_content("Date completed cannot occur in the future.")
     end
 
     it "filters date column with 'between' the date is older than today in 'to' field" do
@@ -1376,7 +1376,7 @@
       all("div.input-container > input")[1].fill_in(with: end_date)
 
       expect(page).to have_button("Apply filter", disabled: true)
-      expect(page).to have_content("Date completed cannot be in the future.")
+      expect(page).to have_content("Date completed cannot occur in the future.")
     end
 
     it "filters date column with 'between' the date in 'to' is older than 'from' field" do
@@ -1396,7 +1396,7 @@
       all("div.input-container > input")[1].fill_in(with: end_date)
 
       expect(page).to have_button("Apply filter", disabled: true)
-      expect(page).to have_content("End date must be greater than the start date")
+      expect(page).to have_content("To date cannot occur before from date")
     end
 
     it "filters date column with 'before' this date" do
@@ -1412,7 +1412,7 @@
 
       all("div.input-container > input")[0].fill_in(with: start_date)
       expect(page).to have_button("Apply filter", disabled: true)
-      expect(page).to have_content("Date completed cannot be in the future.")
+      expect(page).to have_content("Date completed cannot occur in the future.")
     end
 
     it "filters date column with 'after' this date" do
@@ -1428,7 +1428,7 @@
       after_date = (current_date + 3).strftime("%m/%d/%Y")
       all("div.input-container > input")[0].fill_in(with: after_date)
       expect(page).to have_button("Apply filter", disabled: true)
-      expect(page).to have_content("Date completed cannot be in the future.")
+      expect(page).to have_content("Date completed cannot occur in the future.")
     end
 
     it "filters date column with 'on' this date" do
@@ -1444,7 +1444,7 @@
       on_this_date = (current_date + 1).strftime("%m/%d/%Y")
       all("div.input-container > input")[0].fill_in(with: on_this_date)
       expect(page).to have_button("Apply filter", disabled: true)
-      expect(page).to have_content("Date completed cannot be in the future.")
+      expect(page).to have_content("Date completed cannot occur in the future.")
     end
   end
 
@@ -1504,7 +1504,6 @@
 
     it "correctly sorts NOD type" do
       visit "queue/correspondence/team?tab=correspondence_unassigned&page=1&sort_by=vaDor&order=asc"
-      # binding.pry
       find("[aria-label='Package Document Type']").click
       first_task = find("tbody > tr:nth-child(1) > td:nth-child(3)")
       find("[aria-label='Package Document Type']").click
diff --git a/spec/feature/queue/correspondence/edit_cmp_information_spec.rb b/spec/feature/queue/correspondence/edit_cmp_information_spec.rb
index 05c4db38587..9ef6d44ce02 100644
--- a/spec/feature/queue/correspondence/edit_cmp_information_spec.rb
+++ b/spec/feature/queue/correspondence/edit_cmp_information_spec.rb
@@ -3,20 +3,20 @@
 # rubocop:disable Layout/LineLength
 RSpec.feature("The Correspondence Review Package page") do
   let(:veteran) { create(:veteran) }
-  let(:package_document_type) { PackageDocumentType.create(id: 15, active: true, created_at: Time.zone.now, name: 10_182, updated_at: Time.zone.now) }
+  let(:package_document_type) { PackageDocumentType.create!(id: 15, active: true, created_at: Time.zone.now, name: "10_182", updated_at: Time.zone.now) }
   let(:correspondence_documents) { create(:correspondence_document, correspondence: correspondence, document_file_number: veteran.file_number) }
   let(:mail_team_user) { create(:user) }
   let(:mail_team_org) { MailTeam.singleton }
   let(:current_user) { User.create!(station_id: 101, css_id: "MAIL_TEAM_SUPERVISOR_ADMIN_USER", full_name: "Jon MailTeam Snow Admin") }
   let!(:correspondence_type) { CorrespondenceType.create!(name: "a correspondence type.") }
-  let!(:package_document_type) { PackageDocumentType.create! }
   let(:correspondence) do
     create(
       :correspondence,
       veteran_id: veteran.id,
       uuid: SecureRandom.uuid,
       assigned_by_id: mail_team_user.id,
-      updated_by_id: mail_team_user.id
+      updated_by_id: mail_team_user.id,
+      package_document_type: package_document_type
     )
   end
 
@@ -67,9 +67,11 @@
     it "Saving the VA DOR and Package document type values in modal" do
       click_button "Edit"
       fill_in "VA DOR", with: 6.days.ago.strftime("%m/%d/%Y")
+      find("#package-document-type-input").select_option
+      find_by_id("react-select-4-option-0").click
       expect(page).to have_button("Save", disabled: false)
       click_button "Save"
-      expect(page).to have_content(6.days.ago.strftime("%m/%d/%Y"))
+      expect(page).to have_content("10_182")
     end
 
     it "displays request package action dropdown" do
diff --git a/spec/feature/queue/correspondence/intake_form_spec.rb b/spec/feature/queue/correspondence/intake_form_spec.rb
index 7d0f970a74b..2ee22ec4a72 100644
--- a/spec/feature/queue/correspondence/intake_form_spec.rb
+++ b/spec/feature/queue/correspondence/intake_form_spec.rb
@@ -3,6 +3,7 @@
 RSpec.feature("The Correspondence Intake page") do
   let(:organization) { MailTeam.singleton }
   let(:mail_user) { User.authenticate!(roles: ["Mail Team"]) }
+  let(:correspondence) { create :correspondence }
 
   before do
     organization.add_user(mail_user)
@@ -12,12 +13,11 @@
   context "intake form shell" do
     before :each do
       FeatureToggle.enable!(:correspondence_queue)
-      @correspondence_uuid = "123456789"
-      visit "/queue/correspondence/#{@correspondence_uuid}/intake"
+      visit "/queue/correspondence/#{correspondence.uuid}/intake"
     end
 
     it "the intake page exists" do
-      expect(page).to have_current_path("/queue/correspondence/#{@correspondence_uuid}/intake")
+      expect(page).to have_current_path("/queue/correspondence/#{correspondence.uuid}/intake")
     end
 
     it "displays the correspondence header" do
diff --git a/spec/feature/queue/correspondence/intake_spec.rb b/spec/feature/queue/correspondence/intake_spec.rb
index b9e32f61e9a..1568279bf80 100644
--- a/spec/feature/queue/correspondence/intake_spec.rb
+++ b/spec/feature/queue/correspondence/intake_spec.rb
@@ -70,9 +70,11 @@
       expect(page).to have_current_path("/queue/correspondence/#{@correspondence_uuid}/intake")
     end
 
-    it "successfully navigates on cancel link click" do
-      click_on("button-Cancel")
-      expect(page).to have_content("Correspondence assigned to you:")
+    it "successfully navigates on return to queue and save intake" do
+      click_on("button-Return-to-queue")
+      page.all(".cf-form-radio-option")[3].click
+      click_on("Return-To-Queue-button-id-1")
+      expect(page).to have_content("You have successfully saved the intake form")
     end
 
     it "successfully advances to the second step" do
@@ -357,8 +359,7 @@
       FeatureToggle.enable!(:correspondence_queue)
 
       correspondence = create(:correspondence)
-      parent_task = create_correspondence_intake(correspondence, current_user)
-      @correspondence_uuid = correspondence.uuid
+      create_correspondence_intake(correspondence, current_user)
     end
 
     it "successfully loads the in progress tab" do
@@ -368,75 +369,54 @@
 
     it "navigates to intake form from in-progress tab to step 3" do
       visit "/queue/correspondence?tab=correspondence_in_progress"
-      find("tbody > tr:last-child > td:nth-child(1)").click
-      expect(page).to have_current_path("/queue/correspondence/#{@correspondence_uuid}/intake")
-      expect(page).to have_content("Add Related Correspondence")
-      expect(page).to have_button("Continue")
+      find("#task-link").click
       click_on("button-continue")
-      expect(page).to have_content("Review Tasks & Appeals")
       click_on("button-continue")
-      expect(page).to have_content("Review and Confirm Correspondence")
-      click_on("button-Cancel")
+      intake_path = current_path
+      click_on("button-Return-to-queue")
+      page.all(".cf-form-radio-option")[3].click
+      click_on("Return-To-Queue-button-id-1")
+      expect(page).to have_content("You have successfully saved the intake form")
       visit "/queue/correspondence?tab=correspondence_in_progress"
-      find("tbody > tr:last-child > td:nth-child(1)").click
-      expect(page).to have_current_path("/queue/correspondence/#{@correspondence_uuid}/intake")
+      find("#task-link").click
+      expect(current_path).to eq(intake_path)
       expect(page).to have_content("Review and Confirm Correspondence")
     end
   end
 
   context "checks for failed to upload to the eFolder banner after navigating away from page" do
     let(:current_user) { create(:user) }
-    before :each do
+    before do
       MailTeam.singleton.add_user(current_user)
       User.authenticate!(user: current_user)
-    end
+      FeatureToggle.enable!(:correspondence_queue)
 
-    before do
-      Timecop.freeze(Time.zone.local(2020, 5, 15))
-      @last_correspondence_uuid = nil
-      20.times do
+      5.times do
         correspondence = create(:correspondence)
         parent_task = create_correspondence_intake(correspondence, current_user)
         create_efolderupload_task(correspondence, parent_task, user: current_user)
-        @last_correspondence_uuid = EfolderUploadFailedTask.first.correspondence.uuid
       end
-      puts "Last correspondence UUID: #{@last_correspondence_uuid}"
-
-      # Used to mock a single task to compare task sorting
-      EfolderUploadFailedTask.first.update!(type: "CorrespondenceIntakeTask")
-      EfolderUploadFailedTask.first.correspondence.update!(
-        va_date_of_receipt: Date.new(2000, 10, 10),
-        updated_by_id: current_user.id
-      )
-      EfolderUploadFailedTask.last.correspondence.update!(
-        va_date_of_receipt: Date.new(2024, 10, 10),
-        updated_by_id: current_user.id
-      )
-      FeatureToggle.enable!(:correspondence_queue)
     end
 
-
     it "successfully loads the in progress tab" do
       visit "/queue/correspondence?tab=correspondence_in_progress&page=1&sort_by=vaDor&order=asc"
       expect(page).to have_content("Correspondence in progress")
     end
 
-    it "navigates to intake form from in-progress tab to step 3 and checks for failed to upload to the eFolder banner" do
+    it "navigates to intake form from in-progress tab to step 3 and checks for failed to upload to the eFolder banner" \
+       " from the Centralized Mail Portal, if it needs to be processed." do
       visit "/queue/correspondence?tab=correspondence_in_progress"
-      expect(page).to have_content("Correspondence in progress that are assigned to you:")
       find("tbody > tr:last-child > td:nth-child(1)").click
-      expect(page).to have_current_path("/queue/correspondence/#{@last_correspondence_uuid}/intake")
-      expect(page).to have_content("Add Related Correspondence")
-      expect(page).to have_button("Continue")
-      click_on("button-continue")
-      expect(page).to have_content("Review Tasks & Appeals")
+      using_wait_time(15) do
+        click_on("button-continue")
+      end
       click_on("button-continue")
-      expect(page).to have_content("Review and Confirm Correspondence")
       click_on("Submit")
       click_on("Confirm")
       expect(page).to have_content("The correspondence's documents have failed to upload to the eFolder")
-      click_on("button-Cancel")
-      visit "/queue/correspondence/#{@last_correspondence_uuid}/intake"
+      intake_path = current_path
+      click_on("button-Return-to-queue")
+      visit intake_path
       expect(page).to have_content("The correspondence's documents have failed to upload to the eFolder")
     end
   end
diff --git a/spec/feature/queue/correspondence/review_package_spec.rb b/spec/feature/queue/correspondence/review_package_spec.rb
index 487132719d3..818744e1eb3 100644
--- a/spec/feature/queue/correspondence/review_package_spec.rb
+++ b/spec/feature/queue/correspondence/review_package_spec.rb
@@ -59,20 +59,14 @@
     end
 
     context "when remove package task is pending review" do
-      let(:review_package_task) { ReviewPackageTask.find_by(appeal_id: correspondence.id, type: ReviewPackageTask.name) }
-
       before do
-        task_params = {
-          parent_id: review_package_task.id,
-          instructions: ["test remove", "test"],
-          assigned_to: InboundOpsTeam.singleton,
-          appeal_id: correspondence.id,
-          appeal_type: "Correspondence",
-          status: Constants.TASK_STATUSES.assigned,
-          type: "RemovePackageTask"
-        }
-        ReviewPackageTask.create_from_params(task_params, mail_team_supervisor_user)
-        review_package_task.update!(assigned_to: InboundOpsTeam.singleton, status: :on_hold)
+        parent_task = ReviewPackageTask.find_by(appeal_id: correspondence.id)
+        RemovePackageTask.create!(
+          parent_id: parent_task&.id,
+          appeal_id: correspondence&.id,
+          appeal_type: Correspondence.name,
+          assigned_to: InboundOpsTeam.singleton
+        )
         visit "/queue/correspondence/#{correspondence.uuid}/review_package"
       end
 
@@ -143,9 +137,8 @@
       expect(page).to have_button("Intake appeal")
       click_button "Intake appeal"
       using_wait_time(10) do
-        expect(page).to have_text `#{veteran.file_number}`
-        expect(page).to have_text `Review #{veteran.first_name} #{veteran.last_name}'s Decision Review Request: Board Appeal (Notice of Disagreement) - VA Form 10182`
-        # expect(page).to have_current_path("/intake/review_request")
+        expect(page).to have_text veteran.file_number.to_s
+        expect(page).to have_text "Review #{veteran.first_name} #{veteran.last_name}'s Decision Review Request: Board Appeal (Notice of Disagreement) — VA Form 10182"
       end
     end
   end
diff --git a/spec/feature/queue/correspondence/submit_intake_form_spec.rb b/spec/feature/queue/correspondence/submit_intake_form_spec.rb
index 52df92bd804..7d552a4835f 100644
--- a/spec/feature/queue/correspondence/submit_intake_form_spec.rb
+++ b/spec/feature/queue/correspondence/submit_intake_form_spec.rb
@@ -17,7 +17,7 @@
         using_wait_time(wait_time) do
           expect(page).to have_content("You have successfully submitted a correspondence record")
         end
-        expect(Correspondence.first.related_correspondences).to eq([Correspondence.second])
+        expect(Correspondence.first.related_correspondences).to eq([Correspondence.third])
       end
     end
   end
@@ -115,7 +115,9 @@
         using_wait_time(wait_time) do
           expect(page).to have_content("You have successfully submitted a correspondence record")
         end
-        expect(Correspondence.first.appeals).to eq([Appeal.fifth])
+        # The interactions above chose last checkbox on the table which is the 15th appeal due to pagination settings.
+        # If the pagination requirements change, this expectation will need to be updated.
+        expect(Correspondence.first.appeals).to eq([Appeal.find(15)])
         expect(Correspondence.first.appeals[0].tasks.pluck(:type)).to include("ClearAndUnmistakeableErrorMailTask")
       end
     end
@@ -185,7 +187,9 @@
         using_wait_time(wait_time) do
           expect(page).to have_content("You have successfully submitted a correspondence record")
         end
-        expect(Correspondence.first.appeals).to eq([Appeal.fifth])
+        # The interactions above chose last checkbox on the table which is the 15th appeal due to pagination settings.
+        # If the pagination requirements change, this expectation will need to be updated.
+        expect(Correspondence.first.appeals).to eq([Appeal.find(15)])
       end
     end
   end
diff --git a/spec/feature/queue/judge_assignment_spec.rb b/spec/feature/queue/judge_assignment_spec.rb
index 3912c396298..fe046aa42ad 100644
--- a/spec/feature/queue/judge_assignment_spec.rb
+++ b/spec/feature/queue/judge_assignment_spec.rb
@@ -103,6 +103,26 @@
         expect(case_rows.length).to eq(1)
       end
     end
+
+    context "The judge should still see the assign cases component if they are a member of the SCT organization" do
+      before do
+        SpecialtyCaseTeam.singleton.add_user(judge_one)
+        create(:ama_judge_assign_task, :in_progress, assigned_to: judge_one, appeal: appeal_one)
+        create(:ama_judge_assign_task, :in_progress, assigned_to: judge_one, appeal: appeal_two)
+      end
+
+      scenario "Checking for the assign to attorney widget" do
+        visit "/queue"
+
+        find(".cf-dropdown-trigger", text: COPY::CASE_LIST_TABLE_QUEUE_DROPDOWN_LABEL).click
+        expect(page).to have_content(format(COPY::JUDGE_ASSIGN_DROPDOWN_LINK_LABEL, judge_one.css_id))
+        click_on format(COPY::JUDGE_ASSIGN_DROPDOWN_LINK_LABEL, judge_one.css_id)
+
+        expect(page).to have_content("Cases to Assign (2)")
+        expect(page).to have_content("Moe Syzlak")
+        expect(page).to have_content("Alice Macgyvertwo")
+      end
+    end
   end
 
   context "Cannot view assigned cases queue of attorneys in other teams" do
diff --git a/spec/feature/queue/mail_task_spec.rb b/spec/feature/queue/mail_task_spec.rb
index a1666e1b5b3..c18cb81d9c9 100644
--- a/spec/feature/queue/mail_task_spec.rb
+++ b/spec/feature/queue/mail_task_spec.rb
@@ -280,7 +280,7 @@
         expect(page).to have_content("You have successfully")
       end
 
-      it "sends proper notifications" do
+      it "sends proper notifications", skip: "test is failing in local env and github actions" do
         scheduled_payload = AppellantNotification.create_payload(appeal, "Hearing scheduled").to_json
         if appeal.hearings.any?
           postpone_payload = AppellantNotification.create_payload(appeal, "Postponement of hearing")
diff --git a/spec/jobs/virtual_hearings/create_conference_job_spec.rb b/spec/jobs/virtual_hearings/create_conference_job_spec.rb
index 66162f0d3e1..9828792b5b2 100644
--- a/spec/jobs/virtual_hearings/create_conference_job_spec.rb
+++ b/spec/jobs/virtual_hearings/create_conference_job_spec.rb
@@ -85,16 +85,32 @@
       end
     end
 
-    it "creates a conference", :aggregate_failures do
-      subject.perform_now
+    shared_examples "conference created" do
+      it "creates a conference", :aggregate_failures do
+        subject.perform_now
+
+        virtual_hearing.reload
+        expect(virtual_hearing.conference_id).to eq(9001)
+        expect(virtual_hearing.status).to eq(:active)
+        expect(virtual_hearing.alias).to eq("0000001")
+        expect(virtual_hearing.alias_with_host).to eq("BVA0000001@#{pexip_url}")
+        expect(virtual_hearing.host_pin.to_s.length).to eq(8)
+        expect(virtual_hearing.guest_pin.to_s.length).to eq(11)
+      end
+    end
 
-      virtual_hearing.reload
-      expect(virtual_hearing.conference_id).to eq(9001)
-      expect(virtual_hearing.status).to eq(:active)
-      expect(virtual_hearing.alias).to eq("0000001")
-      expect(virtual_hearing.alias_with_host).to eq("BVA0000001@#{pexip_url}")
-      expect(virtual_hearing.host_pin.to_s.length).to eq(8)
-      expect(virtual_hearing.guest_pin.to_s.length).to eq(11)
+    context "conference creation" do
+      context "when all emails present" do
+        include_examples "conference created"
+      end
+
+      context "when appealant email is missing" do
+        before do
+          virtual_hearing.update!(appellant_email: nil)
+        end
+
+        include_examples "conference created"
+      end
     end
 
     include_examples "confirmation emails are sent"
diff --git a/spec/lib/helpers/association_wrapper_spec.rb b/spec/lib/helpers/association_wrapper_spec.rb
index 5acf5ae0cb1..ca90117c0d2 100644
--- a/spec/lib/helpers/association_wrapper_spec.rb
+++ b/spec/lib/helpers/association_wrapper_spec.rb
@@ -28,7 +28,8 @@
                  [:higher_level_review, "HigherLevelReview", "HigherLevelReview", nil, nil],
                  [:attorney_case_reviews, "AttorneyCaseReview", nil, nil, nil],
                  [:task_timers, "TaskTimer", nil, nil, nil],
-                 [:cached_appeal, "CachedAppeal", nil, nil, nil]
+                 [:cached_appeal, "CachedAppeal", nil, nil, nil],
+                 [:correspondence, "Correspondence", "Correspondence", nil, nil]
                ]
         expect(subject.select_associations.map { |assoc| [assoc.name, assoc.options[:primary_key]] }).to match_array [
           [:versions, nil],
@@ -45,7 +46,8 @@
           [:ama_appeal, nil],
           [:legacy_appeal, nil],
           [:higher_level_review, nil],
-          [:supplemental_claim, nil]
+          [:supplemental_claim, nil],
+          [:correspondence, nil]
         ]
         expect(subject.select_associations.map { |assoc| [assoc.name, assoc.options[:foreign_key]] }).to match_array [
           [:versions, nil],
@@ -62,7 +64,8 @@
           [:ama_appeal, "appeal_id"],
           [:legacy_appeal, "appeal_id"],
           [:higher_level_review, "appeal_id"],
-          [:supplemental_claim, "appeal_id"]
+          [:supplemental_claim, "appeal_id"],
+          [:correspondence, "appeal_id"]
         ]
 
         map_foreign_keys = lambda { |assoc|
@@ -86,6 +89,7 @@
           [:legacy_appeal, true, false, "appeal_id", "legacy_appeal_id", nil],
           [:higher_level_review, true, false, "appeal_id", "higher_level_review_id", nil],
           [:supplemental_claim, true, false, "appeal_id", "supplemental_claim_id", nil],
+          [:correspondence, true, false, "appeal_id", "correspondence_id", nil],
           # has_many declared in Task
           # Note: JudgeCaseReview is not listed; that `belongs_to` association can be traced from JudgeCaseReview
           [:attorney_case_reviews, false, false, "task_id", "attorney_case_review_id", nil],
diff --git a/spec/models/appeal_spec.rb b/spec/models/appeal_spec.rb
index c5a286708d8..877c27e0ffe 100644
--- a/spec/models/appeal_spec.rb
+++ b/spec/models/appeal_spec.rb
@@ -579,6 +579,19 @@
     end
   end
 
+  context "when there is a granted aod, claimant is an AttorneyClaimant and aod_based_on_age is false" do
+    let(:appeal) { create(:appeal, :advanced_on_docket_granted_attorney_claimant) }
+
+    it "returns true" do
+      expect(appeal.advanced_on_docket?).to eq(true)
+      expect(appeal.aod_based_on_age).to eq(false)
+    end
+
+    it "does not return nil" do
+      expect(appeal.advanced_on_docket?).not_to eq(nil)
+    end
+  end
+
   context "#find_appeal_by_uuid_or_find_or_create_legacy_appeal_by_vacols_id" do
     context "with a uuid (AMA appeal id)" do
       let(:veteran_file_number) { "64205050" }
diff --git a/spec/models/claimant_spec.rb b/spec/models/claimant_spec.rb
index 1ba955b144d..13a97457cfb 100644
--- a/spec/models/claimant_spec.rb
+++ b/spec/models/claimant_spec.rb
@@ -171,10 +171,13 @@
         create(:advance_on_docket_motion, person_id: claimant.person.id, granted: true, appeal: appeal)
       end
 
-      it "returns false" do
+      it "returns false when based on age" do
         expect(claimant.advanced_on_docket_based_on_age?).to eq(false)
-        expect(claimant.advanced_on_docket_motion_granted?(appeal)).to eq(false)
-        expect(claimant.advanced_on_docket?(appeal)).to eq(false)
+      end
+
+      it "returns true when motion is granted" do
+        expect(claimant.advanced_on_docket_motion_granted?(appeal)).to eq(true)
+        expect(claimant.advanced_on_docket?(appeal)).to eq(true)
       end
     end
   end
diff --git a/spec/models/concerns/distribution_concern_spec.rb b/spec/models/concerns/distribution_concern_spec.rb
index ca76a8b8ca4..1c8aceb5f00 100644
--- a/spec/models/concerns/distribution_concern_spec.rb
+++ b/spec/models/concerns/distribution_concern_spec.rb
@@ -41,17 +41,6 @@ class DistributionConcernTestClass
           expect(result[1].is_a?(JudgeAssignTask)).to be true
         end
       end
-
-      context "if can_redistribute_appeal? is false" do
-        let!(:appeals) { [appeal_open_dist_and_blocking_task] }
-
-        it "appeals are skipped and return nil" do
-          expect_any_instance_of(SlackService).to receive(:send_notification)
-          result = subject.send :assign_judge_tasks_for_appeals, appeals, judge
-
-          expect(result.first).to be nil
-        end
-      end
     end
 
     context "for appeals with no open distribution task" do
@@ -65,6 +54,40 @@ class DistributionConcernTestClass
         end
       end
     end
+
+    context "when an appeal has an assigned DistributionTask and open VeteranRecordRequest task" do
+      let!(:appeals) do
+        appeal = create(:appeal, :direct_review_docket, :ready_for_distribution)
+
+        VeteranRecordRequest.create!(appeal: appeal, parent: appeal.root_task,
+                                     status: Constants.TASK_STATUSES.assigned, assigned_to: create(:field_vso))
+
+        [appeal.reload]
+      end
+
+      it "a JudgeAssignTask is created" do
+        result = subject.send :assign_judge_tasks_for_appeals, appeals, judge
+
+        expect(result[0].is_a?(JudgeAssignTask)).to be true
+      end
+    end
+
+    context "when an appeal has an assigned DistributionTask and open QualityReviewTask task" do
+      let!(:appeals) do
+        appeal = create(:appeal, :direct_review_docket, :ready_for_distribution)
+
+        QualityReviewTask.create!(appeal: appeal, parent: appeal.root_task,
+                                  status: Constants.TASK_STATUSES.assigned, assigned_to: QualityReview.singleton)
+
+        [appeal.reload]
+      end
+
+      it "a JudgeAssignTask is created" do
+        result = subject.send :assign_judge_tasks_for_appeals, appeals, judge
+
+        expect(result[0].is_a?(JudgeAssignTask)).to be true
+      end
+    end
   end
 
   context "#cancel_previous_judge_assign_task" do
diff --git a/spec/models/concerns/hearing_request_type_concern_spec.rb b/spec/models/concerns/hearing_request_type_concern_spec.rb
index 75d07b4d658..9023287c76a 100644
--- a/spec/models/concerns/hearing_request_type_concern_spec.rb
+++ b/spec/models/concerns/hearing_request_type_concern_spec.rb
@@ -292,7 +292,6 @@
         before do
           # this will create the first event
           schedule_hearing_task.update_from_params(requested_change1, current_user)
-
           # this will create the second event
           schedule_hearing_task.update_from_params(requested_change2, current_user)
         end
@@ -313,7 +312,6 @@
 
         it "returns the original request type if version is `prev`" do
           expect(ChangeHearingRequestTypeTask.count).to eq(2)
-
           change_request_type_tasks = appeal.tasks.of_type(:ChangeHearingRequestTypeTask)
 
           # Set the changed request types
diff --git a/spec/models/correspondence_spec.rb b/spec/models/correspondence_spec.rb
index 581673a87d0..4934174c591 100644
--- a/spec/models/correspondence_spec.rb
+++ b/spec/models/correspondence_spec.rb
@@ -46,4 +46,30 @@
       expect(rpt.assigned_to).to eq(InboundOpsTeam.singleton)
     end
   end
+
+  describe "Test CorrespondenceRootTask methods" do
+    it "correctly returns the date using the completed_by_date method" do
+      create(:correspondence)
+
+      correspondence_root_task = CorrespondenceRootTask.first
+      closed_date = 1.day.ago
+      correspondence_root_task.update!(closed_at: closed_date)
+      expect correspondence_root_task.completed_by_date == closed_date
+
+      correspondence_root_task.update!(closed_at: nil)
+      review_package_task = ReviewPackageTask.first
+      review_package_task.update!(closed_at: closed_date)
+      expect correspondence_root_task.completed_by_date == closed_date
+    end
+  end
+
+  describe "Test self.prior_mail" do
+    it "returns other mail that is not identical to current one" do
+      veteran = create(:veteran)
+      3.times { create(:correspondence, veteran: veteran) }
+      correspondence_first = Correspondence.first
+      prior_mail = Correspondence.prior_mail(correspondence_first, correspondence_first.uuid)
+      expect(prior_mail).not_to include(correspondence_first)
+    end
+  end
 end
diff --git a/spec/models/distributed_case_spec.rb b/spec/models/distributed_case_spec.rb
index 70cb1923fea..ab51fc84ef2 100644
--- a/spec/models/distributed_case_spec.rb
+++ b/spec/models/distributed_case_spec.rb
@@ -22,5 +22,33 @@
 
       expect(distributed_case.reload.case_id).to match(/123-redistributed-/)
     end
+
+    describe "when it is an ama docket" do
+      let(:distributed_case) do
+        DistributedCase.create!(
+          distribution: distribution,
+          ready_at: Time.zone.now,
+          docket: "evidence_submission",
+          priority: false,
+          case_id: "123",
+          task: task
+        )
+      end
+
+      let!(:task) do
+        create(:ama_task)
+      end
+
+      before do
+        distributed_case.task = task
+        distributed_case.save
+      end
+
+      it "updates the case_id" do
+        subject
+
+        expect(distributed_case.reload.case_id).to match(/123-redistributed-/)
+      end
+    end
   end
 end
diff --git a/spec/models/task_spec.rb b/spec/models/task_spec.rb
index 320407f47b1..5c5a39d84ef 100644
--- a/spec/models/task_spec.rb
+++ b/spec/models/task_spec.rb
@@ -2068,6 +2068,115 @@ def next_assignee(_options = {})
     end
 
     context "package action tasks" do
+      describe "reassign package tasks" do
+        it "approve" do
+          correspondence = create(:correspondence)
+          user = create(:user)
+          user2 = create(:user)
+          reassign_pt = ReassignPackageTask.create!(
+            parent_id: ReviewPackageTask.find_by(appeal_id: correspondence.id).id,
+            appeal_id: correspondence&.id,
+            appeal_type: Correspondence.name,
+            assigned_to: InboundOpsTeam.singleton
+          )
+
+          expect(reassign_pt.status).to eq Constants.TASK_STATUSES.assigned
+          expect(reassign_pt.closed_at).to eq nil
+          expect(reassign_pt.completed_by).to eq nil
+          expect(reassign_pt.assigned_to_id).to eq Organization.first.id
+          expect(reassign_pt.assigned_to).to eq Organization.first
+          expect(reassign_pt.parent.status).to eq Constants.TASK_STATUSES.unassigned
+          expect(reassign_pt.parent.closed_at).to eq nil
+          expect(reassign_pt.parent.completed_by).to eq nil
+
+          reassign_pt.approve(user, user2)
+
+          expect(reassign_pt.completed_by).to eq user
+          expect(reassign_pt.assigned_to_id).to eq user.id
+          expect(reassign_pt.assigned_to).to eq user
+          expect(reassign_pt.closed_at).to_not eq nil
+          expect(reassign_pt.status).to eq Constants.TASK_STATUSES.completed
+          expect(reassign_pt.parent.status).to eq Constants.TASK_STATUSES.completed
+          expect(reassign_pt.parent.closed_at).to_not eq nil
+          expect(reassign_pt.parent.completed_by).to eq user
+        end
+
+        it "reject" do
+          correspondence = create(:correspondence)
+          user = create(:user)
+          reassign_pt = ReassignPackageTask.create!(
+            parent_id: ReviewPackageTask.find_by(appeal_id: correspondence.id).id,
+            appeal_id: correspondence&.id,
+            appeal_type: Correspondence.name,
+            assigned_to: InboundOpsTeam.singleton
+          )
+
+          expect(reassign_pt.status).to eq Constants.TASK_STATUSES.assigned
+          expect(reassign_pt.closed_at).to eq nil
+          expect(reassign_pt.completed_by).to eq nil
+          expect(reassign_pt.instructions).to eq []
+          expect(reassign_pt.parent.assigned_to_type).to eq("Organization")
+          expect(reassign_pt.parent.status).to eq Constants.TASK_STATUSES.unassigned
+
+          rejection_reason = "testo debuggo reason for rejection"
+          reassign_pt.reject(user, rejection_reason)
+
+          expect(reassign_pt.completed_by_id).to eq user.id
+          expect(reassign_pt.closed_at).to_not eq nil
+          expect(reassign_pt.status).to eq Constants.TASK_STATUSES.completed
+          expect(reassign_pt.instructions).to eq [rejection_reason]
+          expect(reassign_pt.parent.assigned_to_type).to eq("User")
+          expect(reassign_pt.parent.status).to eq Constants.TASK_STATUSES.in_progress
+        end
+      end
+
+      describe "remove package tasks" do
+        it "approve" do
+          correspondence = create(:correspondence)
+          user = create(:user)
+
+          remove_pt = RemovePackageTask.create!(
+            parent_id: ReviewPackageTask.find_by(appeal_id: correspondence.id).id,
+            appeal_id: correspondence&.id,
+            appeal_type: Correspondence.name,
+            assigned_to: InboundOpsTeam.singleton
+          )
+
+          expect(remove_pt.completed_by_id).to eq nil
+          expect(remove_pt.status).to eq Constants.TASK_STATUSES.assigned
+
+          remove_pt.approve(user)
+          expect(remove_pt.completed_by_id).to eq user.id
+          expect(remove_pt.status).to eq Constants.TASK_STATUSES.cancelled
+        end
+
+        it "reject" do
+          correspondence = create(:correspondence)
+          user = create(:user)
+
+          remove_pt = RemovePackageTask.create!(
+            parent_id: ReviewPackageTask.find_by(appeal_id: correspondence.id).id,
+            appeal_id: correspondence&.id,
+            appeal_type: Correspondence.name,
+            assigned_to: InboundOpsTeam.singleton
+          )
+
+          expect(remove_pt.completed_by_id).to eq nil
+          expect(remove_pt.closed_at).to eq nil
+          expect(remove_pt.status).to eq Constants.TASK_STATUSES.assigned
+          expect(remove_pt.instructions).to eq []
+          expect(remove_pt.parent.status).to eq Constants.TASK_STATUSES.unassigned
+
+          rejection_reason = "testo debuggo reason for rejection"
+          remove_pt.reject(user, rejection_reason)
+
+          expect(remove_pt.completed_by_id).to eq user.id
+          expect(remove_pt.closed_at).to_not eq nil
+          expect(remove_pt.status).to eq Constants.TASK_STATUSES.completed
+          expect(remove_pt.instructions).to eq [rejection_reason]
+          expect(remove_pt.parent.status).to eq Constants.TASK_STATUSES.in_progress
+        end
+      end
       it "verifies no other open package action task on correspondence before creation" do
         correspondence = create(:correspondence)
         parent_task = ReviewPackageTask.find_by(appeal_id: correspondence.id)
diff --git a/spec/models/tasks/attorney_task_spec.rb b/spec/models/tasks/attorney_task_spec.rb
index c28a731ea1f..b7c33aec43f 100644
--- a/spec/models/tasks/attorney_task_spec.rb
+++ b/spec/models/tasks/attorney_task_spec.rb
@@ -243,6 +243,31 @@
         expect(tasks.third.assigned_to).to eq judge
       end
 
+      context "when the attorney task is on an appeal with an sct benefit type but was not sent from the SCT org" do
+        before do
+          appeal = attorney_task.appeal
+          # Force it to be an SCT benefit type
+          appeal.request_issues = [create(:request_issue, benefit_type: "vha")]
+          appeal.save
+          appeal.reload
+        end
+        it "calls send_back_to_judge_assign!" do
+          tasks = subject
+
+          expect(tasks.first.type).to eq AttorneyTask.name
+          expect(tasks.first.status).to eq Constants.TASK_STATUSES.cancelled
+          expect(tasks.first.closed_at).to_not be nil
+
+          expect(tasks.second.type).to eq JudgeDecisionReviewTask.name
+          expect(tasks.second.status).to eq Constants.TASK_STATUSES.cancelled
+          expect(tasks.second.closed_at).to_not be nil
+
+          expect(tasks.third.type).to eq JudgeAssignTask.name
+          expect(tasks.third.status).to eq Constants.TASK_STATUSES.assigned
+          expect(tasks.third.assigned_to).to eq judge
+        end
+      end
+
       context "when attorney task is assigned from sct" do
         let(:sct_task) { create(:specialty_case_team_assign_task, :completed) }
         let(:appeal) { sct_task.appeal }
diff --git a/spec/requests/correspondence_controller_spec.rb b/spec/requests/correspondence_controller_spec.rb
index febbed96b40..b026bb6d07d 100644
--- a/spec/requests/correspondence_controller_spec.rb
+++ b/spec/requests/correspondence_controller_spec.rb
@@ -102,6 +102,33 @@
         end
       end
     end
+
+    it "redirects to unauthorized without valid correspondence access" do
+      current_user = create(:user)
+      User.authenticate!(user: current_user)
+      get correspondence_path
+
+      expect(response.status).to eq 302
+      expect(response.body.include?("/unauthorized")).to be true
+    end
+
+    it "redirects while feature flag disabled" do
+      # redirects to unauthorized without valid correspondence access
+      FeatureToggle.disable!(:correspondence_queue)
+      current_user = create(:user)
+      User.authenticate!(user: current_user)
+      get correspondence_path
+
+      expect(response.status).to eq 302
+      expect(response.body.include?("/unauthorized")).to be true
+
+      # redirects to under_construction with valid correspondence access
+      MailTeam.singleton.add_user(current_user)
+      get correspondence_path
+
+      expect(response.status).to eq 302
+      expect(response.body.include?("/under_construction")).to be true
+    end
   end
 
   describe "correspondence_team" do
diff --git a/spec/seeds/users_spec.rb b/spec/seeds/users_spec.rb
index 9a09c31f59b..befc1fea3db 100644
--- a/spec/seeds/users_spec.rb
+++ b/spec/seeds/users_spec.rb
@@ -6,8 +6,8 @@
 
     it "creates all kinds of users and organizations" do
       expect { subject }.to_not raise_error
-      expect(User.count).to eq(134)
-      expect(Organization.count).to eq(40)
+      expect(User.count).to eq(135)
+      expect(Organization.count).to eq(41)
     end
   end
 end
diff --git a/spec/support/correspondence_helpers.rb b/spec/support/correspondence_helpers.rb
index 3106c097382..5a15cb5418e 100644
--- a/spec/support/correspondence_helpers.rb
+++ b/spec/support/correspondence_helpers.rb
@@ -33,18 +33,17 @@ def visit_intake_form_with_correspondence_load
         assigned_to: current_user,
         veteran_id: veteran.id,
         uuid: SecureRandom.uuid,
-        va_date_of_receipt: Time.zone.local(2023, 1, 1)
+        va_date_of_receipt: Time.zone.local(2023, 1, 1),
+        package_document_type: create(:package_document_type, name: "0304")
       )
     end
-    allow_any_instance_of(CorrespondenceIntakeController).to receive(:correspondence_load).and_return(Correspondence.all)
 
     visit "/queue/correspondence/#{Correspondence.first.uuid}/intake"
   end
 
   def visit_intake_form
-    setup_access
-    uuid = SecureRandom.uuid
-    visit "/queue/correspondence/#{uuid}/intake"
+    correspondence = create :correspondence
+    visit "/queue/correspondence/#{correspondence.uuid}/intake"
   end
 
   def visit_intake_form_step_2_with_appeals
@@ -64,7 +63,6 @@ def visit_intake_form_step_2_with_appeals
         va_date_of_receipt: Time.zone.local(2023, 1, 1)
       )
     end
-    allow_any_instance_of(CorrespondenceIntakeController).to receive(:correspondence_load).and_return(Correspondence.all)
 
     visit "/queue/correspondence/#{Correspondence.first.uuid}/intake"
 
@@ -85,7 +83,6 @@ def visit_intake_form_step_2_with_appeals_without_initial_tasks
         va_date_of_receipt: Time.zone.local(2023, 1, 1)
       )
     end
-    allow_any_instance_of(CorrespondenceIntakeController).to receive(:correspondence_load).and_return(Correspondence.all)
 
     visit "/queue/correspondence/#{Correspondence.first.uuid}/intake"
 
diff --git a/spec/support/database_cleaner.rb b/spec/support/database_cleaner.rb
index 8a4b2d512ef..21b2095888f 100644
--- a/spec/support/database_cleaner.rb
+++ b/spec/support/database_cleaner.rb
@@ -16,7 +16,7 @@
   config.before(:suite) do
     DatabaseCleaner[:active_record, { connection: etl }].clean_with(:truncation)
     DatabaseCleaner[:active_record, { connection: vacols }]
-      .clean_with(:deletion, except: vacols_tables_to_preserve)
+      .clean_with(:deletion, { except: vacols_tables_to_preserve })
     DatabaseCleaner[:active_record, { connection: caseflow }].clean_with(:truncation)
   end
 

From 0960bf7ab0c1ad69f823f313cf00de2148089231 Mon Sep 17 00:00:00 2001
From: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
Date: Thu, 25 Apr 2024 10:53:27 -0400
Subject: [PATCH 231/237] APPEALS-42958: Consolidated Superuser Permissions
 Check (#21454)

* consolidated backend checks to use inbound_ops_team_superuser over mail_superuser

* updated superuser namespace in the frontend
---
 app/controllers/correspondence_queue_controller.rb  |  4 ++--
 ...anization_correspondence_unassigned_tasks_tab.rb |  2 +-
 app/models/user.rb                                  |  4 ----
 .../correspondence/correspondence_cases.html.erb    |  2 +-
 .../correspondence/correspondence_team.html.erb     |  2 +-
 app/views/correspondence/review_package.html.erb    |  2 +-
 app/views/queue/index.html.erb                      |  2 +-
 client/app/queue/QueueApp.jsx                       | 13 ++++++-------
 client/app/queue/QueueTableBuilder.jsx              |  6 +++---
 .../queue/components/QueueOrganizationDropdown.jsx  |  8 ++++----
 .../queue/correspondence/CorrespondenceCases.jsx    |  4 ++--
 .../correspondence/CorrespondenceTableBuilder.jsx   |  8 ++++----
 .../review_package/CorrespondenceReviewPackage.jsx  |  4 ++--
 .../review_package/ReviewPackageCaseTitle.jsx       |  8 ++++----
 client/app/queue/uiReducer/uiActions.js             |  6 +++---
 client/app/queue/uiReducer/uiConstants.js           |  2 +-
 client/app/queue/uiReducer/uiReducer.js             |  8 ++++----
 17 files changed, 40 insertions(+), 45 deletions(-)

diff --git a/app/controllers/correspondence_queue_controller.rb b/app/controllers/correspondence_queue_controller.rb
index 36901808ef8..53a58046111 100644
--- a/app/controllers/correspondence_queue_controller.rb
+++ b/app/controllers/correspondence_queue_controller.rb
@@ -4,7 +4,7 @@ class CorrespondenceQueueController < CorrespondenceController
   def correspondence_cases
     if current_user.mail_supervisor?
       redirect_to "/queue/correspondence/team"
-    elsif current_user.mail_superuser? || current_user.mail_team_user?
+    elsif current_user.inbound_ops_team_superuser? || current_user.mail_team_user?
       intake_cancel_message(action_type) if %w[continue_later cancel_intake].include?(action_type)
       respond_to do |format|
         format.html {}
@@ -18,7 +18,7 @@ def correspondence_cases
   end
 
   def correspondence_team
-    if current_user.mail_superuser? || current_user.mail_supervisor?
+    if current_user.inbound_ops_team_superuser? || current_user.mail_supervisor?
       correspondence_team_response
     elsif current_user.mail_team_user?
       redirect_to "/queue/correspondence"
diff --git a/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb
index 7e9cf41e68c..8dd76c37642 100644
--- a/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb
+++ b/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb
@@ -31,7 +31,7 @@ def self.column_names
       Constants.QUEUE_CONFIG.COLUMNS.DAYS_WAITING_CORRESPONDENCE.name,
       Constants.QUEUE_CONFIG.COLUMNS.NOTES.name
     ]
-    columns.insert(0, Constants.QUEUE_CONFIG.COLUMNS.CHECKBOX_COLUMN.name) unless user.mail_superuser?
+    columns.insert(0, Constants.QUEUE_CONFIG.COLUMNS.CHECKBOX_COLUMN.name) unless user.inbound_ops_team_superuser?
     columns
   end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index 5df4583e737..4b30aa0c437 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -110,10 +110,6 @@ def mail_supervisor?
     organizations.include?(InboundOpsTeam.singleton)
   end
 
-  def mail_superuser?
-    organizations_users.where(admin: true, organization_id: MailTeam.singleton.id || BvaIntake.singleton.id).any?
-  end
-
   def can_assign_hearing_schedule?
     can_any_of_these_roles?(["Edit HearSched", "Build HearSched"])
   end
diff --git a/app/views/correspondence/correspondence_cases.html.erb b/app/views/correspondence/correspondence_cases.html.erb
index 79a9b07416a..6a9ce3be36c 100644
--- a/app/views/correspondence/correspondence_cases.html.erb
+++ b/app/views/correspondence/correspondence_cases.html.erb
@@ -6,7 +6,7 @@
     userCssId: current_user.css_id,
     isMailTeamUser: current_user.mail_team_user?,
     isMailSupervisor: current_user.mail_supervisor?,
-    isMailSuperUser: current_user.mail_superuser?,
+    isInboundOpsSuperuser: current_user.inbound_ops_team_superuser?,
     organizations: current_user.selectable_organizations.map {|o| o.slice(:name, :url)},
     caseSearchHomePage: case_search_home_page,
     dropdownUrls: dropdown_urls,
diff --git a/app/views/correspondence/correspondence_team.html.erb b/app/views/correspondence/correspondence_team.html.erb
index 51d203ebb99..8a533a7e12d 100644
--- a/app/views/correspondence/correspondence_team.html.erb
+++ b/app/views/correspondence/correspondence_team.html.erb
@@ -13,7 +13,7 @@
     flash: flash,
     isMailTeamUser: current_user.mail_team_user?,
     isMailSupervisor: current_user.mail_supervisor?,
-    isMailSuperUser: current_user.mail_superuser?,
+    isInboundOpsSuperuser: current_user.inbound_ops_team_superuser?,
     mailTeamUsers: @mail_team_users,
     responseType: @response_type,
     responseHeader: @response_header,
diff --git a/app/views/correspondence/review_package.html.erb b/app/views/correspondence/review_package.html.erb
index 91457dd3b06..fb1c86346d9 100644
--- a/app/views/correspondence/review_package.html.erb
+++ b/app/views/correspondence/review_package.html.erb
@@ -4,7 +4,7 @@
     userId: current_user.id,
     userRole: (current_user.vacols_roles.first || "").capitalize,
     userCssId: current_user.css_id,
-    userIsCorrespondenceSuperuser: current_user.mail_superuser?,
+    isInboundOpsSuperuser: current_user.inbound_ops_team_superuser?,
     userIsCorrespondenceSupervisor: current_user.mail_supervisor?,
     organizations: current_user.selectable_organizations.map {|o| o.slice(:name, :url)},
     caseSearchHomePage: case_search_home_page,
diff --git a/app/views/queue/index.html.erb b/app/views/queue/index.html.erb
index 59715c2aaa0..ccc1b8bd81f 100644
--- a/app/views/queue/index.html.erb
+++ b/app/views/queue/index.html.erb
@@ -23,7 +23,7 @@
     userCanViewEditNodDate: current_user.can_view_edit_nod_date?,
     isMailTeamUser: current_user.mail_team_user?,
     isMailSupervisor: current_user.mail_supervisor?,
-    isMailSuperUser: current_user.mail_superuser?,
+    isInboundOpsSuperuser: current_user.inbound_ops_team_superuser?,
     canEditCavcRemands: current_user.can_edit_cavc_remands?,
     canEditCavcDashboards: current_user.can_edit_cavc_dashboards?,
     canViewCavcDashboards: current_user.can_view_cavc_dashboards?,
diff --git a/client/app/queue/QueueApp.jsx b/client/app/queue/QueueApp.jsx
index e11106e91cf..6918821e30e 100644
--- a/client/app/queue/QueueApp.jsx
+++ b/client/app/queue/QueueApp.jsx
@@ -28,7 +28,7 @@ import {
   setOrganizations,
   setMailTeamUser,
   setMailSupervisor,
-  setMailSuperUser
+  setInboundOpsSuperUser
 } from './uiReducer/uiActions';
 
 import ScrollToTop from '../components/ScrollToTop';
@@ -134,7 +134,7 @@ class QueueApp extends React.PureComponent {
     this.props.setOrganizations(this.props.organizations);
     this.props.setMailTeamUser(this.props.isMailTeamUser);
     this.props.setMailSupervisor(this.props.isMailSupervisor);
-    this.props.setMailSuperUser(this.props.isMailSuperUser);
+    this.props.setInboundOpsSuperUser(this.props.isInboundOpsSuperuser);
     this.props.setUserIsVsoEmployee(this.props.userIsVsoEmployee);
     this.props.setUserIsCamoEmployee(this.props.userIsCamoEmployee);
     this.props.setUserIsSCTCoordinator(this.props.userIsSCTCoordinator);
@@ -643,7 +643,7 @@ class QueueApp extends React.PureComponent {
       {...props.match.params}>
       <CorrespondenceReviewPackage
         mailTeamUsers={this.props.mailTeamUsers}
-        userIsCorrespondenceSuperuser={this.props.userIsCorrespondenceSuperuser}
+        isInboundOpsSuperuser={this.props.isInboundOpsSuperuser}
         userIsCorrespondenceSupervisor={this.props.userIsCorrespondenceSupervisor}
         {...props.match.params} />
     </ReviewPackageLoadingScreen>
@@ -1534,10 +1534,10 @@ QueueApp.propTypes = {
   setOrganizations: PropTypes.func,
   setMailTeamUser: PropTypes.func,
   setMailSupervisor: PropTypes.func,
-  setMailSuperUser: PropTypes.func,
+  setInboundOpsSuperUser: PropTypes.func,
   isMailTeamUser: PropTypes.bool,
   isMailSupervisor: PropTypes.bool,
-  isMailSuperUser: PropTypes.bool,
+  isInboundOpsSuperuser: PropTypes.bool,
   mailTeamUsers: PropTypes.array,
   organizations: PropTypes.array,
   setUserIsVsoEmployee: PropTypes.func,
@@ -1558,7 +1558,6 @@ QueueApp.propTypes = {
   userCanViewEditNodDate: PropTypes.bool,
   userCanAssignHearingSchedule: PropTypes.bool,
   userIsCorrespondenceSupervisor: PropTypes.bool,
-  userIsCorrespondenceSuperuser: PropTypes.bool,
   canEditCavcRemands: PropTypes.bool,
   canEditCavcDashboards: PropTypes.bool,
   canViewCavcDashboards: PropTypes.bool,
@@ -1595,7 +1594,7 @@ const mapDispatchToProps = (dispatch) =>
       setOrganizations,
       setMailTeamUser,
       setMailSupervisor,
-      setMailSuperUser,
+      setInboundOpsSuperUser,
     },
     dispatch
   );
diff --git a/client/app/queue/QueueTableBuilder.jsx b/client/app/queue/QueueTableBuilder.jsx
index 039bfc6ea8c..5b600f4ba31 100644
--- a/client/app/queue/QueueTableBuilder.jsx
+++ b/client/app/queue/QueueTableBuilder.jsx
@@ -255,7 +255,7 @@ const QueueTableBuilder = (props) => {
     <QueueOrganizationDropdown
       isMailTeamUser={props.isMailTeamUser}
       isMailSupervisor={props.isMailSupervisor}
-      isMailSuperUser={props.isMailSuperUser}
+      isInboundOpsSuperuser={props.isInboundOpsSuperuser}
       organizations={props.organizations}
       featureToggles = {props.featureToggles}
     />
@@ -273,7 +273,7 @@ const mapStateToProps = (state) => {
     organizations: state.ui.organizations,
     isMailTeamUser: state.ui.isMailTeamUser,
     isMailSupervisor: state.ui.isMailSupervisor,
-    isMailSuperUser: state.ui.isMailSuperUser,
+    isInboundOpsSuperuser: state.ui.isInboundOpsSuperuser,
     isVhaOrg: isActiveOrganizationVHA(state),
     userCanBulkAssign: state.ui.activeOrganization.userCanBulkAssign,
     activeOrganization: state.ui.activeOrganization
@@ -283,7 +283,7 @@ const mapStateToProps = (state) => {
 QueueTableBuilder.propTypes = {
   isMailTeamUser: PropTypes.bool,
   isMailSupervisor: PropTypes.bool,
-  isMailSuperUser: PropTypes.bool,
+  isInboundOpsSuperuser: PropTypes.bool,
   organizations: PropTypes.array,
   assignedTasks: PropTypes.array,
   config: PropTypes.shape({
diff --git a/client/app/queue/components/QueueOrganizationDropdown.jsx b/client/app/queue/components/QueueOrganizationDropdown.jsx
index c80b863e7b2..263276105f0 100644
--- a/client/app/queue/components/QueueOrganizationDropdown.jsx
+++ b/client/app/queue/components/QueueOrganizationDropdown.jsx
@@ -11,14 +11,14 @@ export default class QueueOrganizationDropdown extends React.Component {
     const { organizations } = this.props;
     const { isMailTeamUser } = this.props;
     const { isMailSupervisor } = this.props;
-    const { isMailSuperUser } = this.props;
+    const { isInboundOpsSuperuser } = this.props;
     const url = window.location.pathname.split('/');
     const location = url[url.length - 1];
     const queueHref = (location === 'queue') ? '#' : '/queue';
     let correspondenceItems = {};
 
     const isMailTeamAffiliated = () => {
-      if (isMailSuperUser || isMailSupervisor || isMailTeamUser) {
+      if (isInboundOpsSuperuser || isMailSupervisor || isMailTeamUser) {
         return true;
       }
 
@@ -48,7 +48,7 @@ export default class QueueOrganizationDropdown extends React.Component {
 
     let items = [queueItem, ...organizationItems];
 
-    if (isMailSuperUser === true || isMailSupervisor === true) {
+    if (isInboundOpsSuperuser === true || isMailSupervisor === true) {
       const orgHref = '/queue/correspondence/team';
 
       correspondenceItems = {
@@ -81,7 +81,7 @@ export default class QueueOrganizationDropdown extends React.Component {
 QueueOrganizationDropdown.propTypes = {
   isMailTeamUser: PropTypes.bool,
   isMailSupervisor: PropTypes.bool,
-  isMailSuperUser: PropTypes.bool,
+  isInboundOpsSuperuser: PropTypes.bool,
   organizations: PropTypes.arrayOf(PropTypes.shape({
     name: PropTypes.string.isRequired,
     url: PropTypes.string.isRequired
diff --git a/client/app/queue/correspondence/CorrespondenceCases.jsx b/client/app/queue/correspondence/CorrespondenceCases.jsx
index 36233686d53..044941595c1 100644
--- a/client/app/queue/correspondence/CorrespondenceCases.jsx
+++ b/client/app/queue/correspondence/CorrespondenceCases.jsx
@@ -255,7 +255,7 @@ const CorrespondenceCases = (props) => {
         <CorrespondenceTableBuilder
           mailTeamUsers={props.mailTeamUsers}
           isMailTeamUser={props.isMailTeamUser}
-          isMailSuperUser={props.isMailSuperUser}
+          isInboundOpsSuperuser={props.isInboundOpsSuperuser}
           isMailSupervisor={props.isMailSupervisor} />}
         {showReassignPackageModal &&
         <Modal
@@ -312,7 +312,7 @@ CorrespondenceCases.propTypes = {
   responseMessage: PropTypes.string,
   taskIds: PropTypes.array,
   isMailTeamUser: PropTypes.bool,
-  isMailSuperUser: PropTypes.bool,
+  isInboundOpsSuperuser: PropTypes.bool,
   isMailSupervisor: PropTypes.bool,
   featureToggles: PropTypes.object
 };
diff --git a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
index ffa7a9e4413..958845a29ca 100644
--- a/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
+++ b/client/app/queue/correspondence/CorrespondenceTableBuilder.jsx
@@ -253,7 +253,7 @@ const CorrespondenceTableBuilder = (props) => {
         <>
           {/* this setup should prevent a double render of the bulk assign area if a
           user is a superuser and also a supervisor */}
-          {(props.isMailSupervisor || (props.isMailSupervisor && props.isMailSuperUser)) &&
+          {(props.isMailSupervisor || (props.isMailSupervisor && props.isInboundOpsSuperuser)) &&
             (tabConfig.name === QUEUE_CONFIG.CORRESPONDENCE_UNASSIGNED_TASKS_TAB_NAME ||
               tabConfig.name === QUEUE_CONFIG.CORRESPONDENCE_TEAM_ASSIGNED_TASKS_TAB_NAME) &&
             <>
@@ -261,7 +261,7 @@ const CorrespondenceTableBuilder = (props) => {
             </>
           }
           {
-            (props.isMailSuperUser && !props.isMailSupervisor &&
+            (props.isInboundOpsSuperuser && !props.isMailSupervisor &&
               tabConfig.name === QUEUE_CONFIG.CORRESPONDENCE_TEAM_ASSIGNED_TASKS_TAB_NAME) &&
           <>
             {getBulkAssignArea()}
@@ -328,7 +328,7 @@ const CorrespondenceTableBuilder = (props) => {
     <QueueOrganizationDropdown
       isMailTeamUser={props.isMailTeamUser}
       isMailSupervisor={props.isMailSupervisor}
-      isMailSuperUser={props.isMailSuperUser}
+      isInboundOpsSuperuser={props.isInboundOpsSuperuser}
       organizations={props.organizations}
       featureToggles={props.featureToggles}
     />
@@ -362,7 +362,7 @@ CorrespondenceTableBuilder.propTypes = {
   mailTeamUsers: PropTypes.array,
   selectedTasks: PropTypes.array,
   isMailTeamUser: PropTypes.bool,
-  isMailSuperUser: PropTypes.bool,
+  isInboundOpsSuperuser: PropTypes.bool,
   isMailSupervisor: PropTypes.bool
 };
 
diff --git a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
index 568d3e7909e..f604559a854 100644
--- a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
+++ b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
@@ -221,7 +221,7 @@ export const CorrespondenceReviewPackage = (props) => {
             isReassignPackage={isReassignPackage}
             mailTeamUsers={props.mailTeamUsers}
             userIsCorrespondenceSupervisor={props.userIsCorrespondenceSupervisor}
-            userIsCorrespondenceSuperuser={props.userIsCorrespondenceSuperuser}
+            isInboundOpsSuperuser={props.isInboundOpsSuperuser}
           />
           <ReviewPackageData
             correspondence={props.correspondence}
@@ -302,7 +302,7 @@ CorrespondenceReviewPackage.propTypes = {
   setFileNumberSearch: PropTypes.func,
   doFileNumberSearch: PropTypes.func,
   userIsCorrespondenceSupervisor: PropTypes.bool,
-  userIsCorrespondenceSuperuser: PropTypes.bool
+  isInboundOpsSuperuser: PropTypes.bool
 };
 
 const mapStateToProps = (state) => ({
diff --git a/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx b/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx
index 7cdddea965b..bcca37e0405 100644
--- a/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx
+++ b/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx
@@ -60,7 +60,7 @@ const CaseTitleScaffolding = (props) => {
         { (
           props.isReadOnly &&
           props.isReassignPackage &&
-          (props.userIsCorrespondenceSuperuser || props.userIsCorrespondenceSupervisor)) &&
+          (props.isInboundOpsSuperuser || props.userIsCorrespondenceSupervisor)) &&
           <Button
             name="Review reassign request"
             classNames={['usa-button-primary, correspondence-review-package-case-title-button-styling']}
@@ -125,7 +125,7 @@ ReviewPackageCaseTitle.propTypes = {
   isReadOnly: PropTypes.bool,
   isReassignPackage: PropTypes.bool,
   userIsCorrespondenceSupervisor: PropTypes.bool,
-  userIsCorrespondenceSuperuser: PropTypes.bool
+  isInboundOpsSuperuser: PropTypes.bool
 };
 
 CaseSubTitleScaffolding.propTypes = {
@@ -134,7 +134,7 @@ CaseSubTitleScaffolding.propTypes = {
   packageActionModal: PropTypes.string,
   isReadOnly: PropTypes.bool,
   userIsCorrespondenceSupervisor: PropTypes.bool,
-  userIsCorrespondenceSuperuser: PropTypes.bool
+  isInboundOpsSuperuser: PropTypes.bool
 };
 
 CaseTitleScaffolding.propTypes = {
@@ -144,7 +144,7 @@ CaseTitleScaffolding.propTypes = {
   isReadOnly: PropTypes.bool,
   isReassignPackage: PropTypes.bool,
   userIsCorrespondenceSupervisor: PropTypes.bool,
-  userIsCorrespondenceSuperuser: PropTypes.bool
+  isInboundOpsSuperuser: PropTypes.bool
 };
 
 export default ReviewPackageCaseTitle;
diff --git a/client/app/queue/uiReducer/uiActions.js b/client/app/queue/uiReducer/uiActions.js
index 937b7d587d0..230202d459f 100644
--- a/client/app/queue/uiReducer/uiActions.js
+++ b/client/app/queue/uiReducer/uiActions.js
@@ -230,9 +230,9 @@ export const setMailSupervisor = (isMailSupervisor) => ({
   payload: { isMailSupervisor }
 });
 
-export const setMailSuperUser = (isMailSuperUser) => ({
-  type: ACTIONS.SET_MAIL_SUPER_USER,
-  payload: { isMailSuperUser }
+export const setInboundOpsSuperUser = (isInboundOpsSuperuser) => ({
+  type: ACTIONS.SET_INBOUND_OPS_SUPERUSER,
+  payload: { isInboundOpsSuperuser }
 });
 
 export const setActiveOrganization = (id, type, name, isVso, userCanBulkAssign) => ({
diff --git a/client/app/queue/uiReducer/uiConstants.js b/client/app/queue/uiReducer/uiConstants.js
index 5fcca9b827a..2169af94d03 100644
--- a/client/app/queue/uiReducer/uiConstants.js
+++ b/client/app/queue/uiReducer/uiConstants.js
@@ -41,7 +41,7 @@ export const ACTIONS = {
   SET_ORGANIZATIONS: 'SET_ORGANIZATIONS',
   SET_MAIL_TEAM_USER: 'SET_MAIL_TEAM_USER',
   SET_MAIL_SUPERVISOR: 'SET_MAIL_SUPERVISOR',
-  SET_MAIL_SUPER_USER: 'SET_MAIL_SUPER_USER',
+  SET_INBOUND_OPS_SUPERUSER: 'SET_INBOUND_OPS_SUPERUSER',
 
   SET_CAN_EDIT_AOD: 'SET_CAN_EDIT_AOD',
   SET_CAN_EDIT_NOD_DATE: 'SET_CAN_EDIT_NOD_DATE',
diff --git a/client/app/queue/uiReducer/uiReducer.js b/client/app/queue/uiReducer/uiReducer.js
index f5c435951d6..64c6e21fbd9 100644
--- a/client/app/queue/uiReducer/uiReducer.js
+++ b/client/app/queue/uiReducer/uiReducer.js
@@ -22,7 +22,7 @@ export const initialState = {
   organizations: [],
   isMailTeamUser: false,
   isMailSupervisor: false,
-  isMailSuperUser: false,
+  isInboundOpsSuperuser: false,
   activeOrganization: {
     id: null,
     name: null,
@@ -269,10 +269,10 @@ const workQueueUiReducer = (state = initialState, action = {}) => {
         $set: action.payload.isMailSupervisor
       }
     });
-  case ACTIONS.SET_MAIL_SUPER_USER:
+  case ACTIONS.SET_INBOUND_OPS_SUPERUSER:
     return update(state, {
-      isMailSuperUser: {
-        $set: action.payload.isMailSuperUser
+      isInboundOpsSuperuser: {
+        $set: action.payload.isInboundOpsSuperuser
       }
     });
   case ACTIONS.SET_ORGANIZATIONS:

From adeecbc8b6d7ff74050805cb7b275959a2f9472d Mon Sep 17 00:00:00 2001
From: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
Date: Mon, 29 Apr 2024 11:53:57 -0400
Subject: [PATCH 232/237] APPEALS-44391: Intake Correspondence Rerouting
 (#21447)

* cleaned up magic string usage

* updated cancel routing for superusers

* fixed linting issues

* added rerouting for users that cannot access a specific intake

* updated Review Package task to be the same user that was assigned the Intake

* resolved linting issues

* updated inbound ops team superuser check

* refactored intake controller test

* refactored reassign package task specs and reassignment on cancel

* refactored task specs to be more DRY

* added intake task fix to intake_form_spec

* cleaned up test failures related to intake task within intake.

* refactored related correspondence spec tests

* updated test to click correct section

* updated failing snapshots

* fixed typo on prop validations
---
 app/controllers/appeals_controller.rb         |  2 +-
 .../correspondence_controller_concern.rb      | 12 ++-
 .../correspondence_intake_controller.rb       | 39 ++++++--
 .../correspondence_tasks_controller.rb        |  6 +-
 app/controllers/issues_controller.rb          |  2 +-
 app/jobs/ama_notification_efolder_sync_job.rb |  2 +-
 .../legacy_notification_efolder_sync_job.rb   |  2 +-
 app/models/concerns/issue_updater.rb          |  2 +-
 ...ion_correspondence_unassigned_tasks_tab.rb |  5 +-
 app/models/request_issues_update.rb           |  2 +-
 .../work_queue/appeal_search_serializer.rb    |  2 +-
 .../work_queue/appeal_serializer.rb           |  2 +-
 .../correspondence/reassign_package_task.rb   |  1 +
 .../appeal_active_task_cancellation.rb        |  2 +-
 .../intake/components/ReturnToQueueModal.jsx  |  4 +-
 .../ReviewPackageLoadingScreen.jsx            |  2 +-
 .../CaseWorkerIndex.test.js.snap              | 89 ++++++++++---------
 .../__snapshots__/QueueTable.test.js.snap     | 16 ++--
 .../correspondence_intake_controller_spec.rb  | 59 ++++++++----
 .../correspondence_queue_controller_spec.rb   |  8 +-
 ...pondence_review_package_controller_spec.rb |  4 +-
 .../add_related_correspondence_spec.rb        |  6 +-
 .../queue/correspondence/intake_form_spec.rb  | 12 ++-
 .../queue/correspondence/intake_spec.rb       | 51 ++++-------
 .../correspondence/mail_tasks_confirm_spec.rb |  4 +-
 spec/models/task_spec.rb                      | 54 +++++------
 .../correspondence_controller_spec.rb         | 42 ---------
 .../services/external_api/bgs_service_spec.rb |  4 +-
 spec/support/correspondence_helpers.rb        | 28 +++---
 29 files changed, 232 insertions(+), 232 deletions(-)

diff --git a/app/controllers/appeals_controller.rb b/app/controllers/appeals_controller.rb
index 07a9526ed8b..f71f8d1e65b 100644
--- a/app/controllers/appeals_controller.rb
+++ b/app/controllers/appeals_controller.rb
@@ -453,7 +453,7 @@ def create_legacy_issue_update_task(before_issue, current_issue)
     # close out any tasks that might be open
     open_issue_task = Task.where(
       assigned_to: SpecialIssueEditTeam.singleton
-    ).where(status: "assigned").where(appeal: appeal)
+    ).where(status: Constants.TASK_STATUSES.assigned).where(appeal: appeal)
     open_issue_task[0].delete unless open_issue_task.empty?
 
     task = IssuesUpdateTask.create!(
diff --git a/app/controllers/concerns/correspondence_controller_concern.rb b/app/controllers/concerns/correspondence_controller_concern.rb
index 6b724d70e30..3faebd77f17 100644
--- a/app/controllers/concerns/correspondence_controller_concern.rb
+++ b/app/controllers/concerns/correspondence_controller_concern.rb
@@ -20,7 +20,11 @@ def update_tasks(mail_team_user, task_ids)
     return unless @response_type == "success"
 
     tasks = Task.where(id: task_ids)
-    tasks.update_all(assigned_to_id: mail_team_user.id, assigned_to_type: "User", status: "assigned")
+    tasks.update_all(
+      assigned_to_id: mail_team_user.id,
+      assigned_to_type: "User",
+      status: Constants.TASK_STATUSES.assigned
+    )
   end
 
   def set_banner_params(user, task_count, tab)
@@ -70,10 +74,12 @@ def intake_cancel_message(action_type)
     vet = veteran_by_correspondence
     if action_type == "cancel_intake"
       @response_header = "You have successfully cancelled the intake form"
-      @response_message = "#{vet.name}'s correspondence (ID: #{correspondence.id}) has been returned to the supervisor's queue for assignment."
+      @response_message = "#{vet.name}'s correspondence (ID: #{correspondence.id}) "\
+       "has been returned to the supervisor's queue for assignment."
     else
       @response_header = "You have successfully saved the intake form"
-      @response_message = "You can continue from step three of the intake form for #{vet.name}'s correspondence (ID: #{correspondence.id}) at a later date."
+      @response_message = "You can continue from step three of the intake form for #{vet.name}'s "\
+      "correspondence (ID: #{correspondence.id}) at a later date."
     end
     @response_type = "success"
   end
diff --git a/app/controllers/correspondence_intake_controller.rb b/app/controllers/correspondence_intake_controller.rb
index 1d429b80c0c..ad01ac818b3 100644
--- a/app/controllers/correspondence_intake_controller.rb
+++ b/app/controllers/correspondence_intake_controller.rb
@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 class CorrespondenceIntakeController < CorrespondenceController
+  before_action :verify_correspondence_intake_access
   def intake
     # If correspondence intake was started, json data from the database will
     # be loaded into the page when user returns to intake
-    @redux_store ||= CorrespondenceIntake.find_by(user: current_user,
-                                                  correspondence: correspondence)&.redux_store
+    @redux_store ||= CorrespondenceIntake.find_by(correspondence: correspondence)&.redux_store
     @prior_mail = prior_mail.map do |correspondence|
       WorkQueue::CorrespondenceSerializer.new(correspondence).serializable_hash[:data][:attributes]
     end
@@ -55,13 +55,13 @@ def process_intake
 
   def cancel_intake
     begin
-      intake_task = Task.where("appeal_id = ? and appeal_type = 'Correspondence' and type = 'CorrespondenceIntakeTask'",
-                               correspondence.id).first
-      intake_task.update!(status: "cancelled")
+      # find the correspondence intake task even if it isn't assigned to the user
+      intake_task = CorrespondenceIntakeTask.open.find_by(appeal_id: correspondence.id)
+      intake_task.update!(status: Constants.TASK_STATUSES.cancelled)
       ReviewPackageTask.create!(
-        assigned_to: User.find(correspondence.assigned_by_id),
-        assigned_to_id: correspondence.assigned_by_id,
-        status: "assigned",
+        parent_id: intake_task.parent_id,
+        assigned_to: intake_task.assigned_to,
+        status: Constants.TASK_STATUSES.assigned,
         appeal_id: correspondence.id,
         appeal_type: "Correspondence"
       )
@@ -76,4 +76,27 @@ def cancel_intake
   def prior_mail
     Correspondence.prior_mail(veteran_by_correspondence.id, params[:correspondence_uuid])
   end
+
+  def verify_correspondence_intake_access
+    active_intake_task = CorrespondenceIntakeTask.open.find_by(appeal_id: correspondence.id)
+    # route if no active task
+    route_user unless active_intake_task && user_can_work_intake(active_intake_task)
+  end
+
+  # always allow supervisors and superusers to acccess intakes not assigned to them.
+  def user_can_work_intake(task)
+    (task.assigned_to == current_user) ||
+      (current_user.mail_supervisor? || current_user.inbound_ops_team_superuser?)
+  end
+
+  # redirect if no access
+  def route_user
+    if current_user.mail_team_user?
+      redirect_to "/queue/correspondence"
+    elsif current_user.inbound_ops_team_superuser? || current_user.mail_supervisor?
+      redirect_to "/queue/correspondence/team"
+    else
+      redirect_to "/unauthorized"
+    end
+  end
 end
diff --git a/app/controllers/correspondence_tasks_controller.rb b/app/controllers/correspondence_tasks_controller.rb
index 777b76e8850..636e6cc01b0 100644
--- a/app/controllers/correspondence_tasks_controller.rb
+++ b/app/controllers/correspondence_tasks_controller.rb
@@ -33,11 +33,11 @@ def create_package_action_task
   end
 
   def create_correspondence_intake_task
-    review_package_task = ReviewPackageTask.find_by(appeal_id: params[:id], type: ReviewPackageTask.name)
+    review_package_task = ReviewPackageTask.open.find_by(appeal_id: params[:id])
     return render json: { message: "Correspondence Root Task not found" }, status: :not_found unless review_package_task
 
     current_parent = review_package_task.parent
-    current_cit = CorrespondenceIntakeTask.find_by(parent_id: current_parent.id, type: CorrespondenceIntakeTask.name)
+    current_cit = CorrespondenceIntakeTask.open.find_by(parent_id: current_parent.id)
 
     if current_cit.present?
       review_package_task.update!(assigned_to: current_user)
@@ -116,7 +116,7 @@ def package_action_flash(decision, user_name)
   end
 
   def flash_error_banner(user_name)
-    operation_verb = params[:action_type] == "approve" ? "approved" : "rejected"
+    operation_verb = (params[:action_type] == "approve") ? "approved" : "rejected"
     flash[:custom_error] = {
       title: "Package request for #{user_name} could not be #{operation_verb}",
       message: "Please try again at a later time or contact the Help Desk."
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index fa6d8052b65..647cb09b7c4 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -76,7 +76,7 @@ def create_legacy_issue_update_task(issue)
     # close out any tasks that might be open
     open_issue_task = Task.where(
       assigned_to: SpecialIssueEditTeam.singleton
-    ).where(status: "assigned").where(appeal: appeal)
+    ).where(status: Constants.TASK_STATUSES.assigned).where(appeal: appeal)
     open_issue_task[0].delete unless open_issue_task.empty?
 
     task = IssuesUpdateTask.create!(
diff --git a/app/jobs/ama_notification_efolder_sync_job.rb b/app/jobs/ama_notification_efolder_sync_job.rb
index a015cdbcb3d..252ad994cdb 100644
--- a/app/jobs/ama_notification_efolder_sync_job.rb
+++ b/app/jobs/ama_notification_efolder_sync_job.rb
@@ -38,7 +38,7 @@ def appeals_recently_outcoded
     Appeal
       .where(id: RootTask.where(
         appeal_type: "Appeal",
-        status: "completed",
+        status: Constants.TASK_STATUSES.completed,
         closed_at: 1.day.ago..Time.zone.now
       )
       .pluck(:appeal_id)
diff --git a/app/jobs/legacy_notification_efolder_sync_job.rb b/app/jobs/legacy_notification_efolder_sync_job.rb
index 1aa41950469..33f0c2042e5 100644
--- a/app/jobs/legacy_notification_efolder_sync_job.rb
+++ b/app/jobs/legacy_notification_efolder_sync_job.rb
@@ -38,7 +38,7 @@ def appeals_recently_outcoded
     LegacyAppeal
       .where(id: RootTask.where(
         appeal_type: "LegacyAppeal",
-        status: "completed",
+        status: Constants.TASK_STATUSES.completed,
         closed_at: 1.day.ago..Time.zone.now
       )
       .pluck(:appeal_id)
diff --git a/app/models/concerns/issue_updater.rb b/app/models/concerns/issue_updater.rb
index 3b5347083be..0115b4edacd 100644
--- a/app/models/concerns/issue_updater.rb
+++ b/app/models/concerns/issue_updater.rb
@@ -133,7 +133,7 @@ def create_issue_update_task(original_issue, decision_issue)
     # close out any tasks that might be open
     open_issue_task = Task.where(
       assigned_to: SpecialIssueEditTeam.singleton
-    ).where(status: "assigned").where(appeal: appeal)
+    ).where(status: Constants.TASK_STATUSES.assigned).where(appeal: appeal)
     open_issue_task[0].delete unless open_issue_task.empty?
 
     task = IssuesUpdateTask.create!(
diff --git a/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb b/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb
index 8dd76c37642..ad084c92592 100644
--- a/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb
+++ b/app/models/queue_tabs/organization_correspondence_unassigned_tasks_tab.rb
@@ -18,7 +18,10 @@ def description
   end
 
   def tasks
-    CorrespondenceTask.includes(*task_includes).where(assigned_to: assignee, status: "unassigned")
+    CorrespondenceTask.includes(*task_includes).where(
+      assigned_to: assignee,
+      status: Constants.TASK_STATUSES.unassigned
+    )
   end
 
   # :reek:UtilityFunction
diff --git a/app/models/request_issues_update.rb b/app/models/request_issues_update.rb
index 5b184d11e49..b54fd8bacf0 100644
--- a/app/models/request_issues_update.rb
+++ b/app/models/request_issues_update.rb
@@ -396,7 +396,7 @@ def create_issue_update_task(change_type, before_issue, after_issue = nil)
       # close out any tasks that might be open
       open_issue_task = Task.where(
         assigned_to: SpecialIssueEditTeam.singleton
-      ).where(status: "assigned").where(appeal: before_issue.decision_review)
+      ).where(status: Constants.TASK_STATUSES.assigned).where(appeal: before_issue.decision_review)
       open_issue_task[0].delete unless open_issue_task.empty?
 
       task = IssuesUpdateTask.create!(
diff --git a/app/models/serializers/work_queue/appeal_search_serializer.rb b/app/models/serializers/work_queue/appeal_search_serializer.rb
index 987faaf4745..a1554d5686e 100644
--- a/app/models/serializers/work_queue/appeal_search_serializer.rb
+++ b/app/models/serializers/work_queue/appeal_search_serializer.rb
@@ -146,7 +146,7 @@ class WorkQueue::AppealSearchSerializer
   end
 
   attribute :evidence_submission_task do |object|
-    object.tasks.find_by(type: "EvidenceSubmissionWindowTask", status: "assigned")
+    object.tasks.find_by(type: "EvidenceSubmissionWindowTask", status: Constants.TASK_STATUSES.assigned)
   end
 
   attribute :readable_hearing_request_type, &:readable_current_hearing_request_type
diff --git a/app/models/serializers/work_queue/appeal_serializer.rb b/app/models/serializers/work_queue/appeal_serializer.rb
index 6b109ff9446..a8d611ceb5e 100644
--- a/app/models/serializers/work_queue/appeal_serializer.rb
+++ b/app/models/serializers/work_queue/appeal_serializer.rb
@@ -334,7 +334,7 @@ class WorkQueue::AppealSerializer
   end
 
   attribute :evidence_submission_task do |object|
-    object.tasks.find_by(type: "EvidenceSubmissionWindowTask", status: "assigned")
+    object.tasks.find_by(type: "EvidenceSubmissionWindowTask", status: Constants.TASK_STATUSES.assigned)
   end
 
   attribute :has_completed_sct_assign_task, &:completed_specialty_case_team_assign_task?
diff --git a/app/models/tasks/correspondence/reassign_package_task.rb b/app/models/tasks/correspondence/reassign_package_task.rb
index 8e2bc84d1d7..d4d582727fb 100644
--- a/app/models/tasks/correspondence/reassign_package_task.rb
+++ b/app/models/tasks/correspondence/reassign_package_task.rb
@@ -38,6 +38,7 @@ def reject(current_user, reason)
     )
     parent.update!(
       assigned_to_type: "User",
+      assigned_to: assigned_by,
       status: Constants.TASK_STATUSES.in_progress
     )
   end
diff --git a/app/services/appeal_active_task_cancellation.rb b/app/services/appeal_active_task_cancellation.rb
index 7d9c46defc1..0a306e939d3 100644
--- a/app/services/appeal_active_task_cancellation.rb
+++ b/app/services/appeal_active_task_cancellation.rb
@@ -29,7 +29,7 @@ def cancel_active_tasks_except_those_needed_for_distribution
   end
 
   def assign_distribution_task
-    tasks.find_by(type: "DistributionTask").update!(status: "assigned")
+    tasks.find_by(type: "DistributionTask").update!(status: Constants.TASK_STATUSES.assigned)
   end
 
   def all_tasks_except_those_needed_for_distribution
diff --git a/client/app/queue/correspondence/intake/components/ReturnToQueueModal.jsx b/client/app/queue/correspondence/intake/components/ReturnToQueueModal.jsx
index 82ada92dc77..06702a5f0c3 100644
--- a/client/app/queue/correspondence/intake/components/ReturnToQueueModal.jsx
+++ b/client/app/queue/correspondence/intake/components/ReturnToQueueModal.jsx
@@ -57,8 +57,8 @@ const ReturnToQueueModal = (props) => {
         type="info"
       />}
     </Modal>
-  )
-}
+  );
+};
 
 ReturnToQueueModal.propTypes = {
   onCancel: PropTypes.func,
diff --git a/client/app/queue/correspondence/review_package/ReviewPackageLoadingScreen.jsx b/client/app/queue/correspondence/review_package/ReviewPackageLoadingScreen.jsx
index e28fd000036..d474cec1489 100644
--- a/client/app/queue/correspondence/review_package/ReviewPackageLoadingScreen.jsx
+++ b/client/app/queue/correspondence/review_package/ReviewPackageLoadingScreen.jsx
@@ -72,7 +72,7 @@ ReviewPackageLoadingScreen.propTypes = {
   setCorrespondenceDocuments: PropTypes.func,
   setPackageDocumentType: PropTypes.func,
   setVeteranInformation: PropTypes.func,
-  settaskInstructions: PropTypes.func
+  setTaskInstructions: PropTypes.func
 };
 
 const mapDispatchToProps = (dispatch) => bindActionCreators({
diff --git a/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap b/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap
index 72a7022346d..a467c6c7045 100644
--- a/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap
+++ b/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap
@@ -14,53 +14,58 @@ exports[`CaseWorkerIndex renders correctly 1`] = `
             class="cf-push-left"
             data-css-1vh8afw=""
           >
-            <p
-              data-css-14vgq4z=""
+            <a
+              href="/dispatch/establish-claim/"
             >
-              <a
-                href="/dispatch/establish-claim/"
+              <p
+                data-css-14vgq4z=""
               >
-                <svg
-                  data-css-fu31os=""
-                  height="500px"
-                  version="1.1"
-                  viewBox="0 0 500 500"
-                  width="500px"
+                <a
+                  href="/dispatch/establish-claim/"
                 >
-                  <g
-                    fill="none"
-                    fill-rule="evenodd"
-                    stroke="none"
-                    stroke-width="1"
+                  <svg
+                    data-css-fu31os=""
+                    height="500px"
+                    version="1.1"
+                    viewBox="0 0 500 500"
+                    width="500px"
                   >
-                    <path
-                      d="M389.959839,442.284569 C383.432096,442.271612 376.963574,441.048453 370.883534,438.677355 L257.429719,394.98998 C252.590851,393.086238 247.208346,393.086238 242.369478,394.98998 L129.016064,438.677355 C106.320107,447.603374 80.4584687,439.55605 66.8674699,419.338677 C57.0515074,405.211352 54.9782782,387.116356 61.3453815,371.142285 L105.120482,258.016032 C107.028046,253.186861 107.028046,247.815143 105.120482,242.985972 L61.3453815,129.95992 C54.9782782,113.985849 57.0515074,95.8908522 66.8674699,81.7635271 C80.4584687,61.5461545 106.320107,53.4988304 129.016064,62.4248497 L242.269076,106.112224 C247.107944,108.015966 252.490449,108.015966 257.329317,106.112224 L370.783133,62.4248497 C393.47909,53.4988304 419.340728,61.5461545 432.931727,81.7635271 C442.747689,95.8908522 444.820919,113.985849 438.453815,129.95992 L394.678715,243.086172 C392.77115,247.915343 392.77115,253.287062 394.678715,258.116232 L438.453815,371.342685 C444.820919,387.316757 442.747689,405.411753 432.931727,419.539078 C423.237855,433.723837 407.164043,442.231882 389.959839,442.284569 M249.899598,362.224449 C256.353168,362.233978 262.750462,363.422577 268.7751,365.731463 L382.228916,409.418838 C384.691595,410.389201 387.312266,410.898698 389.959839,410.921844 C396.866782,410.810028 403.280763,407.328714 407.128514,401.603206 C411.093101,395.97649 411.889064,388.713698 409.236948,382.364729 L365.461847,269.138277 C360.743378,257.021258 360.743378,243.579944 365.461847,231.462926 L409.236948,118.336673 C411.813252,111.977018 411.021397,104.751703 407.128514,99.0981964 C401.695283,90.9837231 391.338118,87.7327557 382.228916,91.2825651 L268.7751,134.96994 C256.614316,139.574339 243.184881,139.574339 231.024096,134.96994 L117.771084,91.2825651 C108.661882,87.7327557 98.3047167,90.9837231 92.8714859,99.0981964 C88.9068988,104.724913 88.1109359,111.987705 90.7630522,118.336673 L134.538153,231.362725 C139.256622,243.479744 139.256622,256.921058 134.538153,269.038076 L90.7630522,382.164329 C87.7347473,389.869273 89.5592305,398.632331 95.4124457,404.495531 C101.265661,410.358732 110.039485,412.212063 117.771084,409.218437 L231.124498,365.531062 C237.149529,363.373645 243.498568,362.255472 249.899598,362.224449"
-                      fill="#D6D7D9"
-                    />
-                    <path
-                      d="M209.226908,407.765531 L179.959839,419.048096 L202.108434,468.937876 C210.52076,487.825367 229.289165,499.997401 250,499.997401 C270.710835,499.997401 289.47924,487.825367 297.891566,468.937876 L319.97992,419.088176 L290.753012,407.815631 L269.176707,456.412826 C265.803034,463.96969 258.289598,468.837793 250,468.837793 C241.710402,468.837793 234.196966,463.96969 230.823293,456.412826 L209.226908,407.765531 M378.905622,303.837675 L345.180723,318.737475 C333.273614,324.007833 323.754837,333.507534 318.473896,345.390782 L303.504016,379.108216 L332.771084,390.380762 L347.188755,357.915832 C349.28122,353.172217 353.078185,349.382861 357.831325,347.294589 L390.150602,333.006012 L378.875502,303.837675 M121.074297,303.837675 L109.789157,332.995992 L142.168675,347.294589 C146.901437,349.412477 150.689105,353.192554 152.811245,357.915832 L167.138554,390.190381 L196.405622,378.907816 L181.526104,345.390782 C176.245163,333.507534 166.726386,324.007833 154.819277,318.737475 L121.074297,303.817635 M80.9136546,180.571142 L31.124498,202.60521 C12.1990801,211.000678 0.00260459933,229.731472 0.00260459933,250.400802 C0.00260459933,271.070132 12.1990801,289.800925 31.124498,298.196393 L81.0341365,320.240481 L92.3192771,291.082164 L43.7751004,269.639279 C36.2030617,266.272366 31.3251832,258.773988 31.3251832,250.501002 C31.3251832,242.228016 36.2030617,234.729638 43.7751004,231.362725 L92.3092369,209.91984 L80.9538153,180.591182 M418.885542,180.521042 L407.540161,209.849699 L456.2249,231.362725 C463.796938,234.729638 468.674817,242.228016 468.674817,250.501002 C468.674817,258.773988 463.796938,266.272366 456.2249,269.639279 L407.46988,291.192385 L418.74498,320.360721 L468.875502,298.196393 C487.80092,289.800925 499.997395,271.070132 499.997395,250.400802 C499.997395,229.731472 487.80092,211.000678 468.875502,202.60521 L418.885542,180.561122 M167.329317,110.420842 L152.911647,142.885772 C150.819182,147.629387 147.022217,151.418742 142.269076,153.507014 L109.919679,167.795591 L121.2751,197.124248 L154.919679,182.264529 C166.826788,176.994171 176.345565,167.49447 181.626506,155.611222 L196.686747,121.723447 L167.349398,110.400802 M332.670683,110.400802 L303.323293,121.703407 L318.383534,155.641283 C323.664475,167.52453 333.183252,177.024231 345.090361,182.294589 L378.75502,197.164329 L390.100402,167.835671 L357.730924,153.507014 C352.977783,151.418742 349.180818,147.629387 347.088353,142.885772 L332.650602,110.370741 M250,1.00200401 C229.237589,0.829550704 210.38235,13.058923 202.108434,32.0641283 L179.909639,82.0541082 L209.246988,93.3767535 L230.823293,44.7895792 C234.196966,37.2327148 241.710402,32.3646117 250,32.3646117 C258.289598,32.3646117 265.803034,37.2327148 269.176707,44.7895792 L290.692771,93.2665331 L320.040161,81.9639279 L297.891566,32.0641283 C289.61765,13.058923 270.762411,0.829550704 250,1.00200401"
-                      fill="#844e9f"
-                    />
-                    <path
-                      d="M303.504016,379.108216 L290.753012,407.815631 L320.02008,419.088176 L332.771084,390.370741 L303.504016,379.098196 M196.405622,378.907816 L167.138554,390.190381 L179.949799,419.048096 L209.216867,407.765531 L196.405622,378.907816 M407.459839,291.192385 L378.865462,303.837675 L390.140562,333.006012 L418.73494,320.360721 L407.459839,291.192385 M92.3092369,291.102204 L81.0240964,320.260521 L109.789157,332.975952 L121.074297,303.817635 L92.3192771,291.102204 M390.090361,167.805611 L378.74498,197.134269 L407.540161,209.849699 L418.885542,180.521042 L390.090361,167.805611 M109.909639,167.805611 L80.9538153,180.591182 L92.3192771,209.91984 L121.285141,197.124248 L109.929719,167.795591 M179.929719,82.0541082 L167.349398,110.400802 L196.686747,121.723447 L209.267068,93.3767535 L179.929719,82.0541082 M320.060241,81.9539078 L290.692771,93.2665331 L303.303213,121.673347 L332.650602,110.370741 L320.040161,81.9639279"
-                      fill="#7a4b91"
-                    />
-                  </g>
-                </svg>
-                Caseflow
-              </a>
-              <a
-                href="/dispatch/establish-claim/"
-              >
-                <span
-                  class="cf-application-title"
-                  data-css-1mdtwij=""
-                  id="page-title"
+                    <g
+                      fill="none"
+                      fill-rule="evenodd"
+                      stroke="none"
+                      stroke-width="1"
+                    >
+                      <path
+                        d="M389.959839,442.284569 C383.432096,442.271612 376.963574,441.048453 370.883534,438.677355 L257.429719,394.98998 C252.590851,393.086238 247.208346,393.086238 242.369478,394.98998 L129.016064,438.677355 C106.320107,447.603374 80.4584687,439.55605 66.8674699,419.338677 C57.0515074,405.211352 54.9782782,387.116356 61.3453815,371.142285 L105.120482,258.016032 C107.028046,253.186861 107.028046,247.815143 105.120482,242.985972 L61.3453815,129.95992 C54.9782782,113.985849 57.0515074,95.8908522 66.8674699,81.7635271 C80.4584687,61.5461545 106.320107,53.4988304 129.016064,62.4248497 L242.269076,106.112224 C247.107944,108.015966 252.490449,108.015966 257.329317,106.112224 L370.783133,62.4248497 C393.47909,53.4988304 419.340728,61.5461545 432.931727,81.7635271 C442.747689,95.8908522 444.820919,113.985849 438.453815,129.95992 L394.678715,243.086172 C392.77115,247.915343 392.77115,253.287062 394.678715,258.116232 L438.453815,371.342685 C444.820919,387.316757 442.747689,405.411753 432.931727,419.539078 C423.237855,433.723837 407.164043,442.231882 389.959839,442.284569 M249.899598,362.224449 C256.353168,362.233978 262.750462,363.422577 268.7751,365.731463 L382.228916,409.418838 C384.691595,410.389201 387.312266,410.898698 389.959839,410.921844 C396.866782,410.810028 403.280763,407.328714 407.128514,401.603206 C411.093101,395.97649 411.889064,388.713698 409.236948,382.364729 L365.461847,269.138277 C360.743378,257.021258 360.743378,243.579944 365.461847,231.462926 L409.236948,118.336673 C411.813252,111.977018 411.021397,104.751703 407.128514,99.0981964 C401.695283,90.9837231 391.338118,87.7327557 382.228916,91.2825651 L268.7751,134.96994 C256.614316,139.574339 243.184881,139.574339 231.024096,134.96994 L117.771084,91.2825651 C108.661882,87.7327557 98.3047167,90.9837231 92.8714859,99.0981964 C88.9068988,104.724913 88.1109359,111.987705 90.7630522,118.336673 L134.538153,231.362725 C139.256622,243.479744 139.256622,256.921058 134.538153,269.038076 L90.7630522,382.164329 C87.7347473,389.869273 89.5592305,398.632331 95.4124457,404.495531 C101.265661,410.358732 110.039485,412.212063 117.771084,409.218437 L231.124498,365.531062 C237.149529,363.373645 243.498568,362.255472 249.899598,362.224449"
+                        fill="#D6D7D9"
+                      />
+                      <path
+                        d="M209.226908,407.765531 L179.959839,419.048096 L202.108434,468.937876 C210.52076,487.825367 229.289165,499.997401 250,499.997401 C270.710835,499.997401 289.47924,487.825367 297.891566,468.937876 L319.97992,419.088176 L290.753012,407.815631 L269.176707,456.412826 C265.803034,463.96969 258.289598,468.837793 250,468.837793 C241.710402,468.837793 234.196966,463.96969 230.823293,456.412826 L209.226908,407.765531 M378.905622,303.837675 L345.180723,318.737475 C333.273614,324.007833 323.754837,333.507534 318.473896,345.390782 L303.504016,379.108216 L332.771084,390.380762 L347.188755,357.915832 C349.28122,353.172217 353.078185,349.382861 357.831325,347.294589 L390.150602,333.006012 L378.875502,303.837675 M121.074297,303.837675 L109.789157,332.995992 L142.168675,347.294589 C146.901437,349.412477 150.689105,353.192554 152.811245,357.915832 L167.138554,390.190381 L196.405622,378.907816 L181.526104,345.390782 C176.245163,333.507534 166.726386,324.007833 154.819277,318.737475 L121.074297,303.817635 M80.9136546,180.571142 L31.124498,202.60521 C12.1990801,211.000678 0.00260459933,229.731472 0.00260459933,250.400802 C0.00260459933,271.070132 12.1990801,289.800925 31.124498,298.196393 L81.0341365,320.240481 L92.3192771,291.082164 L43.7751004,269.639279 C36.2030617,266.272366 31.3251832,258.773988 31.3251832,250.501002 C31.3251832,242.228016 36.2030617,234.729638 43.7751004,231.362725 L92.3092369,209.91984 L80.9538153,180.591182 M418.885542,180.521042 L407.540161,209.849699 L456.2249,231.362725 C463.796938,234.729638 468.674817,242.228016 468.674817,250.501002 C468.674817,258.773988 463.796938,266.272366 456.2249,269.639279 L407.46988,291.192385 L418.74498,320.360721 L468.875502,298.196393 C487.80092,289.800925 499.997395,271.070132 499.997395,250.400802 C499.997395,229.731472 487.80092,211.000678 468.875502,202.60521 L418.885542,180.561122 M167.329317,110.420842 L152.911647,142.885772 C150.819182,147.629387 147.022217,151.418742 142.269076,153.507014 L109.919679,167.795591 L121.2751,197.124248 L154.919679,182.264529 C166.826788,176.994171 176.345565,167.49447 181.626506,155.611222 L196.686747,121.723447 L167.349398,110.400802 M332.670683,110.400802 L303.323293,121.703407 L318.383534,155.641283 C323.664475,167.52453 333.183252,177.024231 345.090361,182.294589 L378.75502,197.164329 L390.100402,167.835671 L357.730924,153.507014 C352.977783,151.418742 349.180818,147.629387 347.088353,142.885772 L332.650602,110.370741 M250,1.00200401 C229.237589,0.829550704 210.38235,13.058923 202.108434,32.0641283 L179.909639,82.0541082 L209.246988,93.3767535 L230.823293,44.7895792 C234.196966,37.2327148 241.710402,32.3646117 250,32.3646117 C258.289598,32.3646117 265.803034,37.2327148 269.176707,44.7895792 L290.692771,93.2665331 L320.040161,81.9639279 L297.891566,32.0641283 C289.61765,13.058923 270.762411,0.829550704 250,1.00200401"
+                        fill="#844e9f"
+                      />
+                      <path
+                        d="M303.504016,379.108216 L290.753012,407.815631 L320.02008,419.088176 L332.771084,390.370741 L303.504016,379.098196 M196.405622,378.907816 L167.138554,390.190381 L179.949799,419.048096 L209.216867,407.765531 L196.405622,378.907816 M407.459839,291.192385 L378.865462,303.837675 L390.140562,333.006012 L418.73494,320.360721 L407.459839,291.192385 M92.3092369,291.102204 L81.0240964,320.260521 L109.789157,332.975952 L121.074297,303.817635 L92.3192771,291.102204 M390.090361,167.805611 L378.74498,197.134269 L407.540161,209.849699 L418.885542,180.521042 L390.090361,167.805611 M109.909639,167.805611 L80.9538153,180.591182 L92.3192771,209.91984 L121.285141,197.124248 L109.929719,167.795591 M179.929719,82.0541082 L167.349398,110.400802 L196.686747,121.723447 L209.267068,93.3767535 L179.929719,82.0541082 M320.060241,81.9539078 L290.692771,93.2665331 L303.303213,121.673347 L332.650602,110.370741 L320.040161,81.9639279"
+                        fill="#7a4b91"
+                      />
+                    </g>
+                  </svg>
+                  Caseflow
+                </a>
+                <a
+                  href="/dispatch/establish-claim/"
                 >
-                  Dispatch
-                </span>
-              </a>
-            </p>
+                  <span
+                    class="cf-application-title"
+                    data-css-1mdtwij=""
+                    id="page-title"
+                    tabindex="-1"
+                  >
+                    Dispatch
+                  </span>
+                </a>
+              </p>
+            </a>
             <div
               data-css-1mdtwij=""
             />
diff --git a/client/test/app/queue/__snapshots__/QueueTable.test.js.snap b/client/test/app/queue/__snapshots__/QueueTable.test.js.snap
index 5674c3e4876..66a6ae27b33 100644
--- a/client/test/app/queue/__snapshots__/QueueTable.test.js.snap
+++ b/client/test/app/queue/__snapshots__/QueueTable.test.js.snap
@@ -851,7 +851,7 @@ exports[`QueueTable render() Can filter rows 1`] = `
                 },
               ],
               "tasks_per_page": undefined,
-              "total_task_count": 3,
+              "total_task_count": undefined,
             },
           }
         }
@@ -1081,7 +1081,7 @@ exports[`QueueTable render() Can filter rows 1`] = `
                 },
               ],
               "tasks_per_page": undefined,
-              "total_task_count": 3,
+              "total_task_count": undefined,
             },
           }
         }
@@ -1526,7 +1526,7 @@ exports[`QueueTable render() Can sort rows 1`] = `
                 },
               ],
               "tasks_per_page": undefined,
-              "total_task_count": 3,
+              "total_task_count": undefined,
             },
           }
         }
@@ -1711,7 +1711,7 @@ exports[`QueueTable render() Can sort rows 1`] = `
                 },
               ],
               "tasks_per_page": undefined,
-              "total_task_count": 3,
+              "total_task_count": undefined,
             },
           }
         }
@@ -2054,7 +2054,7 @@ exports[`QueueTable render() Matches snapshot with default props 1`] = `
               },
             ],
             "tasks_per_page": undefined,
-            "total_task_count": 3,
+            "total_task_count": undefined,
           },
         }
       }
@@ -2204,7 +2204,7 @@ exports[`QueueTable render() Matches snapshot with default props 1`] = `
               },
             ],
             "tasks_per_page": undefined,
-            "total_task_count": 3,
+            "total_task_count": undefined,
           },
         }
       }
@@ -7328,7 +7328,7 @@ exports[`QueueTable render() Renders pagination when set 1`] = `
                 },
               ],
               "tasks_per_page": undefined,
-              "total_task_count": 20,
+              "total_task_count": undefined,
             },
           }
         }
@@ -9082,7 +9082,7 @@ exports[`QueueTable render() Renders pagination when set 1`] = `
                 },
               ],
               "tasks_per_page": undefined,
-              "total_task_count": 20,
+              "total_task_count": undefined,
             },
           }
         }
diff --git a/spec/controllers/correspondence_intake_controller_spec.rb b/spec/controllers/correspondence_intake_controller_spec.rb
index 8e123b44145..cd0029e31d8 100644
--- a/spec/controllers/correspondence_intake_controller_spec.rb
+++ b/spec/controllers/correspondence_intake_controller_spec.rb
@@ -28,6 +28,9 @@
     FeatureToggle.enable!(:correspondence_queue)
     User.authenticate!(roles: ["Mail Intake"])
     correspondence.update(veteran: veteran)
+    MailTeam.singleton.add_user(current_user)
+    User.authenticate!(user: current_user)
+    correspondence.update(veteran: veteran)
 
     allow(CorrespondenceDocumentsEfolderUploader).to receive(:new).and_return(mock_doc_uploader)
     allow(mock_doc_uploader).to receive(:upload_documents_to_claim_evidence).and_return(true)
@@ -44,11 +47,46 @@
     end
   end
 
+  describe "POST #current_step" do
+    let(:redux_store) do
+      {
+        taskRelatedAppealIds: [],
+        newAppealRelatedTasks: [],
+        fetchedAppeals: [],
+        correspondences: [],
+        radioValue: "0",
+        relatedCorrespondences: [],
+        mailTasks: {},
+        unrelatedTasks: [],
+        currentCorrespondence: {
+          id: 181,
+          veteran_id: 3909
+        },
+        veteranInformation: {
+          id: 3909
+        },
+        waivedEvidenceTasks: []
+      }.to_json
+    end
+
+    it "saves the user's current step in the intake form" do
+      current_step = 1
+      post :current_step, params: {
+        correspondence_uuid: correspondence.uuid,
+        current_step: current_step,
+        redux_store: redux_store
+      }
+
+      expect(response).to have_http_status(:success)
+
+      intake_correspondence = CorrespondenceIntake.find_by(user: current_user, correspondence: correspondence)
+      expect(intake_correspondence.current_step).to eq(current_step)
+      expect(intake_correspondence.redux_store).to eq(redux_store)
+    end
+  end
+
   describe "POST #process_intake" do
     before do
-      MailTeam.singleton.add_user(current_user)
-      User.authenticate!(user: current_user)
-      correspondence.update(veteran: veteran)
       appeal_ids = esw_tasks.map { |task| Task.find(task[:task_id]).appeal.id }
       post :process_intake, params: {
         correspondence_uuid: correspondence.uuid,
@@ -83,11 +121,6 @@
   end
 
   describe "PATCH #intake_update" do
-    before do
-      MailTeam.singleton.add_user(current_user)
-      User.authenticate!(user: current_user)
-    end
-
     it "returns 200 - happy path" do
       patch :intake_update, params: { correspondence_uuid: correspondence.uuid }
 
@@ -96,13 +129,13 @@
 
     it "cancels the task tree and returns the correspondence" do
       # initial state
-      task_statuses = correspondence.tasks.map &:status
+      task_statuses = correspondence.tasks.map(&:status)
       expect(task_statuses.any?(Constants.TASK_STATUSES.cancelled)).to eq false
 
       patch :intake_update, params: { correspondence_uuid: correspondence.uuid }
 
       # updated state after the request
-      task_statuses = correspondence.tasks.map &:status
+      task_statuses = correspondence.tasks.map(&:status)
       expect(task_statuses.all?(Constants.TASK_STATUSES.cancelled)).to eq true
 
       body = JSON.parse(response.body, symbolize_names: true)
@@ -122,12 +155,6 @@
   end
 
   describe "POST #process_intake sad path" do
-    before do
-      MailTeam.singleton.add_user(current_user)
-      User.authenticate!(user: current_user)
-      correspondence.update(veteran: veteran)
-    end
-
     it "Rolls back db changes if there is an error" do
       post :process_intake, params: {
         correspondence_uuid: correspondence.uuid,
diff --git a/spec/controllers/correspondence_queue_controller_spec.rb b/spec/controllers/correspondence_queue_controller_spec.rb
index 8f3b29e9a01..dd7f276e749 100644
--- a/spec/controllers/correspondence_queue_controller_spec.rb
+++ b/spec/controllers/correspondence_queue_controller_spec.rb
@@ -34,7 +34,7 @@
       get :correspondence_cases
 
       body = JSON.parse(response.body, symbolize_names: true)
-      expect(body.keys.include?(:correspondence_config)).to eq true
+      expect(body.key?(:correspondence_config)).to eq true
     end
   end
 
@@ -69,7 +69,8 @@
                                           user: current_user.css_id,
                                           correspondence_uuid: correspondence.uuid }
       expect(controller.view_assigns["response_header"]).to eq("You have successfully cancelled the intake form")
-      expect(controller.view_assigns["response_message"]).to eq("#{veteran.name}'s correspondence (ID: #{correspondence.id}) has been returned to the supervisor's queue for assignment.")
+      expect(controller.view_assigns["response_message"]).to eq("#{veteran.name}'s "\
+        "correspondence (ID: #{correspondence.id}) has been returned to the supervisor's queue for assignment.")
     end
 
     it "returns intake continue later response" do
@@ -77,7 +78,8 @@
                                           user: current_user.css_id,
                                           correspondence_uuid: correspondence.uuid }
       expect(controller.view_assigns["response_header"]).to eq("You have successfully saved the intake form")
-      expect(controller.view_assigns["response_message"]).to eq("You can continue from step three of the intake form for #{veteran.name}'s correspondence (ID: #{correspondence.id}) at a later date.")
+      expect(controller.view_assigns["response_message"]).to eq("You can continue from step three of the "\
+        "intake form for #{veteran.name}'s correspondence (ID: #{correspondence.id}) at a later date.")
     end
   end
 end
diff --git a/spec/controllers/correspondence_review_package_controller_spec.rb b/spec/controllers/correspondence_review_package_controller_spec.rb
index 9894f9698e8..13b7b6e29eb 100644
--- a/spec/controllers/correspondence_review_package_controller_spec.rb
+++ b/spec/controllers/correspondence_review_package_controller_spec.rb
@@ -39,7 +39,7 @@
       User.authenticate!(user: current_user)
       put :update_cmp, params: {
         correspondence_uuid: correspondence.uuid,
-        VADORDate: Time.now,
+        VADORDate: Time.zone.now,
         packageDocument: { value: "1" }
       }
     end
@@ -69,7 +69,7 @@
 
       doc_types.each do |doc_type|
         expect(doc_type).to be_a(Hash)
-        expect(doc_type.keys.include?(:name)).to eq true
+        expect(doc_type.key?(:name)).to eq true
       end
 
       names_from_db = PackageDocumentType.pluck(:name)
diff --git a/spec/feature/queue/correspondence/add_related_correspondence_spec.rb b/spec/feature/queue/correspondence/add_related_correspondence_spec.rb
index 7476ae9e84b..e8f80ef8f60 100644
--- a/spec/feature/queue/correspondence/add_related_correspondence_spec.rb
+++ b/spec/feature/queue/correspondence/add_related_correspondence_spec.rb
@@ -3,7 +3,7 @@
 RSpec.feature("Add Related Correspondence - Correspondence Intake page") do
   include CorrespondenceHelpers
 
-  let(:organization) { MailTeam.singleton }
+  let(:organization) { InboundOpsTeam.singleton }
   let(:bva_user) { User.authenticate!(roles: ["Mail Intake"]) }
 
   before(:each) do
@@ -14,7 +14,7 @@
 
   context "No related correspondence" do
     it "Displays the expected content" do
-      visit_intake_form
+      visit_intake_form_with_correspondence_load
 
       expect(page).to have_content("Add Related Correspondence")
       expect(page).to have_content("Add any related correspondence to the mail package that is in progress.")
@@ -27,7 +27,7 @@
     end
 
     it "Continue button is active" do
-      visit_intake_form
+      visit_intake_form_with_correspondence_load
 
       expect(page.has_button?("Continue")).to be(true)
     end
diff --git a/spec/feature/queue/correspondence/intake_form_spec.rb b/spec/feature/queue/correspondence/intake_form_spec.rb
index 2ee22ec4a72..c82c50c0137 100644
--- a/spec/feature/queue/correspondence/intake_form_spec.rb
+++ b/spec/feature/queue/correspondence/intake_form_spec.rb
@@ -1,11 +1,21 @@
 # frozen_string_literal: true
 
 RSpec.feature("The Correspondence Intake page") do
-  let(:organization) { MailTeam.singleton }
+  let(:organization) { InboundOpsTeam.singleton }
   let(:mail_user) { User.authenticate!(roles: ["Mail Team"]) }
   let(:correspondence) { create :correspondence }
+  let(:correspondence_intake_task) do
+    create(
+      :correspondence_intake_task,
+      appeal: correspondence,
+      appeal_type: Correspondence.name,
+      assigned_to: mail_user
+    )
+  end
 
   before do
+    # reload in case of controller validation triggers before data created
+    correspondence_intake_task.reload
     organization.add_user(mail_user)
     mail_user.reload
   end
diff --git a/spec/feature/queue/correspondence/intake_spec.rb b/spec/feature/queue/correspondence/intake_spec.rb
index 1568279bf80..13ff19862b6 100644
--- a/spec/feature/queue/correspondence/intake_spec.rb
+++ b/spec/feature/queue/correspondence/intake_spec.rb
@@ -5,9 +5,18 @@
   include CorrespondenceTaskHelpers
   alias_method :create_efolderupload_task, :create_efolderupload_failed_task
 
-  let(:organization) { MailTeam.singleton }
+  let(:organization) { InboundOpsTeam.singleton }
   let(:mail_user) { User.authenticate!(roles: ["Mail Team"]) }
   let(:unauthorized_user) { create(:user) }
+  let(:correspondence) { create :correspondence }
+  let(:correspondence_intake_task) do
+    create(
+      :correspondence_intake_task,
+      appeal: correspondence,
+      appeal_type: Correspondence.name,
+      assigned_to: mail_user
+    )
+  end
 
   context "correspondence intake form access" do
     before :each do
@@ -31,22 +40,11 @@
   before :each do
     organization.add_user(mail_user)
     mail_user.reload
+    # reload in case of controller validation triggers before data created
+    correspondence_intake_task.reload
   end
 
   context "intake form feature toggle" do
-    before :each do
-      CorrespondenceType.create!(
-        name: "a correspondence type"
-      )
-      PackageDocumentType.create!
-      create(
-        :correspondence,
-        uuid: SecureRandom.uuid,
-        va_date_of_receipt: Time.zone.local(2023, 1, 1)
-      )
-      @correspondence_uuid = Correspondence.first.uuid
-    end
-
     it "routes user to /under_construction if the feature toggle is disabled" do
       FeatureToggle.disable!(:correspondence_queue)
       User.authenticate!(user: mail_user)
@@ -127,18 +125,7 @@
 
   context "The mail team user is able to add unrelated tasks" do
     before :each do
-      FeatureToggle.enable!(:correspondence_queue)
-      CorrespondenceType.create!(
-        name: "a correspondence type"
-      )
-      create(
-        :correspondence,
-        uuid: SecureRandom.uuid,
-        va_date_of_receipt: Time.zone.local(2023, 1, 1)
-      )
-
-      @correspondence_uuid = Correspondence.first.uuid
-      visit "/queue/correspondence/#{@correspondence_uuid}/intake"
+      setup_and_visit_intake
       click_on("button-continue")
     end
 
@@ -240,14 +227,7 @@
     end
 
     before :each do
-      FeatureToggle.enable!(:correspondence_queue)
-      create(
-        :correspondence,
-        uuid: SecureRandom.uuid,
-        va_date_of_receipt: Time.zone.local(2023, 1, 1)
-      )
-      @correspondence_uuid = Correspondence.first.uuid
-      visit "/queue/correspondence/#{@correspondence_uuid}/intake"
+      setup_and_visit_intake
       click_on("button-continue")
       click_on("+ Add tasks")
     end
@@ -360,6 +340,7 @@
 
       correspondence = create(:correspondence)
       create_correspondence_intake(correspondence, current_user)
+      correspondence.tasks.find_by(type: CorrespondenceIntakeTask.name).reload
     end
 
     it "successfully loads the in progress tab" do
@@ -387,7 +368,7 @@
   context "checks for failed to upload to the eFolder banner after navigating away from page" do
     let(:current_user) { create(:user) }
     before do
-      MailTeam.singleton.add_user(current_user)
+      InboundOpsTeam.singleton.add_user(current_user)
       User.authenticate!(user: current_user)
       FeatureToggle.enable!(:correspondence_queue)
 
diff --git a/spec/feature/queue/correspondence/mail_tasks_confirm_spec.rb b/spec/feature/queue/correspondence/mail_tasks_confirm_spec.rb
index 1de96986969..cc2483e008c 100644
--- a/spec/feature/queue/correspondence/mail_tasks_confirm_spec.rb
+++ b/spec/feature/queue/correspondence/mail_tasks_confirm_spec.rb
@@ -2,7 +2,7 @@
 
 RSpec.feature("The Correspondence Intake page") do
   include CorrespondenceHelpers
-  let(:organization) { MailTeam.singleton }
+  let(:organization) { InboundOpsTeam.singleton }
   let(:mail_user) { User.authenticate!(roles: ["Mail Team"]) }
 
   before do
@@ -56,7 +56,7 @@
       expect(page).to have_text("Completed Mail Tasks")
       expect(page).to have_text("Change of address")
       expect(page).to have_button("Edit Section")
-      all("div > span > button > span", text: "Edit Section")[1].click
+      all("div > span > button > span", text: "Edit Section")[2].click
       expect(page).to have_text("Mail Tasks")
       checkbox = all("#mail-tasks-left .cf-form-checkbox")[0]
       checkbox_input = checkbox.find('input[name="Change of address"]', visible: :all)
diff --git a/spec/models/task_spec.rb b/spec/models/task_spec.rb
index 5c5a39d84ef..7c9409046e2 100644
--- a/spec/models/task_spec.rb
+++ b/spec/models/task_spec.rb
@@ -2068,18 +2068,22 @@ def next_assignee(_options = {})
     end
 
     context "package action tasks" do
+      let(:correspondence) { create(:correspondence) }
+      let(:user) { create(:user) }
+      let(:user2) { create(:user) }
+
       describe "reassign package tasks" do
-        it "approve" do
-          correspondence = create(:correspondence)
-          user = create(:user)
-          user2 = create(:user)
-          reassign_pt = ReassignPackageTask.create!(
-            parent_id: ReviewPackageTask.find_by(appeal_id: correspondence.id).id,
+        let(:reassign_pt) do
+          ReassignPackageTask.create!(
+            parent_id: correspondence.review_package_task.id,
             appeal_id: correspondence&.id,
             appeal_type: Correspondence.name,
-            assigned_to: InboundOpsTeam.singleton
+            assigned_to: InboundOpsTeam.singleton,
+            assigned_by: user2
           )
+        end
 
+        it "approve" do
           expect(reassign_pt.status).to eq Constants.TASK_STATUSES.assigned
           expect(reassign_pt.closed_at).to eq nil
           expect(reassign_pt.completed_by).to eq nil
@@ -2102,15 +2106,6 @@ def next_assignee(_options = {})
         end
 
         it "reject" do
-          correspondence = create(:correspondence)
-          user = create(:user)
-          reassign_pt = ReassignPackageTask.create!(
-            parent_id: ReviewPackageTask.find_by(appeal_id: correspondence.id).id,
-            appeal_id: correspondence&.id,
-            appeal_type: Correspondence.name,
-            assigned_to: InboundOpsTeam.singleton
-          )
-
           expect(reassign_pt.status).to eq Constants.TASK_STATUSES.assigned
           expect(reassign_pt.closed_at).to eq nil
           expect(reassign_pt.completed_by).to eq nil
@@ -2131,17 +2126,17 @@ def next_assignee(_options = {})
       end
 
       describe "remove package tasks" do
-        it "approve" do
-          correspondence = create(:correspondence)
-          user = create(:user)
-
-          remove_pt = RemovePackageTask.create!(
-            parent_id: ReviewPackageTask.find_by(appeal_id: correspondence.id).id,
+        let(:remove_pt) do
+          RemovePackageTask.create!(
+            parent_id: correspondence.review_package_task.id,
             appeal_id: correspondence&.id,
             appeal_type: Correspondence.name,
-            assigned_to: InboundOpsTeam.singleton
+            assigned_to: InboundOpsTeam.singleton,
+            assigned_by: user2
           )
+        end
 
+        it "approve" do
           expect(remove_pt.completed_by_id).to eq nil
           expect(remove_pt.status).to eq Constants.TASK_STATUSES.assigned
 
@@ -2151,16 +2146,6 @@ def next_assignee(_options = {})
         end
 
         it "reject" do
-          correspondence = create(:correspondence)
-          user = create(:user)
-
-          remove_pt = RemovePackageTask.create!(
-            parent_id: ReviewPackageTask.find_by(appeal_id: correspondence.id).id,
-            appeal_id: correspondence&.id,
-            appeal_type: Correspondence.name,
-            assigned_to: InboundOpsTeam.singleton
-          )
-
           expect(remove_pt.completed_by_id).to eq nil
           expect(remove_pt.closed_at).to eq nil
           expect(remove_pt.status).to eq Constants.TASK_STATUSES.assigned
@@ -2177,9 +2162,10 @@ def next_assignee(_options = {})
           expect(remove_pt.parent.status).to eq Constants.TASK_STATUSES.in_progress
         end
       end
+
       it "verifies no other open package action task on correspondence before creation" do
         correspondence = create(:correspondence)
-        parent_task = ReviewPackageTask.find_by(appeal_id: correspondence.id)
+        parent_task = correspondence.review_package_task
         reassign_pt = ReassignPackageTask.create!(
           parent_id: parent_task&.id,
           appeal_id: correspondence&.id,
diff --git a/spec/requests/correspondence_controller_spec.rb b/spec/requests/correspondence_controller_spec.rb
index b026bb6d07d..d6a9f4d5ede 100644
--- a/spec/requests/correspondence_controller_spec.rb
+++ b/spec/requests/correspondence_controller_spec.rb
@@ -20,48 +20,6 @@
     allow(mock_doc_uploader).to receive(:upload_documents_to_claim_evidence).and_return(true)
   end
 
-  describe "#current_step" do
-    let(:redux_store) do
-      {
-        taskRelatedAppealIds: [],
-        newAppealRelatedTasks: [],
-        fetchedAppeals: [],
-        correspondences: [],
-        radioValue: "0",
-        relatedCorrespondences: [],
-        mailTasks: {},
-        unrelatedTasks: [],
-        currentCorrespondence: {
-          id: 181,
-          veteran_id: 3909
-        },
-        veteranInformation: {
-          id: 3909
-        },
-        waivedEvidenceTasks: []
-      }.to_json
-    end
-
-    it "saves the user's current step in the intake form" do
-      current_step = 1
-      correspondence = create(
-        :correspondence
-      )
-
-      post queue_correspondence_intake_current_step_path(correspondence_uuid: correspondence.uuid), params: {
-        correspondence_uuid: correspondence.uuid,
-        current_step: current_step,
-        redux_store: redux_store
-      }
-
-      expect(response).to have_http_status(:success)
-
-      intake_correspondence = CorrespondenceIntake.find_by(user: current_user, correspondence: correspondence)
-      expect(intake_correspondence.current_step).to eq(current_step)
-      expect(intake_correspondence.redux_store).to eq(redux_store)
-    end
-  end
-
   describe "correspondence_cases" do
     before do
       get correspondence_path, as: :json
diff --git a/spec/services/external_api/bgs_service_spec.rb b/spec/services/external_api/bgs_service_spec.rb
index 2ba1d99019f..3e45f544d07 100644
--- a/spec/services/external_api/bgs_service_spec.rb
+++ b/spec/services/external_api/bgs_service_spec.rb
@@ -37,7 +37,7 @@
       expect(bgs).to receive(:get_participant_id_for_user).with(user).and_return(participant_id)
       expect(bgs_client).to receive(:security).and_return(bgs_security_service)
       expect(bgs_security_service).to receive(:find_person_scrty_log_by_ptcpnt_id)
-        .with(participant_id).and_return({ scrty_level_type_cd: "#{sensitivity_level}" })
+        .with(participant_id).and_return({ scrty_level_type_cd: sensitivity_level.to_s })
 
       expect(bgs.sensitivity_level_for_user(user)).to eq(sensitivity_level)
 
@@ -57,7 +57,7 @@
 
       expect(bgs_client).to receive(:security).and_return(bgs_security_service)
       expect(bgs_security_service).to receive(:find_sensitivity_level_by_participant_id)
-        .with(veteran.participant_id).and_return({ scrty_level_type_cd: "#{sensitivity_level}" })
+        .with(veteran.participant_id).and_return({ scrty_level_type_cd: sensitivity_level.to_s })
 
       expect(bgs.sensitivity_level_for_veteran(veteran)).to eq(sensitivity_level)
 
diff --git a/spec/support/correspondence_helpers.rb b/spec/support/correspondence_helpers.rb
index 5a15cb5418e..a4d31fddf6c 100644
--- a/spec/support/correspondence_helpers.rb
+++ b/spec/support/correspondence_helpers.rb
@@ -37,13 +37,7 @@ def visit_intake_form_with_correspondence_load
         package_document_type: create(:package_document_type, name: "0304")
       )
     end
-
-    visit "/queue/correspondence/#{Correspondence.first.uuid}/intake"
-  end
-
-  def visit_intake_form
-    correspondence = create :correspondence
-    visit "/queue/correspondence/#{correspondence.uuid}/intake"
+    find_and_route_to_intake
   end
 
   def visit_intake_form_step_2_with_appeals
@@ -63,9 +57,7 @@ def visit_intake_form_step_2_with_appeals
         va_date_of_receipt: Time.zone.local(2023, 1, 1)
       )
     end
-
-    visit "/queue/correspondence/#{Correspondence.first.uuid}/intake"
-
+    find_and_route_to_intake
     click_button("Continue")
   end
 
@@ -83,9 +75,7 @@ def visit_intake_form_step_2_with_appeals_without_initial_tasks
         va_date_of_receipt: Time.zone.local(2023, 1, 1)
       )
     end
-
-    visit "/queue/correspondence/#{Correspondence.first.uuid}/intake"
-
+    find_and_route_to_intake
     click_button("Continue")
   end
 
@@ -94,10 +84,11 @@ def visit_intake_form_step_3_with_tasks_unrelated
     create(
       :correspondence,
       :with_correspondence_intake_task,
+      assigned_to: current_user,
       uuid: SecureRandom.uuid,
       va_date_of_receipt: Time.zone.local(2023, 1, 1)
     )
-    visit "/queue/correspondence/#{Correspondence.first.uuid}/intake"
+    find_and_route_to_intake
 
     click_button("Continue")
     click_button("+ Add tasks")
@@ -132,7 +123,7 @@ def active_evidence_submissions_tasks
       appeal = create(:appeal, veteran_file_number: veteran.file_number)
       InitialTasksFactory.new(appeal).create_root_and_sub_tasks!
     end
-    visit "/queue/correspondence/#{Correspondence.first.uuid}/intake"
+    find_and_route_to_intake
     click_button("Continue")
   end
 
@@ -145,6 +136,7 @@ def setup_and_visit_intake
       va_date_of_receipt: Time.zone.local(2023, 1, 1)
     )
     @correspondence_uuid = Correspondence.first.uuid
+    correspondence.tasks.find_by(type: CorrespondenceIntakeTask.name).reload
     visit "/queue/correspondence/#{@correspondence_uuid}/intake"
   end
 
@@ -153,5 +145,11 @@ def seed_autotext_table
     Dir[Rails.root.join("db/seeds/*.rb")].sort.each { |f| require f }
     Seeds::CorrespondenceAutoTexts.new.seed!
   end
+
+  def find_and_route_to_intake
+    correspondence = Correspondence.first
+    correspondence.tasks.find_by(type: CorrespondenceIntakeTask.name).reload
+    visit "/queue/correspondence/#{correspondence.uuid}/intake"
+  end
   # rubocop:enable Metrics/ModuleLength
 end

From 62c09247d5a11a85238a26875fa471ba992abe17 Mon Sep 17 00:00:00 2001
From: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
Date: Mon, 29 Apr 2024 14:29:39 -0400
Subject: [PATCH 233/237] added prop to hide dropdown if review package has an
 efolder failed task (#21497)

---
 .../CorrespondenceReviewPackage.jsx               | 15 +++++++++++++++
 .../review_package/ReviewPackageCaseTitle.jsx     |  3 ++-
 .../queue/correspondence/review_package/utils.js  |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
index f604559a854..ed437f76c4f 100644
--- a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
+++ b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
@@ -40,6 +40,7 @@ export const CorrespondenceReviewPackage = (props) => {
   const [selectedId, setSelectedId] = useState(0);
   const [isReadOnly, setIsReadOnly] = useState(false);
   const [isReassignPackage, setIsReassignPackage] = useState(false);
+  const [isEfolderUploadFailedTask, setIsEfolderUploadFailedTask] = useState(true);
   const [reviewPackageDetails, setReviewPackageDetails] = useState({
     veteranName: '',
     taskId: [],
@@ -81,6 +82,15 @@ export const CorrespondenceReviewPackage = (props) => {
       );
     };
 
+    const hasEfolderUploadTask = (tasks) => {
+      const existEfolderUploadTask = tasks.find((task) => task.status === 'in_progress' &&
+      task.type === 'EfolderUploadFailedTask');
+
+      if (existEfolderUploadTask) {
+        setIsEfolderUploadFailedTask(false);
+      }
+    };
+
     try {
       const response = await ApiUtil.get(
         `/queue/correspondence/${correspondence.correspondence_uuid}`
@@ -89,6 +99,8 @@ export const CorrespondenceReviewPackage = (props) => {
       setApiResponse(response.body.general_information);
       const data = response.body.general_information;
 
+      hasEfolderUploadTask(data.correspondence_tasks);
+
       if (response.body.efolder_upload_failed_before.length > 0) {
         setBannerInformation({
           title: CORRESPONDENCE_DOC_UPLOAD_FAILED_HEADER,
@@ -96,6 +108,7 @@ export const CorrespondenceReviewPackage = (props) => {
           bannerType: 'error'
         });
       }
+
       setReviewDetails({
         veteran_name: data.veteran_name || {},
         dropdown_values: data.correspondence_types || [],
@@ -121,6 +134,7 @@ export const CorrespondenceReviewPackage = (props) => {
         });
         setIsReadOnly(true);
       }
+
       if (hasAssignedReassignPackageTask(data.correspondence_tasks)) {
         setBannerInformation({
           title: CORRESPONDENCE_READONLY_BANNER_HEADER,
@@ -214,6 +228,7 @@ export const CorrespondenceReviewPackage = (props) => {
         <AppSegment filledBackground>
           <ReviewPackageCaseTitle
             reviewDetails={reviewPackageDetails}
+            efolder={isEfolderUploadFailedTask}
             handlePackageActionModal={handlePackageActionModal}
             correspondence={props.correspondence}
             packageActionModal={packageActionModal}
diff --git a/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx b/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx
index bcca37e0405..58ee205d2f6 100644
--- a/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx
+++ b/client/app/queue/correspondence/review_package/ReviewPackageCaseTitle.jsx
@@ -98,7 +98,7 @@ const CaseSubTitleScaffolding = (props) => (
       {COPY.CORRESPONDENCE_REVIEW_PACKAGE_SUB_TITLE}
     </div>
     <div className="correspondence-drop-down-div">
-      { !props.isReadOnly &&
+      { (!props.isReadOnly && props.efolder) &&
       <SearchableDropdown
         options={[
           { value: 'splitPackage', label: 'Split package' },
@@ -133,6 +133,7 @@ CaseSubTitleScaffolding.propTypes = {
   mailTeamUsers: PropTypes.array,
   packageActionModal: PropTypes.string,
   isReadOnly: PropTypes.bool,
+  efolder: PropTypes.bool,
   userIsCorrespondenceSupervisor: PropTypes.bool,
   isInboundOpsSuperuser: PropTypes.bool
 };
diff --git a/client/app/queue/correspondence/review_package/utils.js b/client/app/queue/correspondence/review_package/utils.js
index fbe1709b96d..9d770f97ef1 100644
--- a/client/app/queue/correspondence/review_package/utils.js
+++ b/client/app/queue/correspondence/review_package/utils.js
@@ -89,7 +89,7 @@ export const getPackageActionColumns = (dropdownType) => {
                 {`${vaDate}`}
               </p>
             </span>
-          )
+          );
         }
       }
     );

From 864c7fbd1bbcd8cce0caba82dd9ade9b41415050 Mon Sep 17 00:00:00 2001
From: Ki Mau <ki.mau@va.gov>
Date: Tue, 30 Apr 2024 14:38:47 -0400
Subject: [PATCH 234/237] Ki/APPEALS-41707 - Intake: Update and remove fields
 (#21473)

* APPEALS-41707 - Functionality and some CSS

* APPEALS-41707 - Updates

* APPEALS-41707 - Unrelated Specs and Correspondence CSS Lint fixes

* APPEALS-41707 - Additional Linting

* APPEALS-41707 - More Clean up
---
 .../AddCorrespondenceView.jsx                 |  17 --
 .../CorrespondenceDetailsTable.jsx            |  32 +--
 .../intake/components/ReturnToQueueModal.jsx  |   7 +-
 .../ReviewPackageLoadingScreen.jsx            |   2 +-
 client/app/styles/queue/_correspondence.scss  | 196 ++++++++++--------
 .../add_related_correspondence_spec.rb        |   1 -
 .../queue/correspondence/intake_spec.rb       |  14 +-
 .../correspondence/mail_tasks_confirm_spec.rb |   2 +-
 8 files changed, 129 insertions(+), 142 deletions(-)

diff --git a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx
index 6f1c39a6fc4..c867c2f4971 100644
--- a/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx
+++ b/client/app/queue/correspondence/intake/components/AddCorrespondence/AddCorrespondenceView.jsx
@@ -23,7 +23,6 @@ class AddCorrespondenceView extends React.Component {
     this.state = {
       veteranId: '',
       vaDateOfReceipt: '',
-      sourceType: '',
       packageDocumentType: '',
       correspondenceType: '',
       notes: '',
@@ -92,22 +91,6 @@ class AddCorrespondenceView extends React.Component {
           );
         }
       },
-      {
-        cellClass: 'source-type-column',
-        ariaLabel: 'source-type-header-label',
-        header: (
-          <div id="source-type-header">
-            <span id="source-type-header-label" className="table-header-label">
-              Source Type
-            </span>
-          </div>
-        ),
-        valueFunction: () => (
-          <span className="va-source-type-item">
-            <p>{correspondence.sourceType}</p>
-          </span>
-        )
-      },
       {
         cellClass: 'package-document-type-column',
         ariaLabel: 'package-document-type-header-label',
diff --git a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/CorrespondenceDetailsTable.jsx b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/CorrespondenceDetailsTable.jsx
index 8120ba3cce5..546efa9c703 100644
--- a/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/CorrespondenceDetailsTable.jsx
+++ b/client/app/queue/correspondence/intake/components/ConfirmCorrespondence/CorrespondenceDetailsTable.jsx
@@ -10,36 +10,24 @@ export const CorrespondenceDetailsTable = (props) => {
       <table className="corr-table-borderless">
         <tbody>
           <tr>
-            <th><strong>Portal Entry Date</strong></th>
-            <th><strong>Source Type</strong></th>
-            <th><strong>Package Document Type</strong></th>
-            <th><strong>CM Packet Number</strong></th>
-            <th><strong>CMP Queue Name</strong></th>
+            <th className="corr-table-borderless-first-item"><strong>Package Document Type</strong></th>
             <th><strong>VA DOR</strong></th>
+            <th><strong>Veteran</strong></th>
+            <th className="corr-table-borderless-last-item"><strong>Correspondence Type</strong></th>
           </tr>
           <tr>
-            <td>{moment(props.correspondence.portalEntryDate).format('MM/DD/YYYY')}</td>
-            <td>{props.correspondence.sourceType}</td>
-            <td>{props.correspondence.packageDocumentType}</td>
-            <td>{props.correspondence.cmpPacketNumber}</td>
-            <td>{props.correspondence.cmpQueueId}</td>
+            <td className="corr-table-borderless-first-item">{props.correspondence.packageDocumentType}</td>
             <td>{moment(props.correspondence.vaDateOfReceipt).format('MM/DD/YYYY')}</td>
+            <td>{props.correspondence.veteranFullName} ({props.correspondence.veteranFileNumber})</td>
+            <td className="corr-table-borderless-last-item">{props.correspondence.correspondenceType}</td>
           </tr>
           <tr>
-            <th colSpan={2}><strong>Veteran</strong></th>
-            <th><strong>Correspondence Type</strong></th>
+            <th colSpan={6} className="corr-table-borderless-first-item corr-table-borderless-last-item">
+              <strong>Notes</strong></th>
           </tr>
           <tr>
-            <td colSpan={2}>
-              {props.correspondence.veteranFullName} ({props.correspondence.veteranFileNumber})
-            </td>
-            <td>{props.correspondence.correspondenceType}</td>
-          </tr>
-          <tr>
-            <th colSpan={6}><strong>Notes</strong></th>
-          </tr>
-          <tr>
-            <td colSpan={6}>{props.correspondence.notes}</td>
+            <td colSpan={6} className="corr-table-borderless-first-item corr-table-borderless-last-item">
+              {props.correspondence.notes}</td>
           </tr>
         </tbody>
       </table>
diff --git a/client/app/queue/correspondence/intake/components/ReturnToQueueModal.jsx b/client/app/queue/correspondence/intake/components/ReturnToQueueModal.jsx
index 82ada92dc77..acdb57f10c7 100644
--- a/client/app/queue/correspondence/intake/components/ReturnToQueueModal.jsx
+++ b/client/app/queue/correspondence/intake/components/ReturnToQueueModal.jsx
@@ -53,12 +53,13 @@ const ReturnToQueueModal = (props) => {
         vertical
       />
       {selectedRadio === 'continue_later' && <Alert
-        message="Saving the intake form to continue it at a later date will resume the intake form at step three of the process."
+        message="Saving the intake form to continue it at a later date will
+         resume the intake form at step three of the process."
         type="info"
       />}
     </Modal>
-  )
-}
+  );
+};
 
 ReturnToQueueModal.propTypes = {
   onCancel: PropTypes.func,
diff --git a/client/app/queue/correspondence/review_package/ReviewPackageLoadingScreen.jsx b/client/app/queue/correspondence/review_package/ReviewPackageLoadingScreen.jsx
index e28fd000036..d474cec1489 100644
--- a/client/app/queue/correspondence/review_package/ReviewPackageLoadingScreen.jsx
+++ b/client/app/queue/correspondence/review_package/ReviewPackageLoadingScreen.jsx
@@ -72,7 +72,7 @@ ReviewPackageLoadingScreen.propTypes = {
   setCorrespondenceDocuments: PropTypes.func,
   setPackageDocumentType: PropTypes.func,
   setVeteranInformation: PropTypes.func,
-  settaskInstructions: PropTypes.func
+  setTaskInstructions: PropTypes.func
 };
 
 const mapDispatchToProps = (dispatch) => bindActionCreators({
diff --git a/client/app/styles/queue/_correspondence.scss b/client/app/styles/queue/_correspondence.scss
index ecd4808eb76..935780e269d 100644
--- a/client/app/styles/queue/_correspondence.scss
+++ b/client/app/styles/queue/_correspondence.scss
@@ -162,31 +162,46 @@ $translate: 11%;
     td {
       border: 0;
       background-color: $caseflow-background;
-      padding-top: 2rem;
       padding-bottom: 0;
     }
 
+    th {
+      width: 25%;
+    }
+
     td {
       margin: 2px;
       padding-top: 0;
       padding-bottom: 25px;
-      }
+      width: 25%;
+    }
+
+    .corr-table-borderless-first-item {
+      padding-left: 30px;
+    }
+
+    .corr-table-borderless-last-item {
+      padding-right: 30px;
+    }
   }
 
 }
 
-.a-r-h1{
-  margin-bottom: 20px
+.a-r-h1 {
+  margin-bottom: 20px;
 }
-.a-r-p1{
-  margin-top: 0px
+
+.a-r-p1 {
+  margin-top: 0;
 }
-.a-r-h2{
-  margin: 30px auto 20px auto
+
+.a-r-h2 {
+  margin: 30px auto 20px;
 }
-.a-r-p2{
-  margin-top: 0px;
-  margin-bottom: -7px
+
+.a-r-p2 {
+  margin-top: 0;
+  margin-bottom: -7px;
 }
 
 .correspondence-doctype-edit-dropdown .cf-select .cf-select__control {
@@ -194,8 +209,9 @@ $translate: 11%;
 }
 
 .cmp-document-border {
-  border: 1px solid #dee2e6
+  border: 1px solid #dee2e6;
 }
+
 .cmp-document-pagination-style {
   margin-top: 2%;
   margin-left: 1.5%;
@@ -203,16 +219,16 @@ $translate: 11%;
 
 .correspondence-document-table-data-filled {
   background: #0071bc;
-  color: white;
+  color: #ffffff;
 }
 
 .correspondence-document-table-data-empty {
-  background: white;
+  background: #ffffff;
   color: #0071bc;
 }
 
 .correspondence-intake-appeal-button {
-  margin-right: 2rem !important
+  margin-right: 2rem !important;
 }
 
 .main-div-review-form {
@@ -234,7 +250,7 @@ $translate: 11%;
   gap: 12%;
 
   @media (max-width: 600px) {
-    width: 100%
+    width: 100%;
   }
 }
 
@@ -244,12 +260,13 @@ $translate: 11%;
   flex-direction: column;
 
   @media (max-width: 600px) {
-    width: '100%'
+    width: '100%';
   }
 }
 
 .veternal-file-styling-review-form {
   width: 40%;
+
   @media (max-width: 1081px) {
     width: 100%;
   }
@@ -258,6 +275,7 @@ $translate: 11%;
 .error-veternal-file-styling-review-form {
   width: 48%;
   margin-top: -6.4rem;
+
   @media (max-width: 1599px) {
     width: 58%;
   }
@@ -265,6 +283,7 @@ $translate: 11%;
 
 .veternal-name-styling-review-form {
   width: 60%;
+
   @media (max-width: 1081px) {
     width: 100%;
   }
@@ -273,6 +292,7 @@ $translate: 11%;
 .input-styling-review-form {
   display: flex;
   gap: 5%;
+
   @media (max-width: 1081px) {
     flex-direction: column;
   }
@@ -293,13 +313,13 @@ $translate: 11%;
 .review-form-title-style {
   display: flex;
   gap: 20px;
-  margin-top: 20px
+  margin-top: 20px;
 }
 
-.correspondence-case-title-header-containing-div-styling{
+.correspondence-case-title-header-containing-div-styling {
   display: block;
   // Offsets the padding from .cf-app-segment--alt to make the bottom border full width.
-  margin: -2rem -4rem 0 -4rem;
+  margin: -2rem -4rem 0;
   padding: 0 0 1.5rem 4rem;
 
   & > * {
@@ -308,37 +328,37 @@ $translate: 11%;
   }
 }
 
-.correspondence-review-package-case-title-header-styling{
+.correspondence-review-package-case-title-header-styling {
   padding-right: 2.5rem;
 }
 
-.correspondence-review-package-case-title-remove-button{
+.correspondence-review-package-case-title-remove-button {
   float: right !important;
   margin-right: 2rem !important;
 }
 
-.correspondence-review-package-case-title-button-styling{
+.correspondence-review-package-case-title-button-styling {
   margin-right: 2rem !important;
   padding: 15px;
   font-size: larger;
 }
 
-.correspondence-list-styling{
+.correspondence-list-styling {
   list-style-type: none;
   vertical-align: super;
-  padding: 0 0 4rem 0;
+  padding: 0 0 4rem;
   display: flex;
   flex-wrap: wrap;
 }
 
-.correspondence-column-styling{
+.correspondence-column-styling {
   flex-basis: 0;
   -webkit-box-flex: 1;
   -ms-flex-positive: 1;
   flex-grow: 1;
 }
 
-.correspondence-drop-down-div{
+.correspondence-drop-down-div {
   margin-top: -10px;
   flex-basis: 0;
   -webkit-box-flex: 1;
@@ -348,36 +368,40 @@ $translate: 11%;
 }
 
 // PDF Document Viewer is 800px wide or less.
-.correspondence-pdf-tool-bar{
-
+.correspondence-pdf-tool-bar {
   width: 33%;
 
-  &.toolbar-left{
+  &.toolbar-left {
+
     @media(max-width: 1165px) {
       width: 18%;
     }
-
   }
-  &.toolbar-center{
+
+  &.toolbar-center {
+
     @media(max-width: 1165px) {
       width: 18%;
     }
-
   }
-  &.toolbar-right{
+
+  &.toolbar-right {
     text-align: right;
-    @media(max-width: 1165px){
+
+    @media(max-width: 1165px) {
       width: 44%;
-        & .cf-pdf-button-text { display: none } }
+      & .cf-pdf-button-text { display: none; } }
   }
 }
 
-.correspondence-rp-list-item-styling{
+.correspondence-rp-list-item-styling {
   display: inline-block;
   padding: 0.5rem 1.5rem 0.5rem 0;
+
   & > * {
-    padding-right: 1.5rem
+    padding-right: 1.5rem;
   }
+
   & > p {
     font-weight: bold;
     font-size: 17px;
@@ -386,57 +410,57 @@ $translate: 11%;
     color: #323a45;
     line-height: 1.3;
   }
-  & > div { min-height: '22px' }
+
+  & > div { min-height: '22px'; }
 }
 
-.correspondence-rp-h2-right-style{
+.correspondence-rp-h2-right-style {
   margin-right: 20px;
 }
 
-.correspondence-rp-outer-div-style{
+.correspondence-rp-outer-div-style {
   display: inline-flex;
-
 }
+
 .add-related-correspondence {
   border: 2px solid $color-gray-lighter;
-
-    margin-bottom: 5rem;
-    padding: 3rem 4rem
-
+  margin-bottom: 5rem;
+  padding: 3rem 4rem;
 }
 
-.modal-fwb{
-  font-weight: bold
+.modal-fwb {
+  font-weight: bold;
 }
 
-.associated-prior-mail-empty{
+.associated-prior-mail-empty {
   margin-bottom: 150px;
-  font-weight: bold
+  font-weight: bold;
 }
 
 
 .table-latitude {
   width: 100%;
   padding-top: 1px;
-  margin: 0px;
+  margin: 0;
 
   thead {
-      th {
-          padding-inline-end: 15px;
-          padding-top: 10px;
-      }
+    th {
+      padding-inline-end: 15px;
+      padding-top: 10px;
+    }
   }
+
   tbody {
-      tr {
-          td {
-              padding-left: 15px;
-              background-color: #f9f9f9;
-              border-bottom: none;
-              border-color: #d6d7d9;
-              padding-top: 0vh;
-              padding-bottom: 0vh;
-          }
+    tr {
+      td {
+        padding-left: 15px;
+        background-color: $caseflow-background;
+        border-bottom: none;
+        border-color: #d6d7d9;
+        padding-top: 0;
+        padding-bottom: 0;
       }
+    }
   }
 }
 
@@ -447,23 +471,23 @@ $translate: 11%;
 
 .completed-mail-tasks {
   border-bottom: 1px solid #d6d7d9;
-  padding-left: 0px;
+  padding-left: 0;
   padding-bottom: 10px;
   padding-top: 10px;
   margin-bottom: 10px;
   list-style-type: none;
 
-  &:last-child{
+  &:last-child {
     border: none;
   }
 }
 
 .somthing-new {
-  padding-bottom: 0px;
-  padding-top: 0px;
+  padding-bottom: 0;
+  padding-top: 0;
   width: 100%;
 
-  &:first-child{
+  &:first-child {
     padding-top: 5px;
   }
 }
@@ -471,31 +495,25 @@ $translate: 11%;
 .completed-mail-tasks-title {
 
   border-bottom: 1px solid #d6d7d9;
-  padding: 10px 0px;
+  padding: 10px 0;
   margin-bottom: 20px;
   font-weight: bold;
 }
 
 .review-and-confirm-title-div-style {
 
-  background-color: #f9f9f9;
-  padding: 20px;
-}
-
-.review-and-confirm-title-div-style {
-
-  background-color: #f9f9f9;
+  background-color: $caseflow-background;
   padding: 20px;
 }
 
 .review-and-confirm-title-div-color {
 
-  background-color: #f9f9f9;
+  background-color: $caseflow-background;
 }
 
 .correspondence-table-builder-margin {
-  margin-bottom: 0rem;
-  margin-top: 0px;
+  margin-bottom: 0;
+  margin-top: 0;
 }
 
 .correspondence-table-builder-filter-style {
@@ -510,11 +528,11 @@ $translate: 11%;
 }
 
 .correspondence-table-builder-searchable-button-position {
-  margin-left: 2rem
+  margin-left: 2rem;
 }
 
 .correspondence-table-builder-searchable-auto-assign-button-position {
-  margin-left: auto
+  margin-left: auto;
 }
 
 .correspondence-table-builder-searchable-dropdown-style .cf-select .cf-select__value-container {
@@ -527,10 +545,10 @@ $translate: 11%;
 
 .correspondence-table-builder-filter-bar-position {
   display: flex;
-  flex-direction: row
+  flex-direction: row;
 }
 
-.checkbox-modal-style .cf-modal-body{
+.checkbox-modal-style .cf-modal-body {
   width: 50%;
   min-width: 750px;
 }
@@ -538,18 +556,14 @@ $translate: 11%;
 .checkbox-modal-size {
   display: flex;
   flex-direction: column;
-  overflow-y:  scroll;
+  overflow-y: scroll;
   max-height: 400px;
-  padding-left: 1%;
-  margin-left: 100px;
-  padding-right: 10px;
-  padding-top: 0%;
+  padding: 0% 10px 1%;
   width: 73%;
   overflow-x: hidden;
   transform: scale(1.3);
   translate: 0%;
-  margin-top: 80px;
-  margin-bottom: 50px;
+  margin: 80px auto 50px 100px;
 }
 
 .confirm-correspondence-view-border {
diff --git a/spec/feature/queue/correspondence/add_related_correspondence_spec.rb b/spec/feature/queue/correspondence/add_related_correspondence_spec.rb
index 7476ae9e84b..88d7f19deed 100644
--- a/spec/feature/queue/correspondence/add_related_correspondence_spec.rb
+++ b/spec/feature/queue/correspondence/add_related_correspondence_spec.rb
@@ -76,7 +76,6 @@
         associate_with_prior_mail_radio_options[:yes].click
 
         expect(page).to have_content("VA DOR")
-        expect(page).to have_content("Source Type")
         expect(page).to have_content("Package Document Type")
         expect(page).to have_content("Correspondence Type")
         expect(page).to have_content("Notes")
diff --git a/spec/feature/queue/correspondence/intake_spec.rb b/spec/feature/queue/correspondence/intake_spec.rb
index 1568279bf80..69d02a3a2ec 100644
--- a/spec/feature/queue/correspondence/intake_spec.rb
+++ b/spec/feature/queue/correspondence/intake_spec.rb
@@ -218,7 +218,7 @@
         visit_intake_form_step_3_with_tasks_unrelated
 
         expect(page).to have_content("Tasks not related to an Appeal")
-        expect(all("button > span", text: "Edit Section").length).to eq(4)
+        expect(all("button > span", text: "Edit Section").length).to eq(5)
         expect(page).to have_content("Tasks")
         expect(page).to have_content("Task Instructions or Context")
         expect(page).to have_content("CAVC Correspondence")
@@ -227,7 +227,7 @@
 
       it "Edit section link returns user to Tasks not related to an Appeal on Step 2" do
         visit_intake_form_step_3_with_tasks_unrelated
-        all("button > span", text: "Edit Section")[1].click
+        all("button > span", text: "Edit Section")[2].click
         expect(page).to have_content("Review Tasks & Appeals")
         expect(page).to have_content("Tasks not related to an Appeal")
       end
@@ -265,7 +265,7 @@
         expect(page).to have_text("Cancel")
       end
       find_by_id("Add-autotext-button-id-0").click
-      cancel_count = all("#button-Cancel").length
+      cancel_count = all("#button-Return-to-queue").length
       expect(cancel_count).to eq 1
     end
 
@@ -274,8 +274,8 @@
       within find_by_id("autotextModal") do
         expect(page).to have_text("Cancel")
       end
-      find_by_id("Add-autotext-button-id-close").click
-      cancel_count = all("#button-Cancel").length
+      find(".cf-icon-close").click
+      cancel_count = all("#button-Return-to-queue").length
       expect(cancel_count).to eq 1
     end
 
@@ -374,7 +374,7 @@
       click_on("button-continue")
       intake_path = current_path
       click_on("button-Return-to-queue")
-      page.all(".cf-form-radio-option")[3].click
+      page.all(".cf-form-radio-option")[1].click
       click_on("Return-To-Queue-button-id-1")
       expect(page).to have_content("You have successfully saved the intake form")
       visit "/queue/correspondence?tab=correspondence_in_progress"
@@ -416,6 +416,8 @@
       expect(page).to have_content("The correspondence's documents have failed to upload to the eFolder")
       intake_path = current_path
       click_on("button-Return-to-queue")
+      page.all(".cf-form-radio-option")[1].click
+      click_on("Return-To-Queue-button-id-1")
       visit intake_path
       expect(page).to have_content("The correspondence's documents have failed to upload to the eFolder")
     end
diff --git a/spec/feature/queue/correspondence/mail_tasks_confirm_spec.rb b/spec/feature/queue/correspondence/mail_tasks_confirm_spec.rb
index 1de96986969..85fa54e7592 100644
--- a/spec/feature/queue/correspondence/mail_tasks_confirm_spec.rb
+++ b/spec/feature/queue/correspondence/mail_tasks_confirm_spec.rb
@@ -56,7 +56,7 @@
       expect(page).to have_text("Completed Mail Tasks")
       expect(page).to have_text("Change of address")
       expect(page).to have_button("Edit Section")
-      all("div > span > button > span", text: "Edit Section")[1].click
+      all("div > span > button > span", text: "Edit Section")[2].click
       expect(page).to have_text("Mail Tasks")
       checkbox = all("#mail-tasks-left .cf-form-checkbox")[0]
       checkbox_input = checkbox.find('input[name="Change of address"]', visible: :all)

From 3e45809d8b1fdcd263f2031cad5f2834b61d781d Mon Sep 17 00:00:00 2001
From: HunJerBAH <99915461+HunJerBAH@users.noreply.github.com>
Date: Tue, 30 Apr 2024 14:50:22 -0400
Subject: [PATCH 235/237] APPEALS-44390: Soft Delete Correspondence Intake
 (#21508)

* added migrations to refactor correspondence intake relationship to task instead of user/correspondence

* updated model relations and controller check for an open intake

* updated specs to reflect code changes.

* removed leftover pry
---
 .../correspondence_intake_controller.rb       | 10 ++--
 app/models/correspondence.rb                  |  4 ++
 app/models/correspondence_intake.rb           | 11 +++--
 ...10_add_task_id_to_correspondence_intake.rb |  5 ++
 ...ex_on_task_id_to_correspondence_intakes.rb |  5 ++
 ...ove_indexes_from_correspondence_intakes.rb |  6 +++
 ...and_user_id_from_correspondence_intakes.rb |  8 +++
 db/schema.rb                                  | 11 ++---
 .../correspondence_intake_controller_spec.rb  |  5 +-
 .../correspondence/intake_form_persistence.rb | 49 -------------------
 .../intake_form_persistence_spec.rb           | 49 +++++++++++++++++++
 spec/models/correspondence_intake_spec.rb     | 40 ++++++---------
 12 files changed, 112 insertions(+), 91 deletions(-)
 create mode 100644 db/migrate/20240429195710_add_task_id_to_correspondence_intake.rb
 create mode 100644 db/migrate/20240429195848_add_index_on_task_id_to_correspondence_intakes.rb
 create mode 100644 db/migrate/20240429200105_remove_indexes_from_correspondence_intakes.rb
 create mode 100644 db/migrate/20240429200120_remove_correspondence_id_and_user_id_from_correspondence_intakes.rb
 delete mode 100644 spec/feature/queue/correspondence/intake_form_persistence.rb
 create mode 100644 spec/feature/queue/correspondence/intake_form_persistence_spec.rb

diff --git a/app/controllers/correspondence_intake_controller.rb b/app/controllers/correspondence_intake_controller.rb
index ad01ac818b3..63e52308e64 100644
--- a/app/controllers/correspondence_intake_controller.rb
+++ b/app/controllers/correspondence_intake_controller.rb
@@ -5,7 +5,9 @@ class CorrespondenceIntakeController < CorrespondenceController
   def intake
     # If correspondence intake was started, json data from the database will
     # be loaded into the page when user returns to intake
-    @redux_store ||= CorrespondenceIntake.find_by(correspondence: correspondence)&.redux_store
+    @redux_store ||= CorrespondenceIntake.find_by(
+      task: correspondence&.open_intake_task
+    )&.redux_store
     @prior_mail = prior_mail.map do |correspondence|
       WorkQueue::CorrespondenceSerializer.new(correspondence).serializable_hash[:data][:attributes]
     end
@@ -15,8 +17,8 @@ def intake
   end
 
   def current_step
-    intake = CorrespondenceIntake.find_by(user: current_user, correspondence: correspondence) ||
-             CorrespondenceIntake.new(user: current_user, correspondence: correspondence)
+    intake = CorrespondenceIntake.find_by(task: correspondence&.open_intake_task) ||
+             CorrespondenceIntake.new(task: correspondence&.open_intake_task)
 
     intake.update(
       current_step: params[:current_step],
@@ -58,7 +60,7 @@ def cancel_intake
       # find the correspondence intake task even if it isn't assigned to the user
       intake_task = CorrespondenceIntakeTask.open.find_by(appeal_id: correspondence.id)
       intake_task.update!(status: Constants.TASK_STATUSES.cancelled)
-      ReviewPackageTask.create!(
+      ReviewPackageTask.find_or_create_by!(
         parent_id: intake_task.parent_id,
         assigned_to: intake_task.assigned_to,
         status: Constants.TASK_STATUSES.assigned,
diff --git a/app/models/correspondence.rb b/app/models/correspondence.rb
index 56d8353ba89..e5bb2c0d265 100644
--- a/app/models/correspondence.rb
+++ b/app/models/correspondence.rb
@@ -41,6 +41,10 @@ def review_package_task
     Task.find_by(appeal_id: id, appeal_type: type, type: ReviewPackageTask.name)
   end
 
+  def open_intake_task
+    CorrespondenceIntakeTask.open.find_by(appeal_id: id)
+  end
+
   def root_task
     Task.find_by(appeal_id: id, appeal_type: type, type: CorrespondenceRootTask.name)
   end
diff --git a/app/models/correspondence_intake.rb b/app/models/correspondence_intake.rb
index a8c42d85430..7e1ee50a6af 100644
--- a/app/models/correspondence_intake.rb
+++ b/app/models/correspondence_intake.rb
@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 
 class CorrespondenceIntake < ApplicationRecord
-  belongs_to :correspondence
-  belongs_to :user
+  belongs_to :task
 
-  validates :correspondence_id, presence: true
-  validates :user_id, presence: true
+  validates :task_id, presence: true
+  validate :task_type_is_correct, on: :create
+
+  def task_type_is_correct
+    errors.add(:task, "Must be CorrespondenceIntakeTask") unless task&.type == CorrespondenceIntakeTask.name
+  end
 end
diff --git a/db/migrate/20240429195710_add_task_id_to_correspondence_intake.rb b/db/migrate/20240429195710_add_task_id_to_correspondence_intake.rb
new file mode 100644
index 00000000000..f6ce5923265
--- /dev/null
+++ b/db/migrate/20240429195710_add_task_id_to_correspondence_intake.rb
@@ -0,0 +1,5 @@
+class AddTaskIdToCorrespondenceIntake < ActiveRecord::Migration[6.0]
+  def change
+    add_reference :correspondence_intakes, :task, foreign_key: true, index: false
+  end
+end
diff --git a/db/migrate/20240429195848_add_index_on_task_id_to_correspondence_intakes.rb b/db/migrate/20240429195848_add_index_on_task_id_to_correspondence_intakes.rb
new file mode 100644
index 00000000000..796b3b3c3fe
--- /dev/null
+++ b/db/migrate/20240429195848_add_index_on_task_id_to_correspondence_intakes.rb
@@ -0,0 +1,5 @@
+class AddIndexOnTaskIdToCorrespondenceIntakes < Caseflow::Migration
+  def change
+    add_safe_index :correspondence_intakes, [:task_id], name: "index on task_id"
+  end
+end
diff --git a/db/migrate/20240429200105_remove_indexes_from_correspondence_intakes.rb b/db/migrate/20240429200105_remove_indexes_from_correspondence_intakes.rb
new file mode 100644
index 00000000000..288eb61714b
--- /dev/null
+++ b/db/migrate/20240429200105_remove_indexes_from_correspondence_intakes.rb
@@ -0,0 +1,6 @@
+class RemoveIndexesFromCorrespondenceIntakes < ActiveRecord::Migration[6.0]
+  def change
+    remove_index :correspondence_intakes, column: "user_id", name: "index_on_user_id"
+    remove_index :correspondence_intakes, column: "correspondence_id", name: "index_on_correspondence_id"
+  end
+end
diff --git a/db/migrate/20240429200120_remove_correspondence_id_and_user_id_from_correspondence_intakes.rb b/db/migrate/20240429200120_remove_correspondence_id_and_user_id_from_correspondence_intakes.rb
new file mode 100644
index 00000000000..2add0d93a9e
--- /dev/null
+++ b/db/migrate/20240429200120_remove_correspondence_id_and_user_id_from_correspondence_intakes.rb
@@ -0,0 +1,8 @@
+class RemoveCorrespondenceIdAndUserIdFromCorrespondenceIntakes < ActiveRecord::Migration[6.0]
+  def change
+    safety_assured do
+      remove_reference :correspondence_intakes, :correspondence, foreign_key: true, index: false
+      remove_reference :correspondence_intakes, :user, foreign_key: true, index: false
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 86bb704f991..6fb216135dc 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2024_04_03_160601) do
+ActiveRecord::Schema.define(version: 2024_04_29_200120) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -672,14 +672,12 @@
   end
 
   create_table "correspondence_intakes", force: :cascade do |t|
-    t.bigint "correspondence_id", comment: "Foreign key on correspondences table"
     t.datetime "created_at", null: false
     t.integer "current_step", null: false, comment: "Tracks users progress on intake workflow"
     t.jsonb "redux_store", null: false, comment: "JSON representation of the data for the current step"
+    t.bigint "task_id"
     t.datetime "updated_at", null: false
-    t.bigint "user_id", comment: "Foreign key on users table"
-    t.index ["correspondence_id"], name: "index_on_correspondence_id"
-    t.index ["user_id"], name: "index_on_user_id"
+    t.index ["task_id"], name: "index on task_id"
   end
 
   create_table "correspondence_relations", force: :cascade do |t|
@@ -2415,8 +2413,7 @@
   add_foreign_key "correspondence_appeals", "appeals"
   add_foreign_key "correspondence_appeals", "correspondences"
   add_foreign_key "correspondence_documents", "correspondences"
-  add_foreign_key "correspondence_intakes", "correspondences"
-  add_foreign_key "correspondence_intakes", "users"
+  add_foreign_key "correspondence_intakes", "tasks"
   add_foreign_key "correspondence_relations", "correspondences"
   add_foreign_key "correspondence_relations", "correspondences", column: "related_correspondence_id"
   add_foreign_key "correspondences", "correspondence_types"
diff --git a/spec/controllers/correspondence_intake_controller_spec.rb b/spec/controllers/correspondence_intake_controller_spec.rb
index cd0029e31d8..7d42d051e14 100644
--- a/spec/controllers/correspondence_intake_controller_spec.rb
+++ b/spec/controllers/correspondence_intake_controller_spec.rb
@@ -71,6 +71,9 @@
 
     it "saves the user's current step in the intake form" do
       current_step = 1
+      correspondence = create(:correspondence)
+      CorrespondenceIntakeTask.create_from_params(correspondence&.root_task, current_user)
+
       post :current_step, params: {
         correspondence_uuid: correspondence.uuid,
         current_step: current_step,
@@ -79,7 +82,7 @@
 
       expect(response).to have_http_status(:success)
 
-      intake_correspondence = CorrespondenceIntake.find_by(user: current_user, correspondence: correspondence)
+      intake_correspondence = CorrespondenceIntake.find_by(task: correspondence&.open_intake_task)
       expect(intake_correspondence.current_step).to eq(current_step)
       expect(intake_correspondence.redux_store).to eq(redux_store)
     end
diff --git a/spec/feature/queue/correspondence/intake_form_persistence.rb b/spec/feature/queue/correspondence/intake_form_persistence.rb
deleted file mode 100644
index 6ee5a6bef3e..00000000000
--- a/spec/feature/queue/correspondence/intake_form_persistence.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.feature("Persistence of the intake correspondence page") do
-  let(:veteran) { create(:veteran, last_name: "Smith", file_number: "12345678") }
-  let(:correspondence) { create(:correspondence, veteran_id: veteran.id, uuid: SecureRandom.uuid) }
-  let(:current_user) { create(:intake_user) }
-
-  subject(:visit_intake_page) { visit queue_correspondence_intake_path(correspondence_uuid: correspondence.uuid) }
-
-  before do
-    FeatureToggle.enable!(:correspondence_queue)
-    MailTeam.singleton.add_user(current_user)
-    User.authenticate!(user: current_user)
-  end
-
-  context "step 1" do
-    it "creates a correspondence_intake record on page load" do
-      expect { visit_intake_page }.to change(CorrespondenceIntake, :count).by(1)
-
-      expect(CorrespondenceIntake.find_by(user: current_user, correspondence: correspondence).current_step).to eq(1)
-      expect(CorrespondenceIntake.find_by(user: current_user, correspondence: correspondence).redux_store).not_to be_nil
-    end
-  end
-
-  context "step 2" do
-    it "updates the correspondence_intake record when visiting step 2" do
-      visit_intake_page
-      click_button("Continue")
-
-      expect(page).to have_content("Continue")
-
-      expect(CorrespondenceIntake.find_by(user: current_user, correspondence: correspondence).current_step).to eq(2)
-      expect(CorrespondenceIntake.find_by(user: current_user, correspondence: correspondence).redux_store).not_to be_nil
-    end
-  end
-
-  context "step 3" do
-    it "updates the correspondence_intake record when visiting step 3" do
-      visit_intake_page
-      click_button("Continue")
-      click_button("Continue")
-
-      expect(page).to have_content("Submit")
-
-      expect(CorrespondenceIntake.find_by(user: current_user, correspondence: correspondence).current_step).to eq(3)
-      expect(CorrespondenceIntake.find_by(user: current_user, correspondence: correspondence).redux_store).not_to be_nil
-    end
-  end
-end
diff --git a/spec/feature/queue/correspondence/intake_form_persistence_spec.rb b/spec/feature/queue/correspondence/intake_form_persistence_spec.rb
new file mode 100644
index 00000000000..1f3bac8cdcc
--- /dev/null
+++ b/spec/feature/queue/correspondence/intake_form_persistence_spec.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+RSpec.feature("Persistence of the intake correspondence page") do
+  include CorrespondenceHelpers
+  let(:current_user) { create(:intake_user) }
+
+  before do
+    FeatureToggle.enable!(:correspondence_queue)
+    InboundOpsTeam.singleton.add_user(current_user)
+    User.authenticate!(user: current_user)
+    # CorrespondenceIntakeTask.create_from_params(correspondence&.root_task, current_user)
+  end
+
+  context "step 1" do
+    # current behavior is that the CorrespondenceIntake is created on step 2 of the form
+    # unskip this test when the workflow is updated.
+    xit "creates a correspondence_intake record on page load" do
+      expect { visit_intake_form_with_correspondence_load }.to change(CorrespondenceIntake, :count).by(1)
+
+      expect(CorrespondenceIntake.find_by(task: correspondence&.open_intake_task)).to eq(1)
+      expect(CorrespondenceIntake.find_by(task: correspondence&.open_intake_task).redux_store).not_to be_nil
+    end
+  end
+
+  context "step 2" do
+    it "updates the correspondence_intake record when visiting step 2" do
+      visit_intake_form_step_2_with_appeals
+      correspondence = Correspondence.first
+      expect(page).to have_content("Continue")
+
+      expect(CorrespondenceIntake.find_by(task: correspondence&.open_intake_task).current_step).to eq(2)
+      expect(CorrespondenceIntake.find_by(task: correspondence&.open_intake_task).redux_store).not_to be_nil
+    end
+  end
+
+  context "step 3" do
+    it "updates the correspondence_intake record when visiting step 3" do
+      visit_intake_form_step_2_with_appeals
+      correspondence = Correspondence.first
+
+      click_button("Continue")
+
+      expect(page).to have_content("Submit")
+
+      expect(CorrespondenceIntake.find_by(task: correspondence&.open_intake_task).current_step).to eq(3)
+      expect(CorrespondenceIntake.find_by(task: correspondence&.open_intake_task).redux_store).not_to be_nil
+    end
+  end
+end
diff --git a/spec/models/correspondence_intake_spec.rb b/spec/models/correspondence_intake_spec.rb
index 8ea7f73120c..3fc745c78eb 100644
--- a/spec/models/correspondence_intake_spec.rb
+++ b/spec/models/correspondence_intake_spec.rb
@@ -2,8 +2,7 @@
 
 RSpec.describe CorrespondenceIntake, type: :model do
   describe "relationships" do
-    it { CorrespondenceIntake.reflect_on_association(:correspondence).macro.should eq(:belongs_to) }
-    it { CorrespondenceIntake.reflect_on_association(:user).macro.should eq(:belongs_to) }
+    it { CorrespondenceIntake.reflect_on_association(:task).macro.should eq(:belongs_to) }
   end
 
   describe "Record entry" do
@@ -15,39 +14,28 @@
 
       FactoryBot.create(:veteran)
     end
+
     it "can be created" do
-      user = User.create!(css_id: "User", station_id: "1")
-      correspondence = Correspondence.create!(
-        updated_by_id: User.first.id,
-        correspondence_type: CorrespondenceType.first,
-        assigned_by_id: User.first.id,
-        veteran_id: Veteran.first.id,
-        package_document_type: PackageDocumentType.first
-      )
+      correspondence = create(:correspondence)
+      task = CorrespondenceIntakeTask.create_from_params(correspondence&.root_task, create(:user))
       subject = CorrespondenceIntake.create!(
-        correspondence_id: correspondence.id,
-        user_id: user.id,
+        task_id: task.id,
         current_step: 1,
-        redux_store: 1
+        redux_store: {}
       )
 
       expect(subject).to be_a(CorrespondenceIntake)
     end
 
-    it "validates :correspondence_id and :user_id" do
-      user = User.create!(css_id: "User", station_id: "1")
-      correspondence = Correspondence.create!(
-        updated_by_id: User.first.id,
-        correspondence_type: CorrespondenceType.first,
-        assigned_by_id: User.first.id,
-        veteran_id: Veteran.first.id,
-        package_document_type: PackageDocumentType.first
-      )
-
+    it "validates :task_id" do
       expect { CorrespondenceIntake.create! }.to raise_error(ActiveRecord::RecordInvalid)
-      expect { CorrespondenceIntake.create!(correspondence_id: correspondence.id) }
-        .to raise_error(ActiveRecord::RecordInvalid)
-      expect { CorrespondenceIntake.create!(user_id: user.id) }.to raise_error(ActiveRecord::RecordInvalid)
+    end
+
+    it "validates that the associated task is a CorrespondenceIntakeTask" do
+      correspondence = create(:correspondence)
+      task = correspondence&.root_task
+
+      expect { CorrespondenceIntake.create!(task_id: task.id).to raise_error(ActiveRecord::RecordInvalid) }
     end
   end
 end

From 876b84eb95169a25cafce37533477bcfeeb1829a Mon Sep 17 00:00:00 2001
From: vinner57 <128258952+vinner57@users.noreply.github.com>
Date: Thu, 2 May 2024 09:28:48 -0400
Subject: [PATCH 236/237] APPEALS-42281 - displaying NOD of correspondence in
 review package page

---
 app/models/correspondence_document.rb          | 12 ++++++++++++
 .../CorrespondenceReviewPackage.jsx            |  6 ++++--
 .../review_package/ReviewForm.jsx              | 11 ++++++++---
 spec/models/correspondence_document_spec.rb    | 18 ++++++++++++++++++
 4 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/app/models/correspondence_document.rb b/app/models/correspondence_document.rb
index 1389f8b3755..d7a3e571de0 100644
--- a/app/models/correspondence_document.rb
+++ b/app/models/correspondence_document.rb
@@ -4,6 +4,9 @@ class CorrespondenceDocument < CaseflowRecord
   belongs_to :correspondence
   belongs_to :vbms_document_type
 
+  # callbacks
+  after_update :update_correspondence_nod
+
   def pdf_name
     "#{uuid}.pdf"
   end
@@ -31,4 +34,13 @@ def claim_evidence_upload_hash
       }
     }
   end
+
+  def update_correspondence_nod
+    documents = correspondence.correspondence_documents
+    nod = documents.any? { |doc| Caseflow::DocumentTypes::TYPES[doc["vbms_document_type_id"]].include?("10182") }
+    correspondence.update!(
+      nod: nod,
+      updated_by_id: RequestStore.store[:current_user].id
+    )
+  end
 end
diff --git a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
index 568d3e7909e..b95d62b7a8c 100644
--- a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
+++ b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx
@@ -87,7 +87,8 @@ export const CorrespondenceReviewPackage = (props) => {
       );
 
       setApiResponse(response.body.general_information);
-      const data = response.body.general_information;
+      const body = response.body;
+      const data = body.general_information;
 
       if (response.body.efolder_upload_failed_before.length > 0) {
         setBannerInformation({
@@ -99,7 +100,8 @@ export const CorrespondenceReviewPackage = (props) => {
       setReviewDetails({
         veteran_name: data.veteran_name || {},
         dropdown_values: data.correspondence_types || [],
-        correspondence_type_id: data.correspondence_type_id
+        correspondence_type_id: data.correspondence_type_id,
+        nod: body.correspondence.nod
       });
 
       setReviewPackageDetails((prev) => {
diff --git a/client/app/queue/correspondence/review_package/ReviewForm.jsx b/client/app/queue/correspondence/review_package/ReviewForm.jsx
index c5a84bf2cda..be269a6604d 100644
--- a/client/app/queue/correspondence/review_package/ReviewForm.jsx
+++ b/client/app/queue/correspondence/review_package/ReviewForm.jsx
@@ -146,10 +146,16 @@ export const ReviewForm = (props) => {
                   useAriaLabel
                 />
               </div>
-
             </div>
             <div className= "tag-styling-review-form">
-
+              <TextField
+                name="correspondence-package-document-type"
+                label="Package document type"
+                value = {props.reviewDetails?.nod ? 'NOD' : 'Non-NOD'}
+                readOnly
+              />
+            </div>
+            <div className= "tag-styling-review-form">
               <SearchableDropdown
                 name="correspondence-dropdown"
                 label="Correspondence type"
@@ -159,7 +165,6 @@ export const ReviewForm = (props) => {
                 placeholder="Select..."
               />
             </div>
-
           </div>
           <div className="divide-textarea-styling-review-form">
             <div >
diff --git a/spec/models/correspondence_document_spec.rb b/spec/models/correspondence_document_spec.rb
index ffe779cf68d..6a2bac45ad4 100644
--- a/spec/models/correspondence_document_spec.rb
+++ b/spec/models/correspondence_document_spec.rb
@@ -3,6 +3,7 @@
 describe CorrespondenceDocument, :postgres do
   let(:vet) { create(:veteran) }
   let(:cors) { create(:correspondence, veteran_id: vet.id) }
+  let(:user) { create(:user) }
   let(:document) do
     create(
       :correspondence_document,
@@ -14,9 +15,26 @@
 
   before do
     FeatureToggle.enable!(:correspondence_queue)
+    RequestStore[:current_user] = user
   end
 
   it "pdf_location gets file path of static document" do
     expect(document.pdf_location).to eq(File.join(Rails.root, "lib", "pdfs", "KnockKnockJokes.pdf").to_s)
   end
+
+  describe "#update" do
+    context "when correspondence documents have 10182" do
+      it "updates correspondence nod to true" do
+        document.update!(vbms_document_type_id: 1250)
+        expect(document.correspondence.nod).to eq true
+      end
+    end
+
+    context "when correspondence documents doesn't have 10182" do
+      it "updates correspondence nod to false" do
+        document.update!(vbms_document_type_id: 150)
+        expect(document.correspondence.nod).to eq false
+      end
+    end
+  end
 end

From 2cbbf3a45cc724dcec6652c3d4643e723066a421 Mon Sep 17 00:00:00 2001
From: vinner57 <128258952+vinner57@users.noreply.github.com>
Date: Thu, 2 May 2024 09:51:29 -0400
Subject: [PATCH 237/237] fixing package document type alignment

---
 .../app/queue/correspondence/review_package/ReviewForm.jsx  | 2 +-
 client/app/styles/queue/_correspondence.scss                | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/client/app/queue/correspondence/review_package/ReviewForm.jsx b/client/app/queue/correspondence/review_package/ReviewForm.jsx
index be269a6604d..9e1efdb531c 100644
--- a/client/app/queue/correspondence/review_package/ReviewForm.jsx
+++ b/client/app/queue/correspondence/review_package/ReviewForm.jsx
@@ -147,7 +147,7 @@ export const ReviewForm = (props) => {
                 />
               </div>
             </div>
-            <div className= "tag-styling-review-form">
+            <div className= "nod-styling-review-form">
               <TextField
                 name="correspondence-package-document-type"
                 label="Package document type"
diff --git a/client/app/styles/queue/_correspondence.scss b/client/app/styles/queue/_correspondence.scss
index 935780e269d..285630ffaeb 100644
--- a/client/app/styles/queue/_correspondence.scss
+++ b/client/app/styles/queue/_correspondence.scss
@@ -298,6 +298,12 @@ $translate: 11%;
   }
 }
 
+.nod-styling-review-form {
+  & .cf-form-textinput {
+    max-width: 72rem !important;
+  }
+}
+
 .tag-styling-review-form {
   & .cf-select__control {
     max-width: 63rem !important;