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

Jump to bottom

fix(app): Copy fixes in app flows #14167

Merged
merged 6 commits into from
Dec 12, 2023
Merged

fix(app): Copy fixes in app flows #14167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c70ce59
fix(app): change firmware update copy in case no pipette is attached
smb2268 Dec 11, 2023
4c908d5
fix(app): fix bold styling on attach probe module cal step
smb2268 Dec 11, 2023
d0028c0
fix(app): say both mounts for 96 in protocol details
smb2268 Dec 11, 2023
35e2316
fix linting errors
smb2268 Dec 11, 2023
823ec5e
fix formatting
smb2268 Dec 11, 2023
2e4fa27
change i18n key name
smb2268 Dec 12, 2023
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 @@ -39,7 +39,7 @@
"detach": "Detaching Pipette",
"exit_cal": "Exit calibration",
"firmware_updating": "A firmware update is required, instrument is updating...",
"firmware_up_to_date": "Firmware is up to date.",
"firmware_up_to_date": "No firmware update found.",
"gantry_empty_for_96_channel_success": "Now that both mounts are empty, you can begin the 96-Channel Pipette attachment process.",
"get_started_detach": "<block>To get started, remove labware from the deck and clean up the working area to make detachment easier. Also gather the needed equipment shown to the right.</block>",
"grab_screwdriver": "While continuing to hold in place, grab your 2.5mm driver and tighten screws as shown in the animation. Test the pipette attachment by giving it a wiggle before pressing continue",
Expand Down
2 changes: 1 addition & 1 deletion app/src/assets/localization/en/protocol_details.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"labware": "labware",
"last_analyzed": "last analyzed",
"last_updated": "last updated",
"left_and_right_mounts": "Left+Right Mounts",
"both_mounts": "Both Mounts",
"left_mount": "left mount",
"liquid_name": "liquid name",
"liquids_not_in_protocol": "no liquids are specified for this protocol",
Expand Down
21 changes: 11 additions & 10 deletions app/src/organisms/ModuleWizardFlows/AttachProbe.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ const IN_PROGRESS_STYLE = css`
`
const BODY_STYLE = css`
${TYPOGRAPHY.pRegular};

@media ${RESPONSIVENESS.touchscreenMediaQuerySpecs} {
font-size: 1.275rem;
line-height: 1.75rem;
Expand Down Expand Up @@ -126,15 +125,17 @@ export const AttachProbe = (props: AttachProbeProps): JSX.Element | null => {

const bodyText = (
<>
<Trans
t={t}
i18nKey={'pipette_wizard_flows:install_probe'}
values={{ location: probeLocation }}
components={{
strong: <strong />,
block: <StyledText css={BODY_STYLE} />,
}}
/>
<StyledText css={BODY_STYLE}>
<Trans
t={t}
i18nKey={'pipette_wizard_flows:install_probe'}
values={{ location: probeLocation }}
components={{
bold: <strong />,
}}
/>
</StyledText>

{wasteChuteConflict && (
<Banner
type={isWasteChuteOnDeck ? 'error' : 'warning'}
Expand Down
30 changes: 6 additions & 24 deletions app/src/organisms/ProtocolDetails/RobotConfigurationDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,25 +67,7 @@ export const RobotConfigurationDetails = (
</StyledText>
)

// TODO(bh, 2022-10-18): insert 96-channel display name
// const leftAndRightMountsPipetteDisplayName = 'P20 96-Channel GEN1'
const leftAndRightMountsPipetteDisplayName = null
const leftAndRightMountsItem =
leftAndRightMountsPipetteDisplayName != null ? (
<RobotConfigurationDetailsItem
label={t('left_and_right_mounts')}
item={
isLoading ? (
loadingText
) : (
<InstrumentContainer
displayName={leftAndRightMountsPipetteDisplayName}
/>
)
}
/>
) : null

const is96PipetteUsed = leftMountPipetteName === 'p1000_96'
const leftMountPipetteDisplayName =
getPipetteNameSpecs(leftMountPipetteName as PipetteName)?.displayName ??
null
Expand Down Expand Up @@ -134,12 +116,12 @@ export const RobotConfigurationDetails = (
}
/>
<Divider marginY={SPACING.spacing12} width="100%" />
{leftAndRightMountsItem ?? (
<RobotConfigurationDetailsItem
label={is96PipetteUsed ? t('both_mounts') : t('left_mount')}
item={isLoading ? loadingText : leftMountItem}
/>
{!is96PipetteUsed && (
<>
<RobotConfigurationDetailsItem
label={t('left_mount')}
item={isLoading ? loadingText : leftMountItem}
/>
<Divider marginY={SPACING.spacing12} width="100%" />
<RobotConfigurationDetailsItem
label={t('right_mount')}
Expand Down
Loading