address feedback

Opentrons · Jan 13, 2025 · aa0c7ec · aa0c7ec
1 parent 422a6bc
commit aa0c7ec
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/components/src/molecules/DropdownMenu/index.tsx b/components/src/molecules/DropdownMenu/index.tsx
@@ -38,7 +38,7 @@ export interface DropdownOption {
   /** subtext below the name */
   subtext?: string
   disabled?: boolean
-  tooltipText?: string
+  tooltipText?: string | null
 }
 
 export type DropdownBorder = 'rounded' | 'neutral'

diff --git a/protocol-designer/src/feature-flags/reducers.ts b/protocol-designer/src/feature-flags/reducers.ts
@@ -31,7 +31,7 @@ const initialFlags: Flags = {
     process.env.OT_PD_ENABLE_HOT_KEYS_DISPLAY === '1' || true,
   OT_PD_ENABLE_REACT_SCAN: process.env.OT_PD_ENABLE_REACT_SCAN === '1' || false,
   OT_PD_ENABLE_LIQUID_CLASSES:
-    process.env.OT_PD_ENABLE_REACT_SCAN === '1' || false,
+    process.env.OT_PD_ENABLE_LIQUID_CLASSES === '1' || false,
   OT_PD_ENABLE_PARTIAL_TIP_SUPPORT:
     process.env.OT_PD_ENABLE_PARTIAL_TIP_SUPPORT === '1' || false,
 }

diff --git a/...ocol-designer/src/pages/Designer/ProtocolSteps/StepForm/PipetteFields/PartialTipField.tsx b/...ocol-designer/src/pages/Designer/ProtocolSteps/StepForm/PipetteFields/PartialTipField.tsx
@@ -47,7 +47,7 @@ export function PartialTipField(props: PartialTipFieldProps): JSX.Element {
       disabled: noTipracksOnAdapter,
       tooltipText: noTipracksOnAdapter
         ? t('form:step_edit_form.field.nozzles.option_tooltip.partial')
-        : undefined,
+        : null,
     })
     if (enablePartialTip) {
       options.push({
@@ -56,7 +56,7 @@ export function PartialTipField(props: PartialTipFieldProps): JSX.Element {
         disabled: noTipracksOnAdapter,
         tooltipText: noTipracksOnAdapter
           ? t('form:step_edit_form.field.nozzles.option_tooltip.partial')
-          : undefined,
+          : null,
       })
     }
   } else {

diff --git a/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepTools/MixTools/index.tsx b/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepTools/MixTools/index.tsx
@@ -77,7 +77,7 @@ export function MixTools(props: StepFormProps): JSX.Element {
 
   const is96Channel =
     propsForFields.pipette.value != null &&
-    pipettes[String(propsForFields.pipette.value)].name === 'p1000_96'
+    pipettes[String(propsForFields.pipette.value)].spec.channels === 96
   const is8Channel =
     propsForFields.pipette.value != null &&
     pipettes[String(propsForFields.pipette.value)].spec.channels === 8

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
@@ -93,7 +93,7 @@ export function MoveLiquidTools(props: StepFormProps): JSX.Element {
 
   const is96Channel =
     propsForFields.pipette.value != null &&
-    pipettes[String(propsForFields.pipette.value)].name === 'p1000_96'
+    pipettes[String(propsForFields.pipette.value)].spec.channels === 96
   const is8Channel =
     propsForFields.pipette.value != null &&
     pipettes[String(propsForFields.pipette.value)].spec.channels === 8

diff --git a/protocol-designer/src/top-selectors/substep-highlight.ts b/protocol-designer/src/top-selectors/substep-highlight.ts
@@ -34,7 +34,7 @@ function _wellsForPipette(
 
   // `wells` is all the wells that pipette's channel 1 interacts with.
   if ((pipChannels === 8 || pipChannels === 96) && nozzles !== SINGLE) {
-    let channels: 8 | 96 = pipChannels
+    let channels = pipChannels
     if (nozzles === ALL && pipChannels === 8) {
       channels = 96
     } else if (