Merge branch 'edge' into lc-snapshot-protocols-96-happy-path

Author: y3rsh

app/src/assets/localization/en/labware_position_check.json

@@ -51,10 +51,17 @@
   "exit_screen_title": "Exit before completing Labware Position Check?",
   "failed_to_save_final_position": "Failed to save final position",
   "get_labware_offset_data": "Get Labware Offset Data",
-  "install_probe": "<block>Take the calibration probe from its storage location. Ensure the collar is fully unlocked. Push the pipette ejector up and press the probe firmly onto the pipette nozzle as far as it can go. Twist the collar to lock the probe.</block><block>Test that the probe is secure by gently pulling it back and forth. It should be firmly in place.</block>",
+  "go_back": "Go back",
+  "go_back_confirmation": "Are you sure you want to go back to the the labware list without saving?",
+  "install_probe_1ch": "<block>Take the calibration probe from its storage location. Ensure the collar is fully unlocked. Push the pipette ejector up and press the probe firmly onto the pipette nozzle as far as it can go. Twist the collar to lock the probe.</block><block>Test that the probe is secure by gently pulling it back and forth. It should be firmly in place.</block>",
+  "install_probe_8ch": "<block>Take the calibration probe from its storage location. Ensure the collar is fully unlocked. Push the pipette ejector up and press the probe firmly onto the <strong>backmost</strong> pipette nozzle as far as it can go. Twist the collar to lock the probe.</block><block>Test that the probe is secure by gently pulling it back and forth. It should be firmly in place.</block>",
+  "install_probe_96ch": "<block>Take the calibration probe from its storage location. Ensure the collar is fully unlocked. Push the pipette ejector up and press the probe firmly onto the <strong>A1 (back left corner)</strong> pipette nozzle as far as it can go. Twist the collar to lock the probe.</block><block>Test that the probe is secure by gently pulling it back and forth. It should be firmly in place.</block>",
   "jog_controls_adjustment": "Need to make an adjustment?",
+  "jog_too_far": "Jog too far?",
   "jupyter_notebook": "Jupyter Notebook",
   "labware": "labware",
+  "labware_default_offset_added": "{{labware}} default offset added",
+  "labware_default_offset_updated": "{{labware}} default offset updated",
   "labware_display_location_text": "Deck Slot {{slot}}",
   "labware_offset": "Labware Offset",
   "labware_offset_data": "Labware Offset Data",
@@ -81,6 +88,7 @@
   "labware_step_detail_modal_nozzle_or_tip_image_3_text": "If you’re having trouble, slide 1 sheet of printer paper between the nozzle and the tip. A single piece of paper should barely pass between them.",
   "labware_step_detail_tiprack": "The pipette nozzle should be centered above A1 in <italic>{{tiprack_name}}</italic> and <bold>level</bold> with the top of the tip.",
   "labware_step_detail_tiprack_plural": "The pipette nozzles should be centered above column 1 in <italic>{{tiprack_name}}</italic> and <bold>level</bold> with the top of the tips.",
+  "labware_type": "Labware Type",
   "learn_more": "Learn more",
   "legacy_calibration_probe": "calibration probe",
   "legacy_clear_all_slots": "Clear all deck slots of labware, leaving modules in place",
@@ -99,6 +107,7 @@
   "move_pipette": "Move pipette",
   "move_to_a1_position": "Move the pipette to line up in the A1 position",
   "moving_to_slot_title": "Moving to slot {{slot}}",
+  "need_help": "Need help?",
   "new_labware_offset_data": "New labware offset data",
   "ninety_six_probe_location": "A1 (back left corner)",
   "no_labware_offsets": "No Labware Offset",
@@ -125,6 +134,7 @@
   "remove_calibration_probe": "Remove calibration probe",
   "remove_probe": "Unlock the calibraiton probe, remove it from the nozzle, and return it to its storage location.",
   "remove_probe_before_exit": "Remove the calibration probe before exiting",
+  "remove_probe_before_exiting_error": "First, remove the calibration probe before exiting. Then, restart Labware Position Check to continue.",
   "reset_to_default": "Reset to default",
   "return_tip_rack_to_location": "Return tip rack to {{location}}",
   "return_tip_section": "Return tip",
@@ -140,18 +150,24 @@
   "see_how_offsets_work": "See how labware offsets work",
   "select_labware_to_view_data": "Select a labware to view its stored offset data.",
   "slot": "Slot {{slotName}}",
+  "slot_applied_location_offset_updated": "{{slot}} applied location offset updated",
+  "slot_in_module_applied_location_offset_updated": "{{slot}} in {{module}} applied location offset updated",
   "slot_location": "Slot Location",
   "slot_name": "slot {{slotName}}",
