feat: add feature flag for menu

MetaMask · Jun 13, 2024 · fd5644c · fd5644c
1 parent 7e1a561
commit fd5644c
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 15 deletions.
diff --git a/ui/components/multichain/network-list-item/network-list-item.js b/ui/components/multichain/network-list-item/network-list-item.js
@@ -1,6 +1,7 @@
 import React, { useEffect, useRef, useState } from 'react';
 import classnames from 'classnames';
 import PropTypes from 'prop-types';
+import { useSelector } from 'react-redux';
 import {
   AlignItems,
   BackgroundColor,
@@ -10,6 +11,8 @@ import {
   Display,
   JustifyContent,
   TextColor,
+  Size,
+  IconColor,
 } from '../../../helpers/constants/design-system';
 import {
   AvatarNetwork,
@@ -23,6 +26,7 @@ import { useI18nContext } from '../../../hooks/useI18nContext';
 import { getAvatarNetworkColor } from '../../../helpers/utils/accounts';
 import Tooltip from '../../ui/tooltip/tooltip';
 import { NetworkListItemMenu } from '../network-list-item-menu';
+import { getLocalNetworkMenuRedesignFeatureFlag } from '../../../helpers/utils/feature-flags';
 
 const MAXIMUM_CHARACTERS_WITHOUT_TOOLTIP = 20;
 
@@ -43,9 +47,42 @@ export const NetworkListItem = ({
   const setNetworkListItemMenuRef = (ref) => {
     setNetworkListItemMenuElement(ref);
   };
-
   const [networkOptionsMenuOpen, setNetworkOptionsMenuOpen] = useState(false);
+  const networkMenuRedesign = useSelector(
+    getLocalNetworkMenuRedesignFeatureFlag,
+  );
+
+  const renderButton = () => {
+    if (networkMenuRedesign) {
+      return onDeleteClick || onEditClick ? (
+        <ButtonIcon
+          iconName={IconName.MoreVertical}
+          ref={setNetworkListItemMenuRef}
+          data-testid="network-list-item-options-button"
+          ariaLabel={t('networkOptions')}
+          onClick={(e) => {
+            e.stopPropagation();
+            setNetworkOptionsMenuOpen(true);
+          }}
+          size={ButtonIconSize.Sm}
+        />
+      ) : null;
+    }
 
+    return onDeleteClick ? (
+      <ButtonIcon
+        className="multichain-network-list-item__delete"
+        color={IconColor.errorDefault}
+        iconName={IconName.Trash}
+        ariaLabel={t('deleteNetwork')}
+        size={Size.SM}
+        onClick={(e) => {
+          e.stopPropagation();
+          onDeleteClick();
+        }}
+      />
+    ) : null;
+  };
   useEffect(() => {
     if (networkRef.current && focus) {
       networkRef.current.focus();
@@ -112,19 +149,7 @@ export const NetworkListItem = ({
           )}
         </Text>
       </Box>
-      {onDeleteClick || onEditClick ? (
-        <ButtonIcon
-          iconName={IconName.MoreVertical}
-          ref={setNetworkListItemMenuRef}
-          data-testid="network-list-item-options-button"
-          ariaLabel={t('networkOptions')}
-          onClick={(e) => {
-            e.stopPropagation();
-            setNetworkOptionsMenuOpen(true);
-          }}
-          size={ButtonIconSize.Sm}
-        />
-      ) : null}
+      {renderButton()}
       <NetworkListItemMenu
         anchorElement={networkListItemMenuElement}
         isOpen={networkOptionsMenuOpen}

diff --git a/ui/pages/home/home.component.js b/ui/pages/home/home.component.js
@@ -72,6 +72,7 @@ import BetaHomeFooter from './beta/beta-home-footer.component';
 ///: END:ONLY_INCLUDE_IF
 ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
 import FlaskHomeFooter from './flask/flask-home-footer.component';
+import { setEditedNetwork } from '../../store/actions';
 ///: END:ONLY_INCLUDE_IF
 
 function shouldCloseNotificationPopup({
@@ -470,6 +471,7 @@ export default class Home extends PureComponent {
       setRemoveNftMessage('');
       setNewTokensImported(''); // Added this so we dnt see the notif if user does not close it
       setNewTokensImportedError('');
+      setEditedNetwork({});
     };
 
     const autoHideDelay = 5 * SECOND;
@@ -576,11 +578,12 @@ export default class Home extends PureComponent {
             }
           />
         ) : null}
-        {console.log('IM HERE ***********', editedNetwork)}
         {editedNetwork ? (
           <ActionableMessage
             type="success"
             className="home__new-network-notification"
+            autoHideTime={autoHideDelay}
+            onAutoHide={onAutoHide}
             message={
               <Box display={Display.InlineFlex}>
                 <i className="fa fa-check-circle home__new-network-notification-icon" />