Move answer listening down to answers component

BraverElliot · Jun 7, 2024 · d365c65 · d365c65
1 parent 49d3514
commit d365c65
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 18 deletions.
diff --git a/web/components/answers/answers-panel.tsx b/web/components/answers/answers-panel.tsx
@@ -73,6 +73,7 @@ import { formatTime } from 'web/lib/util/time'
 import { shortenedFromNow } from 'web/lib/util/shortenedFromNow'
 import { getBets } from 'common/supabase/bets'
 import { db } from 'web/lib/supabase/db'
+import { useAnswersCpmm } from 'web/hooks/use-answers'
 
 export const SHOW_LIMIT_ORDER_CHARTS_KEY = 'SHOW_LIMIT_ORDER_CHARTS_KEY'
 const MAX_DEFAULT_ANSWERS = 20
@@ -115,7 +116,9 @@ export function AnswersPanel(props: {
 
   const isMultipleChoice = outcomeType === 'MULTIPLE_CHOICE'
 
-  const answers = contract.answers
+  const allAnswers = useAnswersCpmm(contract.id) ?? contract.answers
+
+  const answers = allAnswers
     .filter((a) => isMultipleChoice || ('number' in a && a.number !== 0))
     .map((a) => ({
       ...a,

diff --git a/web/components/answers/binary-multi-answers-panel.tsx b/web/components/answers/binary-multi-answers-panel.tsx
@@ -13,13 +13,14 @@ import { BuyPanelBody } from 'web/components/bet/bet-panel'
 import { VERSUS_COLORS, getVersusColor } from '../charts/contract/choice'
 import { useUser } from 'web/hooks/use-user'
 import { PencilIcon } from '@heroicons/react/solid'
+import { useAnswersCpmm } from 'web/hooks/use-answers'
 
 export function BinaryMultiAnswersPanel(props: {
   contract: CPMMMultiContract
-  answers: Answer[]
   feedReason?: string
 }) {
-  const { feedReason, contract, answers } = props
+  const { feedReason, contract } = props
+  const answers = useAnswersCpmm(contract.id) ?? contract.answers
 
   const [colorLeft, colorRight] = answers.map(
     (a, i) => a.color ?? VERSUS_COLORS[i]

diff --git a/web/components/bet/bet-dialog.tsx b/web/components/bet/bet-dialog.tsx
@@ -71,6 +71,7 @@ export function MultiBetDialog(props: {
     defaultSort,
     'answer-sort' + contract.id
   )
+
   const isBinaryMC = isBinaryMulti(contract)
   return (
     <Modal
@@ -96,7 +97,6 @@ export function MultiBetDialog(props: {
             {isBinaryMC ? (
               <BinaryMultiAnswersPanel
                 contract={contract as CPMMMultiContract}
-                answers={contract.answers}
               />
             ) : (
               <AnswersPanel

diff --git a/web/components/contract/contract-overview.tsx b/web/components/contract/contract-overview.tsx
@@ -74,7 +74,6 @@ import {
   MultiNumericDistributionChart,
   NumericBetPanel,
 } from 'web/components/answers/numeric-bet-panel'
-import { useAnswersCpmm } from 'web/hooks/use-answers'
 import { getAutoBountyPayoutPerHour } from 'common/bounty'
 import { NEW_GRAPH_COLOR } from 'common/multi-numeric'
 import { FaChartArea } from 'react-icons/fa'
@@ -86,7 +85,6 @@ import { useIsClient } from 'web/hooks/use-is-client'
 export const ContractOverview = memo(
   (props: {
     contract: Contract
-    answers: Answer[] | undefined
     betPoints: HistoryPoint<Partial<Bet>>[] | MultiPoints
     showResolver: boolean
     resolutionRating?: ReactNode
@@ -97,7 +95,6 @@ export const ContractOverview = memo(
     const {
       betPoints,
       contract,
-      answers,
       showResolver,
       resolutionRating,
       setShowResolver,
@@ -142,7 +139,6 @@ export const ContractOverview = memo(
         return (
           <ChoiceOverview
             contract={contract}
-            answers={answers ?? []}
             points={betPoints as any}
             showResolver={showResolver}
             setShowResolver={setShowResolver}
@@ -493,7 +489,6 @@ const ChartAnnotation = (props: {
 const ChoiceOverview = (props: {
   points: MultiPoints
   contract: MultiContract
-  answers: Answer[]
   showResolver: boolean
   resolutionRating?: ReactNode
   setShowResolver: (show: boolean) => void
@@ -929,7 +924,7 @@ const BinaryChoiceOverview = (props: {
       ) : (
         <>
           {resolutionRating}
-          <BinaryMultiAnswersPanel contract={contract} answers={answers} />
+          <BinaryMultiAnswersPanel contract={contract} />
           {tradingAllowed(contract) && (
             <UserBetsSummary
               className="border-ink-200 !mb-2 mt-2 "
@@ -946,7 +941,6 @@ const BinaryChoiceOverview = (props: {
 export const SimpleMultiOverview = (props: { contract: CPMMMultiContract }) => {
   const { contract } = props
   const user = useUser()
-  const answers = useAnswersCpmm(contract.id) ?? contract.answers
   const defaultSort = getDefaultSort(contract)
 
   const [sort, setSort] = usePersistentInMemoryState<MultiSort>(
@@ -973,7 +967,7 @@ export const SimpleMultiOverview = (props: { contract: CPMMMultiContract }) => {
       </Row>
 
       <AnswersPanel
-        contract={{ ...contract, answers }}
+        contract={contract}
         selectedAnswerIds={[]}
         sort={sort}
         setSort={setSort}

diff --git a/web/components/contract/feed-contract-card.tsx b/web/components/contract/feed-contract-card.tsx
@@ -310,7 +310,6 @@ export function FeedContractCard(props: {
           contract.outcomeType !== 'NUMBER' && (
             <BinaryMultiAnswersPanel
               contract={contract}
-              answers={contract.answers}
               feedReason={feedReason}
             />
           )}

diff --git a/web/components/dashboard/horizontal-dashboard-card.tsx b/web/components/dashboard/horizontal-dashboard-card.tsx
@@ -160,10 +160,7 @@ export function HorizontalDashboardCard(props: {
           {isBinaryMc &&
             contract.mechanism === 'cpmm-multi-1' &&
             contract.outcomeType !== 'NUMBER' && (
-              <BinaryMultiAnswersPanel
-                contract={contract}
-                answers={contract.answers}
-              />
+              <BinaryMultiAnswersPanel contract={contract} />
             )}
 
           {isBinaryCpmm && (showGraph || !ignore) && (

diff --git a/web/pages/[username]/[contractSlug].tsx b/web/pages/[username]/[contractSlug].tsx
@@ -473,7 +473,6 @@ export function ContractPageContent(props: ContractParams) {
               </div>
               <ContractOverview
                 contract={contract}
-                answers={answers}
                 betPoints={betPoints as any}
                 showResolver={showResolver}
                 resolutionRating={