Skip to content

fix: fix: guard pool metrics against NaN/Infinity/undefined values (fixes #6) #242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
duongynhi000005-oss wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: fix: guard pool metrics against NaN/Infinity/undefined values (fixes #6) #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions src/components/pool/Pools.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,17 @@

function setFeeAPYs(_balances) {
if (!_balances) return;
if (_balances['ETH']) feeAPY['ETH'] = 100 * 95 * 12 / _balances['ETH']; // Approx 95 ETH per month in fees
if (_balances['USDC']) feeAPY['USDC'] = 100 * 100000 * 12 / _balances['USDC']; // Approx 100,000 USDC per month in fees
// Guard against division by zero or undefined values
if (_balances['ETH'] && _balances['ETH'] > 0) {
feeAPY['ETH'] = 100 * 95 * 12 / _balances['ETH']; // Approx 95 ETH per month in fees
} else {
feeAPY['ETH'] = 0;
}
if (_balances['USDC'] && _balances['USDC'] > 0) {
feeAPY['USDC'] = 100 * 100000 * 12 / _balances['USDC']; // Approx 100,000 USDC per month in fees
} else {
feeAPY['USDC'] = 0;
}
}

$: setFeeAPYs($poolBalances);
Expand Down Expand Up @@ -164,13 +173,13 @@
{#each assets as asset}
<div class='row'>
<div class='cell la'><img src={`/asset-logos/${asset}.svg`} /> {asset}</div>
<div class='cell'><span>{numberWithCommas($poolBalances[asset]) || 0}<br/><span class='grayed'>${formatForDisplay(getAmountInUsd(asset, $poolBalances[asset], $prices))}</span></span></div>
<div class='cell'>{formatForDisplay(feeAPY[asset])}%</div>
<div class='cell'><span>{numberWithCommas($poolBalances[asset] || 0)}<br/><span class='grayed'>${formatForDisplay(getAmountInUsd(asset, $poolBalances[asset] || 0, $prices))}</span></span></div>
<div class='cell'>{formatForDisplay(feeAPY[asset] || 0)}%</div>
<div class='cell'>30%+</div>
<div class='cell'>{numberWithCommas($globalUPLs[asset])}</div>
<div class='cell'>{numberWithCommas($bufferBalances[asset])}</div>
<div class='cell highlighted'><span>{numberWithCommas($poolStakes[asset]) || 0}<br><span class='grayed'>${getAmountInUsd(asset, $poolStakes[asset], $prices)}</span></span></div>
<div class='cell highlighted'>{$poolBalances[asset] == 0 ? 'N/A' : formatForDisplay(($poolStakes[asset])/$poolBalances[asset] *100 )+ '%'}</div>
<div class='cell'>{numberWithCommas($globalUPLs[asset] || 0)}</div>
<div class='cell'>{numberWithCommas($bufferBalances[asset] || 0)}</div>
<div class='cell highlighted'><span>{numberWithCommas($poolStakes[asset] || 0)}<br><span class='grayed'>${getAmountInUsd(asset, $poolStakes[asset] || 0, $prices)}</span></span></div>
<div class='cell highlighted'>{!$poolBalances[asset] || $poolBalances[asset] == 0 ? 'N/A' : formatForDisplay(($poolStakes[asset] || 0)/$poolBalances[asset] * 100) + '%'}</div>
</div>
{/each}
<div class='row'>
Expand Down
4 changes: 2 additions & 2 deletions src/lib/formatters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ export function formatForDisplay(amount, fix) {

amount = amount * 1;

if (!amount || isNaN(amount)) return 0;
if (!amount || isNaN(amount) || !isFinite(amount)) return 0;

if (!fix && (amount * 1).toFixed(6)*1 == Math.round(amount * 1)) return Math.round(amount);

Expand Down Expand Up @@ -130,7 +130,7 @@ export function formatPriceForDisplay(price) {
}

export function numberWithCommas(amount) {
if (!amount) return 0;
if (!amount || isNaN(amount) || !isFinite(amount)) return 0;
let formattedAmount = formatForDisplay(amount) * 1;
return formattedAmount.toLocaleString(get(locale));
}
Expand Down