From 0b0d7ee4cbf53da0ad821f8f46cf7fe34da22ba0 Mon Sep 17 00:00:00 2001
From: Ashwin P Chandran <ashwinpc@amazon.com>
Date: Tue, 18 Apr 2023 18:04:38 +0000
Subject: [PATCH 1/4] Chore: Updates branch name

Signed-off-by: Ashwin P Chandran <ashwinpc@amazon.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8366af44496..6572c3eab99 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
   ],
   "private": true,
   "version": "2.7.0",
-  "branch": "2.x",
+  "branch": "2.7",
   "types": "./opensearch_dashboards.d.ts",
   "tsdocMetadata": "./build/tsdoc-metadata.json",
   "build": {

From 68f2e89cbe58ef2cb5a92f40988da7f0e2727a33 Mon Sep 17 00:00:00 2001
From: Ashwin P Chandran <ashwinpc@amazon.com>
Date: Fri, 21 Apr 2023 00:23:54 +0000
Subject: [PATCH 2/4] fixes header change

Signed-off-by: Ashwin P Chandran <ashwinpc@amazon.com>
---
 src/core/public/chrome/ui/header/header_help_menu.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/core/public/chrome/ui/header/header_help_menu.tsx b/src/core/public/chrome/ui/header/header_help_menu.tsx
index f0be769937f..fb1efcf7bbd 100644
--- a/src/core/public/chrome/ui/header/header_help_menu.tsx
+++ b/src/core/public/chrome/ui/header/header_help_menu.tsx
@@ -330,13 +330,12 @@ class HeaderHelpMenuUI extends Component<Props, State> {
         })}
         onClick={this.onMenuButtonClick}
       >
-        <EuiIcon type="questionInCircle" size="m" />
         <EuiIcon
-          type="help"
+          type="questionInCircle"
           size="m"
           title={intl.formatMessage({
             id: 'core.ui.chrome.headerGlobalNav.helpMenuButtonTitle',
-            defaultMessage: 'Help',
+            defaultMessage: 'Help menu',
           })}
         />
       </EuiHeaderSectionItemButton>

From de9b128302363a0115e7ec1b5f8a1a0234693319 Mon Sep 17 00:00:00 2001
From: Ashwin P Chandran <ashwinpc@amazon.com>
Date: Thu, 20 Apr 2023 17:36:35 -0700
Subject: [PATCH 3/4] Update
 src/core/public/chrome/ui/header/header_help_menu.tsx

Signed-off-by: Ashwin P Chandran <ashwinpc@amazon.com>

Co-authored-by: Josh Romero <rmerqg@amazon.com>
---
 src/core/public/chrome/ui/header/header_help_menu.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/public/chrome/ui/header/header_help_menu.tsx b/src/core/public/chrome/ui/header/header_help_menu.tsx
index fb1efcf7bbd..0eba4c0c267 100644
--- a/src/core/public/chrome/ui/header/header_help_menu.tsx
+++ b/src/core/public/chrome/ui/header/header_help_menu.tsx
@@ -335,7 +335,7 @@ class HeaderHelpMenuUI extends Component<Props, State> {
           size="m"
           title={intl.formatMessage({
             id: 'core.ui.chrome.headerGlobalNav.helpMenuButtonTitle',
-            defaultMessage: 'Help menu',
+            defaultMessage: 'Help',
           })}
         />
       </EuiHeaderSectionItemButton>

From 87ec0092bd0977cb145294dceba29ebed5af77be Mon Sep 17 00:00:00 2001
From: Ashwin P Chandran <ashwinpc@amazon.com>
Date: Fri, 21 Apr 2023 00:51:02 +0000
Subject: [PATCH 4/4] fixes snapshots

Signed-off-by: Ashwin P Chandran <ashwinpc@amazon.com>
---
 .../header/__snapshots__/header.test.tsx.snap | 40 ++-----------------
 .../header_help_menu.test.tsx.snap            | 40 ++-----------------
 2 files changed, 8 insertions(+), 72 deletions(-)

diff --git a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap
index 6486e207ed3..4c2beb329a9 100644
--- a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap
+++ b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap
@@ -5415,14 +5415,10 @@ exports[`Header handles visibility and lock changes 1`] = `
                             aria-label="Help menu"
                             onClick={[Function]}
                           >
-                            <EuiIcon
-                              size="m"
-                              type="questionInCircle"
-                            />
                             <EuiIcon
                               size="m"
                               title="Help"
-                              type="help"
+                              type="questionInCircle"
                             />
                           </EuiHeaderSectionItemButton>
                         }
@@ -5474,9 +5470,6 @@ exports[`Header handles visibility and lock changes 1`] = `
                                           >
                                             <span
                                               data-euiicon-type="questionInCircle"
-                                            />
-                                            <span
-                                              data-euiicon-type="help"
                                               title="Help"
                                             />
                                           </span>
@@ -5519,21 +5512,12 @@ exports[`Header handles visibility and lock changes 1`] = `
                                         >
                                           <EuiIcon
                                             size="m"
+                                            title="Help"
                                             type="questionInCircle"
                                           >
                                             <span
                                               data-euiicon-type="questionInCircle"
                                               size="m"
-                                            />
-                                          </EuiIcon>
-                                          <EuiIcon
-                                            size="m"
-                                            title="Help"
-                                            type="help"
-                                          >
-                                            <span
-                                              data-euiicon-type="help"
-                                              size="m"
                                               title="Help"
                                             />
                                           </EuiIcon>
@@ -10674,14 +10658,10 @@ exports[`Header renders condensed header 1`] = `
                             aria-label="Help menu"
                             onClick={[Function]}
                           >
-                            <EuiIcon
-                              size="m"
-                              type="questionInCircle"
-                            />
                             <EuiIcon
                               size="m"
                               title="Help"
-                              type="help"
+                              type="questionInCircle"
                             />
                           </EuiHeaderSectionItemButton>
                         }
