From 5b917444d4890bf5b254aeb2a41250ef7ac448d1 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Mon, 19 Sep 2022 15:41:48 -0230
Subject: [PATCH] Revert "Ensure that 'tokens found in this account' message is
 only shown when token detection activated (#15823)" (#15879)

This reverts commit b359844dc550e2c97e922b2008185b646e7caa04.
---
 ui/components/app/asset-list/asset-list.js | 13 ++++++++-----
 ui/selectors/selectors.js                  | 15 ---------------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/ui/components/app/asset-list/asset-list.js b/ui/components/app/asset-list/asset-list.js
index 27b8664f6..a55ed3677 100644
--- a/ui/components/app/asset-list/asset-list.js
+++ b/ui/components/app/asset-list/asset-list.js
@@ -11,7 +11,7 @@ import {
   getShouldShowFiat,
   getNativeCurrencyImage,
   getDetectedTokensInCurrentNetwork,
-  getDisplayDetectedTokensLink,
+  getIstokenDetectionInactiveOnNonMainnetSupportedNetwork,
 } from '../../../selectors';
 import { getNativeCurrency } from '../../../ducks/metamask/metamask';
 import { useCurrencyDisplay } from '../../../hooks/useCurrencyDisplay';
@@ -66,7 +66,9 @@ const AssetList = ({ onClickAsset }) => {
 
   const primaryTokenImage = useSelector(getNativeCurrencyImage);
   const detectedTokens = useSelector(getDetectedTokensInCurrentNetwork) || [];
-  const displayDetectedTokensLink = useSelector(getDisplayDetectedTokensLink);
+  const istokenDetectionInactiveOnNonMainnetSupportedNetwork = useSelector(
+    getIstokenDetectionInactiveOnNonMainnetSupportedNetwork,
+  );
 
   return (
     <>
@@ -94,9 +96,10 @@ const AssetList = ({ onClickAsset }) => {
           });
         }}
       />
-      {detectedTokens.length > 0 && displayDetectedTokensLink && (
-        <DetectedTokensLink setShowDetectedTokens={setShowDetectedTokens} />
-      )}
+      {detectedTokens.length > 0 &&
+        !istokenDetectionInactiveOnNonMainnetSupportedNetwork && (
+          <DetectedTokensLink setShowDetectedTokens={setShowDetectedTokens} />
+        )}
       <Box marginTop={detectedTokens.length > 0 ? 0 : 4}>
         <Box justifyContent={JUSTIFY_CONTENT.CENTER}>
           <Typography
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index 01655eea6..fab590c36 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -1135,21 +1135,6 @@ export function getIstokenDetectionInactiveOnNonMainnetSupportedNetwork(state) {
   return isDynamicTokenListAvailable && !useTokenDetection && !isMainnet;
 }
 
-/**
- * To check if the token detection is ON and either a dynamic list is available
- * or the user is on mainnet
- *
- * @param {*} state
- * @returns Boolean
- */
-export function getDisplayDetectedTokensLink(state) {
-  const useTokenDetection = getUseTokenDetection(state);
-  const isMainnet = getIsMainnet(state);
-  const isDynamicTokenListAvailable = getIsDynamicTokenListAvailable(state);
-
-  return (isDynamicTokenListAvailable || isMainnet) && useTokenDetection;
-}
-
 /**
  * To get the `customNetworkListEnabled` value which determines whether we use the custom network list
  *