diff --git a/app/src/organisms/Devices/PipetteCard/PipetteOverflowMenu.tsx b/app/src/organisms/Devices/PipetteCard/PipetteOverflowMenu.tsx index f28dd30ac87..a7a988e6478 100644 --- a/app/src/organisms/Devices/PipetteCard/PipetteOverflowMenu.tsx +++ b/app/src/organisms/Devices/PipetteCard/PipetteOverflowMenu.tsx @@ -108,6 +108,7 @@ export const PipetteOverflowMenu = ( handleSettingsSlideout()} + disabled={isRunActive} > {t('view_pipette_setting')} diff --git a/app/src/organisms/Devices/PipetteCard/__tests__/PipetteOverflowMenu.test.tsx b/app/src/organisms/Devices/PipetteCard/__tests__/PipetteOverflowMenu.test.tsx index eed9fee233f..5d0a6893015 100644 --- a/app/src/organisms/Devices/PipetteCard/__tests__/PipetteOverflowMenu.test.tsx +++ b/app/src/organisms/Devices/PipetteCard/__tests__/PipetteOverflowMenu.test.tsx @@ -138,7 +138,7 @@ describe('PipetteOverflowMenu', () => { expect(settings).not.toBeInTheDocument() }) - it('should disable certain menu items if a run is active', () => { + it('should disable certain menu items if a run is active for Flex pipette', () => { mockisFlexPipette.mockReturnValue(true) props = { ...props, @@ -161,4 +161,28 @@ describe('PipetteOverflowMenu', () => { }) ).toBeDisabled() }) + + it('should disable certain menu items if a run is active for OT-2 pipette', () => { + mockisFlexPipette.mockReturnValue(false) + props = { + ...props, + isRunActive: true, + } + render(props) + expect( + screen.getByRole('button', { + name: 'Detach pipette', + }) + ).toBeDisabled() + expect( + screen.getByRole('button', { + name: 'Drop tips', + }) + ).toBeDisabled() + expect( + screen.getByRole('button', { + name: 'Pipette Settings', + }) + ).toBeDisabled() + }) })