refactor: use new multichain selectors in accounts related components

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

@@ -6,23 +6,23 @@ import { PRIMARY, SECONDARY } from '../../../helpers/constants/common';
 import { useUserPreferencedCurrency } from '../../../hooks/useUserPreferencedCurrency';
 import {
   getSelectedAccountCachedBalance,
-  getShouldShowFiat,
-  getNativeCurrencyImage,
   getDetectedTokensInCurrentNetwork,
   getIstokenDetectionInactiveOnNonMainnetSupportedNetwork,
   getShouldHideZeroBalanceTokens,
   ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
   getIsBuyableChain,
   ///: END:ONLY_INCLUDE_IF
-  getCurrentNetwork,
   getSelectedAccount,
   getPreferences,
-  getIsMainnet,
 } from '../../../selectors';
 import {
-  getNativeCurrency,
-  getProviderConfig,
-} from '../../../ducks/metamask/metamask';
+  getMultichainCurrentNetwork,
+  getMultichainNativeCurrency,
+  getMultichainIsEvm,
+  getMultichainShouldShowFiat,
+  getMultichainCurrencyImage,
+  getMultichainIsMainnet,
+} from '../../../selectors/multichain';
 import { useCurrencyDisplay } from '../../../hooks/useCurrencyDisplay';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import {
@@ -53,12 +53,13 @@ import {
 const AssetList = ({ onClickAsset }) => {
   const [showDetectedTokens, setShowDetectedTokens] = useState(false);
   const selectedAccountBalance = useSelector(getSelectedAccountCachedBalance);
-  const nativeCurrency = useSelector(getNativeCurrency);
-  const showFiat = useSelector(getShouldShowFiat);
-  const { chainId } = useSelector(getCurrentNetwork);
-  const isMainnet = useSelector(getIsMainnet);
+  const nativeCurrency = useSelector(getMultichainNativeCurrency);
+  const showFiat = useSelector(getMultichainShouldShowFiat);
+  const isMainnet = useSelector(getMultichainIsMainnet);
   const { useNativeCurrencyAsPrimaryCurrency } = useSelector(getPreferences);
-  const { ticker, type, rpcUrl } = useSelector(getProviderConfig);
+  const { chainId, ticker, type, rpcUrl } = useSelector(
+    getMultichainCurrentNetwork,
+  );
   const isOriginalNativeSymbol = useIsOriginalNativeTokenSymbol(
     chainId,
     ticker,
@@ -94,7 +95,7 @@ const AssetList = ({ onClickAsset }) => {
       currency: secondaryCurrency,
     });
 
-  const primaryTokenImage = useSelector(getNativeCurrencyImage);
+  const primaryTokenImage = useSelector(getMultichainCurrencyImage);
   const detectedTokens = useSelector(getDetectedTokensInCurrentNetwork) || [];
   const isTokenDetectionInactiveOnNonMainnetSupportedNetwork = useSelector(
     getIstokenDetectionInactiveOnNonMainnetSupportedNetwork,
@@ -112,7 +113,9 @@ const AssetList = ({ onClickAsset }) => {
   const shouldShowBuy = isBuyableChain && balanceIsZero;
   ///: END:ONLY_INCLUDE_IF
 
-  let isStakeable = isMainnet;
+  const isEvm = useSelector(getMultichainIsEvm);
+
+  let isStakeable = isMainnet && isEvm;
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
   isStakeable = false;
   ///: END:ONLY_INCLUDE_IF

ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.js

@@ -1,13 +1,15 @@
 import React, { useMemo } from 'react';
-import PropTypes from 'prop-types';
 import { useSelector } from 'react-redux';
+import PropTypes from 'prop-types';
 import { EtherDenomination } from '../../../../shared/constants/common';
 import { PRIMARY, SECONDARY } from '../../../helpers/constants/common';
 import CurrencyDisplay from '../../ui/currency-display';
 import { useUserPreferencedCurrency } from '../../../hooks/useUserPreferencedCurrency';
 import { AvatarNetwork, AvatarNetworkSize } from '../../component-library';
-import { getCurrentNetwork } from '../../../selectors';
-import { getNativeCurrency } from '../../../ducks/metamask/metamask';
+import {
+  getMultichainNativeCurrency,
+  getMultichainCurrentNetwork,
+} from '../../../selectors/multichain';
 
 /* eslint-disable jsdoc/require-param-name */
 // eslint-disable-next-line jsdoc/require-param
@@ -24,9 +26,10 @@ export default function UserPreferencedCurrencyDisplay({
   showCurrencySuffix,
   ...restProps
 }) {
-  const currentNetwork = useSelector(getCurrentNetwork);
-  const nativeCurrency = useSelector(getNativeCurrency);
+  const currentNetwork = useSelector(getMultichainCurrentNetwork);
+  const nativeCurrency = useSelector(getMultichainNativeCurrency);
   const { currency, numberOfDecimals } = useUserPreferencedCurrency(type, {
+    currency: nativeCurrency, // Required for non-EVM support for now
     ethNumberOfDecimals,
     fiatNumberOfDecimals,
     numberOfDecimals: propsNumberOfDecimals,

ui/components/component-library/avatar-network/avatar-network.tsx

@@ -80,7 +80,7 @@ export const AvatarNetwork: AvatarNetworkComponent = React.forwardRef(
               }
               onError={handleOnError}
               src={src}
-              alt={`${name} logo` || 'network logo'}
+              alt={(name && `${name} logo`) || 'network logo'}
             />
           </>
         )}

ui/components/multichain/ramps-card/ramps-card.js

@@ -10,7 +10,10 @@ import {
   TextVariant,
 } from '../../../helpers/constants/design-system';
 import { useI18nContext } from '../../../hooks/useI18nContext';
-import { getCurrentNetwork, getSwapsDefaultToken } from '../../../selectors';
+import {
+  getMultichainDefaultToken,
+  getMultichainCurrentNetwork,
+} from '../../../selectors/multichain';
 import {
   MetaMetricsEventCategory,
   MetaMetricsEventName,
@@ -68,14 +71,15 @@ export const RampsCard = ({ variant }) => {
   const { openBuyCryptoInPdapp } = useRamps(metamaskEntryMap[variant]);
   const trackEvent = useContext(MetaMetricsContext);
   const currentLocale = useSelector(getCurrentLocale);
-  const { chainId, nickname } = useSelector(getCurrentNetwork);
-  const { symbol = 'ETH' } = useSelector(getSwapsDefaultToken);
+  const { chainId, nickname } = useSelector(getMultichainCurrentNetwork);
+  const { symbol } = useSelector(getMultichainDefaultToken);
 
   useEffect(() => {
     trackEvent({
       event: MetaMetricsEventName.EmptyBuyBannerDisplayed,
       category: MetaMetricsEventCategory.Navigation,
       properties: {
+        // FIXME: This might not be a number for non-EVM networks
         chain_id: chainId,
         locale: currentLocale,
         network: nickname,
@@ -85,13 +89,14 @@ export const RampsCard = ({ variant }) => {
   }, [currentLocale, chainId, nickname, trackEvent]);
 
   const onClick = useCallback(() => {
-    openBuyCryptoInPdapp();
+    openBuyCryptoInPdapp(chainId);
     trackEvent({
       event: MetaMetricsEventName.NavBuyButtonClicked,
       category: MetaMetricsEventCategory.Navigation,
       properties: {
         location: `${variant} tab`,
         text: `Buy ${symbol}`,
+        // FIXME: This might not be a number for non-EVM networks
         chain_id: chainId,
         token_symbol: symbol,
       },

ui/components/multichain/token-list-item/token-list-item.js

@@ -36,12 +36,12 @@ import { ModalContent } from '../../component-library/modal-content/deprecated';
 import { ModalHeader } from '../../component-library/modal-header/deprecated';
 import {
   getCurrentChainId,
-  getCurrentNetwork,
   getMetaMetricsId,
   getNativeCurrencyImage,
   getPreferences,
   getTestNetworkBackgroundColor,
 } from '../../../selectors';
+import { getMultichainCurrentNetwork } from '../../../selectors/multichain';
 import Tooltip from '../../ui/tooltip';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
@@ -132,7 +132,7 @@ export const TokenListItem = ({
     </Box>
   );
   // Used for badge icon
-  const currentNetwork = useSelector(getCurrentNetwork);
+  const currentNetwork = useSelector(getMultichainCurrentNetwork);
   const testNetworkBackgroundColor = useSelector(getTestNetworkBackgroundColor);
 
   return (

ui/hooks/useCurrencyDisplay.js

@@ -2,11 +2,12 @@ import { useMemo } from 'react';
 import { useSelector } from 'react-redux';
 import BigNumber from 'bignumber.js';
 import { formatCurrency } from '../helpers/utils/confirm-tx.util';
-import { getCurrentCurrency } from '../selectors';
 import {
-  getConversionRate,
-  getNativeCurrency,
-} from '../ducks/metamask/metamask';
+  getMultichainCurrentCurrency,
+  getMultichainIsEvm,
+  getMultichainNativeCurrency,
+} from '../selectors/multichain';
+import { getConversionRate } from '../ducks/metamask/metamask';
 
 import { getValueFromWeiHex } from '../../shared/modules/conversion.utils';
 import { TEST_NETWORK_TICKER_MAP } from '../../shared/constants/network';
@@ -60,40 +61,51 @@ export function useCurrencyDisplay(
   inputValue,
   { displayValue, prefix, numberOfDecimals, denomination, currency, ...opts },
 ) {
-  const currentCurrency = useSelector(getCurrentCurrency);
-  const nativeCurrency = useSelector(getNativeCurrency);
+  const isEvm = useSelector(getMultichainIsEvm);
+  const currentCurrency = useSelector(getMultichainCurrentCurrency);
+  const nativeCurrency = useSelector(getMultichainNativeCurrency);
   const conversionRate = useSelector(getConversionRate);
   const isUserPreferredCurrency = currency === currentCurrency;
 
   const value = useMemo(() => {
     if (displayValue) {
       return displayValue;
     }
-    if (
-      currency === nativeCurrency ||
-      (!isUserPreferredCurrency && !nativeCurrency)
-    ) {
-      const ethDisplayValue = new Numeric(inputValue, 16, EtherDenomination.WEI)
-        .toDenomination(denomination || EtherDenomination.ETH)
-        .round(numberOfDecimals || DEFAULT_PRECISION)
-        .toBase(10)
-        .toString();
 
-      return ethDisplayValue === '0' && inputValue && Number(inputValue) !== 0
-        ? MIN_AMOUNT_DISPLAY
-        : ethDisplayValue;
-    } else if (isUserPreferredCurrency && conversionRate) {
-      return formatCurrency(
-        getValueFromWeiHex({
-          value: inputValue,
-          fromCurrency: nativeCurrency,
-          toCurrency: currency,
-          conversionRate,
-          numberOfDecimals: numberOfDecimals || 2,
-          toDenomination: denomination,
-        }),
-        currency,
-      );
+    if (isEvm) {
+      if (
+        currency === nativeCurrency ||
+        (!isUserPreferredCurrency && !nativeCurrency)
+      ) {
+        const ethDisplayValue = new Numeric(
+          inputValue,
+          16,
+          EtherDenomination.WEI,
+        )
+          .toDenomination(denomination || EtherDenomination.ETH)
+          .round(numberOfDecimals || DEFAULT_PRECISION)
+          .toBase(10)
+          .toString();
+
+        return ethDisplayValue === '0' && inputValue && Number(inputValue) !== 0
+          ? MIN_AMOUNT_DISPLAY
+          : ethDisplayValue;
+      } else if (isUserPreferredCurrency && conversionRate) {
+        return formatCurrency(
+          getValueFromWeiHex({
+            value: inputValue,
+            fromCurrency: nativeCurrency,
+            toCurrency: currency,
+            conversionRate,
+            numberOfDecimals: numberOfDecimals || 2,
+            toDenomination: denomination,
+          }),
+          currency,
+        );
+      }
+    } else {
+      // For non-EVM we assume the input value can be formatted "as-is"
+      return formatCurrency(inputValue, currency);
     }
     return null;
   }, [

ui/hooks/useCurrencyDisplay.test.js

@@ -2,6 +2,11 @@ import { renderHook } from '@testing-library/react-hooks';
 import * as reactRedux from 'react-redux';
 import sinon from 'sinon';
 import { getCurrentCurrency } from '../selectors';
+import {
+  getMultichainCurrentCurrency,
+  getMultichainIsEvm,
+  getMultichainNativeCurrency,
+} from '../selectors/multichain';
 import {
   getConversionRate,
   getNativeCurrency,
@@ -128,9 +133,17 @@ describe('useCurrencyDisplay', () => {
     describe(`when input is { value: ${value}, decimals: ${restProps.numberOfDecimals}, denomation: ${restProps.denomination} }`, () => {
       const stub = sinon.stub(reactRedux, 'useSelector');
       stub.callsFake((selector) => {
-        if (selector === getCurrentCurrency) {
+        if (selector === getMultichainIsEvm) {
+          return true;
+        } else if (
+          selector === getCurrentCurrency ||
+          selector === getMultichainCurrentCurrency
+        ) {
           return 'usd';
-        } else if (selector === getNativeCurrency) {
+        } else if (
+          selector === getNativeCurrency ||
+          selector === getMultichainNativeCurrency
+        ) {
           return 'ETH';
         } else if (selector === getConversionRate) {
           return 280.45;

ui/hooks/useTransactionDisplayData.test.js

@@ -25,6 +25,12 @@ import { CHAIN_IDS } from '../../shared/constants/network';
 import { TransactionGroupCategory } from '../../shared/constants/transaction';
 import { formatDateWithYearContext } from '../helpers/utils/util';
 import { getMessage } from '../helpers/utils/i18n-helper';
+import {
+  getMultichainCurrentCurrency,
+  getMultichainIsEvm,
+  getMultichainNativeCurrency,
+  getMultichainShouldShowFiat,
+} from '../selectors/multichain';
 import * as i18nhooks from './useI18nContext';
 import * as useTokenFiatAmountHooks from './useTokenFiatAmount';
 import { useTransactionDisplayData } from './useTransactionDisplayData';
@@ -201,7 +207,9 @@ describe('useTransactionDisplayData', () => {
       getMessage('en', messages, key, variables),
     );
     useSelector.callsFake((selector) => {
-      if (selector === getTokens) {
+      if (selector === getMultichainIsEvm) {
+        return true;
+      } else if (selector === getTokens) {
         return [
           {
             address: '0xabca64466f257793eaa52fcfff5066894b76a149',
@@ -213,11 +221,20 @@ describe('useTransactionDisplayData', () => {
         return {
           useNativeCurrencyAsPrimaryCurrency: true,
         };
-      } else if (selector === getShouldShowFiat) {
+      } else if (
+        selector === getShouldShowFiat ||
+        selector === getMultichainShouldShowFiat
+      ) {
         return false;
-      } else if (selector === getNativeCurrency) {
+      } else if (
+        selector === getNativeCurrency ||
+        selector === getMultichainNativeCurrency
+      ) {
         return 'ETH';
-      } else if (selector === getCurrentCurrency) {
+      } else if (
+        selector === getCurrentCurrency ||
+        selector === getMultichainCurrentCurrency
+      ) {
         return 'ETH';
       } else if (selector === getCurrentChainId) {
         return CHAIN_IDS.MAINNET;

ui/hooks/useUserPreferencedCurrency.js

@@ -1,10 +1,10 @@
 import { shallowEqual, useSelector } from 'react-redux';
+import { getPreferences } from '../selectors';
 import {
-  getPreferences,
-  getShouldShowFiat,
-  getCurrentCurrency,
-} from '../selectors';
-import { getNativeCurrency } from '../ducks/metamask/metamask';
+  getMultichainNativeCurrency,
+  getMultichainCurrentCurrency,
+  getMultichainShouldShowFiat,
+} from '../selectors/multichain';
 
 import { PRIMARY, SECONDARY } from '../helpers/constants/common';
 import { EtherDenomination } from '../../shared/constants/common';
@@ -41,13 +41,14 @@ import { ETH_DEFAULT_DECIMALS } from '../constants';
  * @returns {UserPreferredCurrency}
  */
 export function useUserPreferencedCurrency(type, opts = {}) {
-  const nativeCurrency = useSelector(getNativeCurrency);
+  const nativeCurrency = useSelector(getMultichainNativeCurrency);
+
   const { useNativeCurrencyAsPrimaryCurrency } = useSelector(
     getPreferences,
     shallowEqual,
   );
-  const showFiat = useSelector(getShouldShowFiat);
-  const currentCurrency = useSelector(getCurrentCurrency);
+  const showFiat = useSelector(getMultichainShouldShowFiat);
+  const currentCurrency = useSelector(getMultichainCurrentCurrency);
 
   const fiatReturn = {
     currency: currentCurrency,