Fix: PR comments

Author: salimtb

ui/components/app/detected-token/detected-token-details/detected-token-details.js

@@ -14,6 +14,7 @@ import DetectedTokenAddress from '../detected-token-address/detected-token-addre
 import DetectedTokenAggregators from '../detected-token-aggregators/detected-token-aggregators';
 import { Display } from '../../../../helpers/constants/design-system';
 import {
+  getCurrentNetwork,
   getTestNetworkBackgroundColor,
   getTokenList,
 } from '../../../../selectors';
@@ -28,7 +29,7 @@ const DetectedTokenDetails = ({
   const tokenList = useSelector(getTokenList);
   const tokenData = tokenList[token.address?.toLowerCase()];
   const testNetworkBackgroundColor = useSelector(getTestNetworkBackgroundColor);
-
+  const currentNetwork = useSelector(getCurrentNetwork);
   return (
     <Box
       display={Display.Flex}
@@ -40,6 +41,7 @@ const DetectedTokenDetails = ({
           <AvatarNetwork
             size={AvatarNetworkSize.Xs}
             src={CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP[chainId]}
+            name={currentNetwork?.nickname || ''}
             backgroundColor={testNetworkBackgroundColor}
           />
         }

ui/components/app/modals/hide-token-confirmation-modal/hide-token-confirmation-modal.js

@@ -26,15 +26,14 @@ function mapStateToProps(state) {
 function mapDispatchToProps(dispatch) {
   return {
     hideModal: () => dispatch(actions.hideModal()),
-    hideToken: (address, networkClientId) => {
-      dispatch(
+    hideToken: async (address, networkClientId) => {
+      await dispatch(
         actions.ignoreTokens({
           tokensToIgnore: address,
           networkClientId,
         }),
-      ).then(() => {
-        dispatch(actions.hideModal());
-      });
+      );
+      dispatch(actions.hideModal());
     },
   };
 }

ui/components/multichain/detected-token-banner/detected-token-banner.js

@@ -1,4 +1,4 @@
-import React, { useContext, useMemo } from 'react';
+import React, { useContext } from 'react';
 import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
@@ -7,9 +7,8 @@ import { useI18nContext } from '../../../hooks/useI18nContext';
 import {
   getCurrentChainId,
   getDetectedTokensInCurrentNetwork,
+  getAllDetectedTokensForSelectedAddress,
   getPreferences,
-  getSelectedInternalAccount,
-  getAllDetectedTokens,
   getNetworkConfigurationsByChainId,
 } from '../../../selectors';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
@@ -27,8 +26,9 @@ export const DetectedTokensBanner = ({
 }) => {
   const t = useI18nContext();
   const trackEvent = useContext(MetaMetricsContext);
-  const allNetworks = useSelector(getNetworkConfigurationsByChainId);
   const { tokenNetworkFilter } = useSelector(getPreferences);
+  const allNetworks = useSelector(getNetworkConfigurationsByChainId);
+
   const allOpts = {};
   Object.keys(allNetworks || {}).forEach((chainId) => {
     allOpts[chainId] = true;
@@ -39,34 +39,18 @@ export const DetectedTokensBanner = ({
     Object.keys(allOpts || {}).length;
 
   const detectedTokens = useSelector(getDetectedTokensInCurrentNetwork);
-  const { address: selectedAddress } = useSelector(getSelectedInternalAccount);
-  const allDetectedTokens = useSelector(getAllDetectedTokens);
-
-  const { detectedTokensMultichain } = useMemo(() => {
-    const detectedTokensAllChains = Object.entries(
-      allDetectedTokens || {},
-    ).reduce((acc, [chainId, chainTokens]) => {
-      const tokensForAddress = chainTokens[selectedAddress];
-      if (tokensForAddress) {
-        acc[chainId] = tokensForAddress.map((token) => ({
-          ...token,
-          chainId,
-        }));
-      }
-      return acc;
-    }, {});
-
-    return { detectedTokensMultichain: detectedTokensAllChains };
-  }, [selectedAddress, allDetectedTokens]);
 
+  const detectedTokensMultichain = useSelector(
+    getAllDetectedTokensForSelectedAddress,
+  );
   const chainId = useSelector(getCurrentChainId);
 
   const detectedTokensDetails =
     process.env.PORTFOLIO_VIEW && !allNetworksFilterShown
       ? Object.values(detectedTokensMultichain)
           .flat()
           .map(({ address, symbol }) => `${symbol} - ${address}`)
-      : detectedTokens?.map(({ address, symbol }) => `${symbol} - ${address}`);
+      : detectedTokens.map(({ address, symbol }) => `${symbol} - ${address}`);
 
   const totalTokens =
     process.env.PORTFOLIO_VIEW && !allNetworksFilterShown