Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
45 changes: 26 additions & 19 deletions src/components/dashboard-page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -127,34 +127,40 @@ export function DashboardPage() {

const invalidatablePermitCount = invalidatablePermits.length;

const claimableTotalValue = useMemo(() => {
const assumedDecimals = 18;
let totalSumInWei = 0n;
const claimableTotalsByToken = useMemo(() => {
const totals = new Map<string, { networkId: number; tokenAddress: Address; total: bigint }>();
for (const permit of claimablePermits) {
if (permit.amount) {
try {
totalSumInWei += permit.amount;
} catch (e) {
console.error(`Error parsing amount for claimableTotalValue calc: ${permit.amount}`, e);
}
}
}
try {
return parseFloat(formatUnits(totalSumInWei, assumedDecimals));
} catch (e) {
console.error("Error formatting total sum:", e);
return 0;
if (!permit.amount || !permit.tokenAddress) continue;
const tokenAddress = permit.tokenAddress as Address;
const key = `${permit.networkId}:${tokenAddress.toLowerCase()}`;
const current = totals.get(key)?.total ?? 0n;
totals.set(key, { networkId: permit.networkId, tokenAddress, total: current + permit.amount });
}
return totals;
}, [claimablePermits]);

const estimatedTotalValueDisplay = useMemo(() => {
if (!preferredRewardTokenAddress) {
return `$${claimableTotalValue.toFixed(2)}`;
if (claimableTotalsByToken.size === 1) {
const [{ networkId, tokenAddress, total }] = Array.from(claimableTotalsByToken.values());
const tokenInfo = getTokenInfo(networkId, tokenAddress);
if (tokenInfo) {
try {
const formatted = parseFloat(formatUnits(total, tokenInfo.decimals));
return `${formatted.toFixed(2)} ${tokenInfo.symbol}`;
} catch {
// fallthrough
}
}
}

// Fallback when multiple tokens are claimable or token metadata is unknown.
return `${claimablePermitCount} Reward${claimablePermitCount !== 1 ? "s" : ""}`;
}

const preferredTokenInfo = getTokenInfo(chain?.id, preferredRewardTokenAddress);
if (!preferredTokenInfo) {
return `$${claimableTotalValue.toFixed(2)} (Unknown Pref Token)`;
return `${claimablePermitCount} Reward${claimablePermitCount !== 1 ? "s" : ""} (Unknown Pref Token)`;
}

let totalEstimatedValueInWei = 0n;
Expand Down Expand Up @@ -185,7 +191,7 @@ export function DashboardPage() {
console.error("Error formatting estimated total value:", e);
return `Error (${preferredTokenInfo.symbol})`;
}
}, [claimableTotalValue, preferredRewardTokenAddress, chain?.id, permits, claimablePermits]);
}, [preferredRewardTokenAddress, chain?.id, permits, claimablePermits, claimableTotalsByToken, claimablePermitCount]);

const { handleClaimPermit, handleClaimBatch, handleClaimSequential, isClaiming, sequentialClaimError, swapSubmissionStatus, walletConnectionError } =
usePermitClaiming({
Expand All @@ -198,6 +204,7 @@ export function DashboardPage() {
address,
chain: chain ?? null,
setBalancesAndAllowances,
preferredRewardTokenAddress,
});

const { handleInvalidatePermit, handleInvalidatePermitsBatch, isInvalidating } = usePermitInvalidation({
Expand Down
7 changes: 7 additions & 0 deletions src/constants/supported-reward-tokens.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,10 @@ export function getTokenInfo(chainId: number | undefined, tokenAddress: Address
const tokens = getSupportedRewardTokensForChain(chainId);
return tokens.find((token) => token.address.toLowerCase() === tokenAddress.toLowerCase());
}

export function getTokenBySymbol(chainId: number | undefined, symbol: string): RewardTokenInfo | undefined {
if (!chainId) return undefined;
const normalized = symbol.trim().toLowerCase();
const tokens = getSupportedRewardTokensForChain(chainId);
return tokens.find((token) => token.symbol.trim().toLowerCase() === normalized);
}
Loading