Merge branch 'B-22767' into B-22767-INT

transcom · Mar 4, 2025 · c2f6a7d · c2f6a7d
2 parents 5a3dac0 + 63366cd
commit c2f6a7d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/pkg/handlers/primeapiv3/move_task_order_test.go b/pkg/handlers/primeapiv3/move_task_order_test.go
@@ -32,8 +32,12 @@ func (suite *HandlerSuite) TestGetMoveTaskOrder() {
 	verifyAddressFields := func(address *models.Address, payload *primev3messages.Address) {
 		suite.Equal(address.ID.String(), payload.ID.String())
 		suite.Equal(address.StreetAddress1, *payload.StreetAddress1)
-		suite.Equal(*address.StreetAddress2, *payload.StreetAddress2)
-		suite.Equal(*address.StreetAddress3, *payload.StreetAddress3)
+		if address.StreetAddress2 != nil {
+			suite.Equal(*address.StreetAddress2, *payload.StreetAddress2)
+		}
+		if address.StreetAddress3 != nil {
+			suite.Equal(*address.StreetAddress3, *payload.StreetAddress3)
+		}
 		suite.Equal(address.City, *payload.City)
 		suite.Equal(address.State, *payload.State)
 		suite.Equal(address.PostalCode, *payload.PostalCode)
@@ -1494,6 +1498,7 @@ func (suite *HandlerSuite) TestGetMoveTaskOrder() {
 					PrimeEstimatedWeightRecordedDate: &aWeekAgo,
 					RequiredDeliveryDate:             &nowDate,
 					ScheduledDeliveryDate:            &nowDate,
+					MarketCode:                       models.MarketCodeInternational,
 				},
 			},
 			{

diff --git a/yarn.lock b/yarn.lock
@@ -16502,9 +16502,9 @@ stop-iteration-iterator@^1.0.0:
     internal-slot "^1.0.4"
 
 store2@^2.14.2:
-  version "2.14.2"
-  resolved "https://registry.yarnpkg.com/store2/-/store2-2.14.2.tgz#56138d200f9fe5f582ad63bc2704dbc0e4a45068"
-  integrity sha512-siT1RiqlfQnGqgT/YzXVUNsom9S0H1OX+dpdGN1xkyYATo4I6sep5NmsRD/40s3IIOvlCq6akxkqG82urIZW1w==
+  version "2.14.4"
+  resolved "https://registry.yarnpkg.com/store2/-/store2-2.14.4.tgz#81b313abaddade4dcd7570c5cc0e3264a8f7a242"
+  integrity sha512-srTItn1GOvyvOycgxjAnPA63FZNwy0PTyUBFMHRM+hVFltAeoh0LmNBz9SZqUS9mMqGk8rfyWyXn3GH5ReJ8Zw==
 
 storybook@^7.6.20:
   version "7.6.20"