Merge branch 'edge' into pd-switch-pipette

Opentrons · Nov 20, 2024 · da61c78 · da61c78
2 parents bae1d02 + 5ed800e
commit da61c78
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/protocol-designer/src/pages/CreateNewProtocolWizard/PDListItemCustomize.tsx b/protocol-designer/src/pages/CreateNewProtocolWizard/PDListItemCustomize.tsx
@@ -27,7 +27,6 @@ interface PDListItemCustomizeProps {
   label?: string
   dropdown?: DropdownMenuProps
   tag?: TagProps
-  forceDirection?: boolean
 }
 
 export function PDListItemCustomize({
@@ -38,7 +37,6 @@ export function PDListItemCustomize({
   label,
   dropdown,
   tag,
-  forceDirection = false,
 }: PDListItemCustomizeProps): JSX.Element {
   const responsiveType = useResponsiveBreakpoints()
   const isLargeScreen = responsiveType === 'xl' || responsiveType === 'lg'
@@ -53,7 +51,7 @@ export function PDListItemCustomize({
       )}
       {dropdown != null && (
         <Flex paddingBottom={SPACING.spacing8}>
-          <DropdownMenu {...dropdown} forceDirection={forceDirection} />
+          <DropdownMenu {...dropdown} menuPlacement="bottom" />
         </Flex>
       )}
       {tag != null && <Tag {...tag} />}

diff --git a/protocol-designer/src/pages/CreateNewProtocolWizard/SelectFixtures.tsx b/protocol-designer/src/pages/CreateNewProtocolWizard/SelectFixtures.tsx
@@ -158,7 +158,6 @@ export function SelectFixtures(props: WizardTileProps): JSX.Element | null {
                 return (
                   <ListItem type="noActive" key={ae}>
                     <ListItemCustomize
-                      menuPlacement="bottom"
                       linkText={t('remove')}
                       onClick={() => {
                         setValue(

diff --git a/protocol-designer/src/pages/CreateNewProtocolWizard/SelectModules.tsx b/protocol-designer/src/pages/CreateNewProtocolWizard/SelectModules.tsx
@@ -258,7 +258,6 @@ export function SelectModules(props: WizardTileProps): JSX.Element | null {
                       return (
                         <ListItem type="noActive" key={`${module.model}`}>
                           <ListItemCustomize
-                            menuPlacement="bottom"
                             dropdown={
                               MOAM_MODULE_TYPES.includes(module.type) &&
                               robotType === FLEX_ROBOT_TYPE

diff --git a/protocol-designer/src/pages/Designer/DeckSetup/DeckSetupDetails.tsx b/protocol-designer/src/pages/Designer/DeckSetup/DeckSetupDetails.tsx
@@ -200,7 +200,9 @@ export function DeckSetupDetails(props: DeckSetupDetailsProps): JSX.Element {
         }
         const isLabwareOccludedByThermocyclerLid =
           moduleOnDeck.type === THERMOCYCLER_MODULE_TYPE &&
-          (moduleOnDeck.moduleState as ThermocyclerModuleState).lidOpen !== true
+          (moduleOnDeck.moduleState as ThermocyclerModuleState).lidOpen !==
+            true &&
+          tab === 'protocolSteps'
 
         const tempInnerProps = getModuleInnerProps(moduleOnDeck.moduleState)
         const innerProps =

diff --git a/shared-data/labware/definitions/2/opentrons_tough_pcr_auto_sealing_lid/1.json b/shared-data/labware/definitions/2/opentrons_tough_pcr_auto_sealing_lid/1.json
@@ -66,6 +66,11 @@
       "y": 0,
       "z": 8.193
     },
+    "biorad_96_wellplate_200ul_pcr": {
+      "x": 0,
+      "y": 0,
+      "z": 8.08
+    },
     "opentrons_flex_deck_riser": {
       "x": 0,
       "y": 0,