From 1ce366f0ff72e7240498954c8dbe30f2104f85ba Mon Sep 17 00:00:00 2001 From: deandreJones Date: Wed, 24 Jan 2024 14:09:15 -0600 Subject: [PATCH] B-18480 --- .../ReviewBillableWeight/ReviewBillableWeight.jsx | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/pages/Office/ReviewBillableWeight/ReviewBillableWeight.jsx b/src/pages/Office/ReviewBillableWeight/ReviewBillableWeight.jsx index 96c4252cf35..1d32f2f4c50 100644 --- 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}