diff --git a/public/pages/Aliases/containers/AliasActions/AliasActions.test.tsx b/public/pages/Aliases/containers/AliasActions/AliasActions.test.tsx
index 984bdf7ba..4ae8cc4ae 100644
--- a/public/pages/Aliases/containers/AliasActions/AliasActions.test.tsx
+++ b/public/pages/Aliases/containers/AliasActions/AliasActions.test.tsx
@@ -6,7 +6,6 @@
 import React from "react";
 import "@testing-library/jest-dom/extend-expect";
 import { render, waitFor } from "@testing-library/react";
-// @ts-ignore
 import userEvent from "@testing-library/user-event";
 import { browserServicesMock, coreServicesMock } from "../../../../../test/mocks";
 import AliasesActions, { AliasesActionsProps } from "./index";
@@ -14,7 +13,6 @@ import { ModalProvider } from "../../../../components/Modal";
 import { ServicesContext } from "../../../../services";
 import { CoreServicesContext } from "../../../../components/core_services";
 import { buildMockApiCallerForFlush, selectedAliases } from "../../../../containers/FlushIndexModal/FlushIndexModalTestHelper";
-import { act } from "react-dom/test-utils";
 import { IAlias } from "../../interface";
 
 function renderWithRouter(props: Omit<AliasesActionsProps, "history">) {
@@ -359,7 +357,7 @@ describe("<AliasesActions /> spec", () => {
 
   it("renders flush component", async () => {
     browserServicesMock.commonService.apiCaller = buildMockApiCallerForFlush();
-    const { getByTestId, getByText } = render(
+    const { getByTestId, getByText, queryByTestId } = render(
       <CoreServicesContext.Provider value={coreServicesMock}>
         <ServicesContext.Provider value={browserServicesMock}>
           <ModalProvider>
@@ -370,9 +368,11 @@ describe("<AliasesActions /> spec", () => {
     );
     userEvent.click(document.querySelector('[data-test-subj="moreAction"] button') as Element);
     userEvent.click(getByTestId("Flush Action"));
-    await act(async () => {});
-    expect(getByText("The following aliases will be flushed:")).toBeInTheDocument();
-    expect(document.body.children).toMatchSnapshot();
+    await waitFor(() => {
+      expect(queryByTestId("Flush Action")).toBeNull();
+      expect(getByText("The following aliases will be flushed:")).toBeInTheDocument();
+      expect(document.body.children).toMatchSnapshot();
+    });
   });
 
   it("flush all aliases disabled", async () => {
diff --git a/public/pages/Aliases/containers/AliasActions/__snapshots__/AliasActions.test.tsx.snap b/public/pages/Aliases/containers/AliasActions/__snapshots__/AliasActions.test.tsx.snap
index 2874e21ba..0db264c08 100644
--- a/public/pages/Aliases/containers/AliasActions/__snapshots__/AliasActions.test.tsx.snap
+++ b/public/pages/Aliases/containers/AliasActions/__snapshots__/AliasActions.test.tsx.snap
@@ -466,178 +466,6 @@ HTMLCollection [
       </div>
     </div>
   </div>,
-  <div
-    aria-hidden="true"
-    data-aria-hidden="true"
-  >
-    <div
-      data-focus-guard="true"
-      style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-      tabindex="-1"
-    />
-    <div
-      data-focus-lock-disabled="disabled"
-    >
-      <div
-        aria-describedby="some_html_id"
-        aria-live="off"
-        aria-modal="true"
-        class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPopover__panel euiPopover__panel--bottom euiPopover__panel-isOpen"
-        data-autofocus="true"
-        role="dialog"
-        style="top: 16px; left: -22px; z-index: 2000;"
-        tabindex="0"
-      >
-        <div
-          class="euiPopover__panelArrow euiPopover__panelArrow--bottom"
-          style="left: 10px; top: 0px;"
-        />
-        <p
-          class="euiScreenReaderOnly"
-          id="some_html_id"
-        >
-          You are in a dialog. To close this dialog, hit escape.
-        </p>
-        <div>
-          <div
-            class="euiContextMenu"
-            style="height: 0px;"
-          >
-            <div
-              class="euiContextMenuPanel euiContextMenu__panel"
-              tabindex="-1"
-            >
-              <div>
-                <div>
-                  <button
-                    class="euiContextMenuItem euiContextMenuItem-isDisabled"
-                    data-test-subj="editAction"
-                    disabled=""
-                    type="button"
-                  >
-                    <span
-                      class="euiContextMenu__itemLayout"
-                    >
-                      <span
-                        class="euiContextMenuItem__text"
-                      >
-                        Edit
-                      </span>
-                    </span>
-                  </button>
-                  <hr
-                    class="euiHorizontalRule euiHorizontalRule--full"
-                  />
-                  <button
-                    class="euiContextMenuItem"
-                    data-test-subj="ForceMergeAction"
-                    type="button"
-                  >
-                    <span
-                      class="euiContextMenu__itemLayout"
-                    >
-                      <span
-                        class="euiContextMenuItem__text"
-                      >
-                        Force merge
-                      </span>
-                    </span>
-                  </button>
-                  <button
-                    class="euiContextMenuItem euiContextMenuItem-isDisabled"
-                    data-test-subj="rolloverAction"
-                    disabled=""
-                    type="button"
-                  >
-                    <span
-                      class="euiContextMenu__itemLayout"
-                    >
-                      <span
-                        class="euiContextMenuItem__text"
-                      >
-                        Roll over
-                      </span>
-                    </span>
-                  </button>
-                  <hr
-                    class="euiHorizontalRule euiHorizontalRule--full"
-                  />
-                  <button
-                    class="euiContextMenuItem"
-                    data-test-subj="ClearCacheAction"
-                    type="button"
-                  >
-                    <span
-                      class="euiContextMenu__itemLayout"
-                    >
-                      <span
-                        class="euiContextMenuItem__text"
-                      >
-                        Clear cache
-                      </span>
-                    </span>
-                  </button>
-                  <button
-                    class="euiContextMenuItem"
-                    data-test-subj="Flush Action"
-                    type="button"
-                  >
-                    <span
-                      class="euiContextMenu__itemLayout"
-                    >
-                      <span
-                        class="euiContextMenuItem__text"
-                      >
-                        Flush
-                      </span>
-                    </span>
-                  </button>
-                  <button
-                    class="euiContextMenuItem"
-                    data-test-subj="refreshAction"
-                    type="button"
-                  >
-                    <span
-                      class="euiContextMenu__itemLayout"
-                    >
-                      <span
-                        class="euiContextMenuItem__text"
-                      >
-                        Refresh
-                      </span>
-                    </span>
-                  </button>
-                  <hr
-                    class="euiHorizontalRule euiHorizontalRule--full"
-                  />
-                  <button
-                    class="euiContextMenuItem"
-                    data-test-subj="deleteAction"
-                    type="button"
-                  >
-                    <span
-                      class="euiContextMenu__itemLayout"
-                    >
-                      <span
-                        class="euiContextMenuItem__text"
-                      >
-                        Delete
-                      </span>
-                    </span>
-                  </button>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      data-focus-guard="true"
-      style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-      tabindex="-1"
-    />
-  </div>,
   <div
     class="euiOverlayMask euiOverlayMask--aboveHeader"
   >
diff --git a/public/pages/DataStreams/containers/DataStreamsActions/DataStreamsActions.test.tsx b/public/pages/DataStreams/containers/DataStreamsActions/DataStreamsActions.test.tsx
index bd5e719c7..8196e498d 100644
--- a/public/pages/DataStreams/containers/DataStreamsActions/DataStreamsActions.test.tsx
+++ b/public/pages/DataStreams/containers/DataStreamsActions/DataStreamsActions.test.tsx
@@ -14,7 +14,6 @@ import { CoreServicesContext } from "../../../../components/core_services";
 import { Route, HashRouter as Router, Switch, Redirect } from "react-router-dom";
 import { ROUTES } from "../../../../utils/constants";
 import { buildMockApiCallerForFlush, selectedDataStreams } from "../../../../containers/FlushIndexModal/FlushIndexModalTestHelper";
-import { act } from "react-dom/test-utils";
 const historyPushMock = jest.fn();
 
 function renderWithRouter(props: Omit<DataStreamsActionsProps, "history">) {
@@ -335,7 +334,7 @@ describe("<DataStreamsActions /> spec", () => {
 
   it("renders flush component", async () => {
     browserServicesMock.commonService.apiCaller = buildMockApiCallerForFlush();
-    const { getByTestId, getByText } = render(
+    const { getByTestId, getByText, queryByTestId } = render(
       <CoreServicesContext.Provider value={coreServicesMock}>
         <ServicesContext.Provider value={browserServicesMock}>
           <Router>
@@ -367,9 +366,11 @@ describe("<DataStreamsActions /> spec", () => {
     );
     userEvent.click(document.querySelector('[data-test-subj="moreAction"] button') as Element);
     userEvent.click(getByTestId("Flush Action"));
-    await act(async () => {});
-    expect(getByText("The following data streams will be flushed:")).toBeInTheDocument();
-    expect(document.body.children).toMatchSnapshot();
+    await waitFor(() => {
+      expect(queryByTestId("Flush Action")).toBeNull();
+      expect(getByText("The following data streams will be flushed:")).toBeInTheDocument();
+      expect(document.body.children).toMatchSnapshot();
+    });
   });
 
   it("flush all data streams disabled", async () => {
diff --git a/public/pages/DataStreams/containers/DataStreamsActions/__snapshots__/DataStreamsActions.test.tsx.snap b/public/pages/DataStreams/containers/DataStreamsActions/__snapshots__/DataStreamsActions.test.tsx.snap
index c0a02ab23..6e0b76857 100644
--- a/public/pages/DataStreams/containers/DataStreamsActions/__snapshots__/DataStreamsActions.test.tsx.snap
+++ b/public/pages/DataStreams/containers/DataStreamsActions/__snapshots__/DataStreamsActions.test.tsx.snap
@@ -316,159 +316,6 @@ HTMLCollection [
       </div>
     </div>
   </div>,
-  <div
-    aria-hidden="true"
-    data-aria-hidden="true"
-  >
-    <div
-      data-focus-guard="true"
-      style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-      tabindex="-1"
-    />
-    <div
-      data-focus-lock-disabled="disabled"
-    >
-      <div
-        aria-describedby="some_html_id"
-        aria-live="off"
-        aria-modal="true"
-        class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPopover__panel euiPopover__panel--bottom euiPopover__panel-isOpen"
-        data-autofocus="true"
-        role="dialog"
-        style="top: 16px; left: -22px; z-index: 2000;"
-        tabindex="0"
-      >
-        <div
-          class="euiPopover__panelArrow euiPopover__panelArrow--bottom"
-          style="left: 10px; top: 0px;"
-        />
-        <p
-          class="euiScreenReaderOnly"
-          id="some_html_id"
-        >
-          You are in a dialog. To close this dialog, hit escape.
-        </p>
-        <div>
-          <div
-            class="euiContextMenu"
-            style="height: 0px;"
-          >
-            <div
-              class="euiContextMenuPanel euiContextMenu__panel"
-              tabindex="-1"
-            >
-              <div>
-                <div>
-                  <button
-                    class="euiContextMenuItem"
-                    data-test-subj="ForceMergeAction"
-                    type="button"
-                  >
-                    <span
-                      class="euiContextMenu__itemLayout"
-                    >
-                      <span
-                        class="euiContextMenuItem__text"
-                      >
-                        Force merge
-                      </span>
-                    </span>
-                  </button>
-                  <button
-                    class="euiContextMenuItem euiContextMenuItem-isDisabled"
-                    data-test-subj="rolloverAction"
-                    disabled=""
-                    type="button"
-                  >
-                    <span
-                      class="euiContextMenu__itemLayout"
-                    >
-                      <span
-                        class="euiContextMenuItem__text"
-                      >
-                        Roll over
-                      </span>
-                    </span>
-                  </button>
-                  <hr
-                    class="euiHorizontalRule euiHorizontalRule--full"
-                  />
-                  <button
-                    class="euiContextMenuItem"
-                    data-test-subj="ClearCacheAction"
-                    type="button"
-                  >
-                    <span
-                      class="euiContextMenu__itemLayout"
-                    >
-                      <span
-                        class="euiContextMenuItem__text"
-                      >
-                        Clear cache
-                      </span>
-                    </span>
-                  </button>
-                  <button
-                    class="euiContextMenuItem"
-                    data-test-subj="Flush Action"
-                    type="button"
-                  >
-                    <span
-                      class="euiContextMenu__itemLayout"
-                    >
-                      <span
-                        class="euiContextMenuItem__text"
-                      >
-                        Flush
-                      </span>
-                    </span>
-                  </button>
-                  <button
-                    class="euiContextMenuItem"
-                    data-test-subj="refreshAction"
-                    type="button"
-                  >
-                    <span
-                      class="euiContextMenu__itemLayout"
-                    >
-                      <span
-                        class="euiContextMenuItem__text"
-                      >
-                        Refresh
-                      </span>
-                    </span>
-                  </button>
-                  <hr
-                    class="euiHorizontalRule euiHorizontalRule--full"
-                  />
-                  <button
-                    class="euiContextMenuItem"
-                    data-test-subj="deleteAction"
-                    type="button"
-                  >
-                    <span
-                      class="euiContextMenu__itemLayout"
-                    >
-                      <span
-                        class="euiContextMenuItem__text"
-                      >
-                        Delete
-                      </span>
-                    </span>
-                  </button>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      data-focus-guard="true"
-      style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-      tabindex="-1"
-    />
-  </div>,
   <div
     class="euiOverlayMask euiOverlayMask--aboveHeader"
   >
diff --git a/public/pages/Indices/containers/IndicesActions/IndicesActions.test.tsx b/public/pages/Indices/containers/IndicesActions/IndicesActions.test.tsx
index 26f2568f6..2df5691b3 100644
--- a/public/pages/Indices/containers/IndicesActions/IndicesActions.test.tsx
+++ b/public/pages/Indices/containers/IndicesActions/IndicesActions.test.tsx
@@ -17,7 +17,6 @@ import { CoreServicesContext } from "../../../../components/core_services";
 import { createMemoryHistory } from "history";
 import { ROUTES } from "../../../../utils/constants";
 import { buildMockApiCallerForFlush, selectedIndices } from "../../../../containers/FlushIndexModal/FlushIndexModalTestHelper";
-import { act } from "react-dom/test-utils";
 
 function renderWithRouter(
   props: Omit<IndicesActionsProps, "history"> & { history?: IndicesActionsProps["history"]; location?: RouteComponentProps["location"] }
@@ -971,7 +970,6 @@ describe("<IndicesActions /> spec", () => {
     );
     userEvent.click(document.querySelector('[data-test-subj="moreAction"] button') as Element);
     userEvent.click(getByTestId("Flush Action"));
-    await act(async () => {});
     await waitFor(() => {
       expect(queryByTestId("Flush Action")).toBeNull();
       expect(getByText("The following indexes will be flushed:")).toBeInTheDocument();
@@ -979,7 +977,7 @@ describe("<IndicesActions /> spec", () => {
     });
   });
 
-  it("renders all indices enabled", async () => {
+  it("renders flush all indices enabled", async () => {
     browserServicesMock.commonService.apiCaller = buildMockApiCallerForFlush();
     const { getByTestId } = render(
       <CoreServicesContext.Provider value={coreServicesMock}>
diff --git a/release-notes/opensearch-index-management-dashboards-plugin.release-notes-2.8.0.0.md b/release-notes/opensearch-index-management-dashboards-plugin.release-notes-2.8.0.0.md
index 0c818b626..a8dde085b 100644
--- a/release-notes/opensearch-index-management-dashboards-plugin.release-notes-2.8.0.0.md
+++ b/release-notes/opensearch-index-management-dashboards-plugin.release-notes-2.8.0.0.md
@@ -5,7 +5,7 @@ Compatible with OpenSearch 2.8.0
 ### Features
 * Feature: Add refresh index operation to UI  ([#761](https://github.com/opensearch-project/index-management-dashboards-plugin/pull/761))
 * Feature: Add clear cache operation to UI  ([#728](https://github.com/opensearch-project/index-management-dashboards-plugin/pull/728),[#773](https://github.com/opensearch-project/index-management-dashboards-plugin/pull/773))
-* Feature: Add flush index operation to UI  ([#713](https://github.com/opensearch-project/index-management-dashboards-plugin/pull/713),[#718](https://github.com/opensearch-project/index-management-dashboards-plugin/pull/718),[#751](https://github.com/opensearch-project/index-management-dashboards-plugin/pull/751),[#753](https://github.com/opensearch-project/index-management-dashboards-plugin/pull/753))
+* Feature: Add flush index operation to UI  ([#713](https://github.com/opensearch-project/index-management-dashboards-plugin/pull/713),[#718](https://github.com/opensearch-project/index-management-dashboards-plugin/pull/718),[#751](https://github.com/opensearch-project/index-management-dashboards-plugin/pull/751),[#753](https://github.com/opensearch-project/index-management-dashboards-plugin/pull/753),[#779](https://github.com/opensearch-project/index-management-dashboards-plugin/pull/779))
 * Feature: Add notification settings page and runtime notification option for long running index operations  ([#731](https://github.com/opensearch-project/index-management-dashboards-plugin/pull/731),[#732](https://github.com/opensearch-project/index-management-dashboards-plugin/pull/732))
 * Feature: Composable templates enhancement  ([#730](https://github.com/opensearch-project/index-management-dashboards-plugin/pull/730))
 * Implemented alias action UX. ([#754](https://github.com/opensearch-project/index-management-dashboards-plugin/pull/754))