fix disposal field

Opentrons · Dec 12, 2024 · 6185bd5 · 6185bd5
1 parent b0c8e69
commit 6185bd5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/...ol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepTools/MoveLiquidTools/index.tsx b/...ol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepTools/MoveLiquidTools/index.tsx
@@ -71,7 +71,6 @@ export function MoveLiquidTools(props: StepFormProps): JSX.Element {
   const labwares = useSelector(getLabwareEntities)
   const pipettes = useSelector(getPipetteEntities)
   const addFieldNamePrefix = makeAddFieldNamePrefix(tab)
-
   const isWasteChuteSelected =
     propsForFields.dispense_labware?.value != null
       ? additionalEquipmentEntities[
@@ -98,11 +97,15 @@ export function MoveLiquidTools(props: StepFormProps): JSX.Element {
     additionalEquipmentEntities[String(propsForFields.dispense_labware.value)]
       ?.name === 'trashBin'
 
-  const destinationLabwareType = getTrashOrLabware(
-    labwares,
-    additionalEquipmentEntities,
-    formData.dispense_labware as string
-  )
+  const destinationLabwareType =
+    formData.dispense_labware != null
+      ? getTrashOrLabware(
+          labwares,
+          additionalEquipmentEntities,
+          formData.dispense_labware as string
+        )
+      : null
+
   const isDestinationTrash =
     destinationLabwareType != null
       ? ['trashBin', 'wasteChute'].includes(destinationLabwareType)
@@ -134,12 +137,12 @@ export function MoveLiquidTools(props: StepFormProps): JSX.Element {
 
   const mappedErrorsToField = getFormErrorsMappedToField(visibleFormErrors)
 
-  // auto-collapse blowout field if disposal volume is checked
-  useEffect(() => {
-    if (formData.disposalVolume_checkbox) {
-      propsForFields.blowout_checkbox.updateValue(false)
-    }
-  }, [formData.disposalVolume_checkbox])
+  // auto-collapse blowout field if disposal volume is not null
+  // useEffect(() => {
+  //   if (formData.disposalVolume_checkbox) {
+  //     propsForFields.blowout_checkbox.updateValue(false)
+  //   }
+  // }, [formData.disposalVolume_checkbox])
 
   return toolboxStep === 0 ? (
     <Flex

diff --git a/protocol-designer/src/steplist/formLevel/handleFormChange/dependentFieldsUpdateMoveLiquid.ts b/protocol-designer/src/steplist/formLevel/handleFormChange/dependentFieldsUpdateMoveLiquid.ts
@@ -428,6 +428,7 @@ const updatePatchDisposalVolumeFields = (
       ...patch,
       disposalVolume_checkbox: true,
       disposalVolume_volume: recommendedMinimumDisposalVol,
+      blowout_checkbox: false,
     }
   }