From 3cca08851cb1527705c60bbb4202d50174f034af Mon Sep 17 00:00:00 2001
From: Ashwin P Chandran <ashwinpc@amazon.com>
Date: Thu, 20 Apr 2023 18:22:09 -0700
Subject: [PATCH] Fix header icon (#3910)

* fixes header change
* Update src/core/public/chrome/ui/header/header_help_menu.tsx
* fixes snapshots

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

---------

Signed-off-by: Ashwin P Chandran <ashwinpc@amazon.com>
Co-authored-by: Josh Romero <rmerqg@amazon.com>
---
 .../header/__snapshots__/header.test.tsx.snap | 40 ++-----------------
 .../header_help_menu.test.tsx.snap            | 40 ++-----------------
 .../chrome/ui/header/header_help_menu.tsx     |  3 +-
 3 files changed, 9 insertions(+), 74 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 6486e207ed37..4c2beb329a98 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 5406fbf6abaa..036e2b4ee0ce 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>
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 f0be769937f5..0eba4c0c2673 100644
--- a/src/core/public/chrome/ui/header/header_help_menu.tsx
+++ b/src/core/public/chrome/ui/header/header_help_menu.tsx
@@ -330,9 +330,8 @@ 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',