From 5f25788e503d6847b94f3e949bfc68e74526b807 Mon Sep 17 00:00:00 2001
From: Nicholas Gambino <nicholas.gambino@consensys.net>
Date: Wed, 18 Dec 2024 15:22:47 -0800
Subject: [PATCH 1/3] chore: Update style for header, update snapshots

---
 .../app-header/__snapshots__/app-header.test.js.snap          | 4 ++--
 ui/components/multichain/app-header/app-header-container.tsx  | 2 +-
 ui/components/multichain/app-header/app-header.js             | 2 +-
 ui/components/multichain/app-header/index.scss                | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ui/components/multichain/app-header/__snapshots__/app-header.test.js.snap b/ui/components/multichain/app-header/__snapshots__/app-header.test.js.snap
index ea37f1e209ec..fca6b40eedc4 100644
--- a/ui/components/multichain/app-header/__snapshots__/app-header.test.js.snap
+++ b/ui/components/multichain/app-header/__snapshots__/app-header.test.js.snap
@@ -3,7 +3,7 @@
 exports[`App Header locked state matches snapshot: locked 1`] = `
 <div>
   <div
-    class="mm-box multichain-app-header multichain-app-header-shadow mm-box--margin-bottom-4 mm-box--display-flex mm-box--align-items-center mm-box--width-full mm-box--background-color-background-default"
+    class="mm-box multichain-app-header multichain-app-header-border mm-box--margin-bottom-4 mm-box--display-flex mm-box--align-items-center mm-box--width-full mm-box--background-color-background-default"
   >
     <div
       class="mm-box multichain-app-header__lock-contents mm-box--padding-2 mm-box--display-flex mm-box--gap-2 mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full mm-box--background-color-background-default"
@@ -431,7 +431,7 @@ exports[`App Header unlocked state matches snapshot: unlocked 1`] = `
     class="mm-box multichain-app-header mm-box--margin-bottom-4 mm-box--display-flex mm-box--align-items-center mm-box--width-full mm-box--background-color-background-alternative"
   >
     <div
-      class="mm-box multichain-app-header__contents multichain-app-header-shadow mm-box--padding-2 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--gap-2 mm-box--align-items-center mm-box--width-full mm-box--background-color-background-default"
+      class="mm-box multichain-app-header__contents multichain-app-header-border mm-box--padding-2 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--gap-2 mm-box--align-items-center mm-box--width-full mm-box--background-color-background-default"
     >
       <div>
         <button
diff --git a/ui/components/multichain/app-header/app-header-container.tsx b/ui/components/multichain/app-header/app-header-container.tsx
index 8acda149d6eb..61d991e4529c 100644
--- a/ui/components/multichain/app-header/app-header-container.tsx
+++ b/ui/components/multichain/app-header/app-header-container.tsx
@@ -29,7 +29,7 @@ export const AppHeaderContainer = ({
     <Box
       display={Display.Flex}
       className={classnames('multichain-app-header', {
-        'multichain-app-header-shadow': !isUnlocked || popupStatus,
+        'multichain-app-header-border': !isUnlocked || popupStatus,
       })}
       marginBottom={headerBottomMargin}
       alignItems={AlignItems.center}
diff --git a/ui/components/multichain/app-header/app-header.js b/ui/components/multichain/app-header/app-header.js
index 904862ae7bb8..87d8c73647c0 100644
--- a/ui/components/multichain/app-header/app-header.js
+++ b/ui/components/multichain/app-header/app-header.js
@@ -132,7 +132,7 @@ export const AppHeader = ({ location }) => {
                 ? 'multichain-app-header__contents'
                 : 'multichain-app-header__lock-contents',
               {
-                'multichain-app-header-shadow': isUnlocked && !popupStatus,
+                'multichain-app-header-border': isUnlocked && !popupStatus,
               },
             )}
             {...(isUnlocked ? unlockedStyling : lockStyling)}
diff --git a/ui/components/multichain/app-header/index.scss b/ui/components/multichain/app-header/index.scss
index 381ebef7f851..eb6581c0be88 100644
--- a/ui/components/multichain/app-header/index.scss
+++ b/ui/components/multichain/app-header/index.scss
@@ -73,8 +73,8 @@
   }
 }
 
-.multichain-app-header-shadow {
-  box-shadow: var(--shadow-size-md) var(--color-shadow-default);
+.multichain-app-header-border {
+  border-bottom: 1px solid var(--color-border-muted)
 }
 
 .multichain-app-header-logo {

From 0571e795e1d6d66c213e528e8a49bba24dd3314e Mon Sep 17 00:00:00 2001
From: Nicholas Gambino <nicholas.gambino@consensys.net>
Date: Wed, 18 Dec 2024 16:06:37 -0800
Subject: [PATCH 2/3] fix: Add trailing comma

---
 ui/components/multichain/app-header/index.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/components/multichain/app-header/index.scss b/ui/components/multichain/app-header/index.scss
index eb6581c0be88..6d51b6e2d6cc 100644
--- a/ui/components/multichain/app-header/index.scss
+++ b/ui/components/multichain/app-header/index.scss
@@ -74,7 +74,7 @@
 }
 
 .multichain-app-header-border {
-  border-bottom: 1px solid var(--color-border-muted)
+  border-bottom: 1px solid var(--color-border-muted);
 }
 
 .multichain-app-header-logo {

From 9a6cbac4a7cda9dc0f238ea55a919cd36875369a Mon Sep 17 00:00:00 2001
From: Nicholas Gambino <nicholas.gambino@consensys.net>
Date: Thu, 19 Dec 2024 12:50:15 -0800
Subject: [PATCH 3/3] fix: Update e2e

---
 test/e2e/snaps/test-snap-notification.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/e2e/snaps/test-snap-notification.spec.js b/test/e2e/snaps/test-snap-notification.spec.js
index c96c1bc96e3d..ca3491690a41 100644
--- a/test/e2e/snaps/test-snap-notification.spec.js
+++ b/test/e2e/snaps/test-snap-notification.spec.js
@@ -100,10 +100,10 @@ describe('Test Snap Notification', function () {
 
         // try to click on the account menu icon (via xpath)
         await driver.clickElement(
-          '[data-testid="account-options-menu-button"]',
+          '[data-testid="notifications-tag-counter__unread-dot"]',
         );
 
-        // try to click on the notification item (via xpath)
+        // // try to click on the notification item (via xpath)
         await driver.waitForSelector({
           text: 'Notifications 1',
           css: '.menu-item',