Skip to content

Commit

Permalink
fix(app): set max height for desktop modal shell (#14915)
Browse files Browse the repository at this point in the history
closes RQA-2279
  • Loading branch information
ncdiehl11 authored and Carlos-fernandez committed May 20, 2024
1 parent 833c3d0 commit 93a3330
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion app/src/assets/localization/en/pipette_wizard_flows.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"detach_mount_attach_96": "Detach {{mount}} Pipette and Attach 96-Channel Pipette",
"detach_mounting_plate_instructions": "Hold onto the plate so it does not fall. Then remove the pins on the plate from the slots on the gantry carriage.",
"detach_next_pipette": "Detach next pipette",
"detach_pipette_to_attach_96": "Detach {{pipetteName}} and attach 96-Channel pipette",
"detach_pipette_to_attach_96": "Detach {{pipetteName}} and Attach 96-Channel pipette",
"detach_pipette": "detach {{mount}} pipette",
"detach_pipettes_attach_96": "Detach Pipettes and Attach 96-Channel Pipette",
"detach_z_axis_screw_again": "detach the z-axis screw before attaching the 96-Channel Pipette.",
Expand Down
8 changes: 6 additions & 2 deletions app/src/organisms/PipetteWizardFlows/ChoosePipette.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,11 @@ export const ChoosePipette = (props: ChoosePipetteProps): JSX.Element => {
</Flex>
</LegacyModalShell>
) : (
<LegacyModalShell width="47rem" height="30rem" header={wizardHeader}>
<LegacyModalShell
width="47rem"
height="min-content"
header={wizardHeader}
>
{showExitConfirmation ? (
<ExitModal
goBack={() => setShowExitConfirmation(false)}
Expand All @@ -218,7 +222,7 @@ export const ChoosePipette = (props: ChoosePipetteProps): JSX.Element => {
) : (
<Flex
flexDirection={DIRECTION_COLUMN}
padding={SPACING.spacing40}
padding={SPACING.spacing32}
justifyContent={JUSTIFY_SPACE_BETWEEN}
>
<Flex flexDirection={DIRECTION_COLUMN}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ describe('ChoosePipette', () => {
props = { ...props, selectedPipette: NINETY_SIX_CHANNEL }
render(props)
screen.getByText(
'Detach Flex 1-Channel 1000 μL and attach 96-Channel pipette'
'Detach Flex 1-Channel 1000 μL and Attach 96-Channel pipette'
)
})

Expand All @@ -163,7 +163,7 @@ describe('ChoosePipette', () => {
props = { ...props, selectedPipette: NINETY_SIX_CHANNEL }
render(props)
screen.getByText(
'Detach Flex 1-Channel 1000 μL and attach 96-Channel pipette'
'Detach Flex 1-Channel 1000 μL and Attach 96-Channel pipette'
)
})
})
2 changes: 1 addition & 1 deletion app/src/organisms/PipetteWizardFlows/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ export const PipetteWizardFlows = (
currentStep.section === SECTIONS.BEFORE_BEGINNING &&
selectedPipette === NINETY_SIX_CHANNEL &&
flowType === FLOWS.ATTACH
? '70%'
? '30rem'
: 'auto'
}
header={wizardHeader}
Expand Down

0 comments on commit 93a3330

Please sign in to comment.