From 509bd72528296798e3e514445b5116b46ca896fb Mon Sep 17 00:00:00 2001
From: IanLondon <ianlondondu@gmail.com>
Date: Tue, 26 Mar 2019 09:49:58 -0400
Subject: [PATCH] move mix field around (closes #3041)

---
 .../forms/MoveLiquid/SourceDestFields.js      | 38 +++++++++++--------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/protocol-designer/src/components/StepEditForm/forms/MoveLiquid/SourceDestFields.js b/protocol-designer/src/components/StepEditForm/forms/MoveLiquid/SourceDestFields.js
index 0a30d83facf..67f5eeb9259 100644
--- a/protocol-designer/src/components/StepEditForm/forms/MoveLiquid/SourceDestFields.js
+++ b/protocol-designer/src/components/StepEditForm/forms/MoveLiquid/SourceDestFields.js
@@ -29,6 +29,24 @@ function SourceDestFields (props: Props) {
   const {className, focusHandlers, prefix} = props
   const addFieldNamePrefix = makeAddFieldNamePrefix(prefix)
 
+  const mixFields = (
+    <CheckboxRowField
+      name={addFieldNamePrefix('mix_checkbox')}
+      label={i18n.t('form.step_edit_form.field.mix.label')}
+      className={styles.small_field}>
+      <TextField
+        name={addFieldNamePrefix('mix_volume')}
+        units={i18n.t('application.units.microliter')}
+        className={styles.small_field}
+        {...focusHandlers} />
+      <TextField
+        name={addFieldNamePrefix('mix_times')}
+        units={i18n.t('application.units.times')}
+        className={styles.small_field}
+        {...focusHandlers} />
+    </CheckboxRowField>
+  )
+
   return (
     <div className={className}>
       <div className={styles.form_row}>
@@ -48,6 +66,7 @@ function SourceDestFields (props: Props) {
               label={i18n.t('form.step_edit_form.field.preWetTip.label')}
               className={styles.small_field}
             />
+            {mixFields}
             <CheckboxRowField
               disabled
               tooltipComponent={i18n.t('tooltip.not_in_beta')}
@@ -64,6 +83,9 @@ function SourceDestFields (props: Props) {
             </CheckboxRowField>
           </React.Fragment>
         }
+
+        {prefix === 'dispense' && mixFields}
+
         <CheckboxRowField
           name={addFieldNamePrefix('touchTip_checkbox')}
           tooltipComponent={i18n.t(`tooltip.step_fields.${addFieldNamePrefix('touchTip_checkbox')}`)}
@@ -72,21 +94,7 @@ function SourceDestFields (props: Props) {
         >
           <TipPositionField fieldName={addFieldNamePrefix('touchTip_mmFromBottom')} />
         </CheckboxRowField>
-        <CheckboxRowField
-          name={addFieldNamePrefix('mix_checkbox')}
-          label={i18n.t('form.step_edit_form.field.mix.label')}
-          className={styles.small_field}>
-          <TextField
-            name={addFieldNamePrefix('mix_volume')}
-            units={i18n.t('application.units.microliter')}
-            className={styles.small_field}
-            {...focusHandlers} />
-          <TextField
-            name={addFieldNamePrefix('mix_times')}
-            units={i18n.t('application.units.times')}
-            className={styles.small_field}
-            {...focusHandlers} />
-        </CheckboxRowField>
+
         {prefix === 'dispense' &&
           <CheckboxRowField
             name='blowout_checkbox'