From 38fc68e1041a5ea896d71b41b627c0de34816254 Mon Sep 17 00:00:00 2001
From: Nick De Villiers <nick.devilliers@canonical.com>
Date: Mon, 11 Mar 2024 09:53:20 +0000
Subject: [PATCH] fix(prefs): Adding/editing API key no longer shows "Deleted"
 message MAASENG-2812 (#5334)

---
 .../views/APIKeys/APIKeyDeleteForm/APIKeyDeleteForm.tsx  | 3 +++
 .../preferences/views/APIKeys/APIKeyList/APIKeyList.tsx  | 9 +--------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/app/preferences/views/APIKeys/APIKeyDeleteForm/APIKeyDeleteForm.tsx b/src/app/preferences/views/APIKeys/APIKeyDeleteForm/APIKeyDeleteForm.tsx
index eecca4fe82..a1e3dfcb4d 100644
--- a/src/app/preferences/views/APIKeys/APIKeyDeleteForm/APIKeyDeleteForm.tsx
+++ b/src/app/preferences/views/APIKeys/APIKeyDeleteForm/APIKeyDeleteForm.tsx
@@ -2,6 +2,7 @@ import { useDispatch, useSelector } from "react-redux";
 import { useNavigate } from "react-router-dom-v5-compat";
 
 import ModelActionForm from "@/app/base/components/ModelActionForm";
+import { useAddMessage } from "@/app/base/hooks";
 import urls from "@/app/base/urls";
 import { actions as tokenActions } from "@/app/store/token";
 import tokenSelectors from "@/app/store/token/selectors";
@@ -12,6 +13,8 @@ const APIKeyDeleteForm = ({ id }: { id: number }) => {
   const saved = useSelector(tokenSelectors.saved);
   const saving = useSelector(tokenSelectors.saving);
 
+  useAddMessage(saved, tokenActions.cleanup, "API key deleted successfully.");
+
   return (
     <ModelActionForm
       aria-label="Delete API Key"
diff --git a/src/app/preferences/views/APIKeys/APIKeyList/APIKeyList.tsx b/src/app/preferences/views/APIKeys/APIKeyList/APIKeyList.tsx
index 59d2606b87..e2b687dca7 100644
--- a/src/app/preferences/views/APIKeys/APIKeyList/APIKeyList.tsx
+++ b/src/app/preferences/views/APIKeys/APIKeyList/APIKeyList.tsx
@@ -2,11 +2,7 @@ import { Notification } from "@canonical/react-components";
 import { useSelector } from "react-redux";
 
 import TableActions from "@/app/base/components/TableActions";
-import {
-  useFetchActions,
-  useAddMessage,
-  useWindowTitle,
-} from "@/app/base/hooks";
+import { useFetchActions, useWindowTitle } from "@/app/base/hooks";
 import urls from "@/app/base/urls";
 import SettingsTable from "@/app/settings/components/SettingsTable";
 import { actions as tokenActions } from "@/app/store/token";
@@ -54,9 +50,6 @@ const APIKeyList = (): JSX.Element => {
   const loading = useSelector(tokenSelectors.loading);
   const loaded = useSelector(tokenSelectors.loaded);
   const tokens = useSelector(tokenSelectors.all);
-  const saved = useSelector(tokenSelectors.saved);
-
-  useAddMessage(saved, tokenActions.cleanup, "API key deleted successfully.");
 
   useFetchActions([tokenActions.fetch]);