m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Ensure that 'tokens found in this account' message is only shown when token detection activated (#15823)

Browse Source
This commit is contained in:
Dan J Miller 2022-09-14 13:05:14 -02:30 committed by seaona
parent b2f1c3f53e
commit 99e3721f13
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ui/components/app/asset-list/asset-list.js
View File

@ -11,7 +11,7 @@ import {
getShouldShowFiat, getShouldShowFiat,
getNativeCurrencyImage, getNativeCurrencyImage,
getDetectedTokensInCurrentNetwork, getDetectedTokensInCurrentNetwork,
getIstokenDetectionInactiveOnNonMainnetSupportedNetwork, getDisplayDetectedTokensLink,
} from '../../../selectors'; } from '../../../selectors';
import { getNativeCurrency } from '../../../ducks/metamask/metamask'; import { getNativeCurrency } from '../../../ducks/metamask/metamask';
import { useCurrencyDisplay } from '../../../hooks/useCurrencyDisplay'; import { useCurrencyDisplay } from '../../../hooks/useCurrencyDisplay';
@ -66,9 +66,7 @@ const AssetList = ({ onClickAsset }) => {
const primaryTokenImage = useSelector(getNativeCurrencyImage); const primaryTokenImage = useSelector(getNativeCurrencyImage);
const detectedTokens = useSelector(getDetectedTokensInCurrentNetwork) || []; const detectedTokens = useSelector(getDetectedTokensInCurrentNetwork) || [];
const istokenDetectionInactiveOnNonMainnetSupportedNetwork = useSelector( const displayDetectedTokensLink = useSelector(getDisplayDetectedTokensLink);
getIstokenDetectionInactiveOnNonMainnetSupportedNetwork,
);
return ( return (
<> <>
@ -96,10 +94,9 @@ const AssetList = ({ onClickAsset }) => {
}); });
}} }}
/> />
{detectedTokens.length > 0 && {detectedTokens.length > 0 && displayDetectedTokensLink && (
!istokenDetectionInactiveOnNonMainnetSupportedNetwork && ( <DetectedTokensLink setShowDetectedTokens={setShowDetectedTokens} />
<DetectedTokensLink setShowDetectedTokens={setShowDetectedTokens} /> )}
)}
<Box marginTop={detectedTokens.length > 0 ? 0 : 4}> <Box marginTop={detectedTokens.length > 0 ? 0 : 4}>
<Box justifyContent={JUSTIFY_CONTENT.CENTER}> <Box justifyContent={JUSTIFY_CONTENT.CENTER}>
<Typography <Typography

15
ui/selectors/selectors.js
View File

@ -1121,6 +1121,21 @@ export function getIstokenDetectionInactiveOnNonMainnetSupportedNetwork(state) {
return isDynamicTokenListAvailable && !useTokenDetection && !isMainnet; 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 * To get the `customNetworkListEnabled` value which determines whether we use the custom network list
* *