Skip to content

Commit 0f5ed78

Browse files
committed
refactor(app): don't pop the offset conflict modal if the run is historical
1 parent caf67dd commit 0f5ed78

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunHeader/RunHeaderModalContainer/useRunHeaderModalContainer.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
useRunHeaderDropTip,
1414
} from './hooks'
1515
import { useErrorRecoveryFlows } from '/app/organisms/ErrorRecoveryFlows'
16-
import { useProtocolDetailsForRun } from '/app/resources/runs'
16+
import { useCurrentRunId, useProtocolDetailsForRun } from '/app/resources/runs'
1717
import { getFallbackRobotSerialNumber } from '../utils'
1818
import {
1919
ANALYTICS_PROTOCOL_PROCEED_TO_RUN,
@@ -89,6 +89,7 @@ export function useRunHeaderModalContainer({
8989
const robotAnalyticsData = useRobotAnalyticsData(robotName)
9090
const isLabwareOffsetConflict =
9191
useSelector(selectOffsetSource(runId)) === OFFSETS_CONFLICT
92+
const isThisRunCurrent = runId === useCurrentRunId()
9293

9394
function handleProceedToRunClick(): void {
9495
navigate(`/devices/${robotName}/protocol-runs/${runId}/run-preview`)
@@ -145,7 +146,7 @@ export function useRunHeaderModalContainer({
145146
missingStepsModalUtils,
146147
dropTipUtils,
147148
offsetConflictModalUtils: {
148-
showModal: isLabwareOffsetConflict,
149+
showModal: isLabwareOffsetConflict && isThisRunCurrent,
149150
},
150151
}
151152
}

0 commit comments

Comments
 (0)