addressing review comments

app/scripts/controllers/detect-tokens.test.js

@@ -75,7 +75,6 @@ describe('DetectTokensController', function () {
           };
           return cb(modifiedNetworkState);
         }),
-      // config: { provider: this.provider },
     });
 
     assetsContractController = new AssetsContractController(

app/scripts/metamask-controller.js

@@ -1004,7 +1004,6 @@ export default class MetamaskController extends EventEmitter {
         // TODO: Handle failure to get conversion rate more gracefully
         console.error(error);
       }
-      // }
     });
 
     this.networkController.lookupNetwork();

ui/components/app/asset-list/asset-list.js

@@ -12,7 +12,6 @@ import {
   getNativeCurrencyImage,
   getDetectedTokensInCurrentNetwork,
   getIstokenDetectionInactiveOnNonMainnetSupportedNetwork,
-  getUseCurrencyRateCheck,
 } from '../../../selectors';
 import { getNativeCurrency } from '../../../ducks/metamask/metamask';
 import { useCurrencyDisplay } from '../../../hooks/useCurrencyDisplay';
@@ -38,7 +37,6 @@ const AssetList = ({ onClickAsset }) => {
   const selectedAccountBalance = useSelector(getSelectedAccountCachedBalance);
   const nativeCurrency = useSelector(getNativeCurrency);
   const showFiat = useSelector(getShouldShowFiat);
-  const useCurrencyRateCheck = useSelector(getUseCurrencyRateCheck);
   const trackEvent = useContext(MetaMetricsContext);
   const balance = useSelector(getSelectedAccountCachedBalance);
   const balanceIsLoading = !balance;
@@ -81,11 +79,7 @@ const AssetList = ({ onClickAsset }) => {
           primaryCurrencyProperties.value ?? secondaryCurrencyProperties.value
         }
         tokenSymbol={primaryCurrencyProperties.suffix}
-        secondary={
-          showFiat && useCurrencyRateCheck
-            ? secondaryCurrencyDisplay
-            : undefined
-        }
+        secondary={showFiat ? secondaryCurrencyDisplay : undefined}
         tokenImage={balanceIsLoading ? null : primaryTokenImage}
         identiconBorder
       />

ui/components/app/currency-input/currency-input.test.js

@@ -16,6 +16,7 @@ describe('CurrencyInput Component', () => {
       preferences: {
         showFiatInTestnets: true,
       },
+      useCurrencyRateCheck: true,
     },
   };
   describe('rendering', () => {

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

@@ -78,7 +78,6 @@ describe('DetectedTokenDetails', () => {
     renderWithProvider(<DetectedTokenDetails {...args} />, store);
 
     expect(screen.getByText('0 SNX')).toBeInTheDocument();
-    expect(screen.getByText('$0')).toBeInTheDocument();
     expect(screen.getByText('Token address:')).toBeInTheDocument();
     expect(screen.getByText('0xc01...2a6f')).toBeInTheDocument();
     expect(screen.getByText('From token lists:')).toBeInTheDocument();

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

@@ -1,5 +1,4 @@
 import React, { useEffect, useState } from 'react';
-import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
 
 import Box from '../../../ui/box';
@@ -13,14 +12,12 @@ import {
 } from '../../../../helpers/constants/design-system';
 import { useTokenTracker } from '../../../../hooks/useTokenTracker';
 import { useTokenFiatAmount } from '../../../../hooks/useTokenFiatAmount';
-import { getUseCurrencyRateCheck } from '../../../../selectors';
 
 const DetectedTokenValues = ({
   token,
   handleTokenSelection,
   tokensListDetected,
 }) => {
-  const useCurrencyRateCheck = useSelector(getUseCurrencyRateCheck);
   const [tokenSelection, setTokenSelection] = useState(() => {
     return tokensListDetected[token.address]?.selected;
   });
@@ -49,7 +46,7 @@ const DetectedTokenValues = ({
           {`${balanceString || '0'} ${token.symbol}`}
         </Typography>
         <Typography variant={TYPOGRAPHY.H7} color={COLORS.TEXT_ALTERNATIVE}>
-          {useCurrencyRateCheck && (formattedFiatBalance || '$0')}
+          {formattedFiatBalance}
         </Typography>
       </Box>
       <Box className="detected-token-values__checkbox">

ui/components/app/detected-token/detected-token-values/detected-token-values.test.js

@@ -74,6 +74,5 @@ describe('DetectedTokenValues', () => {
     renderWithProvider(<DetectedTokenValues {...args} />, store);
 
     expect(screen.getByText('0 SNX')).toBeInTheDocument();
-    expect(screen.getByText('$0')).toBeInTheDocument();
   });
 });

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

@@ -17,7 +17,6 @@ describe('DetectedToken', () => {
     expect(screen.getByText('0 LINK')).toBeInTheDocument();
     expect(screen.getByText('0 COMP')).toBeInTheDocument();
     expect(screen.getByText('0 FSW')).toBeInTheDocument();
-    expect(screen.getAllByText('$0')).toHaveLength(3);
     expect(screen.getAllByText('Token address:')).toHaveLength(3);
     expect(screen.getByText('0x514...86CA')).toBeInTheDocument();
     expect(screen.getByText('0xc00...6888')).toBeInTheDocument();

ui/components/app/multilayer-fee-message/multi-layer-fee-message.js

@@ -1,5 +1,4 @@
 import React, { useContext, useState, useEffect } from 'react';
-import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
 import { captureException } from '@sentry/browser';
 import TransactionDetailItem from '../transaction-detail-item/transaction-detail-item.component';
@@ -12,7 +11,6 @@ import {
   toBigNumber,
   toNormalizedDenomination,
 } from '../../../../shared/modules/conversion.utils';
-import { getUseCurrencyRateCheck } from '../../../selectors';
 
 export default function MultilayerFeeMessage({
   transaction,
@@ -21,7 +19,6 @@ export default function MultilayerFeeMessage({
   plainStyle,
 }) {
   const t = useContext(I18nContext);
-  const useCurrencyRateCheck = useSelector(getUseCurrencyRateCheck);
 
   const [fetchedLayer1Total, setLayer1Total] = useState(null);
 
@@ -84,15 +81,15 @@ export default function MultilayerFeeMessage({
         key="total-item"
         detailTitle={t('gasFee')}
         detailTotal={layer1Total}
-        detailText={useCurrencyRateCheck && feeTotalInFiat}
+        detailText={feeTotalInFiat}
         noBold={plainStyle}
         flexWidthValues={plainStyle}
       />
       <TransactionDetailItem
         key="total-item"
         detailTitle={t('total')}
         detailTotal={totalInEth}
-        detailText={useCurrencyRateCheck && totalInFiat}
+        detailText={totalInFiat}
         subTitle={t('transactionDetailMultiLayerTotalSubtitle')}
         noBold={plainStyle}
         flexWidthValues={plainStyle}

ui/components/app/token-cell/token-cell.js

@@ -3,10 +3,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { useSelector } from 'react-redux';
 import AssetListItem from '../asset-list-item';
-import {
-  getSelectedAddress,
-  getUseCurrencyRateCheck,
-} from '../../../selectors';
+import { getSelectedAddress } from '../../../selectors';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { useTokenFiatAmount } from '../../../hooks/useTokenFiatAmount';
 
@@ -20,7 +17,6 @@ export default function TokenCell({
   isERC721,
 }) {
   const userAddress = useSelector(getSelectedAddress);
-  const useCurrencyRateCheck = useSelector(getUseCurrencyRateCheck);
   const t = useI18nContext();
 
   const formattedFiat = useTokenFiatAmount(address, string, symbol);
@@ -51,7 +47,7 @@ export default function TokenCell({
       tokenDecimals={decimals}
       warning={warning}
       primary={`${string || 0}`}
-      secondary={useCurrencyRateCheck && formattedFiat}
+      secondary={formattedFiat}
       isERC721={isERC721}
     />
   );

ui/components/app/wallet-overview/eth-overview.js

@@ -22,7 +22,6 @@ import {
   getIsBuyableChain,
   getNativeCurrencyImage,
   getSelectedAccountCachedBalance,
-  getUseCurrencyRateCheck,
 } from '../../../selectors/selectors';
 import SwapIcon from '../../ui/icon/swap-icon.component';
 import BuyIcon from '../../ui/icon/overview-buy-icon.component';
@@ -53,7 +52,6 @@ const EthOverview = ({ className }) => {
   const isBuyableChain = useSelector(getIsBuyableChain);
   const primaryTokenImage = useSelector(getNativeCurrencyImage);
   const defaultSwapsToken = useSelector(getSwapsDefaultToken);
-  const useCurrencyRateCheck = useSelector(getUseCurrencyRateCheck);
 
   return (
     <>
@@ -91,7 +89,7 @@ const EthOverview = ({ className }) => {
                   <span className="eth-overview__cached-star">*</span>
                 ) : null}
               </div>
-              {showFiat && balance && useCurrencyRateCheck && (
+              {showFiat && balance && (
                 <UserPreferencedCurrencyDisplay
                   className={classnames({
                     'eth-overview__cached-secondary-balance': balanceIsCached,

ui/components/app/wallet-overview/token-overview.js

@@ -23,7 +23,6 @@ import {
   getIsBuyableTransakToken,
   getIsBuyableMoonpayToken,
   getIsBuyableWyreToken,
-  getUseCurrencyRateCheck,
 } from '../../../selectors/selectors';
 
 import BuyIcon from '../../ui/icon/overview-buy-icon.component';
@@ -68,7 +67,6 @@ const TokenOverview = ({ className, token }) => {
   const isTokenBuyableWyre = useSelector((state) =>
     getIsBuyableWyreToken(state, token.symbol),
   );
-  const useCurrencyRateCheck = useSelector(getUseCurrencyRateCheck);
 
   const isBuyable =
     isTokenBuyableCoinbasePay ||
@@ -103,7 +101,7 @@ const TokenOverview = ({ className, token }) => {
               displayValue={balanceToRender}
               suffix={token.symbol}
             />
-            {formattedFiatBalance && useCurrencyRateCheck ? (
+            {formattedFiatBalance ? (
               <CurrencyDisplay
                 className="token-overview__secondary-balance"
                 displayValue={formattedFiatBalance}

ui/selectors/selectors.js

@@ -586,9 +586,12 @@ export function getShouldShowFiat(state) {
   const isMainNet = getIsMainnet(state);
   const isCustomNetwork = getIsCustomNetwork(state);
   const conversionRate = getConversionRate(state);
+  const useCurrencyRateCheck = getUseCurrencyRateCheck(state);
   const { showFiatInTestnets } = getPreferences(state);
   return Boolean(
-    (isMainNet || isCustomNetwork || showFiatInTestnets) && conversionRate,
+    (isMainNet || isCustomNetwork || showFiatInTestnets) &&
+      useCurrencyRateCheck &&
+      conversionRate,
   );
 }