Merge branch 'main' into B-21049

pkg/notifications/constants.go

@@ -7,7 +7,8 @@ const MyMoveLink = "https://my.move.mil/"
 const WashingtonHQServicesLink = "https://www.esd.whs.mil"
 const SmartVoucherLink = "https://smartvoucher.dfas.mil/"
 
-const DtodErrorMessage = "We are unable to calculate your distance. It may be that you have entered an invalid ZIP Code, or the system that calculates distance (DTOD) may be down. Please check your ZIP Code to ensure it was entered correctly and is not a PO Box."
+const DTODFailureErrorMessage = "We are unable to calculate your distance. It may be that you have entered an invalid ZIP Code, or the system that calculates distance (DTOD) may be down. Please check your ZIP Code to ensure it was entered correctly and is not a PO Box."
+const DTODDownErrorMessage = "We are having an issue with the system we use to calculate mileage (DTOD) and cannot proceed."
 
 var affiliationDisplayValue = map[models.ServiceMemberAffiliation]string{
 	models.AffiliationARMY:       "Army",

pkg/route/dtod_zip5_distance.go

@@ -106,11 +106,15 @@ func (d *dtodZip5DistanceInfo) DTODZip5Distance(appCtx appcontext.AppContext, pi
 
 	if distanceFloat <= 0 {
 		dtodAvailable, _ := validateDTODServiceAvailable(*d)
-		if !dtodAvailable && appCtx.Session().IsServiceMember() {
-			return distance, nil
+		if !dtodAvailable {
+			if appCtx.Session().IsServiceMember() {
+				return distance, nil
+			} else {
+				return distance, apperror.NewEventError(notifications.DTODDownErrorMessage, nil)
+			}
 		}
 
-		return distance, apperror.NewEventError(notifications.DtodErrorMessage, nil)
+		return distance, apperror.NewEventError(notifications.DTODFailureErrorMessage, nil)
 	}
 
 	// TODO: DTOD gives us a float back. Should we round, floor, or ceiling? Just going to round for now.

pkg/route/dtod_zip5_distance_test.go

@@ -98,7 +98,7 @@ func (suite *GHCTestSuite) TestDTODZip5DistanceFake() {
 				suite.Error(err)
 				switch err.(type) {
 				case apperror.EventError:
-					suite.Equal(err.Error(), notifications.DtodErrorMessage)
+					suite.Equal(err.Error(), notifications.DTODDownErrorMessage)
 				}
 			} else {
 				suite.NoError(err)

src/components/Office/ShipmentForm/ShipmentForm.jsx

@@ -820,7 +820,7 @@ const ShipmentForm = (props) => {
               <Alert data-testid="errorMessage" type="error" headingLevel="h4" heading="An error occurred">
                 {errorCode === 400 ? (
                   <p>
-                    {errorMessage} If the error persists, please try again later, or contact the&nbsp;
+                    {errorMessage} Please try again later, or contact the&nbsp;
                     <Link to={technicalHelpDeskURL} target="_blank" rel="noreferrer">
                       Technical Help Desk
                     </Link>