diff --git a/app/src/components/ChangePipette/PipetteSelection.js b/app/src/components/ChangePipette/PipetteSelection.js index 5561acf722b3..0c1b87331644 100644 --- a/app/src/components/ChangePipette/PipetteSelection.js +++ b/app/src/components/ChangePipette/PipetteSelection.js @@ -1,9 +1,7 @@ // @flow import * as React from 'react' -import { useSelector } from 'react-redux' import { PipetteSelect } from '@opentrons/components' -import { getConfig } from '../../config' import styles from './styles.css' const LABEL = 'Select the pipette you wish to attach:' @@ -13,17 +11,12 @@ export type PipetteSelectionProps = { } export function PipetteSelection(props: PipetteSelectionProps) { - const config = useSelector(getConfig) - const nameBlacklist = Boolean(config.devInternal?.enableMultiGEN2) - ? [] - : ['p20_multi_gen2', 'p300_multi_gen2'] return ( ) diff --git a/app/src/config/constants.js b/app/src/config/constants.js index c79b3b291c3a..43b2377f313b 100644 --- a/app/src/config/constants.js +++ b/app/src/config/constants.js @@ -4,7 +4,6 @@ import type { DevInternalFlag } from './types' export const DEV_INTERNAL_FLAGS: Array = [ 'allPipetteConfig', - 'enableMultiGEN2', 'enableBundleUpload', 'enableWifiDisconnect', ] diff --git a/app/src/config/types.js b/app/src/config/types.js index d17c5d1a2a7a..7a7adf573e69 100644 --- a/app/src/config/types.js +++ b/app/src/config/types.js @@ -9,7 +9,6 @@ export type DiscoveryCandidates = string | Array export type DevInternalFlag = | 'allPipetteConfig' - | 'enableMultiGEN2' | 'enableBundleUpload' | 'enableWifiDisconnect' diff --git a/protocol-designer/src/components/modals/FilePipettesModal/PipetteFields.js b/protocol-designer/src/components/modals/FilePipettesModal/PipetteFields.js index 5df3b5fb1d55..ac4cde7e1f41 100644 --- a/protocol-designer/src/components/modals/FilePipettesModal/PipetteFields.js +++ b/protocol-designer/src/components/modals/FilePipettesModal/PipetteFields.js @@ -1,6 +1,5 @@ // @flow import React, { useMemo } from 'react' -import { useSelector } from 'react-redux' import { DropdownField, FormGroup, @@ -19,7 +18,6 @@ import formStyles from '../../forms/forms.css' import { getOnlyLatestDefs } from '../../../labware-defs/utils' import type { FormPipettesByMount } from '../../../step-forms' -import { getEnableMultiGEN2Pipettes } from '../../../feature-flags/selectors' export type Props = {| initialTabIndex?: number, @@ -66,7 +64,6 @@ export function PipetteFields(props: Props) { errors, touched, } = props - const enableMultiGEN2 = useSelector(getEnableMultiGEN2Pipettes) const tiprackOptions = useMemo(() => { const defs = getOnlyLatestDefs() @@ -91,15 +88,11 @@ export function PipetteFields(props: Props) { const renderPipetteSelect = (props: PipetteSelectProps) => { const { tabIndex, mount } = props const pipetteName = values[mount].pipetteName - const nameBlacklist = enableMultiGEN2 - ? [] - : ['p20_multi_gen2', 'p300_multi_gen2'] return ( { const nameAccessor = `pipettesByMount.${mount}.pipetteName`