From 2352847ab420e6b88283ebe998583857adc5b91a Mon Sep 17 00:00:00 2001 From: Ian Philips Date: Fri, 29 Apr 2022 15:06:59 -0600 Subject: [PATCH] Only use bets by current user for comment input --- web/components/feed/activity-items.ts | 12 +++++++----- web/components/feed/feed-items.tsx | 8 ++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/web/components/feed/activity-items.ts b/web/components/feed/activity-items.ts index 413259c0..7879b637 100644 --- a/web/components/feed/activity-items.ts +++ b/web/components/feed/activity-items.ts @@ -31,7 +31,7 @@ type BaseActivityItem = { export type CommentInputItem = BaseActivityItem & { type: 'commentInput' - bets: Bet[] + betsByCurrentUser: Bet[] comments: Comment[] } @@ -323,7 +323,7 @@ function getCommentsWithPositions( id: comment.id, contract: contract, comment, - betsBySameUser: bets.length === 0 ? [] : betsByUserId[comment.userId], + betsBySameUser: bets.length === 0 ? [] : betsByUserId[comment.userId] ?? [], truncate: true, hideOutcome: false, smallAvatar: false, @@ -385,7 +385,7 @@ export function getAllContractActivityItems( type: 'commentInput', id: 'commentInput', contract, - bets: [], + betsByCurrentUser: [], comments: [], }) } else { @@ -411,7 +411,7 @@ export function getAllContractActivityItems( type: 'commentInput', id: 'commentInput', contract, - bets: [], + betsByCurrentUser: [], comments: [], }) } @@ -507,7 +507,9 @@ export function getSpecificContractActivityItems( type: 'commentInput', id: 'commentInput', contract, - bets: bets, + betsByCurrentUser: user + ? bets.filter((bet) => bet.userId === user.id) + : [], comments: comments, }) break diff --git a/web/components/feed/feed-items.tsx b/web/components/feed/feed-items.tsx index 2b8e71dc..584907d9 100644 --- a/web/components/feed/feed-items.tsx +++ b/web/components/feed/feed-items.tsx @@ -221,10 +221,10 @@ export function FeedComment(props: { export function CommentInput(props: { contract: Contract - bets: Bet[] + betsByCurrentUser: Bet[] comments: Comment[] }) { - const { contract, bets, comments } = props + const { contract, betsByCurrentUser, comments } = props const user = useUser() const [comment, setComment] = useState('') @@ -238,7 +238,7 @@ export function CommentInput(props: { } // Should this be oldest bet or most recent bet? - const mostRecentCommentableBet = bets + const mostRecentCommentableBet = betsByCurrentUser .filter( (bet) => canCommentOnBet(bet.userId, bet.createdTime, user) && @@ -258,7 +258,7 @@ export function CommentInput(props: { ) } const { userPosition, userPositionMoney, yesFloorShares, noFloorShares } = - getBettorsPosition(contract, Date.now(), bets) + getBettorsPosition(contract, Date.now(), betsByCurrentUser) return ( <>