diff --git a/components/src/molecules/DropdownMenu/index.tsx b/components/src/molecules/DropdownMenu/index.tsx index 276be51511a..4664cdc04b6 100644 --- a/components/src/molecules/DropdownMenu/index.tsx +++ b/components/src/molecules/DropdownMenu/index.tsx @@ -332,7 +332,7 @@ export function DropdownMenu(props: DropdownMenuProps): JSX.Element { {option.subtext} diff --git a/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepTools/AbsorbanceReaderTools/Initialization.tsx b/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepTools/AbsorbanceReaderTools/Initialization.tsx index 1b6c5252917..8dfdb1456a8 100644 --- a/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepTools/AbsorbanceReaderTools/Initialization.tsx +++ b/protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepTools/AbsorbanceReaderTools/Initialization.tsx @@ -282,6 +282,7 @@ function WavelengthItem(props: WavelengthItemProps): JSX.Element { handleDeleteWavelength, index, error, + mode, } = props const { t } = useTranslation('form') const showCustom = !DEFINED_OPTIONS.some(({ value }) => value === wavelength) @@ -332,7 +333,7 @@ function WavelengthItem(props: WavelengthItemProps): JSX.Element { error={!isFocused ? error : null} /> ) : null} - {wavelengths.length > 1 ? ( + {wavelengths.length > 1 && mode === 'multi' ? ( { handleDeleteWavelength(index) diff --git a/protocol-designer/src/ui/modules/selectors.ts b/protocol-designer/src/ui/modules/selectors.ts index c0b9da78da7..d5f39bc3159 100644 --- a/protocol-designer/src/ui/modules/selectors.ts +++ b/protocol-designer/src/ui/modules/selectors.ts @@ -19,6 +19,7 @@ import { import type { DropdownOption } from '@opentrons/components' import type { Selector } from '../../types' import type { LabwareNamesByModuleId } from '../../steplist/types' +import { getDeckSetupForActiveItem } from '../../top-selectors/labware-locations' export const getLabwareNamesByModuleId: Selector = createSelector( getInitialDeckSetup, @@ -86,11 +87,11 @@ export const getHeaterShakerLabwareOptions: Selector< export const getAbsorbanceReaderLabwareOptions: Selector< DropdownOption[] > = createSelector( - getInitialDeckSetup, + getDeckSetupForActiveItem, getLabwareNicknamesById, - (initialDeckSetup, nicknamesById) => { + (deckSetup, nicknamesById) => { const absorbanceReaderModuleOptions = getModuleLabwareOptions( - initialDeckSetup, + deckSetup, nicknamesById, ABSORBANCE_READER_TYPE )