From 4e3c08aba4503ff6adb28ea884affa7bfd07ddbe Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Fri, 21 Apr 2023 08:37:51 -0500
Subject: [PATCH] UX: Multichain: Network Menu: Set Focus on Selected Network
 (#18706)

---
 .../network-list-item/network-list-item.js    | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 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
index d21832732..a66bbc0be 100644
--- a/ui/components/multichain/network-list-item/network-list-item.js
+++ b/ui/components/multichain/network-list-item/network-list-item.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect, useRef } from 'react';
 import classnames from 'classnames';
 import PropTypes from 'prop-types';
 import Box from '../../ui/box/box';
@@ -31,6 +31,14 @@ export const NetworkListItem = ({
   onDeleteClick,
 }) => {
   const t = useI18nContext();
+  const networkRef = useRef();
+
+  useEffect(() => {
+    if (networkRef.current && selected) {
+      networkRef.current.querySelector('.mm-button-link').focus();
+    }
+  }, [networkRef, selected]);
+
   return (
     <Box
       onClick={onClick}
@@ -43,6 +51,7 @@ export const NetworkListItem = ({
       alignItems={AlignItems.center}
       justifyContent={JustifyContent.spaceBetween}
       width={BLOCK_SIZES.FULL}
+      ref={networkRef}
     >
       {selected && (
         <Box
@@ -53,7 +62,14 @@ export const NetworkListItem = ({
       )}
       <AvatarNetwork name={name} src={iconSrc} />
       <Box className="multichain-network-list-item__network-name">
-        <ButtonLink onClick={onClick} color={TextColor.textDefault} ellipsis>
+        <ButtonLink
+          onClick={(e) => {
+            e.stopPropagation();
+            onClick();
+          }}
+          color={TextColor.textDefault}
+          ellipsis
+        >
           {name.length > MAXIMUM_CHARACTERS_WITHOUT_TOOLTIP ? (
             <Tooltip
               title={name}