From ce7d530e571623fc570f7a8e6142b76127c722f4 Mon Sep 17 00:00:00 2001 From: SamueleA Date: Tue, 1 Aug 2023 18:27:49 -0400 Subject: [PATCH] fixed top header --- packages/wallet/src/api/data.tsx | 4 +- .../CollectibleTileContent.tsx | 10 -- .../src/views/Home/components/HomeHeader.tsx | 104 ++++++------------ 3 files changed, 34 insertions(+), 84 deletions(-) diff --git a/packages/wallet/src/api/data.tsx b/packages/wallet/src/api/data.tsx index 55a88b0f..d6bebf42 100644 --- a/packages/wallet/src/api/data.tsx +++ b/packages/wallet/src/api/data.tsx @@ -165,8 +165,8 @@ export const fetchBalancesAssetsSummary = async ({ accountAddress, chainId }: Ge const aPrice = aPriceData?.price ? aPriceData.price.value : 0 const bPrice = bPriceData?.price ? bPriceData.price.value : 0 - const aFormattedBalance = Number(ethers.utils.formatUnits(a.balance, a.tokenMetadata?.decimals || 0)) - const bFormattedBalance = Number(ethers.utils.formatUnits(b.balance, b.tokenMetadata?.decimals || 0)) + const aFormattedBalance = Number(ethers.utils.formatUnits(a.balance, a.contractInfo?.decimals || 0)) + const bFormattedBalance = Number(ethers.utils.formatUnits(b.balance, b.contractInfo?.decimals || 0)) const aValue = aFormattedBalance * aPrice const bValue = bFormattedBalance * bPrice diff --git a/packages/wallet/src/views/Home/components/AssetSummary/CollectibleTile/CollectibleTileContent.tsx b/packages/wallet/src/views/Home/components/AssetSummary/CollectibleTile/CollectibleTileContent.tsx index 2bbf932c..49c5f82c 100644 --- a/packages/wallet/src/views/Home/components/AssetSummary/CollectibleTile/CollectibleTileContent.tsx +++ b/packages/wallet/src/views/Home/components/AssetSummary/CollectibleTile/CollectibleTileContent.tsx @@ -11,17 +11,7 @@ export const CollectibleTileContent = ({ }: CollectibleTileContentProps) => { const imageUrl = balance?.tokenMetadata?.image - console.log('balance...', balance) - return ( - // - // collectible - // { - const theme = useModalTheme() const { address } = useAccount() - const { chain } = useNetwork() - const chainId = chain?.id || 1 - const chainName = chain?.name || '' - const { data: balances = [], isLoading: isLoadingBalances } = useBalances({ accountAddress: address || '', chainId: chain?.id || 1 }) - - const nativeTokenBalances = balances?.filter(b => b.contractAddress === ethers.constants.AddressZero) - - const erc20TokensBalances = balances?.filter(b => b.contractType === 'ERC20') - - const tokenBalances = [...nativeTokenBalances, ...erc20TokensBalances] - - const nativeToken: Token = { - chainId, - contractAddress: ethers.constants.AddressZero - } - - const erc20Tokens: Token[] = balances.filter(b => b.contractType === 'ERC20').map((token) => ({ - chainId, - contractAddress: token.contractAddress - })) - - const { data: coinPrices = [], isLoading: isLoadingCoinPrices } = useCoinPrices({ - tokens: [nativeToken, ...erc20Tokens] - }) - const isLoading = isLoadingBalances || isLoadingCoinPrices - - const computeBalance = (balances: TokenBalance[], prices: TokenPrice[]): string => { - let totalUsd = 0 - - balances.forEach((balance) => { - const priceForToken = prices.find(p => compareAddress(p.token.contractAddress, balance.contractAddress)) - if (!priceForToken) { - return; - } - const priceFiat = priceForToken.price?.value || 0 - const decimals = balance.contractInfo?.decimals || 18 - const valueFormatted = ethers.utils.formatUnits(balance.balance, decimals) - const value = parseFloat(valueFormatted) * priceFiat - totalUsd += value - }) - - return totalUsd.toFixed(2) + const onClickSearch = () => { + console.log('clicked search') } - const balance = computeBalance(tokenBalances, coinPrices) - - const getNetworkText = () => { - // if there is no network name - if (chainName === `Chain ${chainId}`) { - return chainName - } - - - return(`${capitalize(chainName)} - ${chainId}`) + const onClickAccount = () => { + console.log('clicked account') } return ( <> - - + + - - + + + {formatAddress(address || '')} - - - - - {getNetworkText()} - +