From db246eaf0b6c32b603a10bb1ab05e39db43dd714 Mon Sep 17 00:00:00 2001
From: 1Copenut <trevor.pierce@elastic.co>
Date: Mon, 21 Nov 2022 10:00:51 -0600
Subject: [PATCH 01/15] Bumping EUI to v70.3.0

---
 package.json                      |  2 +-
 src/dev/license_checker/config.ts |  2 +-
 yarn.lock                         | 46 ++++++++++++++++++++++++++-----
 3 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 808c068cb878a..b728696dfede6 100644
--- a/package.json
+++ b/package.json
@@ -108,7 +108,7 @@
     "@elastic/datemath": "5.0.3",
     "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@8.4.0-canary.1",
     "@elastic/ems-client": "8.3.3",
-    "@elastic/eui": "70.2.4",
+    "@elastic/eui": "70.3.0",
     "@elastic/filesaver": "1.1.2",
     "@elastic/node-crypto": "1.2.1",
     "@elastic/numeral": "^2.5.1",
diff --git a/src/dev/license_checker/config.ts b/src/dev/license_checker/config.ts
index eaa968f3c94e8..9fcc2c291208e 100644
--- a/src/dev/license_checker/config.ts
+++ b/src/dev/license_checker/config.ts
@@ -84,6 +84,6 @@ export const LICENSE_OVERRIDES = {
   'jsts@1.6.2': ['Eclipse Distribution License - v 1.0'], // cf. https://github.com/bjornharrtell/jsts
   '@mapbox/jsonlint-lines-primitives@2.0.2': ['MIT'], // license in readme https://github.com/tmcw/jsonlint
   '@elastic/ems-client@8.3.3': ['Elastic License 2.0'],
-  '@elastic/eui@70.2.4': ['SSPL-1.0 OR Elastic License 2.0'],
+  '@elastic/eui@70.3.0': ['SSPL-1.0 OR Elastic License 2.0'],
   'language-subtag-registry@0.3.21': ['CC-BY-4.0'], // retired ODC‑By license https://github.com/mattcg/language-subtag-registry
 };
diff --git a/yarn.lock b/yarn.lock
index 1348827b2539c..a63283eb2e6b0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1527,10 +1527,10 @@
   resolved "https://registry.yarnpkg.com/@elastic/eslint-plugin-eui/-/eslint-plugin-eui-0.0.2.tgz#56b9ef03984a05cc213772ae3713ea8ef47b0314"
   integrity sha512-IoxURM5zraoQ7C8f+mJb9HYSENiZGgRVcG4tLQxE61yHNNRDXtGDWTZh8N1KIHcsqN1CEPETjuzBXkJYF/fDiQ==
 
-"@elastic/eui@70.2.4":
-  version "70.2.4"
-  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-70.2.4.tgz#341be8be182e2d96980de771d3fc0f2a43757e9f"
-  integrity sha512-rtjeJJCz7XGtuRP30kK6TZti6o5wmwA1BHQuStTH8mFmTIdUnfRgFaI1AJvbLwckgj4JuVkdfAYBUxqyC9V8UA==
+"@elastic/eui@70.3.0":
+  version "70.3.0"
+  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-70.3.0.tgz#a428aea2f944fb87439eb90f74f2574061b97685"
+  integrity sha512-TKQP/JumUG9JCQycYwQ+sQRfpVf3OTShEfsUHeLVSK9yTE+0tdtb5aNIEFvTvsEGnvEMnWHDlCwsYJhyXJTwLw==
   dependencies:
     "@types/chroma-js" "^2.0.0"
     "@types/lodash" "^4.14.160"
@@ -1551,7 +1551,7 @@
     react-beautiful-dnd "^13.1.0"
     react-dropzone "^11.5.3"
     react-element-to-jsx-string "^14.3.4"
-    react-focus-on "^3.5.4"
+    react-focus-on "^3.7.0"
     react-input-autosize "^3.0.0"
     react-is "^17.0.2"
     react-virtualized-auto-sizer "^1.0.6"
@@ -8802,6 +8802,13 @@ aria-hidden@^1.1.3:
   dependencies:
     tslib "^1.0.0"
 
+aria-hidden@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/aria-hidden/-/aria-hidden-1.2.2.tgz#8c4f7cc88d73ca42114106fdf6f47e68d31475b8"
+  integrity sha512-6y/ogyDTk/7YAe91T3E2PR1ALVKyM2QbTio5HwM+N1Q6CMlCKhvClyIjkckBswa0f2xJhjsfzIGa1yVSe1UMVA==
+  dependencies:
+    tslib "^2.0.0"
+
 aria-query@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.2.tgz#0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b"
@@ -22486,7 +22493,19 @@ react-focus-lock@^2.9.0:
     use-callback-ref "^1.3.0"
     use-sidecar "^1.1.2"
 
-react-focus-on@^3.5.4, react-focus-on@^3.6.0:
+react-focus-lock@^2.9.2:
+  version "2.9.2"
+  resolved "https://registry.yarnpkg.com/react-focus-lock/-/react-focus-lock-2.9.2.tgz#a57dfd7c493e5a030d87f161c96ffd082bd920f2"
+  integrity sha512-5JfrsOKyA5Zn3h958mk7bAcfphr24jPoMoznJ8vaJF6fUrPQ8zrtEd3ILLOK8P5jvGxdMd96OxWNjDzATfR2qw==
+  dependencies:
+    "@babel/runtime" "^7.0.0"
+    focus-lock "^0.11.2"
+    prop-types "^15.6.2"
+    react-clientside-effect "^1.2.6"
+    use-callback-ref "^1.3.0"
+    use-sidecar "^1.1.2"
+
+react-focus-on@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/react-focus-on/-/react-focus-on-3.6.0.tgz#159e13082dad4ea1f07abe11254f0e981d5a7b79"
   integrity sha512-onIRjpd9trAUenXNdDcvjc8KJUSklty4X/Gr7hAm/MzM7ekSF2pg9D8KBKL7ipige22IAPxLRRf/EmJji9KD6Q==
