diff --git a/src/components/Customer/Home/Helper/Helper.stories.jsx b/src/components/Customer/Home/Helper/Helper.stories.jsx index 3e23865065c..971efe9c7e8 100644 --- a/src/components/Customer/Home/Helper/Helper.stories.jsx +++ b/src/components/Customer/Home/Helper/Helper.stories.jsx @@ -56,7 +56,7 @@ export const SubmittedMove = () => ; export const AmendedOrders = () => ; export const ApprovedMove = () => ( - + ); export const PPMCloseoutSubmitted = () => ; diff --git a/src/pages/MyMove/Home/HomeHelpers.jsx b/src/pages/MyMove/Home/HomeHelpers.jsx index 7a73196a168..206b16c8381 100644 --- a/src/pages/MyMove/Home/HomeHelpers.jsx +++ b/src/pages/MyMove/Home/HomeHelpers.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import { Link } from 'react-router-dom'; +import { generatePath, Link } from 'react-router-dom'; import { Link as ExternalLink } from '@trussworks/react-uswds'; import styles from './Home.module.scss'; @@ -96,35 +96,41 @@ export const HelperSubmittedMove = () => ( ); -export const HelperApprovedMove = () => ( - -
-

Talk to your counselor or to your movers to make any changes to your move.

-
-
-

- For PPM shipments -

-

- When you are done moving your things, select Upload PPM Documents to document your PPM, - calculate your final incentive, and create a payment request packet. You will upload weight tickets, receipts, - and other documentation that a counselor will review. -

-
-
-

- If you receive new orders while your move is underway -

-
    -
  • Talk to your counselor
  • -
  • Talk to your movers
  • -
  • - Upload a copy of your new orders -
  • -
-
-
-); +export const HelperApprovedMove = ({ orderId }) => { + const path = generatePath(customerRoutes.ORDERS_AMEND_PATH, { + orderId, + }); + + return ( + +
+

Talk to your counselor or to your movers to make any changes to your move.

+
+
+

+ For PPM shipments +

+

+ When you are done moving your things, select Upload PPM Documents to document your PPM, + calculate your final incentive, and create a payment request packet. You will upload weight tickets, receipts, + and other documentation that a counselor will review. +

+
+
+

+ If you receive new orders while your move is underway +

+
    +
  • Talk to your counselor
  • +
  • Talk to your movers
  • +
  • + Upload a copy of your new orders +
  • +
+
+
+ ); +}; export const HelperAmendedOrders = () => ( diff --git a/src/pages/MyMove/Home/MoveHome.jsx b/src/pages/MyMove/Home/MoveHome.jsx index 9af82b0bbcf..69afb201a28 100644 --- a/src/pages/MyMove/Home/MoveHome.jsx +++ b/src/pages/MyMove/Home/MoveHome.jsx @@ -417,7 +417,7 @@ const MoveHome = ({ serviceMemberMoves, isProfileComplete, serviceMember, signed if (!hasSubmittedMove()) return ; if (hasSubmittedPPMCloseout()) return ; if (hasUnapprovedAmendedOrders()) return ; - if (isMoveApproved()) return ; + if (isMoveApproved()) return ; return ; }; diff --git a/src/pages/MyMove/Home/index.jsx b/src/pages/MyMove/Home/index.jsx index 830c1b17cae..33f7d5bfb34 100644 --- a/src/pages/MyMove/Home/index.jsx +++ b/src/pages/MyMove/Home/index.jsx @@ -241,12 +241,14 @@ export class Home extends Component { }; renderHelper = () => { + const { orders } = this.props; if (!this.hasOrders) return ; if (!this.hasAnyShipments) return ; if (!this.hasSubmittedMove) return ; if (this.hasSubmittedPPMCloseout) return ; if (this.hasUnapprovedAmendedOrders) return ; - if (this.isMoveApproved) return ; + if (this.isMoveApproved) return ; + return ; };