diff --git a/app/src/assets/localization/en/pipette_wizard_flows.json b/app/src/assets/localization/en/pipette_wizard_flows.json index 908c74901dd..3ff554ca130 100644 --- a/app/src/assets/localization/en/pipette_wizard_flows.json +++ b/app/src/assets/localization/en/pipette_wizard_flows.json @@ -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": "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.", "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", diff --git a/app/src/assets/localization/en/protocol_details.json b/app/src/assets/localization/en/protocol_details.json index 902d978e6d6..f5db4b53508 100644 --- a/app/src/assets/localization/en/protocol_details.json +++ b/app/src/assets/localization/en/protocol_details.json @@ -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", diff --git a/app/src/organisms/ModuleWizardFlows/AttachProbe.tsx b/app/src/organisms/ModuleWizardFlows/AttachProbe.tsx index ee9d0be66ba..67071792fe2 100644 --- a/app/src/organisms/ModuleWizardFlows/AttachProbe.tsx +++ b/app/src/organisms/ModuleWizardFlows/AttachProbe.tsx @@ -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; @@ -126,15 +125,17 @@ export const AttachProbe = (props: AttachProbeProps): JSX.Element | null => { const bodyText = ( <> - , - block: , - }} - /> + + , + }} + /> + + {wasteChuteConflict && ( ) - // TODO(bh, 2022-10-18): insert 96-channel display name - // const leftAndRightMountsPipetteDisplayName = 'P20 96-Channel GEN1' - const leftAndRightMountsPipetteDisplayName = null - const leftAndRightMountsItem = - leftAndRightMountsPipetteDisplayName != null ? ( - - ) - } - /> - ) : null - + const is96PipetteUsed = leftMountPipetteName === 'p1000_96' const leftMountPipetteDisplayName = getPipetteNameSpecs(leftMountPipetteName as PipetteName)?.displayName ?? null @@ -134,12 +116,12 @@ export const RobotConfigurationDetails = ( } /> - {leftAndRightMountsItem ?? ( + + {!is96PipetteUsed && ( <> -