Merge branch 'feature/APPEALS-60433' into Ki/APPEALS-54280

client/app/queue/correspondence/details/CorrespondenceDetails.jsx

@@ -2,6 +2,7 @@
 import React, { useState, useEffect } from 'react';
 import { useDispatch, connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
+import { useHistory } from 'react-router';
 import AppSegment from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/AppSegment';
 import PropTypes from 'prop-types';
 import TabWindow from '../../../components/TabWindow';
@@ -29,6 +30,7 @@ import CorrespondenceAppealTasks from '../CorrespondenceAppealTasks';
 
 const CorrespondenceDetails = (props) => {
   const dispatch = useDispatch();
+  const history = useHistory();
   const correspondence = props.correspondence;
   const correspondenceInfo = props.correspondenceInfo;
   const expandedLinkedAppeals = props.expandedLinkedAppeals;
@@ -59,6 +61,8 @@ const CorrespondenceDetails = (props) => {
   const [isExpanded, setIsExpanded] = useState(false);
   const [isTasksUnrelatedSectionExpanded, setIsTasksUnrelatedSectionExpanded] = useState(false);
   const [appealTaskKey, setAppealTaskKey] = useState(0);
+  const [showModal, setShowModal] = useState(false);
+  const [isReturnToQueue, setIsReturnToQueue] = useState(false);
 
   // Initialize checkbox states
   useEffect(() => {
@@ -849,6 +853,20 @@ const CorrespondenceDetails = (props) => {
     }
   ];
 
+  const handleModalClose = () => {
+    if (isReturnToQueue) {
+      setShowModal(!showModal);
+    } else {
+      if (props.isInboundOpsSuperuser || props.isInboundOpsSupervisor) {
+        window.location.href = '/queue/correspondence/team';
+      } else if (props.isInboundOpsUser) {
+        window.location.href = '/queue/correspondence/team';
+      } else {
+        window.location.href = '/queue';
+      }
+    }
+  };
+
   const saveChanges = () => {
     if (isAdminNotLoggedIn() === false) {
       handlepriorMailUpdate();
@@ -947,19 +965,28 @@ const CorrespondenceDetails = (props) => {
           tabs={tabList}
         />
       </AppSegment>
-      {
-        // eslint-disable-next-line max-len
-        (props.isInboundOpsUser || props.isInboundOpsSuperuser || props.isInboundOpsSupervisor) && <div className="margin-top-for-add-task-view">
-          <Button
-            type="button"
-            onClick={() => saveChanges()}
-            disabled={disableSubmitButton}
-            name="save-changes"
-            classNames={['cf-right-side']}>
-          Save changes
-          </Button>
+      <div className="margin-top-for-add-task-view">
+        <div className="cf-push-left">
+              <Button
+                name="Return to queue"
+                classNames={['cf-btn-link']}
+                onClick={handleModalClose}
+              />
         </div>
-      }
+        {
+          // eslint-disable-next-line max-len
+          (props.isInboundOpsUser || props.isInboundOpsSuperuser || props.isInboundOpsSupervisor) && <div>
+            <Button
+              type="button"
+              onClick={() => saveChanges()}
+              disabled={disableSubmitButton}
+              name="save-changes"
+              classNames={['cf-right-side']}>
+            Save changes
+            </Button>
+          </div>
+        }
+      </div>
     </>
   );
 };

client/app/styles/queue/_correspondence.scss

@@ -1673,12 +1673,12 @@ $color-bg-hsl-a: hsl(0, 0%, 80%);
 }
 
 .tasks-added-details {
-  margin-left: 40px;
+  margin-left: 1%;
 }
 
 .tasks-added-waive-banner-alert {
-  margin-left: 40px;
-  width: 95%;
+  margin-left: 1%;
+  width: 98%;
 }
 
 .waive-banner-alert .usa-alert.usa-alert-slim {

client/constants/CORRESPONDENCE_DETAILS_BANNERS.json

@@ -30,7 +30,7 @@
   },
 
   "evidenceWindowBanner": {
-    "message": "The waive evidence window request has been removed from the \"Evidence submission window\" task",
+    "message": "The waive evidence window request has been removed from the \"Evidence submission window\" task.",
     "type": "success"
   }
 }