open.source/manifold
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bets => trades; exclude sold bets

Browse Source
This commit is contained in:
mantikoros 2021-12-24 14:51:48 -05:00
parent 27bc86ff9a
commit a995df36c4
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web/components/bets-list.tsx
View File

@ -176,16 +176,17 @@ export function MyBetsSummary(props: {
const { bets, contract, className } = props const { bets, contract, className } = props
const { resolution } = contract const { resolution } = contract
const betsTotal = _.sumBy(bets, (bet) => bet.amount) const excludeSales = bets.filter((b) => !b.isSold && !b.sale)
const betsTotal = _.sumBy(excludeSales, (bet) => bet.amount)
const betsPayout = resolution const betsPayout = resolution
? _.sumBy(bets, (bet) => resolvedPayout(contract, bet)) ? _.sumBy(bets, (bet) => resolvedPayout(contract, bet))
: 0 : 0
const yesWinnings = _.sumBy(bets, (bet) => const yesWinnings = _.sumBy(excludeSales, (bet) =>
calculatePayout(contract, bet, 'YES') calculatePayout(contract, bet, 'YES')
) )
const noWinnings = _.sumBy(bets, (bet) => const noWinnings = _.sumBy(excludeSales, (bet) =>
calculatePayout(contract, bet, 'NO') calculatePayout(contract, bet, 'NO')
) )
@ -193,7 +194,7 @@ export function MyBetsSummary(props: {
<Row className={clsx('gap-4 sm:gap-6', className)}> <Row className={clsx('gap-4 sm:gap-6', className)}>
<Col> <Col>
<div className="text-sm text-gray-500 whitespace-nowrap"> <div className="text-sm text-gray-500 whitespace-nowrap">
Total bets Amount invested
</div> </div>
<div className="whitespace-nowrap">{formatMoney(betsTotal)}</div> <div className="whitespace-nowrap">{formatMoney(betsTotal)}</div>
</Col> </Col>

4
web/components/profile-menu.tsx
View File

@ -41,8 +41,8 @@ function getNavigationOptions(user: User, options: { mobile: boolean }) {
] ]
: []), : []),
{ {
name: 'Your bets', name: 'Your trades',
href: '/bets', href: '/trades',
}, },
{ {
name: 'Your markets', name: 'Your markets',

2
web/pages/[username]/[contractSlug].tsx
View File

@ -97,7 +97,7 @@ function BetsSection(props: { contract: Contract; user: User | null }) {
return ( return (
<div> <div>
<Title text="Your bets" /> <Title text="Your trades" />
<MyBetsSummary contract={contract} bets={userBets} /> <MyBetsSummary contract={contract} bets={userBets} />
<Spacer h={6} /> <Spacer h={6} />
<ContractBetsTable contract={contract} bets={userBets} /> <ContractBetsTable contract={contract} bets={userBets} />

6
web/pages/bets.tsx → web/pages/trades.tsx
View File

@ -4,13 +4,13 @@ import { SEO } from '../components/SEO'
import { Title } from '../components/title' import { Title } from '../components/title'
import { useUser } from '../hooks/use-user' import { useUser } from '../hooks/use-user'
export default function BetsPage() { export default function TradesPage() {
const user = useUser() const user = useUser()
return ( return (
<Page> <Page>
<SEO title="Your bets" description="Your bets" url="/bets" /> <SEO title="Your trades" description="Your trades" url="/trades" />
<Title text="Your bets" /> <Title text="Your trades" />
{user && <BetsList user={user} />} {user && <BetsList user={user} />}
</Page> </Page>
) )