diff --git a/protocol-designer/src/assets/localization/en/feature_flags.json b/protocol-designer/src/assets/localization/en/feature_flags.json
index f83f09e345c..a70e23931c9 100644
--- a/protocol-designer/src/assets/localization/en/feature_flags.json
+++ b/protocol-designer/src/assets/localization/en/feature_flags.json
@@ -20,10 +20,6 @@
"title": "Enable redesign",
"description": "A whole new world."
},
- "OT_PD_ENABLE_MOAM": {
- "title": "Enable multiple modules",
- "description": "Enable multiple heater-shakers and magnetic blocks for Flex only."
- },
"OT_PD_ENABLE_COMMENT": {
"title": "Enable comment step",
"description": "You can add comments anywhere between timeline steps."
diff --git a/protocol-designer/src/components/EditModules.tsx b/protocol-designer/src/components/EditModules.tsx
index 6ed7c8a6054..31b392c29a5 100644
--- a/protocol-designer/src/components/EditModules.tsx
+++ b/protocol-designer/src/components/EditModules.tsx
@@ -12,7 +12,6 @@ import {
} from '../step-forms'
import { moveDeckItem } from '../labware-ingred/actions/actions'
import { getRobotType } from '../file-data/selectors'
-import { getEnableMoam } from '../feature-flags/selectors'
import { EditMultipleModulesModal } from './modals/EditModulesModal/EditMultipleModulesModal'
import { useBlockingHint } from './Hints/useBlockingHint'
import { MagneticModuleWarningModalContent } from './modals/EditModulesModal/MagneticModuleWarningModalContent'
@@ -34,14 +33,15 @@ export interface ModelModuleInfo {
export const EditModules = (props: EditModulesProps): JSX.Element => {
const { onCloseClick, moduleToEdit } = props
- const enableMoam = useSelector(getEnableMoam)
const { moduleId, moduleType } = moduleToEdit
const _initialDeckSetup = useSelector(stepFormSelectors.getInitialDeckSetup)
const robotType = useSelector(getRobotType)
- const MOAM_MODULE_TYPES: ModuleType[] = enableMoam
- ? [TEMPERATURE_MODULE_TYPE, HEATERSHAKER_MODULE_TYPE, MAGNETIC_BLOCK_TYPE]
- : [TEMPERATURE_MODULE_TYPE]
+ const MOAM_MODULE_TYPES: ModuleType[] = [
+ TEMPERATURE_MODULE_TYPE,
+ HEATERSHAKER_MODULE_TYPE,
+ MAGNETIC_BLOCK_TYPE,
+ ]
const showMultipleModuleModal =
robotType === FLEX_ROBOT_TYPE && MOAM_MODULE_TYPES.includes(moduleType)
diff --git a/protocol-designer/src/components/__tests__/EditModules.test.tsx b/protocol-designer/src/components/__tests__/EditModules.test.tsx
index 6c980fecd25..06a36b19f06 100644
--- a/protocol-designer/src/components/__tests__/EditModules.test.tsx
+++ b/protocol-designer/src/components/__tests__/EditModules.test.tsx
@@ -9,7 +9,6 @@ import {
import { i18n } from '../../assets/localization'
import { getInitialDeckSetup } from '../../step-forms/selectors'
import { getDismissedHints } from '../../tutorial/selectors'
-import { getEnableMoam } from '../../feature-flags/selectors'
import { renderWithProviders } from '../../__testing-utils__'
import { getRobotType } from '../../file-data/selectors'
import { EditMultipleModulesModal } from '../modals/EditModulesModal/EditMultipleModulesModal'
@@ -58,7 +57,6 @@ describe('EditModules', () => {
labware: {},
additionalEquipmentOnDeck: {},
})
- vi.mocked(getEnableMoam).mockReturnValue(true)
vi.mocked(EditModulesModal).mockReturnValue(
mock EditModulesModal
)
diff --git a/protocol-designer/src/components/modals/CreateFileWizard/ModulesAndOtherTile.tsx b/protocol-designer/src/components/modals/CreateFileWizard/ModulesAndOtherTile.tsx
index 2f63d6667bb..5409217dfd3 100644
--- a/protocol-designer/src/components/modals/CreateFileWizard/ModulesAndOtherTile.tsx
+++ b/protocol-designer/src/components/modals/CreateFileWizard/ModulesAndOtherTile.tsx
@@ -37,7 +37,6 @@ import gripperImage from '../../../assets/images/flex_gripper.png'
import wasteChuteImage from '../../../assets/images/waste_chute.png'
import trashBinImage from '../../../assets/images/flex_trash_bin.png'
import { uuid } from '../../../utils'
-import { getEnableMoam } from '../../../feature-flags/selectors'
import { selectors as featureFlagSelectors } from '../../../feature-flags'
import { CrashInfoBox, ModuleDiagram } from '../../modules'
import { ModuleFields } from '../FilePipettesModal/ModuleFields'
@@ -202,15 +201,17 @@ export function ModulesAndOtherTile(props: WizardTileProps): JSX.Element {
function FlexModuleFields(props: WizardTileProps): JSX.Element {
const { watch, setValue } = props
- const enableMoam = useSelector(getEnableMoam)
const modules = watch('modules')
const additionalEquipment = watch('additionalEquipment')
const enableAbsorbanceReader = useSelector(
featureFlagSelectors.getEnableAbsorbanceReader
)
- const MOAM_MODULE_TYPES: ModuleType[] = enableMoam
- ? [TEMPERATURE_MODULE_TYPE, HEATERSHAKER_MODULE_TYPE, MAGNETIC_BLOCK_TYPE]
- : [TEMPERATURE_MODULE_TYPE]
+ const MOAM_MODULE_TYPES: ModuleType[] = [
+ TEMPERATURE_MODULE_TYPE,
+ HEATERSHAKER_MODULE_TYPE,
+ MAGNETIC_BLOCK_TYPE,
+ ]
+
const moduleTypesOnDeck =
modules != null ? Object.values(modules).map(module => module.type) : []
diff --git a/protocol-designer/src/components/modals/CreateFileWizard/__tests__/ModulesAndOtherTile.test.tsx b/protocol-designer/src/components/modals/CreateFileWizard/__tests__/ModulesAndOtherTile.test.tsx
index fdc4e9b86e5..0b4e99952a6 100644
--- a/protocol-designer/src/components/modals/CreateFileWizard/__tests__/ModulesAndOtherTile.test.tsx
+++ b/protocol-designer/src/components/modals/CreateFileWizard/__tests__/ModulesAndOtherTile.test.tsx
@@ -5,10 +5,7 @@ import { fireEvent, screen, cleanup } from '@testing-library/react'
import { FLEX_ROBOT_TYPE, OT2_ROBOT_TYPE } from '@opentrons/shared-data'
import { renderWithProviders } from '../../../../__testing-utils__'
import { i18n } from '../../../../assets/localization'
-import {
- getDisableModuleRestrictions,
- getEnableMoam,
-} from '../../../../feature-flags/selectors'
+import { getDisableModuleRestrictions } from '../../../../feature-flags/selectors'
import { CrashInfoBox } from '../../../modules'
import { ModuleFields } from '../../FilePipettesModal/ModuleFields'
import { ModulesAndOtherTile } from '../ModulesAndOtherTile'
@@ -61,7 +58,6 @@ describe('ModulesAndOtherTile', () => {
...props,
...mockWizardTileProps,
} as WizardTileProps
- vi.mocked(getEnableMoam).mockReturnValue(true)
vi.mocked(CrashInfoBox).mockReturnValue( mock CrashInfoBox
)
vi.mocked(EquipmentOption).mockReturnValue(mock EquipmentOption
)
vi.mocked(getDisableModuleRestrictions).mockReturnValue(false)
diff --git a/protocol-designer/src/feature-flags/reducers.ts b/protocol-designer/src/feature-flags/reducers.ts
index bcb586acf9a..1f9999be001 100644
--- a/protocol-designer/src/feature-flags/reducers.ts
+++ b/protocol-designer/src/feature-flags/reducers.ts
@@ -26,7 +26,6 @@ const initialFlags: Flags = {
OT_PD_ENABLE_ABSORBANCE_READER:
process.env.OT_PD_ENABLE_ABSORBANCE_READER === '1' || false,
OT_PD_ENABLE_REDESIGN: process.env.OT_PD_ENABLE_REDESIGN === '1' || false,
- OT_PD_ENABLE_MOAM: process.env.OT_PD_ENABLE_MOAM === '1' || false,
OT_PD_ENABLE_COMMENT: process.env.OT_PD_ENABLE_COMMENT === '1' || false,
OT_PD_ENABLE_RETURN_TIP: process.env.OT_PD_ENABLE_RETURN_TIP === '1' || false,
OT_PD_ENABLE_HOT_KEYS_DISPLAY:
diff --git a/protocol-designer/src/feature-flags/selectors.ts b/protocol-designer/src/feature-flags/selectors.ts
index a4c3baf05be..896eb5db254 100644
--- a/protocol-designer/src/feature-flags/selectors.ts
+++ b/protocol-designer/src/feature-flags/selectors.ts
@@ -33,10 +33,6 @@ export const getEnableRedesign: Selector = createSelector(
getFeatureFlagData,
flags => flags.OT_PD_ENABLE_REDESIGN ?? false
)
-export const getEnableMoam: Selector = createSelector(
- getFeatureFlagData,
- flags => flags.OT_PD_ENABLE_MOAM ?? false
-)
export const getEnableComment: Selector = createSelector(
getFeatureFlagData,
flags => flags.OT_PD_ENABLE_COMMENT ?? false
diff --git a/protocol-designer/src/feature-flags/types.ts b/protocol-designer/src/feature-flags/types.ts
index f37d77bc814..774d2c5fa5e 100644
--- a/protocol-designer/src/feature-flags/types.ts
+++ b/protocol-designer/src/feature-flags/types.ts
@@ -31,7 +31,6 @@ export type FlagTypes =
| 'OT_PD_ALLOW_ALL_TIPRACKS'
| 'OT_PD_ENABLE_ABSORBANCE_READER'
| 'OT_PD_ENABLE_REDESIGN'
- | 'OT_PD_ENABLE_MOAM'
| 'OT_PD_ENABLE_COMMENT'
| 'OT_PD_ENABLE_RETURN_TIP'
| 'OT_PD_ENABLE_HOT_KEYS_DISPLAY'
@@ -46,7 +45,6 @@ export const allFlags: FlagTypes[] = [
'PRERELEASE_MODE',
'OT_PD_ENABLE_ABSORBANCE_READER',
'OT_PD_ENABLE_REDESIGN',
- 'OT_PD_ENABLE_MOAM',
'OT_PD_ENABLE_COMMENT',
'OT_PD_ENABLE_RETURN_TIP',
]
diff --git a/protocol-designer/src/pages/CreateNewProtocolWizard/SelectModules.tsx b/protocol-designer/src/pages/CreateNewProtocolWizard/SelectModules.tsx
index 4cf2576c25e..6f46ae2be1a 100644
--- a/protocol-designer/src/pages/CreateNewProtocolWizard/SelectModules.tsx
+++ b/protocol-designer/src/pages/CreateNewProtocolWizard/SelectModules.tsx
@@ -25,10 +25,7 @@ import {
TEMPERATURE_MODULE_TYPE,
} from '@opentrons/shared-data'
import { uuid } from '../../utils'
-import {
- getEnableAbsorbanceReader,
- getEnableMoam,
-} from '../../feature-flags/selectors'
+import { getEnableAbsorbanceReader } from '../../feature-flags/selectors'
import { useKitchen } from '../../organisms/Kitchen/hooks'
import { ModuleDiagram } from '../../components/modules'
import { WizardBody } from './WizardBody'
@@ -56,7 +53,6 @@ export function SelectModules(props: WizardTileProps): JSX.Element | null {
const fields = watch('fields')
const modules = watch('modules')
const additionalEquipment = watch('additionalEquipment')
- const enableMoam = useSelector(getEnableMoam)
const enableAbsorbanceReader = useSelector(getEnableAbsorbanceReader)
const robotType = fields.robotType
const supportedModules =
@@ -83,9 +79,11 @@ export function SelectModules(props: WizardTileProps): JSX.Element | null {
)
)
)
- const MOAM_MODULE_TYPES: ModuleType[] = enableMoam
- ? [TEMPERATURE_MODULE_TYPE, HEATERSHAKER_MODULE_TYPE, MAGNETIC_BLOCK_TYPE]
- : [TEMPERATURE_MODULE_TYPE]
+ const MOAM_MODULE_TYPES: ModuleType[] = [
+ TEMPERATURE_MODULE_TYPE,
+ HEATERSHAKER_MODULE_TYPE,
+ MAGNETIC_BLOCK_TYPE,
+ ]
const handleAddModule = (moduleModel: ModuleModel): void => {
if (hasNoAvailableSlots) {
diff --git a/protocol-designer/src/pages/CreateNewProtocolWizard/__tests__/SelectModules.test.tsx b/protocol-designer/src/pages/CreateNewProtocolWizard/__tests__/SelectModules.test.tsx
index bddd3174b7f..a18f06bf508 100644
--- a/protocol-designer/src/pages/CreateNewProtocolWizard/__tests__/SelectModules.test.tsx
+++ b/protocol-designer/src/pages/CreateNewProtocolWizard/__tests__/SelectModules.test.tsx
@@ -4,10 +4,7 @@ import '@testing-library/jest-dom/vitest'
import { FLEX_ROBOT_TYPE, OT2_ROBOT_TYPE } from '@opentrons/shared-data'
import { fireEvent, screen } from '@testing-library/react'
import { i18n } from '../../../assets/localization'
-import {
- getEnableAbsorbanceReader,
- getEnableMoam,
-} from '../../../feature-flags/selectors'
+import { getEnableAbsorbanceReader } from '../../../feature-flags/selectors'
import { renderWithProviders } from '../../../__testing-utils__'
import { SelectModules } from '../SelectModules'
import type { WizardFormState, WizardTileProps } from '../types'
@@ -46,7 +43,6 @@ describe('SelectModules', () => {
props = {
...mockWizardTileProps,
} as WizardTileProps
- vi.mocked(getEnableMoam).mockReturnValue(true)
vi.mocked(getEnableAbsorbanceReader).mockReturnValue(true)
})
diff --git a/protocol-designer/src/pages/Designer/DeckSetup/DeckSetupTools.tsx b/protocol-designer/src/pages/Designer/DeckSetup/DeckSetupTools.tsx
index 0df813cf114..e062fa4784d 100644
--- a/protocol-designer/src/pages/Designer/DeckSetup/DeckSetupTools.tsx
+++ b/protocol-designer/src/pages/Designer/DeckSetup/DeckSetupTools.tsx
@@ -37,14 +37,11 @@ import {
selectNestedLabware,
selectZoomedIntoSlot,
} from '../../../labware-ingred/actions'
-import {
- getEnableAbsorbanceReader,
- getEnableMoam,
-} from '../../../feature-flags/selectors'
+import { getEnableAbsorbanceReader } from '../../../feature-flags/selectors'
import { selectors } from '../../../labware-ingred/selectors'
import { useKitchen } from '../../../organisms/Kitchen/hooks'
import { createContainerAboveModule } from '../../../step-forms/actions/thunks'
-import { FIXTURES, MOAM_MODELS, MOAM_MODELS_WITH_FF } from './constants'
+import { FIXTURES, MOAM_MODELS } from './constants'
import { getSlotInformation } from '../utils'
import { getModuleModelsBySlot, getDeckErrors } from './utils'
import { LabwareTools } from './LabwareTools'
@@ -70,7 +67,6 @@ export function DeckSetupTools(props: DeckSetupToolsProps): JSX.Element | null {
const robotType = useSelector(getRobotType)
const dispatch = useDispatch>()
const enableAbsorbanceReader = useSelector(getEnableAbsorbanceReader)
- const enableMoam = useSelector(getEnableMoam)
const deckSetup = useSelector(getDeckSetupForActiveItem)
const {
selectedLabwareDefUri,
@@ -293,9 +289,7 @@ export function DeckSetupTools(props: DeckSetupToolsProps): JSX.Element | null {
module.type === getModuleType(model) &&
module.slot !== slot
)
- const moamModels = enableMoam
- ? MOAM_MODELS
- : MOAM_MODELS_WITH_FF
+ const moamModels = MOAM_MODELS
const collisionError = getDeckErrors({
modules: deckSetupModules,
diff --git a/protocol-designer/src/pages/Designer/DeckSetup/__tests__/DeckSetupTools.test.tsx b/protocol-designer/src/pages/Designer/DeckSetup/__tests__/DeckSetupTools.test.tsx
index a3d63343389..cb85cf12693 100644
--- a/protocol-designer/src/pages/Designer/DeckSetup/__tests__/DeckSetupTools.test.tsx
+++ b/protocol-designer/src/pages/Designer/DeckSetup/__tests__/DeckSetupTools.test.tsx
@@ -12,10 +12,7 @@ import { renderWithProviders } from '../../../../__testing-utils__'
import { deleteContainer } from '../../../../labware-ingred/actions'
import { createModule, deleteModule } from '../../../../step-forms/actions'
import { getRobotType } from '../../../../file-data/selectors'
-import {
- getEnableAbsorbanceReader,
- getEnableMoam,
-} from '../../../../feature-flags/selectors'
+import { getEnableAbsorbanceReader } from '../../../../feature-flags/selectors'
import {
createDeckFixture,
deleteDeckFixture,
@@ -63,7 +60,6 @@ describe('DeckSetupTools', () => {
vi.mocked(LabwareTools).mockReturnValue(mock labware tools
)
vi.mocked(getRobotType).mockReturnValue(FLEX_ROBOT_TYPE)
vi.mocked(getEnableAbsorbanceReader).mockReturnValue(true)
- vi.mocked(getEnableMoam).mockReturnValue(true)
vi.mocked(getDeckSetupForActiveItem).mockReturnValue({
labware: {},
modules: {},