@@ -22499,6 +22518,19 @@ react-focus-on@^3.5.4, react-focus-on@^3.6.0:
     use-callback-ref "^1.3.0"
     use-sidecar "^1.1.2"
 
+react-focus-on@^3.7.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/react-focus-on/-/react-focus-on-3.7.0.tgz#bf782b51483d52d1d336b7b09cb864897af26cdf"
+  integrity sha512-TsCnbJr4qjqFatJ4U1N8qGSZH+FUzxJ5mJ5ta7TY2YnDmUbGGmcvZMTZgGjQ1fl6vlztsMyg6YyZlPAeeIhEUg==
+  dependencies:
+    aria-hidden "^1.2.2"
+    react-focus-lock "^2.9.2"
+    react-remove-scroll "^2.5.5"
+    react-style-singleton "^2.2.0"
+    tslib "^2.3.1"
+    use-callback-ref "^1.3.0"
+    use-sidecar "^1.1.2"
+
 react-grid-layout@^1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/react-grid-layout/-/react-grid-layout-1.3.4.tgz#4fa819be24a1ba9268aa11b82d63afc4762a32ff"
@@ -22648,7 +22680,7 @@ react-remove-scroll-bar@^2.3.3:
     react-style-singleton "^2.2.1"
     tslib "^2.0.0"
 
-react-remove-scroll@^2.5.2:
+react-remove-scroll@^2.5.2, react-remove-scroll@^2.5.5:
   version "2.5.5"
   resolved "https://registry.yarnpkg.com/react-remove-scroll/-/react-remove-scroll-2.5.5.tgz#1e31a1260df08887a8a0e46d09271b52b3a37e77"
   integrity sha512-ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw==

From bd4de156d8975fa1c32fa2c99943aa9840801afc Mon Sep 17 00:00:00 2001
From: 1Copenut <trevor.pierce@elastic.co>
Date: Mon, 21 Nov 2022 11:09:10 -0600
Subject: [PATCH 02/15] Updating three snapshot tests.

---
 .../__snapshots__/modal_service.test.tsx.snap | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/core/overlays/core-overlays-browser-internal/src/modal/__snapshots__/modal_service.test.tsx.snap b/packages/core/overlays/core-overlays-browser-internal/src/modal/__snapshots__/modal_service.test.tsx.snap
index 2b5f564dfb3ee..7105dcea02869 100644
--- a/packages/core/overlays/core-overlays-browser-internal/src/modal/__snapshots__/modal_service.test.tsx.snap
+++ b/packages/core/overlays/core-overlays-browser-internal/src/modal/__snapshots__/modal_service.test.tsx.snap
@@ -94,12 +94,12 @@ exports[`ModalService openConfirm() renders a mountpoint confirm message 2`] = `
   data-eui="EuiFocusTrap"
 >
   <div
-    class="euiModal euiModal--maxWidth-default euiModal--confirmation"
+    class="euiModal euiModal--confirmation emotion-euiModal-defaultMaxWidth-confirmation"
     tabindex="0"
   >
     <button
       aria-label="Closes this modal window"
-      class="euiButtonIcon euiButtonIcon--xSmall euiModal__closeIcon emotion-euiButtonIcon-empty-text-hoverStyles"
+      class="euiButtonIcon euiButtonIcon--xSmall euiModal__closeIcon emotion-euiButtonIcon-empty-text-hoverStyles-euiModal__closeIcon"
       type="button"
     >
       <span
@@ -110,10 +110,10 @@ exports[`ModalService openConfirm() renders a mountpoint confirm message 2`] = `
       />
     </button>
     <div
-      class="euiModalBody"
+      class="euiModalBody emotion-euiModalBody"
     >
       <div
-        class="euiModalBody__overflow"
+        class="euiModalBody__overflow emotion-euiModalBody__overflow"
       >
         <div
           class="euiText emotion-euiText-m"
@@ -130,7 +130,7 @@ exports[`ModalService openConfirm() renders a mountpoint confirm message 2`] = `
       </div>
     </div>
     <div
-      class="euiModalFooter"
+      class="euiModalFooter emotion-euiModalFooter"
     >
       <button
         class="euiButtonEmpty css-9t7nyf-empty-primary"
@@ -298,12 +298,12 @@ exports[`ModalService openConfirm() renders a string confirm message 2`] = `
   data-eui="EuiFocusTrap"
 >
   <div
-    class="euiModal euiModal--maxWidth-default euiModal--confirmation"
+    class="euiModal euiModal--confirmation emotion-euiModal-defaultMaxWidth-confirmation"
     tabindex="0"
   >
     <button
       aria-label="Closes this modal window"
-      class="euiButtonIcon euiButtonIcon--xSmall euiModal__closeIcon emotion-euiButtonIcon-empty-text-hoverStyles"
+      class="euiButtonIcon euiButtonIcon--xSmall euiModal__closeIcon emotion-euiButtonIcon-empty-text-hoverStyles-euiModal__closeIcon"
       type="button"
     >
       <span
@@ -314,10 +314,10 @@ exports[`ModalService openConfirm() renders a string confirm message 2`] = `
       />
     </button>
     <div
-      class="euiModalBody"
+      class="euiModalBody emotion-euiModalBody"
     >
       <div
-        class="euiModalBody__overflow"
+        class="euiModalBody__overflow emotion-euiModalBody__overflow"
       >
         <div
           class="euiText emotion-euiText-m"
@@ -330,7 +330,7 @@ exports[`ModalService openConfirm() renders a string confirm message 2`] = `
       </div>
     </div>
     <div
-      class="euiModalFooter"
+      class="euiModalFooter emotion-euiModalFooter"
     >
       <button
         class="euiButtonEmpty css-9t7nyf-empty-primary"