@@ -10733,9 +10713,6 @@ exports[`Header renders condensed header 1`] = `
                                           >
                                             <span
                                               data-euiicon-type="questionInCircle"
-                                            />
-                                            <span
-                                              data-euiicon-type="help"
                                               title="Help"
                                             />
                                           </span>
@@ -10778,21 +10755,12 @@ exports[`Header renders condensed header 1`] = `
                                         >
                                           <EuiIcon
                                             size="m"
+                                            title="Help"
                                             type="questionInCircle"
                                           >
                                             <span
                                               data-euiicon-type="questionInCircle"
                                               size="m"
-                                            />
-                                          </EuiIcon>
-                                          <EuiIcon
-                                            size="m"
-                                            title="Help"
-                                            type="help"
-                                          >
-                                            <span
-                                              data-euiicon-type="help"
-                                              size="m"
                                               title="Help"
                                             />
                                           </EuiIcon>
diff --git a/src/core/public/chrome/ui/header/__snapshots__/header_help_menu.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/header_help_menu.test.tsx.snap
index 5406fbf6aba..036e2b4ee0c 100644
--- a/src/core/public/chrome/ui/header/__snapshots__/header_help_menu.test.tsx.snap
+++ b/src/core/public/chrome/ui/header/__snapshots__/header_help_menu.test.tsx.snap
@@ -1622,14 +1622,10 @@ exports[`Header help menu hides survey link 1`] = `
           aria-label="Help menu"
           onClick={[Function]}
         >
-          <EuiIcon
-            size="m"
-            type="questionInCircle"
-          />
           <EuiIcon
             size="m"
             title="Help"
-            type="help"
+            type="questionInCircle"
           />
         </EuiHeaderSectionItemButton>
       }
@@ -1681,9 +1677,6 @@ exports[`Header help menu hides survey link 1`] = `
                         >
                           <span
                             data-euiicon-type="questionInCircle"
-                          />
-                          <span
-                            data-euiicon-type="help"
                             title="Help"
                           />
                         </span>
@@ -1726,21 +1719,12 @@ exports[`Header help menu hides survey link 1`] = `
                       >
                         <EuiIcon
                           size="m"
+                          title="Help"
                           type="questionInCircle"
                         >
                           <span
                             data-euiicon-type="questionInCircle"
                             size="m"
-                          />
-                        </EuiIcon>
-                        <EuiIcon
-                          size="m"
-                          title="Help"
-                          type="help"
-                        >
-                          <span
-                            data-euiicon-type="help"
-                            size="m"
                             title="Help"
                           />
                         </EuiIcon>
@@ -3798,14 +3782,10 @@ exports[`Header help menu renders survey link 1`] = `
           aria-label="Help menu"
           onClick={[Function]}
         >
-          <EuiIcon
-            size="m"
-            type="questionInCircle"
-          />
           <EuiIcon
             size="m"
             title="Help"
-            type="help"
+            type="questionInCircle"
           />
         </EuiHeaderSectionItemButton>
       }
@@ -3857,9 +3837,6 @@ exports[`Header help menu renders survey link 1`] = `
                         >
                           <span
                             data-euiicon-type="questionInCircle"
-                          />
-                          <span
-                            data-euiicon-type="help"
                             title="Help"
                           />
                         </span>
@@ -3902,21 +3879,12 @@ exports[`Header help menu renders survey link 1`] = `
                       >
                         <EuiIcon
                           size="m"
+                          title="Help"
                           type="questionInCircle"
                         >
                           <span
                             data-euiicon-type="questionInCircle"
                             size="m"
-                          />
-                        </EuiIcon>
-                        <EuiIcon
-                          size="m"
-                          title="Help"
-                          type="help"
-                        >
-                          <span
-                            data-euiicon-type="help"
-                            size="m"
                             title="Help"
                           />
                         </EuiIcon>