fix(protocol-designer): fix pipette selection issue (#16363)

* fix(protocol-designer): fix pipette selection issue
Opentrons · Sep 27, 2024 · 4324dd3 · 4324dd3
1 parent e3c39e7
commit 4324dd3
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/protocol-designer/src/assets/localization/en/create_new_protocol.json b/protocol-designer/src/assets/localization/en/create_new_protocol.json
@@ -16,10 +16,10 @@
   "modules_added": "Modules added",
   "name": "Name",
   "need_gripper": "Do you want to move labware automatically with the gripper?",
-  "pip_gen": "Pipette generation",
-  "pip_tips": "Pipette tips",
-  "pip_type": "Pipette type",
-  "pip_vol": "Pipette volume",
+  "pipette_gen": "Pipette generation",
+  "pipette_tips": "Pipette tips",
+  "pipette_type": "Pipette type",
+  "pipette_vol": "Pipette volume",
   "pip": "{{mount}} pipette",
   "quantity": "Quantity",
   "remove": "Remove",
@@ -42,5 +42,5 @@
   "which_fixtures": "Which fixtures will you be using?",
   "which_modules": "Select modules to use in your protocol.",
   "which_pipette": "Pick your first pipette. If you need a second pipette, you can add it next.",
-  "your_pips": "Your pipettes"
+  "your_pipettes": "Your pipettes"
 }
diff --git a/protocol-designer/src/organisms/EditInstrumentsModal/index.tsx b/protocol-designer/src/organisms/EditInstrumentsModal/index.tsx
@@ -207,7 +207,7 @@ export function EditInstrumentsModal(
               alignItems={ALIGN_CENTER}
             >
               <StyledText desktopStyle="bodyLargeSemiBold">
-                {t('your_pips')}
+                {t('your_pipettes')}
               </StyledText>
               {has96Channel ? null : (
                 <Btn
@@ -385,7 +385,7 @@ export function EditInstrumentsModal(
               desktopStyle="bodyLargeSemiBold"
               marginBottom={SPACING.spacing16}
             >
-              {t('pip_type')}
+              {t('pipette_type')}
             </StyledText>
             <Flex gridGap={SPACING.spacing4}>
               {PIPETTE_TYPES[robotType].map(type => {
@@ -415,7 +415,7 @@ export function EditInstrumentsModal(
                 desktopStyle="bodyLargeSemiBold"
                 marginBottom={SPACING.spacing16}
               >
-                {t('pip_gen')}
+                {t('pipette_gen')}
               </StyledText>
               <Flex gridGap={SPACING.spacing4}>
                 {PIPETTE_GENS.map(gen => (
@@ -446,7 +446,7 @@ export function EditInstrumentsModal(
                 desktopStyle="bodyLargeSemiBold"
                 marginBottom={SPACING.spacing16}
               >
-                {t('pip_vol')}
+                {t('pipette_vol')}
               </StyledText>
               <Flex gridGap={SPACING.spacing4}>
                 {PIPETTE_VOLUMES[robotType]?.map(volume => {
@@ -506,7 +506,7 @@ export function EditInstrumentsModal(
                       desktopStyle="bodyLargeSemiBold"
                       marginBottom={SPACING.spacing16}
                     >
-                      {t('pip_tips')}
+                      {t('pipette_tips')}
                     </StyledText>
                     <Box
                       css={css`

diff --git a/protocol-designer/src/pages/CreateNewProtocolWizard/SelectPipettes.tsx b/protocol-designer/src/pages/CreateNewProtocolWizard/SelectPipettes.tsx
@@ -155,13 +155,13 @@ export function SelectPipettes(props: WizardTileProps): JSX.Element | null {
                 gridGap={SPACING.spacing12}
               >
                 <StyledText desktopStyle="headingSmallBold">
-                  {t('pip_type')}
+                  {t('pipette_type')}
                 </StyledText>
                 <Flex gridGap={SPACING.spacing4}>
                   {PIPETTE_TYPES[robotType].map(type => {
                     return type.value === '96' &&
-                      pipettesByMount.left.pipetteName != null &&
-                      pipettesByMount.right.pipetteName != null ? null : (
+                      (pipettesByMount.left.pipetteName != null ||
+                        pipettesByMount.right.pipetteName != null) ? null : (
                       <RadioButton
                         key={`${type.label}_${type.value}`}
                         onChange={() => {
@@ -192,7 +192,7 @@ export function SelectPipettes(props: WizardTileProps): JSX.Element | null {
                   gridGap={SPACING.spacing12}
                 >
                   <StyledText desktopStyle="headingSmallBold">
-                    {t('pip_gen')}
+                    {t('pipette_gen')}
                   </StyledText>
                   <Flex gridGap={SPACING.spacing4}>
                     {PIPETTE_GENS.map(gen => (
@@ -219,7 +219,7 @@ export function SelectPipettes(props: WizardTileProps): JSX.Element | null {
                   gridGap={SPACING.spacing12}
                 >
                   <StyledText desktopStyle="headingSmallBold">
-                    {t('pip_vol')}
+                    {t('pipette_vol')}
                   </StyledText>
                   <Flex gridGap={SPACING.spacing4}>
                     {PIPETTE_VOLUMES[robotType]?.map(volume => {
@@ -283,7 +283,7 @@ export function SelectPipettes(props: WizardTileProps): JSX.Element | null {
                           gridGap={SPACING.spacing16}
                         >
                           <StyledText desktopStyle="headingSmallBold">
-                            {t('pip_tips')}
+                            {t('pipette_tips')}
                           </StyledText>
                           <Box
                             css={css`
@@ -373,7 +373,7 @@ export function SelectPipettes(props: WizardTileProps): JSX.Element | null {
                 alignItems={ALIGN_CENTER}
               >
                 <StyledText desktopStyle="headingSmallBold">
-                  {t('your_pips')}
+                  {t('your_pipettes')}
                 </StyledText>
                 {has96Channel ? null : (
                   <Btn