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(app): set max height for desktop modal shell #14915

Merged
merged 3 commits into from
Apr 16, 2024
+10 −6
Merged

fix(app): set max height for desktop modal shell #14915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d582663
fix(app): set max height for desktop modal shell
ncdiehl Apr 16, 2024
95b5905
post review fix
ncdiehl Apr 16, 2024
4bea6d2
fix copy capitalization for ChoosePipette step
ncdiehl Apr 16, 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
2 changes: 1 addition & 1 deletion app/src/assets/localization/en/pipette_wizard_flows.json
View file
Open in desktop
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
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions app/src/organisms/PipetteWizardFlows/__tests__/ChoosePipette.test.tsx
View file
Open in desktop
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
View file
Open in desktop
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
Loading