From a9a2a0ff9737eb5e0a1959084ff6790467400994 Mon Sep 17 00:00:00 2001 From: smb2268 Date: Mon, 6 Nov 2023 15:11:24 -0500 Subject: [PATCH 1/2] fix(app): fix calibration copy, 96 wizard attach title fix RQA-1866, RQA-1767 --- app/src/assets/localization/en/device_settings.json | 1 + app/src/organisms/PipetteWizardFlows/index.tsx | 7 +++++-- .../CalibrationDetails/PipetteOffsetCalibrationItems.tsx | 8 ++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/src/assets/localization/en/device_settings.json b/app/src/assets/localization/en/device_settings.json index 64738982dbe..fbb9ef8d57e 100644 --- a/app/src/assets/localization/en/device_settings.json +++ b/app/src/assets/localization/en/device_settings.json @@ -12,6 +12,7 @@ "are_you_sure_you_want_to_disconnect": "Are you sure you want to disconnect from {{ssid}}?", "attach_a_pipette_before_calibrating": "Attach a pipette in order to perform calibration", "boot_scripts": "Boot scripts", + "both": "Both", "browse_file_system": "Browse file system", "bug_fixes": "Bug Fixes", "calibrate_deck": "Calibrate deck", diff --git a/app/src/organisms/PipetteWizardFlows/index.tsx b/app/src/organisms/PipetteWizardFlows/index.tsx index 4d2b765d336..83d7bf75338 100644 --- a/app/src/organisms/PipetteWizardFlows/index.tsx +++ b/app/src/organisms/PipetteWizardFlows/index.tsx @@ -65,8 +65,11 @@ export const PipetteWizardFlows = ( const attachedPipettes = useAttachedPipettesFromInstrumentsQuery() const memoizedPipetteInfo = React.useMemo(() => props.pipetteInfo ?? null, []) - const isGantryEmpty = - attachedPipettes[LEFT] == null && attachedPipettes[RIGHT] == null + const isGantryEmpty = React.useMemo( + () => attachedPipettes[LEFT] == null && attachedPipettes[RIGHT] == null, + [] + ) + const pipetteWizardSteps = React.useMemo( () => memoizedPipetteInfo == null diff --git a/app/src/organisms/RobotSettingsCalibration/CalibrationDetails/PipetteOffsetCalibrationItems.tsx b/app/src/organisms/RobotSettingsCalibration/CalibrationDetails/PipetteOffsetCalibrationItems.tsx index 7804a780cf9..5e36a378317 100644 --- a/app/src/organisms/RobotSettingsCalibration/CalibrationDetails/PipetteOffsetCalibrationItems.tsx +++ b/app/src/organisms/RobotSettingsCalibration/CalibrationDetails/PipetteOffsetCalibrationItems.tsx @@ -24,6 +24,7 @@ import { import type { State } from '../../../redux/types' import type { FormattedPipetteOffsetCalibration } from '..' +import type { LEFT } from '../../../redux/pipettes' const StyledTable = styled.table` width: 100%; @@ -66,10 +67,13 @@ export function PipetteOffsetCalibrationItems({ const attachedPipettesFromPipetteQuery = useAttachedPipettes() const attachedPipetteFromInstrumentQuery = useAttachedPipettesFromInstrumentsQuery() const isFlex = useIsFlex(robotName) - const attachedPipettes = Boolean(isFlex) + const attachedPipettes = isFlex ? attachedPipetteFromInstrumentQuery : attachedPipettesFromPipetteQuery + const is96Attached = + // @ts-expect-error isFlex is a type narrower but not recognized as one + isFlex && attachedPipettes?.[LEFT]?.instrumentName === 'p1000_96' return ( @@ -97,7 +101,7 @@ export function PipetteOffsetCalibrationItems({ as="p" textTransform={TYPOGRAPHY.textTransformCapitalize} > - {calibration.mount} + {is96Attached ? t('both') : calibration.mount} {isFlex ? null : ( From c423d70daee0caf39ebf5399bb26ee75ea548392 Mon Sep 17 00:00:00 2001 From: smb2268 Date: Mon, 6 Nov 2023 15:35:39 -0500 Subject: [PATCH 2/2] fix import --- .../CalibrationDetails/PipetteOffsetCalibrationItems.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/organisms/RobotSettingsCalibration/CalibrationDetails/PipetteOffsetCalibrationItems.tsx b/app/src/organisms/RobotSettingsCalibration/CalibrationDetails/PipetteOffsetCalibrationItems.tsx index 5e36a378317..6ff47a30870 100644 --- a/app/src/organisms/RobotSettingsCalibration/CalibrationDetails/PipetteOffsetCalibrationItems.tsx +++ b/app/src/organisms/RobotSettingsCalibration/CalibrationDetails/PipetteOffsetCalibrationItems.tsx @@ -16,6 +16,7 @@ import { StyledText } from '../../../atoms/text' import { OverflowMenu } from './OverflowMenu' import { formatLastCalibrated, getDisplayNameForTipRack } from './utils' import { getCustomLabwareDefinitions } from '../../../redux/custom-labware' +import { LEFT } from '../../../redux/pipettes' import { useAttachedPipettes, useIsFlex, @@ -24,7 +25,6 @@ import { import type { State } from '../../../redux/types' import type { FormattedPipetteOffsetCalibration } from '..' -import type { LEFT } from '../../../redux/pipettes' const StyledTable = styled.table` width: 100%;