From 03d5de364d169b3f13b291b16124b6fd6b882a00 Mon Sep 17 00:00:00 2001
From: RachelElysia <71795832+RachelElysia@users.noreply.github.com>
Date: Fri, 22 Oct 2021 11:19:34 -0400
Subject: [PATCH] Fix subsequent delete checkbox state (#2587)

---
 changes/issue-2525-resets-checkboxes-subsequent-deletes      | 1 +
 .../components/flash_messages/FlashMessage/FlashMessage.tsx  | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 changes/issue-2525-resets-checkboxes-subsequent-deletes

diff --git a/changes/issue-2525-resets-checkboxes-subsequent-deletes b/changes/issue-2525-resets-checkboxes-subsequent-deletes
new file mode 100644
index 0000000000..543bc3f220
--- /dev/null
+++ b/changes/issue-2525-resets-checkboxes-subsequent-deletes
@@ -0,0 +1 @@
+* Bug Fix: All app table checkboxes reset after subsequent deletes
\ No newline at end of file
diff --git a/frontend/components/flash_messages/FlashMessage/FlashMessage.tsx b/frontend/components/flash_messages/FlashMessage/FlashMessage.tsx
index 28d9e9d97a..9dd917324f 100644
--- a/frontend/components/flash_messages/FlashMessage/FlashMessage.tsx
+++ b/frontend/components/flash_messages/FlashMessage/FlashMessage.tsx
@@ -43,7 +43,10 @@ const FlashMessage = ({
 
     if (alertType === "success" && isVisible) {
       // After 4 seconds, set hide to true.
-      const timer = setTimeout(() => setHide(true), 4000);
+      const timer = setTimeout(() => {
+        setHide(true);
+        onRemoveFlash(); // This function resets notifications which allows CoreLayout reset of selected rows
+      }, 4000);
       // Return a cleanup function that will clear this reset, in case another render happens
       // after this. We want that render to set a new timeout (if needed).
       return () => clearTimeout(timer);