Merge pull request #11973 from transcom/B-18480

B-18480
transcom · Feb 9, 2024 · 72cc4e4 · 72cc4e4
2 parents d34dafa + 0d79a83
commit 72cc4e4
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/pages/Office/ReviewBillableWeight/ReviewBillableWeight.jsx b/src/pages/Office/ReviewBillableWeight/ReviewBillableWeight.jsx
@@ -276,8 +276,16 @@ export default function ReviewBillableWeight() {
                   departedDate={selectedShipment.actualPickupDate}
                   pickupAddress={selectedShipment.pickupAddress}
                   destinationAddress={selectedShipment.destinationAddress}
-                  estimatedWeight={selectedShipment.primeEstimatedWeight}
-                  primeActualWeight={selectedShipment.primeActualWeight}
+                  estimatedWeight={
+                    selectedShipment.shipmentType !== SHIPMENT_OPTIONS.PPM
+                      ? selectedShipment.primeEstimatedWeight
+                      : selectedShipment.ppmShipment.estimatedWeight
+                  }
+                  primeActualWeight={
+                    selectedShipment.shipmentType !== SHIPMENT_OPTIONS.PPM
+                      ? selectedShipment.primeActualWeight
+                      : weightRequested
+                  }
                   originalWeight={selectedShipment.primeActualWeight}
                   adjustedWeight={selectedShipment.billableWeightCap}
                   reweighRemarks={selectedShipment?.reweigh?.verificationReason}