From fef9255f969fd4dea06ce58c67357265cda5e44f Mon Sep 17 00:00:00 2001 From: RachelElysia Date: Fri, 15 Mar 2024 14:37:30 -0400 Subject: [PATCH 1/2] [released bug] Fleet UI: Persist flash messages when modals close --- changes/17624-modal-flash-message-error | 1 + frontend/components/Modal/Modal.tsx | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 changes/17624-modal-flash-message-error diff --git a/changes/17624-modal-flash-message-error b/changes/17624-modal-flash-message-error new file mode 100644 index 00000000000..52167d895b3 --- /dev/null +++ b/changes/17624-modal-flash-message-error @@ -0,0 +1 @@ +* Fix flash message from closing when a modal closes \ No newline at end of file diff --git a/frontend/components/Modal/Modal.tsx b/frontend/components/Modal/Modal.tsx index 280f66e4919..f60d6634d2b 100644 --- a/frontend/components/Modal/Modal.tsx +++ b/frontend/components/Modal/Modal.tsx @@ -41,7 +41,6 @@ const Modal = ({ } }; - hideFlash(); document.addEventListener("keydown", closeWithEscapeKey); return () => { From 9ca3fef810029c69e0f1c6ef1757a849255c84c6 Mon Sep 17 00:00:00 2001 From: RachelElysia Date: Fri, 15 Mar 2024 14:38:26 -0400 Subject: [PATCH 2/2] Remove unused imports --- frontend/components/Modal/Modal.tsx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/frontend/components/Modal/Modal.tsx b/frontend/components/Modal/Modal.tsx index f60d6634d2b..8d96a378181 100644 --- a/frontend/components/Modal/Modal.tsx +++ b/frontend/components/Modal/Modal.tsx @@ -1,6 +1,5 @@ -import React, { useContext, useEffect } from "react"; +import React, { useEffect } from "react"; import classnames from "classnames"; -import { NotificationContext } from "context/notification"; import Button from "components/buttons/Button/Button"; import Icon from "components/Icon/Icon"; @@ -32,8 +31,6 @@ const Modal = ({ isLoading = false, className, }: IModalProps): JSX.Element => { - const { hideFlash } = useContext(NotificationContext); - useEffect(() => { const closeWithEscapeKey = (e: KeyboardEvent) => { if (e.key === "Escape") {