From 0ce2b146ece10c4bdf8719e08a65a882e7690f7a Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Tue, 26 Apr 2022 09:11:12 -0600
Subject: [PATCH] Moved answers

---
 web/components/answers/answers-panel.tsx | 54 ++++++++++++++++++++++++
 web/components/feed/activity-items.ts    | 36 ----------------
 2 files changed, 54 insertions(+), 36 deletions(-)

diff --git a/web/components/answers/answers-panel.tsx b/web/components/answers/answers-panel.tsx
index f7277618..52c6581e 100644
--- a/web/components/answers/answers-panel.tsx
+++ b/web/components/answers/answers-panel.tsx
@@ -11,6 +11,13 @@ import { AnswerItem } from './answer-item'
 import { CreateAnswerPanel } from './create-answer-panel'
 import { AnswerResolvePanel } from './answer-resolve-panel'
 import { Spacer } from '../layout/spacer'
+import { FeedItems } from '../feed/feed-items'
+import { ActivityItem } from '../feed/activity-items'
+import { useBets } from '../../hooks/use-bets'
+import { Bet } from '../../../common/bet'
+import { User } from '../../../common/user'
+import { getOutcomeProbability } from '../../../common/calculate'
+import { Answer } from '../../../common/answer'
 
 export function AnswersPanel(props: {
   contract: FullContract<DPM, FreeResponse>
@@ -47,6 +54,12 @@ export function AnswersPanel(props: {
 
   const chosenTotal = _.sum(Object.values(chosenAnswers))
 
+  const answerItems = getAnswers(
+    contract as FullContract<DPM, FreeResponse>,
+    useBets(contract.id) || ([] as Bet[]),
+    user
+  ).reverse()
+
   const onChoose = (answerId: string, prob: number) => {
     if (resolveOption === 'CHOOSE') {
       setChosenAnswers({ [answerId]: prob })
@@ -102,6 +115,15 @@ export function AnswersPanel(props: {
         <div className="pb-4 text-gray-500">No answers yet...</div>
       )}
 
+      {!resolveOption && sortedAnswers.length > 0 && (
+        <FeedItems
+          contract={contract}
+          items={answerItems}
+          className={''}
+          betRowClassName={''}
+        />
+      )}
+
       {tradingAllowed(contract) &&
         (!resolveOption || resolveOption === 'CANCEL') && (
           <CreateAnswerPanel contract={contract} />
@@ -121,3 +143,35 @@ export function AnswersPanel(props: {
     </Col>
   )
 }
+
+function getAnswers(
+  contract: FullContract<DPM, FreeResponse>,
+  bets: Bet[],
+  user: User | undefined | null
+) {
+  let outcomes = _.uniq(bets.map((bet) => bet.outcome)).filter(
+    (outcome) => getOutcomeProbability(contract, outcome) > 0.0001
+  )
+  outcomes = _.sortBy(outcomes, (outcome) =>
+    getOutcomeProbability(contract, outcome)
+  )
+
+  const answers = outcomes
+    .map((outcome) => {
+      const answer = contract.answers?.find(
+        (answer) => answer.id === outcome
+      ) as Answer
+
+      return {
+        id: outcome,
+        type: 'answer' as const,
+        contract,
+        answer,
+        items: [] as ActivityItem[],
+        user,
+      }
+    })
+    .filter((group) => group.answer)
+
+  return answers
+}
diff --git a/web/components/feed/activity-items.ts b/web/components/feed/activity-items.ts
index 6c2d55fb..dd793407 100644
--- a/web/components/feed/activity-items.ts
+++ b/web/components/feed/activity-items.ts
@@ -256,38 +256,6 @@ function getAnswerGroups(
   return answerGroups
 }
 
-function getAnswers(
-  contract: FullContract<DPM, FreeResponse>,
-  bets: Bet[],
-  user: User | undefined | null
-) {
-  let outcomes = _.uniq(bets.map((bet) => bet.outcome)).filter(
-    (outcome) => getOutcomeProbability(contract, outcome) > 0.0001
-  )
-  outcomes = _.sortBy(outcomes, (outcome) =>
-    getOutcomeProbability(contract, outcome)
-  )
-
-  const answerGroups = outcomes
-    .map((outcome) => {
-      const answer = contract.answers?.find(
-        (answer) => answer.id === outcome
-      ) as Answer
-
-      return {
-        id: outcome,
-        type: 'answer' as const,
-        contract,
-        answer,
-        items: [] as ActivityItem[],
-        user,
-      }
-    })
-    .filter((group) => group.answer)
-
-  return answerGroups
-}
-
 function groupBetsAndComments(
   bets: Bet[],
   comments: Comment[],
@@ -387,10 +355,6 @@ export function getAllContractActivityItems(
       commentsByBetId,
       contract,
     })
-
-    items.push(
-      ...getAnswers(contract as FullContract<DPM, FreeResponse>, bets, user)
-    )
   } else {
     items.push(
       ...groupBetsAndComments(bets, comments, contract, user?.id, {