+  "something_went_wrong": "Something went wrong",
   "specific_slots_can_be_adjusted": "Specific slot locations can be adjusted as needed",
+  "start_over": "Start over",
   "start_position_check": "begin labware position check, move to Slot {{initial_labware_slot}}",
   "store_probe": "Before exiting, unlock the calibration probe, remove it from the nozzle, and return it to its storage location.",
   "stored_offset_data": "Apply Stored Labware Offset Data?",
   "stored_offsets_for_this_protocol": "Stored Labware Offset data that applies to this protocol",
   "table_view": "Table View",
   "tip_rack": "tip rack",
+  "total_offsets": "Total Offsets",
   "try_again": "Try again",
   "unsaved_changes_will_be_lost": "Unsaved changes will be lost",
   "view_current_offsets": "view current offsets",
   "view_data": "View data",
+  "view_labware_list": "View labware list",
   "what_is_labware_offset_data": "What is labware offset data?"
 }

app/src/molecules/MultiDeckLabelTagBtns/index.tsx

@@ -12,11 +12,12 @@ import {
   JUSTIFY_END,
   JUSTIFY_FLEX_START,
   RESPONSIVENESS,
+  SecondaryButton,
   SPACING,
   StyledText,
 } from '@opentrons/components'
 
-import { QuaternaryButton, SmallButton } from '/app/atoms/buttons'
+import { SmallButton } from '/app/atoms/buttons'
 
 import type { SmallButtonTypes } from '/app/atoms/buttons/SmallButton'
 
@@ -75,11 +76,11 @@ export function MultiDeckLabelTagBtns({
         )}
         <>
           <SmallButton {...colThreePrimaryBtn} css={ODD_ONLY_BUTTON} />
-          <QuaternaryButton {...colThreePrimaryBtn} css={DESKTOP_ONLY_BUTTON}>
+          <SecondaryButton {...colThreePrimaryBtn} css={DESKTOP_ONLY_BUTTON}>
             <StyledText desktopStyle="captionSemiBold">
               {colThreePrimaryBtn.buttonText}
             </StyledText>
-          </QuaternaryButton>
+          </SecondaryButton>
         </>
       </Flex>
     </Flex>

app/src/molecules/WizardHeader/index.tsx

@@ -13,6 +13,7 @@ import {
   SPACING,
   LegacyStyledText,
   TYPOGRAPHY,
+  StyledText,
 } from '@opentrons/components'
 import { StepMeter } from '/app/atoms/StepMeter'
 
@@ -22,6 +23,7 @@ interface WizardHeaderProps {
   totalSteps?: number | null
   currentStep?: number | null
   exitDisabled?: boolean
+  hideStepText?: boolean
 }
 
 const EXIT_BUTTON_STYLE = css`
@@ -59,14 +61,7 @@ const HEADER_CONTAINER_STYLE = css`
     border-radius: ${BORDERS.borderRadius16};
   }
 `
-const HEADER_TEXT_STYLE = css`
-  ${TYPOGRAPHY.pSemiBold}
-  @media ${RESPONSIVENESS.touchscreenMediaQuerySpecs} {
-    font-size: ${TYPOGRAPHY.fontSize22};
-    font-weight: ${TYPOGRAPHY.fontWeightBold};
-    line-height: ${TYPOGRAPHY.lineHeight28};
-  }
-`
+
 const STEP_TEXT_STYLE = css`
   ${TYPOGRAPHY.pSemiBold}
   color: ${COLORS.grey60};
@@ -77,21 +72,31 @@ const STEP_TEXT_STYLE = css`
 `
 
 export const WizardHeader = (props: WizardHeaderProps): JSX.Element => {
-  const { totalSteps, currentStep, title, onExit, exitDisabled } = props
+  const {
+    totalSteps,
+    currentStep,
+    hideStepText,
+    title,
+    onExit,
+    exitDisabled,
+  } = props
   const { t } = useTranslation('shared')
 
   return (
     <Box css={BOX_STYLE}>
       <Flex css={HEADER_CONTAINER_STYLE}>
         <Flex flexDirection={DIRECTION_ROW} alignItems={ALIGN_CENTER}>
-          <LegacyStyledText
-            css={HEADER_TEXT_STYLE}
-            marginRight={SPACING.spacing8}
+          <StyledText
+            desktopStyle="bodyLargeSemiBold"
+            oddStyle="bodyTextSemiBold"
           >
             {title}
-          </LegacyStyledText>
+          </StyledText>
 
-          {currentStep != null && totalSteps != null && currentStep > 0 ? (
+          {!hideStepText &&
+          currentStep != null &&
+          totalSteps != null &&
+          currentStep > 0 ? (
             <LegacyStyledText css={STEP_TEXT_STYLE}>
               {t('step', { current: currentStep, max: totalSteps })}
             </LegacyStyledText>