Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Sep 27, 2024
+17 −17
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da2357d
fix(protocol-designer): fix pipette selection issue
koji Sep 26, 2024
fd556d5
pip -> pipette
koji Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions protocol-designer/src/assets/localization/en/create_new_protocol.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -42,5 +42,5 @@
"which_fixtures": "Which fixtures will you be using?",
"which_mods": "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"
}
10 changes: 5 additions & 5 deletions protocol-designer/src/organisms/EditInstrumentsModal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ export function EditInstrumentsModal(
alignItems={ALIGN_CENTER}
>
<StyledText desktopStyle="bodyLargeSemiBold">
{t('your_pips')}
{t('your_pipettes')}
</StyledText>
{has96Channel ? null : (
<Btn
Expand Down Expand Up @@ -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 => {
Expand Down Expand Up @@ -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 => (
Expand Down Expand Up @@ -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 => {
Expand Down Expand Up @@ -506,7 +506,7 @@ export function EditInstrumentsModal(
desktopStyle="bodyLargeSemiBold"
marginBottom={SPACING.spacing16}
>
{t('pip_tips')}
{t('pipette_tips')}
</StyledText>
<Box
css={css`
Expand Down
14 changes: 7 additions & 7 deletions protocol-designer/src/pages/CreateNewProtocolWizard/SelectPipettes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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={() => {
Expand Down Expand Up @@ -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 => (
Expand All @@ -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 => {
Expand Down Expand Up @@ -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`
Expand Down Expand Up @@ -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
Expand Down
Loading