diff --git a/ui/components/app/asset-list/asset-list.js b/ui/components/app/asset-list/asset-list.js index 3ba7a0c7d..da0209e8d 100644 --- a/ui/components/app/asset-list/asset-list.js +++ b/ui/components/app/asset-list/asset-list.js @@ -7,7 +7,7 @@ import AssetListItem from '../asset-list-item'; import { PRIMARY, SECONDARY } from '../../../helpers/constants/common'; import { useUserPreferencedCurrency } from '../../../hooks/useUserPreferencedCurrency'; import { - getCurrentAccountWithSendEtherInfo, + getSelectedAccountCachedBalance, getShouldShowFiat, getNativeCurrencyImage, getDetectedTokensInCurrentNetwork, @@ -33,9 +33,7 @@ const AssetList = ({ onClickAsset }) => { const [showDetectedTokens, setShowDetectedTokens] = useState(false); - const selectedAccountBalance = useSelector( - (state) => getCurrentAccountWithSendEtherInfo(state).balance, - ); + const selectedAccountBalance = useSelector(getSelectedAccountCachedBalance); const nativeCurrency = useSelector(getNativeCurrency); const showFiat = useSelector(getShouldShowFiat); const trackEvent = useContext(MetaMetricsContext); diff --git a/ui/components/app/wallet-overview/eth-overview.js b/ui/components/app/wallet-overview/eth-overview.js index de3339b3e..b560c435b 100644 --- a/ui/components/app/wallet-overview/eth-overview.js +++ b/ui/components/app/wallet-overview/eth-overview.js @@ -16,13 +16,13 @@ import { PRIMARY, SECONDARY } from '../../../helpers/constants/common'; import { showModal } from '../../../store/actions'; import { isBalanceCached, - getSelectedAccount, getShouldShowFiat, getCurrentKeyring, getSwapsDefaultToken, getIsSwapsChain, getIsBuyableChain, getNativeCurrencyImage, + getSelectedAccountCachedBalance, } from '../../../selectors/selectors'; import SwapIcon from '../../ui/icon/swap-icon.component'; import BuyIcon from '../../ui/icon/overview-buy-icon.component'; @@ -32,6 +32,7 @@ import IconButton from '../../ui/icon-button'; import { isHardwareKeyring } from '../../../helpers/utils/hardware'; import { MetaMetricsContext } from '../../../contexts/metametrics'; import { EVENT } from '../../../../shared/constants/metametrics'; +import Spinner from '../../ui/spinner'; import WalletOverview from './wallet-overview'; const EthOverview = ({ className }) => { @@ -43,8 +44,7 @@ const EthOverview = ({ className }) => { const usingHardwareWallet = isHardwareKeyring(keyring?.type); const balanceIsCached = useSelector(isBalanceCached); const showFiat = useSelector(getShouldShowFiat); - const selectedAccount = useSelector(getSelectedAccount); - const { balance } = selectedAccount; + const balance = useSelector(getSelectedAccountCachedBalance); const isSwapsChain = useSelector(getIsSwapsChain); const isBuyableChain = useSelector(getIsBuyableChain); const primaryTokenImage = useSelector(getNativeCurrencyImage); @@ -60,21 +60,28 @@ const EthOverview = ({ className }) => { >
- + {balance ? ( + + ) : ( + + )} {balanceIsCached ? ( * ) : null}
- {showFiat && ( + {showFiat && balance && (