Merge branch 'B-22087-main' into B-22087-int

transcom · Mar 4, 2025 · 381879a · 381879a
2 parents c69bb05 + 3dadb58
commit 381879a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/pkg/models/mto_shipments.go b/pkg/models/mto_shipments.go
@@ -531,7 +531,6 @@ func FilterDeletedRejectedCanceledMtoShipments(unfilteredShipments MTOShipments)
 		if shipment.DeletedAt == nil &&
 			(shipment.Status != MTOShipmentStatusDraft) &&
 			(shipment.Status != MTOShipmentStatusRejected) &&
-			(shipment.Status != MTOShipmentStatusCancellationRequested) &&
 			(shipment.Status != MTOShipmentStatusCanceled) {
 			filteredShipments = append(filteredShipments, shipment)
 		}

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"