diff --git a/common/calculate.ts b/common/calculate.ts index c7215e93..09aa6483 100644 --- a/common/calculate.ts +++ b/common/calculate.ts @@ -115,7 +115,8 @@ export function resolvedPayout(contract: Contract, bet: Bet) { export function getContractBetMetrics(contract: Contract, yourBets: Bet[]) { const { resolution } = contract - let invested = 0 + let currentInvested = 0 + let totalInvested = 0 let payout = 0 let loan = 0 let saleValue = 0 @@ -124,18 +125,19 @@ export function getContractBetMetrics(contract: Contract, yourBets: Bet[]) { for (const bet of yourBets) { const { isSold, sale, amount, loanAmount, isRedemption } = bet if (isSold) { - invested += amount + totalInvested += amount } else if (sale) { saleValue += sale.amount } else { if (isRedemption) { redeemed += -1 * amount } else if (amount > 0) { - invested += amount + totalInvested += amount } else { saleValue -= amount } + currentInvested += amount loan += loanAmount ?? 0 payout += resolution ? calculatePayout(contract, bet, resolution) @@ -143,16 +145,16 @@ export function getContractBetMetrics(contract: Contract, yourBets: Bet[]) { } } - const profit = payout + saleValue + redeemed - invested - const profitPercent = (profit / invested) * 100 - const netInvestment = payout - loan + const netPayout = payout - loan + const profit = payout + saleValue + redeemed - totalInvested + const profitPercent = (profit / totalInvested) * 100 return { - invested, + invested: Math.max(0, currentInvested), payout, + netPayout, profit, profitPercent, - netInvestment, } } @@ -160,8 +162,8 @@ export function getContractBetNullMetrics() { return { invested: 0, payout: 0, + netPayout: 0, profit: 0, profitPercent: 0, - netInvestment: 0, } } diff --git a/web/components/bets-list.tsx b/web/components/bets-list.tsx index 171a3ebe..19720bbe 100644 --- a/web/components/bets-list.tsx +++ b/web/components/bets-list.tsx @@ -119,7 +119,7 @@ export function BetsList(props: { user: User }) { ) const currentNetInvestment = _.sumBy( unsettled, - (c) => contractsMetrics[c.id].netInvestment + (c) => contractsMetrics[c.id].netPayout ) const totalPortfolio = currentNetInvestment + user.balance @@ -127,7 +127,7 @@ export function BetsList(props: { user: User }) { const totalPnl = totalPortfolio - user.totalDeposits const totalProfitPercent = (totalPnl / user.totalDeposits) * 100 const investedProfitPercent = - ((currentBetsValue - currentInvested) / currentInvested) * 100 + ((currentBetsValue - currentInvested) / (currentInvested + 0.1)) * 100 return ( @@ -321,8 +321,6 @@ export function MyBetsSummary(props: { bets ) - console.log({ invested, profit, payout }) - return (