Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

B 22192 INT #14942

Open
wants to merge 10 commits into
base: integrationTesting
Choose a base branch
from
+6 −8
Open

B 22192 INT #14942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7ad4c72
Merge branch 'main' of github.com:transcom/mymove into MAIN-B-22039-r…
ryan-mchugh Feb 25, 2025
8191575
Merge branch 'main' of github.com:transcom/mymove into MAIN-B-22039-r…
ryan-mchugh Feb 28, 2025
29c9e8a
Merge branch 'main' of github.com:transcom/mymove into MAIN-B-22039-r…
ryan-mchugh Feb 28, 2025
3ebb152
Merge branch 'main' into MAIN-B-22039-remove_lat_lon
brianmanley-caci Mar 3, 2025
be8a59a
Merge branch 'main' into MAIN-B-22039-remove_lat_lon
brianmanley-caci Mar 3, 2025
d13d25a
Merge pull request #14924 from transcom/MAIN-B-22039-remove_lat_lon
brianmanley-caci Mar 3, 2025
32edcba
updated verbiage to match address location
loganwc Mar 4, 2025
fc8aa60
Merge branch 'B-22192' into B-22192-INT
loganwc Mar 4, 2025
e055eda
verbiage smerbiage
loganwc Mar 6, 2025
4630f21
Merge branch 'B-22192' into B-22192-INT
loganwc Mar 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/components/Office/ShipmentForm/ShipmentForm.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1156,7 +1156,7 @@ const ShipmentForm = (props) => {
<>
<h4>Third Delivery Address</h4>
<FormGroup>
<p>Do you want the movers to deliver any belongings from a third address?</p>
<p>Do you want the movers to deliver any belongings to a third address?</p>
<div className={formStyles.radioGroup}>
<Field
as={Radio}
Expand Down Expand Up @@ -1331,9 +1331,7 @@ const ShipmentForm = (props) => {
<>
<h4>Third Delivery Address</h4>
<FormGroup>
<p>
Do you want the movers to deliver any belongings from a third address?
</p>
<p>Do you want the movers to deliver any belongings to a third address?</p>
<div className={formStyles.radioGroup}>
<Field
as={Radio}
Expand Down
6 changes: 3 additions & 3 deletions src/pages/PrimeUI/Shipment/PrimeUIShipmentCreateForm.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ const PrimeUIShipmentCreateForm = ({ enableBoat, enableMobileHome }) => {
<h4>Third Delivery Address</h4>
<FormGroup>
<p>
Will the movers pick up any belongings from a third address? (Must be near the pickup address.
Will the movers deliver any belongings to a third address? (Must be near the pickup address.
Subject to approval.)
</p>
<div className={formStyles.radioGroup}>
Expand Down Expand Up @@ -536,7 +536,7 @@ const PrimeUIShipmentCreateForm = ({ enableBoat, enableMobileHome }) => {
<h4>Second Delivery Address</h4>
<FormGroup>
<p>
Will the movers pick up any belongings from a second address? (Must be near the pickup address.
Will the movers deliver any belongings to a second address? (Must be near the pickup address.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you add a test to make sure it says 'deliver' instead of pickup?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jk 😉

Subject to approval.)
</p>
<div className={formStyles.radioGroup}>
Expand Down Expand Up @@ -579,7 +579,7 @@ const PrimeUIShipmentCreateForm = ({ enableBoat, enableMobileHome }) => {
<h4>Third Delivery Address</h4>
<FormGroup>
<p>
Will the movers pick up any belongings from a third address? (Must be near the pickup
Will the movers deliver any belongings from a third address? (Must be near the pickup
address. Subject to approval.)
</p>
<div className={formStyles.radioGroup}>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/PrimeUI/Shipment/PrimeUIShipmentUpdatePPMForm.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ const PrimeUIShipmentUpdatePPMForm = () => {
<h4>Third destination location</h4>
<FormGroup>
<p>
Will the movers pick up any belongings from a third address? (Must be near the Delivery Address.
Will the movers deliver any belongings to a third address? (Must be near the Delivery Address.
Subject to approval.)
</p>
<div className={formStyles.radioGroup}>
Expand Down
Loading