From d7a5f5178474041e528a78f03cde7f5ddbf1a134 Mon Sep 17 00:00:00 2001 From: liangping <18786721@qq.com> Date: Tue, 5 Apr 2022 14:09:05 +0800 Subject: [PATCH 1/2] use 18 decimals for denoms starts with gravity --- src/libs/utils.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/libs/utils.js b/src/libs/utils.js index 09befd4f..2df158ce 100644 --- a/src/libs/utils.js +++ b/src/libs/utils.js @@ -344,7 +344,7 @@ export function formatTokenDenom(tokenDenom) { export function getUnitAmount(amount, tokenDenom) { const denom = tokenDenom.denom_trace ? tokenDenom.denom_trace.base_denom : tokenDenom - let exp = 6 + let exp = String(denom).startsWith('gravity') ? 18 : 6 const config = Object.values(getLocalChains()) config.forEach(x => { @@ -363,11 +363,11 @@ export function numberWithCommas(x) { return parts.join('.') } -export function formatTokenAmount(tokenAmount, fraction = 2, tokenDenom = 'uatom', format = true) { +export function formatTokenAmount(tokenAmount, decimals = 2, tokenDenom = 'uatom', format = true) { const denom = tokenDenom.denom_trace ? tokenDenom.denom_trace.base_denom : tokenDenom let amount = 0 - - let exp = 6 + console.log('format:', denom) + let exp = String(denom).startsWith('gravity') ? 18 : 6 const config = Object.values(getLocalChains()) config.forEach(x => { @@ -378,10 +378,10 @@ export function formatTokenAmount(tokenAmount, fraction = 2, tokenDenom = 'uatom }) amount = Number(Number(tokenAmount)) / (10 ** exp) if (amount > 10) { - if (format) { return numberWithCommas(parseFloat(amount.toFixed(fraction))) } - return parseFloat(amount.toFixed(fraction)) + if (format) { return numberWithCommas(parseFloat(amount.toFixed(decimals))) } + return parseFloat(amount.toFixed(decimals)) } - return parseFloat(amount.toFixed(fraction)) + return parseFloat(amount.toFixed(decimals)) } export function isTestnet() { From 5f883b87324fcb11c17d7c091282e0dece20e571 Mon Sep 17 00:00:00 2001 From: liangping <18786721@qq.com> Date: Tue, 5 Apr 2022 14:25:23 +0800 Subject: [PATCH 2/2] remove console --- src/libs/utils.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libs/utils.js b/src/libs/utils.js index 2df158ce..1f2b6b6b 100644 --- a/src/libs/utils.js +++ b/src/libs/utils.js @@ -366,7 +366,6 @@ export function numberWithCommas(x) { export function formatTokenAmount(tokenAmount, decimals = 2, tokenDenom = 'uatom', format = true) { const denom = tokenDenom.denom_trace ? tokenDenom.denom_trace.base_denom : tokenDenom let amount = 0 - console.log('format:', denom) let exp = String(denom).startsWith('gravity') ? 18 : 6 const config = Object.values(getLocalChains())