From 1a32d618e2ac6179388eadaa058e0b05d2f90533 Mon Sep 17 00:00:00 2001
From: Jethary Rader <66035149+jerader@users.noreply.github.com>
Date: Tue, 21 May 2024 07:32:57 -0400
Subject: [PATCH] feat(protocol-designer): y position tooltip and migration
 copy (#15225)

closes AUTH-398 AUTH-409
---
 .../cypress/e2e/migrations.cy.js              |  2 +-
 .../TipPositionField/TipPositionModal.tsx     | 13 ++++++-
 .../forms/MoveLiquidForm/SourceDestFields.tsx | 37 ++++++++++---------
 .../src/localization/en/modal.json            |  4 +-
 .../src/localization/en/tooltip.json          |  3 +-
 5 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/protocol-designer/cypress/e2e/migrations.cy.js b/protocol-designer/cypress/e2e/migrations.cy.js
index 08fd71b7206..e31402f9996 100644
--- a/protocol-designer/cypress/e2e/migrations.cy.js
+++ b/protocol-designer/cypress/e2e/migrations.cy.js
@@ -106,7 +106,7 @@ describe('Protocol fixtures migrate and match snapshots', () => {
           if (migrationModal === 'v8.1') {
             cy.get('div')
               .contains(
-                'The default dispense height is now 1mm from the bottom of the well'
+                'The default dispense height is now 1 mm from the bottom of the well'
               )
               .should('exist')
             cy.get('button').contains('ok', { matchCase: false }).click()
diff --git a/protocol-designer/src/components/StepEditForm/fields/TipPositionField/TipPositionModal.tsx b/protocol-designer/src/components/StepEditForm/fields/TipPositionField/TipPositionModal.tsx
index 2ec2e7f41ab..297b2bdb9a0 100644
--- a/protocol-designer/src/components/StepEditForm/fields/TipPositionField/TipPositionModal.tsx
+++ b/protocol-designer/src/components/StepEditForm/fields/TipPositionField/TipPositionModal.tsx
@@ -10,6 +10,8 @@ import {
   RadioGroup,
   SPACING,
   StyledText,
+  Tooltip,
+  useHoverTooltip,
 } from '@opentrons/components'
 import { getMainPagePortalEl } from '../../../portals/MainPageModalPortal'
 import { getIsTouchTipField } from '../../../../form-types'
@@ -51,11 +53,12 @@ export const TipPositionModal = (
     wellYWidthMm,
     closeModal,
   } = props
+  const [targetProps, tooltipProps] = useHoverTooltip()
   const zSpec = specs.z
   const ySpec = specs.y
   const xSpec = specs.x
 
-  const { t } = useTranslation(['modal', 'button'])
+  const { t } = useTranslation(['modal', 'button', 'tooltip'])
 
   if (zSpec == null || xSpec == null || ySpec == null) {
     console.error(
@@ -255,7 +258,12 @@ export const TipPositionModal = (
           value={xValue ?? ''}
         />
       </Flex>
-      <Flex flexDirection={DIRECTION_COLUMN} gridGap={SPACING.spacing4}>
+      <Flex
+        flexDirection={DIRECTION_COLUMN}
+        gridGap={SPACING.spacing4}
+        width="max-content"
+        {...targetProps}
+      >
         <StyledText as="label" paddingLeft={SPACING.spacing24}>
           {t('tip_position.field_titles.y_position')}
         </StyledText>
@@ -271,6 +279,7 @@ export const TipPositionModal = (
           units="mm"
           value={yValue ?? ''}
         />
+        <Tooltip {...tooltipProps}>{t('tooltip:y_position_value')}</Tooltip>
       </Flex>
       <Flex flexDirection={DIRECTION_COLUMN} gridGap={SPACING.spacing4}>
         <StyledText as="label" paddingLeft={SPACING.spacing24}>
diff --git a/protocol-designer/src/components/StepEditForm/forms/MoveLiquidForm/SourceDestFields.tsx b/protocol-designer/src/components/StepEditForm/forms/MoveLiquidForm/SourceDestFields.tsx
index f37060c242c..6e972dac3a1 100644
--- a/protocol-designer/src/components/StepEditForm/forms/MoveLiquidForm/SourceDestFields.tsx
+++ b/protocol-designer/src/components/StepEditForm/forms/MoveLiquidForm/SourceDestFields.tsx
@@ -145,24 +145,6 @@ export const SourceDestFields = (props: SourceDestFieldsProps): JSX.Element => {
           </>
         )}
 
-        <CheckboxRowField
-          {...propsForFields[addFieldNamePrefix('touchTip_checkbox')]}
-          label={t('step_edit_form.field.touchTip.label')}
-          className={styles.small_field}
-        >
-          <TipPositionField
-            propsForFields={propsForFields}
-            zField={`${prefix}_touchTip_mmFromBottom`}
-            labwareId={
-              formData[
-                getLabwareFieldForPositioningField(
-                  addFieldNamePrefix('touchTip_mmFromBottom')
-                )
-              ]
-            }
-          />
-        </CheckboxRowField>
-
         {prefix === 'dispense' && (
           <CheckboxRowField
             {...propsForFields.blowout_checkbox}
@@ -192,6 +174,25 @@ export const SourceDestFields = (props: SourceDestFieldsProps): JSX.Element => {
             />
           </CheckboxRowField>
         )}
+
+        <CheckboxRowField
+          {...propsForFields[addFieldNamePrefix('touchTip_checkbox')]}
+          label={t('step_edit_form.field.touchTip.label')}
+          className={styles.small_field}
+        >
+          <TipPositionField
+            propsForFields={propsForFields}
+            zField={`${prefix}_touchTip_mmFromBottom`}
+            labwareId={
+              formData[
+                getLabwareFieldForPositioningField(
+                  addFieldNamePrefix('touchTip_mmFromBottom')
+                )
+              ]
+            }
+          />
+        </CheckboxRowField>
+
         <CheckboxRowField
           {...propsForFields[addFieldNamePrefix('airGap_checkbox')]}
           label={t('step_edit_form.field.airGap.label')}
diff --git a/protocol-designer/src/localization/en/modal.json b/protocol-designer/src/localization/en/modal.json
index f02b0053466..08bade5fbeb 100644
--- a/protocol-designer/src/localization/en/modal.json
+++ b/protocol-designer/src/localization/en/modal.json
@@ -274,8 +274,8 @@
     },
     "toV8_1Migration": {
       "body1": "Your protocol will be automatically updated to the latest version.",
-      "body2": "The default dispense height is now 1mm from the bottom of the well. If your protocol contains any dispense commands without a custom height, it will be automatically updated.",
-      "body3": "As always, please contact us with any questions or feedback."
+      "body2": "The default dispense height is now 1 mm from the bottom of the well, instead of 0.5 mm. All dispense commands without a custom height will change to use the new default height.",
+      "body3": "Additionally, blowout actions now precede touch tip actions. The new order affects all dispenses that include both actions."
     },
     "toV8Migration": {
       "body1": "Your protocol will be automatically updated to the latest version.",
diff --git a/protocol-designer/src/localization/en/tooltip.json b/protocol-designer/src/localization/en/tooltip.json
index 52a582f0103..8551c11abea 100644
--- a/protocol-designer/src/localization/en/tooltip.json
+++ b/protocol-designer/src/localization/en/tooltip.json
@@ -10,6 +10,7 @@
   "not_enough_space_for_temp": "There is not enough space on the deck to add more temperature modules",
   "not_in_beta": "ⓘ Coming Soon",
   "missing_tiprack": "Missing a tiprack? Make sure it is added to the deck",
+  "y_position_value": "A negative value moves towards the front",
 
   "step_description": {
     "heaterShaker": "Set heat, shake, or labware latch commands for the Heater-Shaker module",
@@ -41,7 +42,7 @@
       "dispense_flowRate": "The speed at which the pipette dispenses",
       "dispense_mix_checkbox": "Pipette up and down after dispensing",
       "dispense_mmFromBottom": "Adjust tip position for dispense",
-      "dispense_touchTip_checkbox": "Touch tip to each side of well after dispensing",
+      "dispense_touchTip_checkbox": "Touch tip to each side of well after dispensing and other dispense advanced setting commands",
       "dispense_touchTip_mmFromBottom": "Distance from the bottom of the well",
       "disposalVolume_checkbox": "Aspirate extra volume that is disposed of after a multi-dispense is complete. We recommend a disposal volume of at least the pipette's minimum.",
       "heaterShakerSetTimer": "Once this counter has elapsed, the module will deactivate the heater and shaker",