From eaaabf9644790d680a5eb46f25b62e7704dd764b Mon Sep 17 00:00:00 2001
From: Marshall Polaris <marshall@pol.rs>
Date: Tue, 20 Sep 2022 16:11:06 -0700
Subject: [PATCH] Move LP fetching into bets tab

---
 web/components/contract/contract-tabs.tsx | 44 ++++++++++-------------
 1 file changed, 18 insertions(+), 26 deletions(-)

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