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

Make contract trades tab number actually match number of entries

Browse Source
This commit is contained in:
Marshall Polaris 2022-09-15 01:56:01 -07:00
parent c787605d14
commit 8116f178aa
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
web/components/contract/contract-tabs.tsx
View File

@ -19,6 +19,10 @@ import { BetSignUpPrompt } from '../sign-up-prompt'
import { PlayMoneyDisclaimer } from '../play-money-disclaimer' import { PlayMoneyDisclaimer } from '../play-money-disclaimer'
import BetButton from '../bet-button' import BetButton from '../bet-button'
import { capitalize } from 'lodash' import { capitalize } from 'lodash'
import {
DEV_HOUSE_LIQUIDITY_PROVIDER_ID,
HOUSE_LIQUIDITY_PROVIDER_ID,
} from 'common/antes'
export function ContractTabs(props: { export function ContractTabs(props: {
contract: Contract contract: Contract
@ -37,13 +41,19 @@ export function ContractTabs(props: {
const visibleBets = bets.filter( const visibleBets = bets.filter(
(bet) => !bet.isAnte && !bet.isRedemption && bet.amount !== 0 (bet) => !bet.isAnte && !bet.isRedemption && bet.amount !== 0
) )
const visibleLps = lps?.filter((l) => !l.isAnte && l.amount > 0) const visibleLps = (lps ?? []).filter(
(l) =>
!l.isAnte &&
l.userId !== HOUSE_LIQUIDITY_PROVIDER_ID &&
l.userId !== DEV_HOUSE_LIQUIDITY_PROVIDER_ID &&
l.amount > 0
)
// Load comments here, so the badge count will be correct // Load comments here, so the badge count will be correct
const updatedComments = useComments(contract.id) const updatedComments = useComments(contract.id)
const comments = updatedComments ?? props.comments const comments = updatedComments ?? props.comments
const betActivity = visibleLps && ( const betActivity = lps != null && (
<ContractBetsActivity <ContractBetsActivity
contract={contract} contract={contract}
bets={visibleBets} bets={visibleBets}
@ -117,7 +127,7 @@ export function ContractTabs(props: {
{ {
title: capitalize(PAST_BETS), title: capitalize(PAST_BETS),
content: betActivity, content: betActivity,
badge: `${visibleBets.length}`, badge: `${visibleBets.length + visibleLps.length}`,
}, },
...(!user || !userBets?.length ...(!user || !userBets?.length
? [] ? []

13
web/components/feed/feed-liquidity.tsx
View File

@ -9,17 +9,13 @@ import { RelativeTimestamp } from 'web/components/relative-timestamp'
import React from 'react' import React from 'react'
import { LiquidityProvision } from 'common/liquidity-provision' import { LiquidityProvision } from 'common/liquidity-provision'
import { UserLink } from 'web/components/user-link' import { UserLink } from 'web/components/user-link'
import {
DEV_HOUSE_LIQUIDITY_PROVIDER_ID,
HOUSE_LIQUIDITY_PROVIDER_ID,
} from 'common/antes'
export function FeedLiquidity(props: { export function FeedLiquidity(props: {
className?: string className?: string
liquidity: LiquidityProvision liquidity: LiquidityProvision
}) { }) {
const { liquidity } = props const { liquidity } = props
const { userId, createdTime, isAnte } = liquidity const { userId, createdTime } = liquidity
const isBeforeJune2022 = dayjs(createdTime).isBefore('2022-06-01') const isBeforeJune2022 = dayjs(createdTime).isBefore('2022-06-01')
// eslint-disable-next-line react-hooks/rules-of-hooks // eslint-disable-next-line react-hooks/rules-of-hooks
@ -28,13 +24,6 @@ export function FeedLiquidity(props: {
const user = useUser() const user = useUser()
const isSelf = user?.id === userId const isSelf = user?.id === userId
if (
isAnte ||
userId === HOUSE_LIQUIDITY_PROVIDER_ID ||
userId === DEV_HOUSE_LIQUIDITY_PROVIDER_ID
)
return <></>
return ( return (
<Row className="items-center gap-2 pt-3"> <Row className="items-center gap-2 pt-3">
{isSelf ? ( {isSelf ? (