From 20198bd7dd2d287a51a711aa1cd476ea8fc2871d Mon Sep 17 00:00:00 2001
From: Matthew Russell <mattrussell36@gmail.com>
Date: Mon, 22 May 2023 07:48:25 -0700
Subject: [PATCH] chore: revert dropdown and orderlist changes

---
 libs/announcements/src/lib/announcements.tsx               | 2 +-
 .../src/components/network-switcher/network-switcher.tsx   | 6 +++++-
 .../src/components/dropdown-menu/dropdown-menu.tsx         | 7 +++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/libs/announcements/src/lib/announcements.tsx b/libs/announcements/src/lib/announcements.tsx
index baf4ae54b..bdde69baf 100644
--- a/libs/announcements/src/lib/announcements.tsx
+++ b/libs/announcements/src/lib/announcements.tsx
@@ -86,7 +86,7 @@ export const AnnouncementBanner = ({
         )}
       </div>
       <button
-        className="absolute right-0 top-0 p-4 w-10 h-full flex items-center justify-center"
+        className="absolute right-0 top-0 p-4 w-10 h-full flex items-center justify-center text-white"
         data-testid="app-announcement-close"
         onClick={() => setVisible(false)}
       >
diff --git a/libs/environment/src/components/network-switcher/network-switcher.tsx b/libs/environment/src/components/network-switcher/network-switcher.tsx
index f4822927c..c4442aca5 100644
--- a/libs/environment/src/components/network-switcher/network-switcher.tsx
+++ b/libs/environment/src/components/network-switcher/network-switcher.tsx
@@ -13,6 +13,7 @@ import {
 import { useEnvironment } from '../../hooks/use-environment';
 import { Networks } from '../../types';
 import { DApp, TOKEN_NEW_NETWORK_PARAM_PROPOSAL, useLinks } from '../../hooks';
+import classNames from 'classnames';
 
 export const envNameMapping: Record<Networks, string> = {
   [Networks.VALIDATOR_TESTNET]: t('VALIDATOR_TESTNET'),
@@ -110,7 +111,10 @@ export const NetworkSwitcher = ({
         <DropdownMenuTrigger
           data-testid="network-switcher"
           ref={menuRef}
-          className={className}
+          className={classNames(
+            'flex justify-between items-center text-sm text-vega-dark-600 dark:text-vega-light-600 py-1 px-2 rounded border border-vega-dark-200 whitespace-nowrap dark:hover:bg-vega-dark-500 hover:bg-vega-light-500',
+            className
+          )}
         >
           <span className="flex justify-between items-center gap-2">
             <span>{envTriggerMapping[current]}</span>
diff --git a/libs/ui-toolkit/src/components/dropdown-menu/dropdown-menu.tsx b/libs/ui-toolkit/src/components/dropdown-menu/dropdown-menu.tsx
index 76fb0bd4a..75178ca63 100644
--- a/libs/ui-toolkit/src/components/dropdown-menu/dropdown-menu.tsx
+++ b/libs/ui-toolkit/src/components/dropdown-menu/dropdown-menu.tsx
@@ -44,18 +44,17 @@ export const DropdownMenuTrigger = forwardRef<
   React.ElementRef<typeof DropdownMenuPrimitive.Trigger>,
   DropdownMenuPrimitive.DropdownMenuTriggerProps
 >(({ className, children, ...props }, forwardedRef) => {
-  const triggerClasses = classNames(
+  const defaultClasses = [
     'text-sm py-1 px-2 rounded bg-transparent border whitespace-nowrap',
     'border-vega-light-200 dark:border-vega-dark-200',
     'hover:border-vega-light-300 dark:hover:border-vega-dark-300',
-    className
-  );
+  ].join(' ');
 
   return (
     <DropdownMenuPrimitive.Trigger
       asChild={true}
       ref={forwardedRef}
-      className={triggerClasses}
+      className={className || defaultClasses}
       {...props}
     >
       <button>{children}</button>