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

Remove sold bets from Your Trades

Browse Source
This commit is contained in:
Austin Chen 2022-02-25 16:57:28 -08:00
parent a3592f388b
commit 0a98ffe05c
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,7 @@ import { filterDefined } from '../../common/util/array'
import { LoadingIndicator } from './loading-indicator' import { LoadingIndicator } from './loading-indicator'
import { SiteLink } from './site-link' import { SiteLink } from './site-link'
type BetSort = 'newest' | 'profit' | 'resolved' | 'value' type BetSort = 'newest' | 'profit' | 'settled' | 'value'
export function BetsList(props: { user: User }) { export function BetsList(props: { user: User }) {
const { user } = props const { user } = props
@ -106,23 +106,20 @@ export function BetsList(props: { user: User }) {
contracts, contracts,
(c) => -1 * Math.max(...contractBets[c.id].map((bet) => bet.createdTime)) (c) => -1 * Math.max(...contractBets[c.id].map((bet) => bet.createdTime))
) )
else if (sort === 'resolved') else if (sort === 'settled')
sortedContracts = _.sortBy(contracts, (c) => -1 * (c.resolutionTime ?? 0)) sortedContracts = _.sortBy(contracts, (c) => -1 * (c.resolutionTime ?? 0))
const [resolved, unresolved] = _.partition( const [settled, unsettled] = _.partition(
sortedContracts, sortedContracts,
(c) => c.isResolved (c) => c.isResolved || contractsInvestment[c.id] === 0
) )
const displayedContracts = sort === 'resolved' ? resolved : unresolved const displayedContracts = sort === 'settled' ? settled : unsettled
const currentInvestment = _.sumBy( const currentInvestment = _.sumBy(unsettled, (c) => contractsInvestment[c.id])
unresolved,
(c) => contractsInvestment[c.id]
)
const currentBetsValue = _.sumBy( const currentBetsValue = _.sumBy(
unresolved, unsettled,
(c) => contractsCurrentValue[c.id] (c) => contractsCurrentValue[c.id]
) )
@ -161,7 +158,7 @@ export function BetsList(props: { user: User }) {
<option value="value">By value</option> <option value="value">By value</option>
<option value="profit">By profit</option> <option value="profit">By profit</option>
<option value="newest">Newest</option> <option value="newest">Newest</option>
<option value="resolved">Resolved</option> <option value="settled">Settled</option>
</select> </select>
</Col> </Col>
@ -228,7 +225,7 @@ function MyContractBets(props: { contract: Contract; bets: Bet[] }) {
/> />
</Row> </Row>
<Row className="items-center gap-2 text-sm text-gray-500 flex-1"> <Row className="flex-1 items-center gap-2 text-sm text-gray-500">
{isBinary && ( {isBinary && (
<> <>
{resolution ? ( {resolution ? (