diff --git a/shared/constants/multichain/networks.ts b/shared/constants/multichain/networks.ts index de5e50639374..9acc6fb56ec3 100644 --- a/shared/constants/multichain/networks.ts +++ b/shared/constants/multichain/networks.ts @@ -36,3 +36,7 @@ export const MULTICHAIN_PROVIDER_CONFIGS: Record< }, }, }; + +export const MULTICHAIN_NATIVE_CURRENCY_TO_CAIP19 = { + BTC: `${MultichainNetworks.BITCOIN}/slip44:0`, +} as const; diff --git a/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.js b/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.js index 6611fbcd68c1..f8c63b6b043a 100644 --- a/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.js +++ b/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.js @@ -1,5 +1,4 @@ import React, { useMemo } from 'react'; -import { useSelector } from 'react-redux'; import PropTypes from 'prop-types'; import { EtherDenomination } from '../../../../shared/constants/common'; import { PRIMARY, SECONDARY } from '../../../helpers/constants/common'; @@ -10,12 +9,14 @@ import { getMultichainNativeCurrency, getMultichainCurrentNetwork, } from '../../../selectors/multichain'; +import { useMultichainSelector } from '../../../hooks/useMultichainSelector'; /* eslint-disable jsdoc/require-param-name */ // eslint-disable-next-line jsdoc/require-param /** @param {PropTypes.InferProps>} */ export default function UserPreferencedCurrencyDisplay({ 'data-testid': dataTestId, + account, ethNumberOfDecimals, fiatNumberOfDecimals, numberOfDecimals: propsNumberOfDecimals, @@ -26,9 +27,16 @@ export default function UserPreferencedCurrencyDisplay({ showCurrencySuffix, ...restProps }) { - const currentNetwork = useSelector(getMultichainCurrentNetwork); - const nativeCurrency = useSelector(getMultichainNativeCurrency); + const currentNetwork = useMultichainSelector( + getMultichainCurrentNetwork, + account, + ); + const nativeCurrency = useMultichainSelector( + getMultichainNativeCurrency, + account, + ); const { currency, numberOfDecimals } = useUserPreferencedCurrency(type, { + account, ethNumberOfDecimals, fiatNumberOfDecimals, numberOfDecimals: propsNumberOfDecimals, @@ -56,6 +64,7 @@ export default function UserPreferencedCurrencyDisplay({ return ( + + +`; + +exports[`AccountListItem renders AccountListItem component and shows account name, address, and balance: evm-account-list-item 1`] = `