diff --git a/app/src/organisms/CommandText/MoveLabwareCommandText.tsx b/app/src/organisms/CommandText/MoveLabwareCommandText.tsx index 7d33a0b3f7f..f2a68a76fd2 100644 --- a/app/src/organisms/CommandText/MoveLabwareCommandText.tsx +++ b/app/src/organisms/CommandText/MoveLabwareCommandText.tsx @@ -1,13 +1,13 @@ import { useTranslation } from 'react-i18next' +import { GRIPPER_WASTE_CHUTE_ADDRESSABLE_AREA } from '@opentrons/shared-data' +import { getLabwareName } from './utils' +import { getLabwareDisplayLocation } from './utils/getLabwareDisplayLocation' +import { getFinalLabwareLocation } from './utils/getFinalLabwareLocation' import type { CompletedProtocolAnalysis, MoveLabwareRunTimeCommand, RobotType, -} from '@opentrons/shared-data/' -import { getLabwareName } from './utils' -import { getLabwareDisplayLocation } from './utils/getLabwareDisplayLocation' -import { getFinalLabwareLocation } from './utils/getFinalLabwareLocation' - +} from '@opentrons/shared-data' interface MoveLabwareCommandTextProps { command: MoveLabwareRunTimeCommand robotSideAnalysis: CompletedProtocolAnalysis @@ -32,6 +32,12 @@ export function MoveLabwareCommandText( robotType ) + const location = newDisplayLocation.includes( + GRIPPER_WASTE_CHUTE_ADDRESSABLE_AREA + ) + ? 'Waste Chute' + : newDisplayLocation + return strategy === 'usingGripper' ? t('move_labware_using_gripper', { labware: getLabwareName(robotSideAnalysis, labwareId), @@ -44,7 +50,7 @@ export function MoveLabwareCommandText( robotType ) : '', - new_location: newDisplayLocation, + new_location: location, }) : t('move_labware_manually', { labware: getLabwareName(robotSideAnalysis, labwareId), @@ -57,6 +63,6 @@ export function MoveLabwareCommandText( robotType ) : '', - new_location: newDisplayLocation, + new_location: location, }) } diff --git a/app/src/organisms/CommandText/__tests__/CommandText.test.tsx b/app/src/organisms/CommandText/__tests__/CommandText.test.tsx index e3e99f2aede..7e739174ce7 100644 --- a/app/src/organisms/CommandText/__tests__/CommandText.test.tsx +++ b/app/src/organisms/CommandText/__tests__/CommandText.test.tsx @@ -1,28 +1,29 @@ import * as React from 'react' import { renderWithProviders } from '@opentrons/components' import { - AspirateInPlaceRunTimeCommand, - BlowoutInPlaceRunTimeCommand, - DispenseInPlaceRunTimeCommand, - DropTipInPlaceRunTimeCommand, FLEX_ROBOT_TYPE, - MoveToAddressableAreaRunTimeCommand, OT2_ROBOT_TYPE, - PrepareToAspirateRunTimeCommand, + GRIPPER_WASTE_CHUTE_ADDRESSABLE_AREA, } from '@opentrons/shared-data' import { i18n } from '../../../i18n' import { CommandText } from '../' import { mockRobotSideAnalysis } from '../__fixtures__' import type { + AspirateInPlaceRunTimeCommand, + BlowoutInPlaceRunTimeCommand, BlowoutRunTimeCommand, ConfigureForVolumeRunTimeCommand, + DispenseInPlaceRunTimeCommand, DispenseRunTimeCommand, + DropTipInPlaceRunTimeCommand, DropTipRunTimeCommand, LabwareDefinition2, LoadLabwareRunTimeCommand, LoadLiquidRunTimeCommand, + MoveToAddressableAreaRunTimeCommand, MoveToWellRunTimeCommand, + PrepareToAspirateRunTimeCommand, RunTimeCommand, } from '@opentrons/shared-data' @@ -1280,6 +1281,37 @@ describe('CommandText', () => { 'Moving Opentrons 96 Tip Rack 300 µL using gripper from Slot 9 to off deck' ) }) + it('renders correct text for move labware with gripper to waste chute', () => { + const { getByText } = renderWithProviders( + , + { + i18nInstance: i18n, + } + )[0] + getByText( + 'Moving Opentrons 96 Tip Rack 300 µL using gripper from Slot 9 to Waste Chute' + ) + }) it('renders correct text for move labware with gripper to module', () => { const { getByText } = renderWithProviders(