@@ -1065,12 +1065,12 @@ exports[`ModalService openModal() renders a modal to the DOM 2`] = `
   data-eui="EuiFocusTrap"
 >
   <div
-    class="euiModal euiModal--maxWidth-default"
+    class="euiModal emotion-euiModal-defaultMaxWidth"
     tabindex="0"
   >
     <button
       aria-label="Closes this modal window"
-      class="euiButtonIcon euiButtonIcon--xSmall euiModal__closeIcon emotion-euiButtonIcon-empty-text-hoverStyles"
+      class="euiButtonIcon euiButtonIcon--xSmall euiModal__closeIcon emotion-euiButtonIcon-empty-text-hoverStyles-euiModal__closeIcon"
       type="button"
     >
       <span

From 8c8f86aec83ca61e67f57a2dd6dbc3cdc400e49a Mon Sep 17 00:00:00 2001
From: 1Copenut <trevor.pierce@elastic.co>
Date: Mon, 21 Nov 2022 11:37:07 -0600
Subject: [PATCH 03/15] Updated data-test-subj to current confirm modal string.

---
 .../delete_timeline_modal.test.tsx                     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/delete_timeline_modal/delete_timeline_modal.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/delete_timeline_modal/delete_timeline_modal.test.tsx
index d584b487fd459..72ca705b21fb9 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/delete_timeline_modal/delete_timeline_modal.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/delete_timeline_modal/delete_timeline_modal.test.tsx
@@ -36,7 +36,7 @@ describe('DeleteTimelineModal', () => {
       />
     );
 
-    expect(wrapper.find('[data-test-subj="title"]').first().text()).toEqual(
+    expect(wrapper.find('[data-test-subj="confirmModalTitleText"]').first().text()).toEqual(
       'Delete "Privilege Escalation"?'
     );
   });
@@ -50,7 +50,7 @@ describe('DeleteTimelineModal', () => {
       />
     );
 
-    expect(wrapper.find('[data-test-subj="title"]').first().text()).toEqual(
+    expect(wrapper.find('[data-test-subj="confirmModalTitleText"]').first().text()).toEqual(
       'Delete "Leading and trailing whitespace"?'
     );
   });
@@ -60,7 +60,7 @@ describe('DeleteTimelineModal', () => {
       <DeleteTimelineModal onDelete={jest.fn()} closeModal={jest.fn()} />
     );
 
-    expect(wrapper.find('[data-test-subj="title"]').first().text()).toEqual(
+    expect(wrapper.find('[data-test-subj="confirmModalTitleText"]').first().text()).toEqual(
       'Delete "Untitled timeline"?'
     );
   });
@@ -70,7 +70,7 @@ describe('DeleteTimelineModal', () => {
       <DeleteTimelineModal onDelete={jest.fn()} title={null} closeModal={jest.fn()} />
     );
 
-    expect(wrapper.find('[data-test-subj="title"]').first().text()).toEqual(
+    expect(wrapper.find('[data-test-subj="confirmModalTitleText"]').first().text()).toEqual(
       'Delete "Untitled timeline"?'
     );
   });
@@ -80,7 +80,7 @@ describe('DeleteTimelineModal', () => {
       <DeleteTimelineModal onDelete={jest.fn()} title={'    '} closeModal={jest.fn()} />
     );
 
-    expect(wrapper.find('[data-test-subj="title"]').first().text()).toEqual(
+    expect(wrapper.find('[data-test-subj="confirmModalTitleText"]').first().text()).toEqual(
       'Delete "Untitled timeline"?'
     );
   });

From 05cba2603a4f530eb7557593c022d6687f704e3d Mon Sep 17 00:00:00 2001
From: 1Copenut <trevor.pierce@elastic.co>
Date: Mon, 21 Nov 2022 11:44:35 -0600
Subject: [PATCH 04/15] Updated one confirm modal data-test-subj string.

---
 .../policy_forms/components/policy_form_layout.test.tsx     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/components/policy_form_layout.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/components/policy_form_layout.test.tsx
index 0ad249af74bc0..3a359b81f9bec 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/components/policy_form_layout.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_forms/components/policy_form_layout.test.tsx
@@ -179,9 +179,9 @@ describe('Policy Form Layout', () => {
 
       it('should show a modal confirmation', () => {
         expect(confirmModal).toHaveLength(1);
-        expect(confirmModal.find('div[data-test-subj="confirmModalTitleText"]').text()).toEqual(
-          'Save and deploy changes'
-        );
+        expect(
+          confirmModal.find('[data-test-subj="confirmModalTitleText"]').first().text()
+        ).toEqual('Save and deploy changes');
         expect(modalCancelButton.text()).toEqual('Cancel');
         expect(modalConfirmButton.text()).toEqual('Save and deploy changes');
       });

From 75cb55f7ed57d1555b4c755181fa00a29b9e72bc Mon Sep 17 00:00:00 2001
From: 1Copenut <trevor.pierce@elastic.co>
Date: Mon, 21 Nov 2022 11:54:30 -0600
Subject: [PATCH 05/15] Updating class euiModal count from 1 to 2.

---
 .../index_management/__jest__/components/index_table.test.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x-pack/plugins/index_management/__jest__/components/index_table.test.js b/x-pack/plugins/index_management/__jest__/components/index_table.test.js
index 2446461d1580b..a6ba969fa780c 100644
--- a/x-pack/plugins/index_management/__jest__/components/index_table.test.js
+++ b/x-pack/plugins/index_management/__jest__/components/index_table.test.js
@@ -421,7 +421,7 @@ describe('index table', () => {
     const rowIndex = 0;
     openMenuAndClickButton(rendered, rowIndex, 'forcemergeIndexMenuButton');
     snapshot(status(rendered, rowIndex));
-    expect(rendered.find('.euiModal').length).toBe(1);
+    expect(rendered.find('.euiModal').length).toBe(2);
 
     let count = 0;
     store.subscribe(() => {

From 03ca3d25f01816425228c126e10d5798099fa9eb Mon Sep 17 00:00:00 2001
From: 1Copenut <trevor.pierce@elastic.co>
Date: Mon, 21 Nov 2022 12:06:28 -0600
Subject: [PATCH 06/15] Updating four more snapshot tests.

---
 .../sample_data_card.test.tsx.snap            |  4 ++--
 .../__snapshots__/list_header.test.tsx.snap   | 22 ++++++++---------
 .../__snapshots__/no_data_card.test.tsx.snap  |  2 +-
 .../__snapshots__/index.test.tsx.snap         | 24 +++++++++----------
 4 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/packages/home/sample_data_card/src/__snapshots__/sample_data_card.test.tsx.snap b/packages/home/sample_data_card/src/__snapshots__/sample_data_card.test.tsx.snap
index 9919f56bdf111..44d6e8eb955b1 100644
--- a/packages/home/sample_data_card/src/__snapshots__/sample_data_card.test.tsx.snap
+++ b/packages/home/sample_data_card/src/__snapshots__/sample_data_card.test.tsx.snap
@@ -46,7 +46,7 @@ exports[`SampleDataCard installed renders with app links 1`] = `
       class="emotion-euiCard__betaBadgeAnchor"
     >
       <span
