diff --git a/app/src/organisms/ODD/QuickTransferFlow/constants.ts b/app/src/organisms/ODD/QuickTransferFlow/constants.ts index 5aa6aa3b60d..dd1b18cda43 100644 --- a/app/src/organisms/ODD/QuickTransferFlow/constants.ts +++ b/app/src/organisms/ODD/QuickTransferFlow/constants.ts @@ -100,7 +100,6 @@ export const SINGLE_CHANNEL_COMPATIBLE_LABWARE = [ 'opentrons/thermoscientificnunc_96_wellplate_2000ul/1', 'opentrons/usascientific_12_reservoir_22ml/1', 'opentrons/usascientific_96_wellplate_2.4ml_deep/1', - 'opentrons/evotips_opentrons_96_labware/1', ] export const EIGHT_CHANNEL_COMPATIBLE_LABWARE = [ @@ -145,7 +144,6 @@ export const EIGHT_CHANNEL_COMPATIBLE_LABWARE = [ 'opentrons/thermoscientificnunc_96_wellplate_2000ul/1', 'opentrons/usascientific_12_reservoir_22ml/1', 'opentrons/usascientific_96_wellplate_2.4ml_deep/1', - 'opentrons/evotips_opentrons_96_labware/1', ] export const NINETY_SIX_CHANNEL_COMPATIBLE_LABWARE = [ @@ -190,5 +188,4 @@ export const NINETY_SIX_CHANNEL_COMPATIBLE_LABWARE = [ 'opentrons/thermoscientificnunc_96_wellplate_2000ul/1', 'opentrons/usascientific_12_reservoir_22ml/1', 'opentrons/usascientific_96_wellplate_2.4ml_deep/1', - 'opentrons/evotips_opentrons_96_labware/1', ] diff --git a/app/src/organisms/ODD/QuickTransferFlow/utils/getCompatibleLabwareByCategory.ts b/app/src/organisms/ODD/QuickTransferFlow/utils/getCompatibleLabwareByCategory.ts index cb52a095a33..dd0c0ff7182 100644 --- a/app/src/organisms/ODD/QuickTransferFlow/utils/getCompatibleLabwareByCategory.ts +++ b/app/src/organisms/ODD/QuickTransferFlow/utils/getCompatibleLabwareByCategory.ts @@ -1,4 +1,7 @@ -import { getAllDefinitions } from '@opentrons/shared-data' +import { + getAllDefinitions, + LABWAREV2_DO_NOT_LIST, +} from '@opentrons/shared-data' import { SINGLE_CHANNEL_COMPATIBLE_LABWARE, EIGHT_CHANNEL_COMPATIBLE_LABWARE, @@ -12,7 +15,7 @@ export function getCompatibleLabwareByCategory( pipetteChannels: 1 | 8 | 96, category: LabwareFilter ): LabwareDefinition2[] | undefined { - const allLabwareDefinitions = getAllDefinitions() + const allLabwareDefinitions = getAllDefinitions(LABWAREV2_DO_NOT_LIST) let compatibleLabwareUris: string[] = SINGLE_CHANNEL_COMPATIBLE_LABWARE if (pipetteChannels === 8) { compatibleLabwareUris = EIGHT_CHANNEL_COMPATIBLE_LABWARE diff --git a/shared-data/js/getLabware.ts b/shared-data/js/getLabware.ts index 41949e01d9a..a6a42801639 100644 --- a/shared-data/js/getLabware.ts +++ b/shared-data/js/getLabware.ts @@ -44,6 +44,9 @@ export const LABWAREV2_DO_NOT_LIST = [ 'opentrons_ot3_96_tiprack_1000ul', 'opentrons_ot3_96_tiprack_50ul', 'opentrons_flex_lid_absorbance_plate_reader_module', + // temporarily blocking evotips until it is out of beta + 'evotips_flex_96_tiprack_adapter', + 'evotips_opentrons_96_labware', ] // NOTE(sa, 2020-7-14): in PD we do not want to list calibration blocks // or the adapter/labware combos since we migrated to splitting them up @@ -60,6 +63,9 @@ export const PD_DO_NOT_LIST = [ // temporarily blocking TC lid adapter and deck riser until it is supported in PD 'opentrons_tough_pcr_auto_sealing_lid', 'opentrons_flex_deck_riser', + // temporarily blocking evotips until it is supported in PD + 'evotips_flex_96_tiprack_adapter', + 'evotips_opentrons_96_labware', ] export function getIsLabwareV1Tiprack(def: LabwareDefinition1): boolean {