Fix piecharts

bro-n-bro · Feb 14, 2024 · 32384e4 · 32384e4
1 parent 59522a8
commit 32384e4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/components/account/Charts.vue b/src/components/account/Charts.vue
@@ -265,10 +265,10 @@
                                     network.total.rewards += amount
 
                                     // Calc tokens rewards price
-                                    network.totalRewardsPrice += amountCurrentDenom * el.price
+                                    network.totalRewardsPrice += amount * el.price
 
                                     // Calc tokens price
-                                    network.totalTokensPrice += amountCurrentDenom * el.price
+                                    network.totalTokensPrice += amount * el.price
 
                                     // Group by denom
                                     if (store.prices.find(e => e.symbol == el.symbol)) {
@@ -347,6 +347,8 @@
             }
         }
 
+        console.log(store.account)
+
         // Hide loader
         loading.value = false
     }

diff --git a/src/components/account/charts/ChartAssets.vue b/src/components/account/charts/ChartAssets.vue
@@ -63,7 +63,7 @@
 <script setup>
     import { onBeforeMount, computed, reactive, ref, watch } from 'vue'
     import { useGlobalStore } from '@/stores'
-    import { currencyСonversion } from '@/utils'
+    import { currencyСonversion, formatTokenAmount } from '@/utils'
 
     import { Chart as ChartJS, ArcElement } from 'chart.js'
     import { Doughnut } from 'vue-chartjs'
@@ -239,7 +239,7 @@
             token = currentData.value.groupByDenom.find(e => e.symbol == symbol)
 
         if(currentData.value.totalTokensPrice) {
-            result = currencyСonversion(token.symbol == 'BOOT' ? token.amount / Math.pow(10, store.networks.bostrom.exponent) : token.amount, token.symbol) / currentData.value.totalTokensPrice * 100
+            result = currencyСonversion(formatTokenAmount(token.amount, token.symbol), token.symbol) / currentData.value.totalTokensPrice * 100
         }
 
         return result