-        class="euiBetaBadge emotion-euiBetaBadge-hollow-m-euiCard__betaBadge"
+        class="euiBetaBadge emotion-euiBetaBadge-hollow-m-baseline-euiCard__betaBadge"
         id="generated-idBetaBadge"
         title="installed"
       >
@@ -164,7 +164,7 @@ exports[`SampleDataCard installed renders without app links 1`] = `
       class="emotion-euiCard__betaBadgeAnchor"
     >
       <span
-        class="euiBetaBadge emotion-euiBetaBadge-hollow-m-euiCard__betaBadge"
+        class="euiBetaBadge emotion-euiBetaBadge-hollow-m-baseline-euiCard__betaBadge"
         id="generated-idBetaBadge"
         title="installed"
       >
diff --git a/packages/kbn-securitysolution-exception-list-components/src/list_header/__snapshots__/list_header.test.tsx.snap b/packages/kbn-securitysolution-exception-list-components/src/list_header/__snapshots__/list_header.test.tsx.snap
index d734d7db2cfac..df2bbce84c141 100644
--- a/packages/kbn-securitysolution-exception-list-components/src/list_header/__snapshots__/list_header.test.tsx.snap
+++ b/packages/kbn-securitysolution-exception-list-components/src/list_header/__snapshots__/list_header.test.tsx.snap
@@ -237,13 +237,13 @@ Object {
         data-eui="EuiFocusTrap"
       >
         <div
-          class="euiModal euiModal--maxWidth-default"
+          class="euiModal emotion-euiModal-defaultMaxWidth"
           data-test-subj="EditModal"
           tabindex="0"
         >
           <button
             aria-label="Closes this modal window"
-            class="euiButtonIcon euiButtonIcon--xSmall euiModal__closeIcon emotion-euiButtonIcon-empty-text-hoverStyles"
+            class="euiButtonIcon euiButtonIcon--xSmall euiModal__closeIcon emotion-euiButtonIcon-empty-text-hoverStyles-euiModal__closeIcon"
             type="button"
           >
             <span
@@ -254,22 +254,20 @@ Object {
             />
           </button>
           <div
-            class="euiModalHeader"
+            class="euiModalHeader emotion-euiModalHeader"
           >
-            <div
-              class="euiModalHeader__title"
+            <h1
+              class="euiTitle euiModalHeader__title emotion-euiTitle-m"
               data-test-subj="editModalTitle"
             >
-              <h1>
-                Edit List Name
-              </h1>
-            </div>
+              Edit List Name
+            </h1>
           </div>
           <div
-            class="euiModalBody"
+            class="euiModalBody emotion-euiModalBody"
           >
             <div
-              class="euiModalBody__overflow"
+              class="euiModalBody__overflow emotion-euiModalBody__overflow"
             >
               <form
                 class="euiForm"
@@ -347,7 +345,7 @@ Object {
             </div>
           </div>
           <div
-            class="euiModalFooter"
+            class="euiModalFooter emotion-euiModalFooter"
           >
             <button
               class="euiButtonEmpty css-9t7nyf-empty-primary"
diff --git a/src/plugins/kibana_react/public/page_template/no_data_page/no_data_card/__snapshots__/no_data_card.test.tsx.snap b/src/plugins/kibana_react/public/page_template/no_data_page/no_data_card/__snapshots__/no_data_card.test.tsx.snap
index b9cd02ecc6f7f..03c02c8e36560 100644
--- a/src/plugins/kibana_react/public/page_template/no_data_page/no_data_card/__snapshots__/no_data_card.test.tsx.snap
+++ b/src/plugins/kibana_react/public/page_template/no_data_page/no_data_card/__snapshots__/no_data_card.test.tsx.snap
@@ -138,7 +138,7 @@ exports[`NoDataCard props recommended 1`] = `
       class="emotion-euiCard__betaBadgeAnchor"
     >
       <span
-        class="euiBetaBadge emotion-euiBetaBadge-hollow-m-euiCard__betaBadge"
+        class="euiBetaBadge emotion-euiBetaBadge-hollow-m-baseline-euiCard__betaBadge"
         id="generated-idBetaBadge"
         title="Recommended"
       >
