From 9310a95499ff4e5145e3b1fa1e45862e07e7b964 Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Tue, 25 Jul 2023 11:59:22 -0500
Subject: [PATCH] UX: Ensure block explorer link is for desired account
 (#20144)

---
 .../account-list-item-menu/account-list-item-menu.js        | 1 +
 ui/components/multichain/global-menu/global-menu.js         | 1 +
 .../multichain/menu-items/view-explorer-menu-item.js        | 6 +++---
 .../multichain/menu-items/view-explorer-menu-item.test.js   | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ui/components/multichain/account-list-item-menu/account-list-item-menu.js b/ui/components/multichain/account-list-item-menu/account-list-item-menu.js
index e3e2eeec4..90f070c45 100644
--- a/ui/components/multichain/account-list-item-menu/account-list-item-menu.js
+++ b/ui/components/multichain/account-list-item-menu/account-list-item-menu.js
@@ -138,6 +138,7 @@ export const AccountListItemMenu = ({
             metricsLocation={METRICS_LOCATION}
             closeMenu={closeMenu}
             textProps={{ variant: TextVariant.bodySm }}
+            address={identity.address}
           />
           {isRemovable ? (
             <MenuItem
diff --git a/ui/components/multichain/global-menu/global-menu.js b/ui/components/multichain/global-menu/global-menu.js
index d25a10d61..0d928f8b9 100644
--- a/ui/components/multichain/global-menu/global-menu.js
+++ b/ui/components/multichain/global-menu/global-menu.js
@@ -101,6 +101,7 @@ export const GlobalMenu = ({ closeMenu, anchorElement }) => {
       <ViewExplorerMenuItem
         metricsLocation={METRICS_LOCATION}
         closeMenu={closeMenu}
+        address={address}
       />
       <MenuItem
         iconName={IconName.Connect}
diff --git a/ui/components/multichain/menu-items/view-explorer-menu-item.js b/ui/components/multichain/menu-items/view-explorer-menu-item.js
index 534090be7..ca99996e8 100644
--- a/ui/components/multichain/menu-items/view-explorer-menu-item.js
+++ b/ui/components/multichain/menu-items/view-explorer-menu-item.js
@@ -18,7 +18,6 @@ import {
   getBlockExplorerLinkText,
   getCurrentChainId,
   getRpcPrefsForCurrentProvider,
-  getSelectedAddress,
 } from '../../../selectors';
 import { getURLHostName } from '../../../helpers/utils/util';
 import { NETWORKS_ROUTE } from '../../../helpers/constants/routes';
@@ -27,15 +26,15 @@ export const ViewExplorerMenuItem = ({
   metricsLocation,
   closeMenu,
   textProps,
+  address,
 }) => {
   const t = useI18nContext();
   const trackEvent = useContext(MetaMetricsContext);
   const history = useHistory();
 
-  const currentAddress = useSelector(getSelectedAddress);
   const chainId = useSelector(getCurrentChainId);
   const rpcPrefs = useSelector(getRpcPrefsForCurrentProvider);
-  const addressLink = getAccountLink(currentAddress, chainId, rpcPrefs);
+  const addressLink = getAccountLink(address, chainId, rpcPrefs);
 
   const { blockExplorerUrl } = rpcPrefs;
   const blockExplorerUrlSubTitle = getURLHostName(blockExplorerUrl);
@@ -94,4 +93,5 @@ ViewExplorerMenuItem.propTypes = {
   metricsLocation: PropTypes.string.isRequired,
   closeMenu: PropTypes.func,
   textProps: PropTypes.object,
+  address: PropTypes.string.isRequired,
 };
diff --git a/ui/components/multichain/menu-items/view-explorer-menu-item.test.js b/ui/components/multichain/menu-items/view-explorer-menu-item.test.js
index 58fd8b115..447635fd9 100644
--- a/ui/components/multichain/menu-items/view-explorer-menu-item.test.js
+++ b/ui/components/multichain/menu-items/view-explorer-menu-item.test.js
@@ -10,6 +10,7 @@ const render = () => {
     <ViewExplorerMenuItem
       metricsLocation="Global Menu"
       closeMenu={jest.fn()}
+      address="0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc"
     />,
     store,
   );