From a6b497cacdc3b653038f8f26befa2eae9f31dbdb Mon Sep 17 00:00:00 2001
From: Cameron Perera <cameron.perera@hashicorp.com>
Date: Fri, 15 Sep 2023 10:46:09 -0500
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20fix=20cancel=20session=20?=
 =?UTF-8?q?failing=20after=20shell=20has=20started=20(#1899)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

✅ Closes: ICU-11035
---
 ui/desktop/app/routes/scopes/scope/projects/sessions.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ui/desktop/app/routes/scopes/scope/projects/sessions.js b/ui/desktop/app/routes/scopes/scope/projects/sessions.js
index 30aed9109..7def33b5c 100644
--- a/ui/desktop/app/routes/scopes/scope/projects/sessions.js
+++ b/ui/desktop/app/routes/scopes/scope/projects/sessions.js
@@ -93,7 +93,12 @@ export default class ScopesScopeProjectsSessionsRoute extends Route {
   @notifyError(({ message }) => message, { catch: true })
   @notifySuccess('notifications.canceled-success')
   async cancelSession(session) {
-    await session.cancelSession();
+    // fetch session from API to verify we have most up to date record
+    const updatedSession = await this.store.findRecord('session', session.id, {
+      reload: true,
+    });
+    await updatedSession.cancelSession();
+
     await this.ipc.invoke('stop', { session_id: session.id });
     if (
       this.router.currentRoute.name ===