diff --git a/x-pack/plugins/security_solution/public/common/components/import_data_modal/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/common/components/import_data_modal/__snapshots__/index.test.tsx.snap
index 179ef9b666aad..6d3605f16e741 100644
--- a/x-pack/plugins/security_solution/public/common/components/import_data_modal/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/common/components/import_data_modal/__snapshots__/index.test.tsx.snap
@@ -14,13 +14,13 @@ Object {
         data-eui="EuiFocusTrap"
       >
         <div
-          class="euiModal"
-          style="max-width: 750px;"
+          class="euiModal emotion-euiModal"
+          style="max-inline-size: 750px;"
           tabindex="0"
         >
           <button
             aria-label="Closes this modal window"
-            class="euiButtonIcon euiButtonIcon--xSmall euiModal__closeIcon emotion-euiButtonIcon-empty-text-hoverStyles"
+            class="euiButtonIcon euiButtonIcon--xSmall euiModal__closeIcon emotion-euiButtonIcon-empty-text-hoverStyles-euiModal__closeIcon"
             type="button"
           >
             <span
@@ -31,21 +31,19 @@ Object {
             />
           </button>
           <div
-            class="euiModalHeader"
+            class="euiModalHeader emotion-euiModalHeader"
           >
-            <div
-              class="euiModalHeader__title"
+            <h1
+              class="euiTitle euiModalHeader__title emotion-euiTitle-m"
             >
-              <h1>
-                title
-              </h1>
-            </div>
+              title
+            </h1>
           </div>
           <div
-            class="euiModalBody"
+            class="euiModalBody emotion-euiModalBody"
           >
             <div
-              class="euiModalBody__overflow"
+              class="euiModalBody__overflow emotion-euiModalBody__overflow"
             >
               <div
                 class="euiText emotion-euiText-s"
@@ -113,7 +111,7 @@ Object {
             </div>
           </div>
           <div
-            class="euiModalFooter"
+            class="euiModalFooter emotion-euiModalFooter"
           >
             <button
               class="euiButtonEmpty css-9t7nyf-empty-primary"

From 542d3ede98f6410132312aa6fe6a2a6369c8ff10 Mon Sep 17 00:00:00 2001
From: 1Copenut <trevor.pierce@elastic.co>
Date: Mon, 21 Nov 2022 14:53:42 -0600
Subject: [PATCH 07/15] Updating one snapshot, one CSS selector for find
 method.

---
 .../__snapshots__/edit_modal.test.tsx.snap    | 22 +++++++++----------
 .../create_case_modal.test.tsx                |  2 +-
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/packages/kbn-securitysolution-exception-list-components/src/list_header/edit_modal/__snapshots__/edit_modal.test.tsx.snap b/packages/kbn-securitysolution-exception-list-components/src/list_header/edit_modal/__snapshots__/edit_modal.test.tsx.snap
index 74a4924e1a9f1..6d02d55f6a91e 100644
--- a/packages/kbn-securitysolution-exception-list-components/src/list_header/edit_modal/__snapshots__/edit_modal.test.tsx.snap
+++ b/packages/kbn-securitysolution-exception-list-components/src/list_header/edit_modal/__snapshots__/edit_modal.test.tsx.snap
@@ -14,13 +14,13 @@ Object {
         data-eui="EuiFocusTrap"
       >
         <div
-          class="euiModal euiModal--maxWidth-default"
+          class="euiModal emotion-euiModal-defaultMaxWidth"
           data-test-subj="EditModal"
           tabindex="0"
         >
           <button
             aria-label="Closes this modal window"
-            class="euiButtonIcon euiButtonIcon--xSmall euiModal__closeIcon emotion-euiButtonIcon-empty-text-hoverStyles"
+            class="euiButtonIcon euiButtonIcon--xSmall euiModal__closeIcon emotion-euiButtonIcon-empty-text-hoverStyles-euiModal__closeIcon"
             type="button"
           >
             <span
@@ -31,22 +31,20 @@ Object {
             />
           </button>
           <div
-            class="euiModalHeader"
+            class="euiModalHeader emotion-euiModalHeader"
           >
-            <div
-              class="euiModalHeader__title"
+            <h1
+              class="euiTitle euiModalHeader__title emotion-euiTitle-m"
               data-test-subj="editModalTitle"
             >
-              <h1>
-                Edit list name
-              </h1>
-            </div>
+              Edit list name
+            </h1>
           </div>
           <div
-            class="euiModalBody"
+            class="euiModalBody emotion-euiModalBody"
           >
             <div
-              class="euiModalBody__overflow"
+              class="euiModalBody__overflow emotion-euiModalBody__overflow"
             >
               <form
                 class="euiForm"
@@ -124,7 +122,7 @@ Object {
             </div>
           </div>
           <div
-            class="euiModalFooter"
+            class="euiModalFooter emotion-euiModalFooter"
           >
             <button
               class="euiButtonEmpty css-9t7nyf-empty-primary"
diff --git a/x-pack/plugins/cases/public/components/use_create_case_modal/create_case_modal.test.tsx b/x-pack/plugins/cases/public/components/use_create_case_modal/create_case_modal.test.tsx
index 9ee4a78b7d817..e1ffe92e0c4c1 100644
--- a/x-pack/plugins/cases/public/components/use_create_case_modal/create_case_modal.test.tsx
+++ b/x-pack/plugins/cases/public/components/use_create_case_modal/create_case_modal.test.tsx
@@ -61,7 +61,7 @@ describe('CreateCaseModal', () => {
       </TestProviders>
     );
 
-    wrapper.find('.euiModal__closeIcon').first().simulate('click');
+    wrapper.find('button.euiModal__closeIcon').first().simulate('click');
     expect(onCloseCaseModal).toBeCalled();
   });
 

From 36288954bcb03d30ed95ed62e8d27ec0a8070094 Mon Sep 17 00:00:00 2001
From: 1Copenut <trevor.pierce@elastic.co>
Date: Tue, 22 Nov 2022 10:33:44 -0600
Subject: [PATCH 08/15] Bumping react-focus-on to 3.7.0 to match EUI.

---
 package.json |  2 +-
 yarn.lock    | 38 +++-----------------------------------
 2 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/package.json b/package.json
index b728696dfede6..ee1cdebc22159 100644
--- a/package.json
+++ b/package.json
@@ -603,7 +603,7 @@
     "react-dom": "^17.0.2",
     "react-dropzone": "^4.2.9",
     "react-fast-compare": "^2.0.4",
-    "react-focus-on": "^3.6.0",
+    "react-focus-on": "3.7.0",
     "react-grid-layout": "^1.3.4",
     "react-hook-form": "^7.39.1",
     "react-intl": "^2.8.0",
diff --git a/yarn.lock b/yarn.lock
index a63283eb2e6b0..5f10f8daf9d01 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8795,13 +8795,6 @@ argsplit@^1.0.5:
   resolved "https://registry.yarnpkg.com/argsplit/-/argsplit-1.0.5.tgz#9319a6ef63411716cfeb216c45ec1d13b35c5e99"
   integrity sha1-kxmm72NBFxbP6yFsRewdE7NcXpk=
 
-aria-hidden@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/aria-hidden/-/aria-hidden-1.1.3.tgz#bb48de18dc84787a3c6eee113709c473c64ec254"
-  integrity sha512-RhVWFtKH5BiGMycI72q2RAFMLQi8JP9bLuQXgR5a8Znp7P5KOIADSJeyfI8PCVxLEp067B2HbP5JIiI/PXIZeA==
-  dependencies:
-    tslib "^1.0.0"
-
 aria-hidden@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/aria-hidden/-/aria-hidden-1.2.2.tgz#8c4f7cc88d73ca42114106fdf6f47e68d31475b8"
@@ -22481,18 +22474,6 @@ react-fast-compare@^3.0.1:
   resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb"
   integrity sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA==
 
-react-focus-lock@^2.9.0:
-  version "2.9.1"
-  resolved "https://registry.yarnpkg.com/react-focus-lock/-/react-focus-lock-2.9.1.tgz#094cfc19b4f334122c73bb0bff65d77a0c92dd16"
-  integrity sha512-pSWOQrUmiKLkffPO6BpMXN7SNKXMsuOakl652IBuALAu1esk+IcpJyM+ALcYzPTTFz1rD0R54aB9A4HuP5t1Wg==
-  dependencies:
-    "@babel/runtime" "^7.0.0"
-    focus-lock "^0.11.2"
-    prop-types "^15.6.2"
-    react-clientside-effect "^1.2.6"
-    use-callback-ref "^1.3.0"
-    use-sidecar "^1.1.2"
-
 react-focus-lock@^2.9.2:
   version "2.9.2"
   resolved "https://registry.yarnpkg.com/react-focus-lock/-/react-focus-lock-2.9.2.tgz#a57dfd7c493e5a030d87f161c96ffd082bd920f2"
@@ -22505,20 +22486,7 @@ react-focus-lock@^2.9.2:
     use-callback-ref "^1.3.0"
     use-sidecar "^1.1.2"
 
-react-focus-on@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/react-focus-on/-/react-focus-on-3.6.0.tgz#159e13082dad4ea1f07abe11254f0e981d5a7b79"
-  integrity sha512-onIRjpd9trAUenXNdDcvjc8KJUSklty4X/Gr7hAm/MzM7ekSF2pg9D8KBKL7ipige22IAPxLRRf/EmJji9KD6Q==
-  dependencies:
-    aria-hidden "^1.1.3"
-    react-focus-lock "^2.9.0"
-    react-remove-scroll "^2.5.2"
-    react-style-singleton "^2.2.0"
-    tslib "^2.3.1"
-    use-callback-ref "^1.3.0"
-    use-sidecar "^1.1.2"
-
-react-focus-on@^3.7.0:
+react-focus-on@3.7.0, react-focus-on@^3.7.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/react-focus-on/-/react-focus-on-3.7.0.tgz#bf782b51483d52d1d336b7b09cb864897af26cdf"
   integrity sha512-TsCnbJr4qjqFatJ4U1N8qGSZH+FUzxJ5mJ5ta7TY2YnDmUbGGmcvZMTZgGjQ1fl6vlztsMyg6YyZlPAeeIhEUg==
@@ -22680,7 +22648,7 @@ react-remove-scroll-bar@^2.3.3:
     react-style-singleton "^2.2.1"
     tslib "^2.0.0"
 
-react-remove-scroll@^2.5.2, react-remove-scroll@^2.5.5:
+react-remove-scroll@^2.5.5:
   version "2.5.5"
   resolved "https://registry.yarnpkg.com/react-remove-scroll/-/react-remove-scroll-2.5.5.tgz#1e31a1260df08887a8a0e46d09271b52b3a37e77"
   integrity sha512-ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw==
@@ -26175,7 +26143,7 @@ tslib@2.3.1:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
   integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
 
-tslib@^1.0.0, tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
+tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
   integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==

From 85f481dc73f3392edbaaa7f242e2357f2ce6472b Mon Sep 17 00:00:00 2001
From: 1Copenut <trevor.pierce@elastic.co>
Date: Tue, 22 Nov 2022 13:45:21 -0600
Subject: [PATCH 09/15] Wrapping confirm title in DIV to restore test.

---
 .../revert_to_basic/revert_to_basic.js                 | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/x-pack/plugins/license_management/public/application/sections/license_dashboard/revert_to_basic/revert_to_basic.js b/x-pack/plugins/license_management/public/application/sections/license_dashboard/revert_to_basic/revert_to_basic.js
index 0a3c6d25ec5ac..6831bf4daaba7 100644
--- a/x-pack/plugins/license_management/public/application/sections/license_dashboard/revert_to_basic/revert_to_basic.js
+++ b/x-pack/plugins/license_management/public/application/sections/license_dashboard/revert_to_basic/revert_to_basic.js
@@ -30,10 +30,12 @@ export class RevertToBasic extends React.PureComponent {
     return (
       <EuiConfirmModal
         title={
-          <FormattedMessage
-            id="xpack.licenseMgmt.licenseDashboard.revertToBasic.confirmModalTitle"
-            defaultMessage="Confirm Revert to Basic License"
-          />
+          <div>
+            <FormattedMessage
+              id="xpack.licenseMgmt.licenseDashboard.revertToBasic.confirmModalTitle"
+              defaultMessage="Confirm Revert to Basic License"
+            />
+          </div>
         }
         onCancel={cancelStartBasicLicense}
         onConfirm={() => startBasicLicense(licenseType, true)}

From 6c80355992200db08138dd7eb04777c9ae888630 Mon Sep 17 00:00:00 2001
From: Constance Chen <constance.chen@elastic.co>
Date: Tue, 22 Nov 2022 16:49:24 -0800
Subject: [PATCH 10/15] Add blur workaround to password change modal

- CI/tests were failing because the blur events were fighting one another and causing focus to be lost when clicking between password fields
---
 .../users/edit_user/change_password_modal.tsx   | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/security/public/management/users/edit_user/change_password_modal.tsx b/x-pack/plugins/security/public/management/users/edit_user/change_password_modal.tsx
index beba64e6b2fb9..c7bd7dd3664dc 100644
--- a/x-pack/plugins/security/public/management/users/edit_user/change_password_modal.tsx
+++ b/x-pack/plugins/security/public/management/users/edit_user/change_password_modal.tsx
@@ -102,7 +102,7 @@ export const ChangePasswordModal: FunctionComponent<ChangePasswordModalProps> =
   const isCurrentUser = currentUser?.username === username;
   const isSystemUser = username === 'kibana' || username === 'kibana_system';
 
-  const [form, eventHandlers] = useForm({
+  const [form, { onBlur, ...eventHandlers }] = useForm({
     onSubmit: async (values) => {
       try {
         await new UserAPIClient(services.http!).changePassword(
@@ -141,6 +141,13 @@ export const ChangePasswordModal: FunctionComponent<ChangePasswordModalProps> =
     defaultValues,
   });
 
+  // For some reason, the focus-lock dependency that EuiModal uses to accessibly trap focus
+  // is fighting the form `onBlur` and causing focus to be lost when clicking between password
+  // fields, so this workaround waits a tick before validating the form on blur
+  const validateFormOnBlur = (event: React.FocusEvent<HTMLFormElement & HTMLInputElement>) => {
+    requestAnimationFrame(() => onBlur(event));
+  };
+
   const firstFieldRef = useInitialFocus<HTMLInputElement>([isLoading]);
   const modalFormId = useGeneratedHtmlId({ prefix: 'modalForm' });
 
@@ -158,7 +165,13 @@ export const ChangePasswordModal: FunctionComponent<ChangePasswordModalProps> =
         {isLoading ? (
           <EuiLoadingContent />
         ) : (
-          <EuiForm id={modalFormId} component="form" noValidate {...eventHandlers}>
+          <EuiForm
+            id={modalFormId}
+            component="form"
+            noValidate
+            {...eventHandlers}
+            onBlur={validateFormOnBlur}
+          >
             {isSystemUser ? (
               <>
                 <EuiCallOut

From 8c90cd8e4020dae24efae28e51ea75ce22339b8b Mon Sep 17 00:00:00 2001
From: 1Copenut <trevor.pierce@elastic.co>
Date: Wed, 23 Nov 2022 14:11:29 -0600
Subject: [PATCH 11/15] Bumping EUI to 70.4.0.

---
 package.json                      | 2 +-
 src/dev/license_checker/config.ts | 2 +-
 yarn.lock                         | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index ce310ff108071..6fb0603106800 100644
--- a/package.json
+++ b/package.json
@@ -108,7 +108,7 @@
     "@elastic/datemath": "5.0.3",
     "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@8.4.0-canary.1",
     "@elastic/ems-client": "8.3.3",
-    "@elastic/eui": "70.3.0",
+    "@elastic/eui": "70.4.0",
     "@elastic/filesaver": "1.1.2",
     "@elastic/node-crypto": "1.2.1",
     "@elastic/numeral": "^2.5.1",
diff --git a/src/dev/license_checker/config.ts b/src/dev/license_checker/config.ts
index 9fcc2c291208e..eebb7e8eabe58 100644
--- a/src/dev/license_checker/config.ts
+++ b/src/dev/license_checker/config.ts
@@ -84,6 +84,6 @@ export const LICENSE_OVERRIDES = {
   'jsts@1.6.2': ['Eclipse Distribution License - v 1.0'], // cf. https://github.com/bjornharrtell/jsts
   '@mapbox/jsonlint-lines-primitives@2.0.2': ['MIT'], // license in readme https://github.com/tmcw/jsonlint
   '@elastic/ems-client@8.3.3': ['Elastic License 2.0'],
-  '@elastic/eui@70.3.0': ['SSPL-1.0 OR Elastic License 2.0'],
+  '@elastic/eui@70.4.0': ['SSPL-1.0 OR Elastic License 2.0'],
   'language-subtag-registry@0.3.21': ['CC-BY-4.0'], // retired ODC‑By license https://github.com/mattcg/language-subtag-registry
 };
diff --git a/yarn.lock b/yarn.lock
index 0666d725ca114..e3678d5c8f27e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1527,10 +1527,10 @@
   resolved "https://registry.yarnpkg.com/@elastic/eslint-plugin-eui/-/eslint-plugin-eui-0.0.2.tgz#56b9ef03984a05cc213772ae3713ea8ef47b0314"
   integrity sha512-IoxURM5zraoQ7C8f+mJb9HYSENiZGgRVcG4tLQxE61yHNNRDXtGDWTZh8N1KIHcsqN1CEPETjuzBXkJYF/fDiQ==
 
-"@elastic/eui@70.3.0":
-  version "70.3.0"
-  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-70.3.0.tgz#a428aea2f944fb87439eb90f74f2574061b97685"
-  integrity sha512-TKQP/JumUG9JCQycYwQ+sQRfpVf3OTShEfsUHeLVSK9yTE+0tdtb5aNIEFvTvsEGnvEMnWHDlCwsYJhyXJTwLw==
+"@elastic/eui@70.4.0":
+  version "70.4.0"
+  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-70.4.0.tgz#0ce7520ac96e137f05861224a6cd0a029c4dc0bc"
+  integrity sha512-w/pMxC0drBtzy3RQzHBLLbKRgy4EUTSetej0eg7m87copRZOwWXqlrIt52uuUj9txenxmpSonnnvSB+1a7fCfg==
   dependencies:
     "@types/chroma-js" "^2.0.0"
     "@types/lodash" "^4.14.160"

From d1c8e3acf8ce63705b8abf13f0a99d362cb62b71 Mon Sep 17 00:00:00 2001
From: 1Copenut <trevor.pierce@elastic.co>
Date: Wed, 23 Nov 2022 14:43:00 -0600
Subject: [PATCH 12/15] Updating 1 unit test for EuiTourStep types.

---
 .../public/query_string_input/no_data_popover.test.tsx          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/unified_search/public/query_string_input/no_data_popover.test.tsx b/src/plugins/unified_search/public/query_string_input/no_data_popover.test.tsx
index f80fc68494091..8d41fac7ad29e 100644
--- a/src/plugins/unified_search/public/query_string_input/no_data_popover.test.tsx
+++ b/src/plugins/unified_search/public/query_string_input/no_data_popover.test.tsx
@@ -75,7 +75,7 @@ describe('NoDataPopover', () => {
     };
     const instance = mount(<NoDataPopover {...props} />);
     act(() => {
-      instance.find(EuiTourStep).prop('footerAction')!.props.onClick();
+      instance.find('button[data-test-subj="noDataPopoverDismissButton"]').simulate('click');
     });
     instance.setProps({ ...props });
     expect(props.storage.set).toHaveBeenCalledWith(expect.any(String), true);

From 5389257a512789fe258f56025181a38f4f4d9368 Mon Sep 17 00:00:00 2001
From: 1Copenut <trevor.pierce@elastic.co>
Date: Mon, 28 Nov 2022 10:10:27 -0600
Subject: [PATCH 13/15] Updated modal selector to be more exclusive.

---
 .../index_management/__jest__/components/index_table.test.js  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/index_management/__jest__/components/index_table.test.js b/x-pack/plugins/index_management/__jest__/components/index_table.test.js
index a6ba969fa780c..0c3487cd7a5d8 100644
--- a/x-pack/plugins/index_management/__jest__/components/index_table.test.js
+++ b/x-pack/plugins/index_management/__jest__/components/index_table.test.js
@@ -421,13 +421,13 @@ describe('index table', () => {
     const rowIndex = 0;
     openMenuAndClickButton(rendered, rowIndex, 'forcemergeIndexMenuButton');
     snapshot(status(rendered, rowIndex));
-    expect(rendered.find('.euiModal').length).toBe(2);
+    expect(rendered.find('div.euiModal').length).toBe(1);
 
     let count = 0;
     store.subscribe(() => {
       if (count === 1) {
         snapshot(status(rendered, rowIndex));
-        expect(rendered.find('.euiModal').length).toBe(0);
+        expect(rendered.find('div.euiModal').length).toBe(0);
       }
       count++;
     });

From 32ec4cd8b658cbe6baad43b7e06e38bb8e4ea022 Mon Sep 17 00:00:00 2001
From: 1Copenut <trevor.pierce@elastic.co>
Date: Tue, 29 Nov 2022 12:11:10 -0600
Subject: [PATCH 14/15] Set the correct version delimiter for react-focus-on

---
 package.json | 2 +-
 yarn.lock    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index efc936a55e8b8..d36ebb51e2d9a 100644
--- a/package.json
+++ b/package.json
@@ -611,7 +611,7 @@
     "react-dom": "^17.0.2",
     "react-dropzone": "^4.2.9",
     "react-fast-compare": "^2.0.4",
-    "react-focus-on": "3.7.0",
+    "react-focus-on": "^3.7.0",
     "react-grid-layout": "^1.3.4",
     "react-hook-form": "^7.39.5",
     "react-intl": "^2.8.0",
diff --git a/yarn.lock b/yarn.lock
index e7c76ebf76aa3..f2692a83d77d7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -22664,7 +22664,7 @@ react-focus-lock@^2.9.2:
     use-callback-ref "^1.3.0"
     use-sidecar "^1.1.2"
 
-react-focus-on@3.7.0, react-focus-on@^3.7.0:
+react-focus-on@^3.7.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/react-focus-on/-/react-focus-on-3.7.0.tgz#bf782b51483d52d1d336b7b09cb864897af26cdf"
   integrity sha512-TsCnbJr4qjqFatJ4U1N8qGSZH+FUzxJ5mJ5ta7TY2YnDmUbGGmcvZMTZgGjQ1fl6vlztsMyg6YyZlPAeeIhEUg==

From 016b979537bf008f138c0257db0055db82574d45 Mon Sep 17 00:00:00 2001
From: 1Copenut <trevor.pierce@elastic.co>
Date: Tue, 29 Nov 2022 12:23:21 -0600
Subject: [PATCH 15/15] Refactored FormattedMessage to raw i18n so modal title
 would render as H1.

---
 .../revert_to_basic/revert_to_basic.js              | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/x-pack/plugins/license_management/public/application/sections/license_dashboard/revert_to_basic/revert_to_basic.js b/x-pack/plugins/license_management/public/application/sections/license_dashboard/revert_to_basic/revert_to_basic.js
index 6831bf4daaba7..548b63fa49d9f 100644
--- a/x-pack/plugins/license_management/public/application/sections/license_dashboard/revert_to_basic/revert_to_basic.js
+++ b/x-pack/plugins/license_management/public/application/sections/license_dashboard/revert_to_basic/revert_to_basic.js
@@ -10,6 +10,7 @@ import React from 'react';
 import { EuiFlexItem, EuiCard, EuiButton, EuiLink, EuiConfirmModal, EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EXTERNAL_LINKS } from '../../../../../common/constants';
+import { i18n } from '@kbn/i18n';
 
 export class RevertToBasic extends React.PureComponent {
   cancel = () => {
@@ -29,14 +30,10 @@ export class RevertToBasic extends React.PureComponent {
     }
     return (
       <EuiConfirmModal
-        title={
-          <div>
-            <FormattedMessage
-              id="xpack.licenseMgmt.licenseDashboard.revertToBasic.confirmModalTitle"
-              defaultMessage="Confirm Revert to Basic License"
-            />
-          </div>
-        }
+        title={i18n.translate(
+          'xpack.licenseMgmt.licenseDashboard.revertToBasic.confirmModalTitle',
+          { defaultMessage: 'Confirm Revert to Basic License' }
+        )}
         onCancel={cancelStartBasicLicense}
         onConfirm={() => startBasicLicense(licenseType, true)}
         cancelButtonText={