More changes to cancel run modal

Opentrons · Jul 31, 2024 · 9b5ccf6 · 9b5ccf6
1 parent 6d0fccf
commit 9b5ccf6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 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)
       }
     },
@@ -87,8 +87,8 @@ export function ConfirmCancelRunModal({
   React.useEffect(() => {
     if (runStatus === RUN_STATUS_STOPPED) {
       trackProtocolRunEvent({ name: ANALYTICS_PROTOCOL_RUN_ACTION.CANCEL })
+      dismissCurrentRun(runId)
       if (!isActiveRun) {
-        dismissCurrentRun(runId)
         if (isQuickTransfer && protocolId != null) {
           navigate(`/quick-transfer/${protocolId}`)
         } else if (isQuickTransfer) {

diff --git a/app/src/pages/RunSummary/index.tsx b/app/src/pages/RunSummary/index.tsx
@@ -163,11 +163,17 @@ export function RunSummary(): JSX.Element {
 
   const returnToQuickTransfer = (): void => {
     // add this deletion if dismissal is successful and if its not needed
-    closeCurrentRun({
-      onSuccess: () => {
-        deleteRun(runId)
-      },
-    })
+    if (!isRunCurrent) {
+      deleteRun(runId)
+      console.log('not current, deleting')
+    } else {
+      console.log('current, closing')
+      closeCurrentRun({
+        onSuccess: () => {
+          deleteRun(runId)
+        },
+      })
+    }
     navigate('/quick-transfer')
   }