Fix logic to delete run if cancelled in the middle of the run

Opentrons · Jul 31, 2024 · 6e410b8 · 6e410b8
1 parent d8148f7
commit 6e410b8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/app/src/organisms/OnDeviceDisplay/RunningProtocol/ConfirmCancelRunModal.tsx b/app/src/organisms/OnDeviceDisplay/RunningProtocol/ConfirmCancelRunModal.tsx
@@ -56,7 +56,7 @@ export function ConfirmCancelRunModal({
     isLoading: isDismissing,
   } = useDismissCurrentRunMutation({
     onSuccess: () => {
-      if (isQuickTransfer) {
+      if (isQuickTransfer && !isActiveRun) {
         deleteRun(runId)
       }
     },

diff --git a/app/src/pages/RunSummary/index.tsx b/app/src/pages/RunSummary/index.tsx
@@ -162,7 +162,15 @@ export function RunSummary(): JSX.Element {
   // TODO(jh, 07-24-24): After EXEC-504, add reportRecoveredRunResult here.
 
   const returnToQuickTransfer = (): void => {
-    deleteRun(runId)
+    if (!isRunCurrent) {
+      deleteRun(runId)
+    } else {
+      closeCurrentRun({
+        onSuccess: () => {
+          deleteRun(runId)
+        },
+      })
+    }
     navigate('/quick-transfer')
   }