From fa47f85e43d0756e75650c07b0d77d73479ea38b Mon Sep 17 00:00:00 2001
From: Ian London <ianlondondu@gmail.com>
Date: Fri, 3 Aug 2018 13:18:34 -0400
Subject: [PATCH] feat(protocol-designer): add 'drop tip' to 'dispense' section
 of form (#1998)

- command creators & tests already are set up for this!

Closes #1689
---
 .../src/components/StepEditForm/TransferLikeForm.js             | 1 +
 protocol-designer/src/form-types.js                             | 1 +
 protocol-designer/src/steplist/fieldLevel/types.js              | 1 +
 protocol-designer/src/steplist/formProcessing.js                | 2 +-
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/protocol-designer/src/components/StepEditForm/TransferLikeForm.js b/protocol-designer/src/components/StepEditForm/TransferLikeForm.js
index 33ff1ddacee..66a8b85c9b0 100644
--- a/protocol-designer/src/components/StepEditForm/TransferLikeForm.js
+++ b/protocol-designer/src/components/StepEditForm/TransferLikeForm.js
@@ -94,6 +94,7 @@ const TransferLikeForm = (props: TransferLikeFormProps) => {
         <div className={formStyles.row_wrapper}>
           <div className={styles.left_settings_column}>
             <FormGroup label='TECHNIQUE'>
+              <StepCheckboxRow name="dispense_touchTip" label="Touch tip" />
               <StepCheckboxRow name="dispense_mix_checkbox" label='Mix'>
                 <StepInputField name="dispense_mix_volume" units="μL" {...focusHandlers} />
                 <StepInputField name="dispense_mix_times" units="Times" {...focusHandlers} />
diff --git a/protocol-designer/src/form-types.js b/protocol-designer/src/form-types.js
index cb0f524dcf7..0157a72b230 100644
--- a/protocol-designer/src/form-types.js
+++ b/protocol-designer/src/form-types.js
@@ -69,6 +69,7 @@ export type TransferLikeForm = {|
   'volume'?: string,
   'dispense_labware'?: string,
   'dispense_wells'?: Array<string>,
+  'dispense_touchTip'?: boolean,
   'dispense_mix_checkbox'?: boolean,
   'dispense_mix_volume'?: string,
   'dispense_mix_times'?: string
diff --git a/protocol-designer/src/steplist/fieldLevel/types.js b/protocol-designer/src/steplist/fieldLevel/types.js
index a0498993066..98983b14014 100644
--- a/protocol-designer/src/steplist/fieldLevel/types.js
+++ b/protocol-designer/src/steplist/fieldLevel/types.js
@@ -20,6 +20,7 @@ export type StepFieldName =
   | 'dispense_delayMinutes'
   | 'dispense_delaySeconds'
   | 'dispense_labware'
+  | 'dispense_touchTip'
   | 'dispense_mix_checkbox'
   | 'dispense_mix_times'
   | 'dispense_mix_volume'
diff --git a/protocol-designer/src/steplist/formProcessing.js b/protocol-designer/src/steplist/formProcessing.js
index 9786d2c4d6f..0d04188a107 100644
--- a/protocol-designer/src/steplist/formProcessing.js
+++ b/protocol-designer/src/steplist/formProcessing.js
@@ -157,7 +157,7 @@ function _vapTransferLike (
     mixInDestination,
     preWetTip: formData['aspirate_preWetTip'] || false,
     touchTipAfterAspirate: formData['aspirate_touchTip'] || false,
-    touchTipAfterDispense: false, // TODO Ian 2018-03-01 Not in form
+    touchTipAfterDispense: formData['dispense_touchTip'] || false,
     description: 'description would be here 2018-03-01' // TODO get from form
   }