clean up code

Opentrons · Apr 5, 2024 · 74102a8 · 74102a8
1 parent 5158943
commit 74102a8
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/protocol-designer/src/components/DeckSetup/index.tsx b/protocol-designer/src/components/DeckSetup/index.tsx
@@ -162,6 +162,7 @@ export const DeckSetupContents = (props: ContentsProps): JSX.Element => {
   }, [])
 
   const allModules: ModuleOnDeck[] = values(activeDeckSetup.modules)
+
   // NOTE: naively hard-coded to show warning north of slots 1 or 3 when occupied by any module
   const multichannelWarningSlotIds: AddressableAreaName[] = showGen1MultichannelCollisionWarnings
     ? compact([

diff --git a/protocol-designer/src/components/modals/CreateFileWizard/ModulesAndOtherTile.tsx b/protocol-designer/src/components/modals/CreateFileWizard/ModulesAndOtherTile.tsx
@@ -190,7 +190,7 @@ export function ModulesAndOtherTile(props: WizardTileProps): JSX.Element {
 
 function FlexModuleFields(props: WizardTileProps): JSX.Element {
   const { watch, setValue } = props
-  const moamFf = useSelector(getEnableMoam)
+  const enableMoamFf = useSelector(getEnableMoam)
   const modules = watch('modules')
   const additionalEquipment = watch('additionalEquipment')
   const moduleTypesOnDeck =
@@ -268,7 +268,10 @@ function FlexModuleFields(props: WizardTileProps): JSX.Element {
         }
 
         const handleOnClick = (): void => {
-          if (moduleType !== TEMPERATURE_MODULE_TYPE) {
+          if (
+            (moduleType !== TEMPERATURE_MODULE_TYPE && enableMoamFf) ||
+            !enableMoamFf
+          ) {
             if (moduleOnDeck) {
               const updatedModules =
                 modules != null
@@ -302,7 +305,7 @@ function FlexModuleFields(props: WizardTileProps): JSX.Element {
             disabled={isDisabled && !moduleOnDeck}
             onClick={handleOnClick}
             multiples={
-              moduleType === TEMPERATURE_MODULE_TYPE && moamFf
+              moduleType === TEMPERATURE_MODULE_TYPE && enableMoamFf
                 ? {
                     maxItems: 7,
                     setValue: handleMultiplesClick,
@@ -316,7 +319,9 @@ function FlexModuleFields(props: WizardTileProps): JSX.Element {
                   }
                 : undefined
             }
-            showCheckbox={moduleType !== TEMPERATURE_MODULE_TYPE}
+            showCheckbox={
+              enableMoamFf ? moduleType !== TEMPERATURE_MODULE_TYPE : true
+            }
           />
         )
       })}

diff --git a/...ol-designer/src/components/modals/CreateFileWizard/__tests__/ModulesAndOtherTile.test.tsx b/...ol-designer/src/components/modals/CreateFileWizard/__tests__/ModulesAndOtherTile.test.tsx
@@ -5,7 +5,10 @@ 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 '../../../../localization'
-import { getDisableModuleRestrictions } from '../../../../feature-flags/selectors'
+import {
+  getDisableModuleRestrictions,
+  getEnableMoam,
+} from '../../../../feature-flags/selectors'
 import { CrashInfoBox } from '../../../modules'
 import { ModuleFields } from '../../FilePipettesModal/ModuleFields'
 import { ModulesAndOtherTile } from '../ModulesAndOtherTile'
@@ -58,6 +61,7 @@ describe('ModulesAndOtherTile', () => {
       ...props,
       ...mockWizardTileProps,
     } as WizardTileProps
+    vi.mocked(getEnableMoam).mockReturnValue(true)
     vi.mocked(CrashInfoBox).mockReturnValue(<div> mock CrashInfoBox</div>)
     vi.mocked(EquipmentOption).mockReturnValue(<div>mock EquipmentOption</div>)
     vi.mocked(getDisableModuleRestrictions).mockReturnValue(false)

diff --git a/protocol-designer/src/components/modals/CreateFileWizard/index.tsx b/protocol-designer/src/components/modals/CreateFileWizard/index.tsx
@@ -141,10 +141,7 @@ export function CreateFileWizard(): JSX.Element | null {
                 {
                   type: formModule.type,
                   model: formModule.model || ('' as ModuleModel),
-                  slot:
-                    formModule.slot === ''
-                      ? getTrashSlot(values)
-                      : formModule.slot,
+                  slot: formModule.slot,
                 },
               ]
             },