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

Move LP fetching into bets tab

Browse Source
This commit is contained in:
Marshall Polaris 2022-09-20 16:11:06 -07:00
parent 538d1cfff8
commit eaaabf9644
1 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,6 @@ import { FeedLiquidity } from '../feed/feed-liquidity'
import { FeedAnswerCommentGroup } from '../feed/feed-answer-comment-group' import { FeedAnswerCommentGroup } from '../feed/feed-answer-comment-group'
import { FeedCommentThread, ContractCommentInput } from '../feed/feed-comments' import { FeedCommentThread, ContractCommentInput } from '../feed/feed-comments'
import { CommentTipMap } from 'web/hooks/use-tip-txns' import { CommentTipMap } from 'web/hooks/use-tip-txns'
import { LiquidityProvision } from 'common/liquidity-provision'
import { groupBy, sortBy } from 'lodash' import { groupBy, sortBy } from 'lodash'
import { Bet } from 'common/bet' import { Bet } from 'common/bet'
import { Contract, FreeResponseContract } from 'common/contract' import { Contract, FreeResponseContract } from 'common/contract'
@ -36,28 +35,11 @@ export function ContractTabs(props: {
const isMobile = useIsMobile() const isMobile = useIsMobile()
const lps = useLiquidity(contract.id)
const userBets = const userBets =
user && bets.filter((bet) => !bet.isAnte && bet.userId === user.id) user && bets.filter((bet) => !bet.isAnte && bet.userId === user.id)
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.userId !== HOUSE_LIQUIDITY_PROVIDER_ID &&
l.userId !== DEV_HOUSE_LIQUIDITY_PROVIDER_ID &&
l.amount > 0
)
const betActivity = lps != null && (
<ContractBetsActivity
contract={contract}
bets={visibleBets}
lps={visibleLps}
/>
)
const yourTrades = ( const yourTrades = (
<div> <div>
@ -83,7 +65,12 @@ export function ContractTabs(props: {
<CommentsTabContent contract={contract} comments={comments} /> <CommentsTabContent contract={contract} comments={comments} />
), ),
}, },
{ title: capitalize(PAST_BETS), content: betActivity }, {
title: capitalize(PAST_BETS),
content: (
<ContractBetsActivity contract={contract} bets={visibleBets} />
),
},
...(!user || !userBets?.length ...(!user || !userBets?.length
? [] ? []
: [ : [
@ -138,24 +125,29 @@ const CommentsTabContent = memo(function CommentsTabContent(props: {
} }
}) })
function ContractBetsActivity(props: { function ContractBetsActivity(props: { contract: Contract; bets: Bet[] }) {
contract: Contract const { contract, bets } = props
bets: Bet[]
lps: LiquidityProvision[]
}) {
const { contract, bets, lps } = props
const [page, setPage] = useState(0) const [page, setPage] = useState(0)
const ITEMS_PER_PAGE = 50 const ITEMS_PER_PAGE = 50
const start = page * ITEMS_PER_PAGE const start = page * ITEMS_PER_PAGE
const end = start + ITEMS_PER_PAGE const end = start + ITEMS_PER_PAGE
const lps = useLiquidity(contract.id) ?? []
const visibleLps = lps.filter(
(l) =>
!l.isAnte &&
l.userId !== HOUSE_LIQUIDITY_PROVIDER_ID &&
l.userId !== DEV_HOUSE_LIQUIDITY_PROVIDER_ID &&
l.amount > 0
)
const items = [ const items = [
...bets.map((bet) => ({ ...bets.map((bet) => ({
type: 'bet' as const, type: 'bet' as const,
id: bet.id + '-' + bet.isSold, id: bet.id + '-' + bet.isSold,
bet, bet,
})), })),
...lps.map((lp) => ({ ...visibleLps.map((lp) => ({
type: 'liquidity' as const, type: 'liquidity' as const,
id: lp.id, id: lp.id,
lp, lp,