fix(frontend): breakdown for eth from staking not showing (rotki#8367)

OjusWiZard · Aug 9, 2024 · 8d157d4 · 8d157d4
1 parent c962058
commit 8d157d4
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 13 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -2,6 2,7 @@
 Changelog
 =========
 
 * :bug:`-` Fix issue where ETH from staking doesn't appear under the ETH breakdown on the dashboard.
 * :bug:`8334` Importing addresses from MetaMask should work when multiple browser wallets are installed.
 * :bug:`-` rotki will now properly run background tasks when logging out and logging in again.
 * :bug:`-` The task to read new curve pools from the chain will be faster now.

diff --git a/frontend/app/src/components/AssetBalances.vue b/frontend/app/src/components/AssetBalances.vue
@@ -172,15 172,15 @@ function expand(item: AssetBalanceWithPrice) {
  v-if="!hideBreakdown && isEvmNativeToken(row.asset)"
  blockchain-only
  :identifier="row.asset"
- class="bg-white dark:bg-[#1E1E1E]"
  class="bg-white dark:bg-[#1E1E1E] my-2"
  />
  <AssetBalances
  v-else
  v-bind="props"
  hide-total
  :balances="row.breakdown ?? []"
  :sticky-header="false"
- class="bg-white dark:bg-[#1E1E1E]"
  class="bg-white dark:bg-[#1E1E1E] my-2"
  />
  </template>
  <template #item.expand="{ row }">

diff --git a/frontend/app/src/components/dashboard/DashboardAssetTable.vue b/frontend/app/src/components/dashboard/DashboardAssetTable.vue
@@ -332,14 332,14 @@ watch(search, () => setPage(1));
  show-percentage
  :total="row.usdValue"
  :identifier="row.asset"
- class="bg-white dark:bg-[#1E1E1E]"
  class="bg-white dark:bg-[#1E1E1E] my-2"
  />
  <AssetBalances
  v-else
  hide-total
  v-bind="props"
  :balances="row.breakdown ?? []"
- class="bg-white dark:bg-[#1E1E1E]"
  class="bg-white dark:bg-[#1E1E1E] my-2"
  />
  </template>
  <template #item.expand="{ row }">

diff --git a/frontend/app/src/composables/assets/retrieval.ts b/frontend/app/src/composables/assets/retrieval.ts
@@ -30,6 30,21 @@ export function useAssetInfoRetrieval() {
  ): ComputedRef<string> =>
  computed(() => get(assetAssociationMap)[identifier] ?? identifier);
 
  const getAssetAssociationIdentifiers = (
  identifier: string,
  ): ComputedRef<string[]> => computed(() => {
  const assets = [identifier];
 
  Object.entries(get(assetAssociationMap)).forEach(([key, item]) => {
  if (item !== identifier)
  return;
 
  assets.push(key);
  });
 
  return assets;
  });
 
  const getAssetNameFallback = (id: string) => {
  if (isEvmIdentifier(id)) {
  const address = getAddressFromEvmIdentifier(id);
@@ -185,6 200,7 @@ export function useAssetInfoRetrieval() {
  return {
  fetchTokenDetails,
  getAssociatedAssetIdentifier,
  getAssetAssociationIdentifiers,
  assetInfo,
  refetchAssetInfo: queueIdentifier,
  assetSymbol,

diff --git a/frontend/app/src/store/blockchain/index.ts b/frontend/app/src/store/blockchain/index.ts
@@ -198,6 198,8 @@ export const useBlockchainStore = defineStore('blockchain', () => {
 
  const getAddresses = (chain: string): string[] => get(addresses)[chain] ?? [];
 
  const { getAssetAssociationIdentifiers } = useAssetInfoRetrieval();
 
  const getBreakdown = (asset: string, chain?: string): AssetBreakdown[] => {
  const breakdown: AssetBreakdown[] = [];
  const balanceData = get(balances);
@@ -213,15 215,18 @@ export const useBlockchainStore = defineStore('blockchain', () => {
 
  for (const address in chainBalanceData) {
  const balance = chainBalanceData[address];
- const assetBalance = balance.assets[asset];
- if (!assetBalance)
- continue;
-
- breakdown.push({
- address,
- location: chain,
- ...assetBalance,
- tags: chainAccounts.find(account => getAccountAddress(account) === address && account.chain === chain)?.tags,
  const assetAssociations = get(getAssetAssociationIdentifiers(asset));
  assetAssociations.forEach((asset) => {
  const assetBalance = balance.assets[asset];
  if (!assetBalance)
  return;
 
  breakdown.push({
  address,
  location: chain,
  ...assetBalance,
  tags: chainAccounts.find(account => getAccountAddress(account) === address && account.chain === chain)?.tags,
  });
  });
  }
  }