Skip to content

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

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
jiangyj545 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

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

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
44 changes: 26 additions & 18 deletions src/components/pool/Pools.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<script>

import { onDestroy } from 'svelte'
import Button from '@components/layout/Button.svelte'

Expand Down Expand Up @@ -31,12 +32,20 @@

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: only calculate when balance is a positive number to avoid Infinity/NaN
if (_balances['ETH'] && _balances['ETH'] > 0) feeAPY['ETH'] = 100 * 95 * 12 / _balances['ETH'];
if (_balances['USDC'] && _balances['USDC'] > 0) feeAPY['USDC'] = 100 * 100000 * 12 / _balances['USDC'];
}

$: setFeeAPYs($poolBalances);

/** Guard against undefined/null/NaN/Infinity — returns value or fallback */
function safe(val, fallback = '—') {
if (val === null || val === undefined) return fallback;
if (typeof val === 'number' && (isNaN(val) || !isFinite(val))) return fallback;
return val;
}

</script>

<style>
Expand Down Expand Up @@ -66,7 +75,6 @@
.subtitle {
color: var(--text300);
}

.buttons {
display: flex;
gap: var(--base-padding);
Expand Down Expand Up @@ -162,16 +170,16 @@
</div>
<div class='table-body'>
{#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'>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>
<div class='row'>
<div class='cell la'><img src={`/asset-logos/${asset}.svg`} /> {asset}</div>
<div class='cell'><span>{safe(numberWithCommas($poolBalances[asset]), isLoading ? '…' : '0')}<br/><span class='grayed'>{safe(formatForDisplay(getAmountInUsd(asset, $poolBalances[asset], $prices)), isLoading ? '…' : '$0')}</span></span></div>
<div class='cell'>{safe(feeAPY[asset]) ? formatForDisplay(safe(feeAPY[asset])) + '%' : (isLoading ? '…' : '—')}</div>
<div class='cell'>30%+</div>
<div class='cell'>{safe(numberWithCommas($globalUPLs[asset]), isLoading ? '…' : '0')}</div>
<div class='cell'>{safe(numberWithCommas($bufferBalances[asset]), isLoading ? '…' : '0')}</div>
<div class='cell highlighted'><span>{safe(numberWithCommas($poolStakes[asset]), isLoading ? '…' : '0')}<br><span class='grayed'>{safe(getAmountInUsd(asset, $poolStakes[asset], $prices), isLoading ? '…' : '$0')}</span></span></div>
<div class='cell highlighted'>{$poolBalances[asset] == 0 || !$poolBalances[asset] ? 'N/A' : safe(formatForDisplay(($poolStakes[asset] || 0) / $poolBalances[asset] * 100)) + '%'}</div>
</div>
{/each}
<div class='row'>
<div class='cell la'>Total</div>
Expand All @@ -185,9 +193,9 @@
</div>
</div>
</div>
</div>

<div class='footnote'>
¹ Does not include trader wins and losses.<br/>
² Sum total of unrealized trader wins or losses. Updated every ~15min.
</div>
</div>
<div class='footnote'>
¹ Does not include trader wins and losses.<br/>
² Sum total of unrealized trader wins or losses. Updated every ~15min.
</div>