Fixed

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

Hide file tree

Showing 2 changed files with 24 additions and 12 deletions.
diff --git a/src/components/account/Charts.vue b/src/components/account/Charts.vue
@@ -45,7 +45,7 @@
 <script setup>
     import { onBeforeMount, ref, inject, reactive } from 'vue'
     import { useGlobalStore } from '@/stores'
-    import { generateAddress, formatTokenAmount, formatAmountToCurrentDenom } from '@/utils'
+    import { generateAddress, formatTokenAmount, formatAmountToCurrentDenom, formatTokenPrice } from '@/utils'
 
     // Components
     import ChartStakeLiquide from '@/components/account/charts/ChartStakeLiquide.vue'
@@ -149,7 +149,7 @@
                                     network.total.liquid_rewards += amount
 
                                     // Calc tokens price
-                                    network.totalTokensPrice += amount * el.price
+                                    network.totalTokensPrice += amount * formatTokenPrice(el.price, el.symbol)
 
                                     // Group by denom
                                     let duplicate = network.groupByDenom.find(e => e.symbol == el.symbol)
@@ -178,7 +178,7 @@
                                     network.total.ibc += amountCurrentDenom
 
                                     // Calc tokens price
-                                    network.totalTokensPrice += amount * el.price
+                                    network.totalTokensPrice += amount * formatTokenPrice(el.price, el.symbol)
 
                                     // Group by denom
                                     let duplicate = network.groupByDenom.find(e => e.symbol == el.symbol)
@@ -207,7 +207,7 @@
                                     network.total.staked += amount
 
                                     // Calc tokens price
-                                    network.totalTokensPrice += amount * el.price
+                                    network.totalTokensPrice += amount * formatTokenPrice(el.price, el.symbol)
 
                                     // Group by denom
                                     let duplicate = network.groupByDenom.find(e => e.symbol == el.symbol)
@@ -236,7 +236,7 @@
                                     network.total.unbonding += amount
 
                                     // Calc tokens price
-                                    network.totalTokensPrice += amount * el.price
+                                    network.totalTokensPrice += amount * formatTokenPrice(el.price, el.symbol)
 
                                     // Group by denom
                                     let duplicate = network.groupByDenom.find(e => e.symbol == el.symbol)
@@ -265,10 +265,10 @@
                                     network.total.rewards += amount
 
                                     // Calc tokens rewards price
-                                    network.totalRewardsPrice += amount * el.price
+                                    network.totalRewardsPrice += amount * formatTokenPrice(el.price, el.symbol)
 
                                     // Calc tokens price
-                                    network.totalTokensPrice += amount * el.price
+                                    network.totalTokensPrice += amount * formatTokenPrice(el.price, el.symbol)
 
                                     // Group by denom
                                     if (store.prices.find(e => e.symbol == el.symbol)) {
@@ -347,8 +347,6 @@
             }
         }
 
-        console.log(store.account)
-
         // Hide loader
         loading.value = false
     }

diff --git a/src/utils/index.js b/src/utils/index.js
@@ -171,7 +171,7 @@ export const sendTx = async ({ txRaw, client }) => {
 // Currency conversion
 export const currencyСonversion = (amount, currency) => {
     let store = useGlobalStore(),
-        tokenPrice = store.prices.find(el => el.symbol == currency).price,
+        tokenPrice = formatTokenPrice(store.prices.find(el => el.symbol == currency).price, currency),
         toPrice = 1
 
     if (store.currentCurrency != 'USDT') {
@@ -181,7 +181,7 @@ export const currencyСonversion = (amount, currency) => {
             currency = formatTokenName('BTC')
         }
 
-        toPrice = store.prices.find(el => el.symbol == currency).price
+        toPrice = formatTokenPrice(store.prices.find(el => el.symbol == currency).price, currency)
     }
 
     return amount * (tokenPrice / toPrice)
@@ -203,7 +203,7 @@ export const formatTokenName = (tokenName) => {
 // Formating token amount
 export const formatTokenAmount = (amount, tokenName) => {
     let store = useGlobalStore(),
-        formatAmount = '',
+        formatAmount = 0,
         formatableToken = store.formatableTokens.find(el => el.tokenName == tokenName)
 
     formatableToken
@@ -219,4 +219,18 @@ export const formatAmountToCurrentDenom = (amount, tokenName) => {
     let store = useGlobalStore()
 
     return amount * (store.prices.find(e => e.symbol == tokenName).price / store.prices.find(e => e.symbol == store.networks[store.currentNetwork].token_name).price)
+}
+
+
+// Formating token price
+export const formatTokenPrice = (price, tokenName) => {
+    let store = useGlobalStore(),
+        formatPrice = 0,
+        formatableToken = store.formatableTokens.find(el => el.tokenName == tokenName)
+
+    formatableToken
+        ? formatPrice = price * Math.pow(10, formatableToken.exponent)
+        : formatPrice = price
+
+    return formatPrice
 }