From 851edf412643565bdfc859832eaf4e23843ef724 Mon Sep 17 00:00:00 2001
From: Ian London <ianlondondu@gmail.com>
Date: Tue, 18 Jun 2019 11:42:20 -0400
Subject: [PATCH] fix(protocol-designer): fix bug with pipette field change
 (#3585)

Changing the pipette field now resets flow rate and tip offset fields.

This also affects pipette swapping in the Edit Pipettes modal. Before
this fix, it wouldn't actually clear out the fields it says it would.
---
 .../src/steplist/formLevel/getDefaultsForStepType.js          | 2 ++
 .../handleFormChange/dependentFieldsUpdateMoveLiquid.js       | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/protocol-designer/src/steplist/formLevel/getDefaultsForStepType.js b/protocol-designer/src/steplist/formLevel/getDefaultsForStepType.js
index 9b7cc1aad61..9035dda71e5 100644
--- a/protocol-designer/src/steplist/formLevel/getDefaultsForStepType.js
+++ b/protocol-designer/src/steplist/formLevel/getDefaultsForStepType.js
@@ -35,6 +35,7 @@ export default function getDefaultsForStepType(
         path: 'single',
         aspirate_wells_grouped: false,
 
+        aspirate_flowRate: null,
         aspirate_labware: null,
         aspirate_wells: [],
         aspirate_wellOrder_first: DEFAULT_WELL_ORDER_FIRST_OPTION,
@@ -45,6 +46,7 @@ export default function getDefaultsForStepType(
         aspirate_mmFromBottom: DEFAULT_MM_FROM_BOTTOM_ASPIRATE,
         aspirate_touchTip_checkbox: false,
 
+        dispense_flowRate: null,
         dispense_labware: null,
         dispense_wells: [],
         dispense_wellOrder_first: DEFAULT_WELL_ORDER_FIRST_OPTION,
diff --git a/protocol-designer/src/steplist/formLevel/handleFormChange/dependentFieldsUpdateMoveLiquid.js b/protocol-designer/src/steplist/formLevel/handleFormChange/dependentFieldsUpdateMoveLiquid.js
index e0640479889..a256fb93962 100644
--- a/protocol-designer/src/steplist/formLevel/handleFormChange/dependentFieldsUpdateMoveLiquid.js
+++ b/protocol-designer/src/steplist/formLevel/handleFormChange/dependentFieldsUpdateMoveLiquid.js
@@ -189,7 +189,9 @@ const updatePatchOnPipetteChange = (
         'dispense_flowRate',
         'aspirate_mix_volume',
         'dispense_mix_volume',
-        'disposalVolume_volume'
+        'disposalVolume_volume',
+        'aspirate_mmFromBottom',
+        'dispense_mmFromBottom'
       ),
     }
   }