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

Don't show quick bet when signed out, or for numeric markets

Browse Source
This commit is contained in:
James Grugett 2022-05-28 15:36:16 -05:00
parent 29a05ffff2
commit 4c81106612
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
web/components/contract/contract-card.tsx
View File

@ -28,6 +28,7 @@ import { AvatarDetails, MiscDetails } from './contract-details'
import { getExpectedValue, getValueFromBucket } from 'common/calculate-dpm' import { getExpectedValue, getValueFromBucket } from 'common/calculate-dpm'
import { QuickBet, ProbBar, getColor } from './quick-bet' import { QuickBet, ProbBar, getColor } from './quick-bet'
import { useContractWithPreload } from 'web/hooks/use-contract' import { useContractWithPreload } from 'web/hooks/use-contract'
import { useUser } from 'web/hooks/use-user'
export function ContractCard(props: { export function ContractCard(props: {
contract: Contract contract: Contract
@ -40,10 +41,16 @@ export function ContractCard(props: {
const { question, outcomeType } = contract const { question, outcomeType } = contract
const { resolution } = contract const { resolution } = contract
const marketClosed = (contract.closeTime || Infinity) < Date.now() || !!resolution const user = useUser()
const marketClosed =
(contract.closeTime || Infinity) < Date.now() || !!resolution
const showQuickBet = !( const showQuickBet = !(
!user ||
marketClosed || marketClosed ||
(outcomeType === 'FREE_RESPONSE' && getTopAnswer(contract) === undefined) (outcomeType === 'FREE_RESPONSE' && getTopAnswer(contract) === undefined) ||
outcomeType === 'NUMERIC'
) )
return ( return (
@ -96,7 +103,7 @@ export function ContractCard(props: {
/> />
</Col> </Col>
{showQuickBet ? ( {showQuickBet ? (
<QuickBet contract={contract} /> <QuickBet contract={contract} user={user} />
) : ( ) : (
<Col className="m-auto pl-2"> <Col className="m-auto pl-2">
{outcomeType === 'BINARY' && ( {outcomeType === 'BINARY' && (

2
web/components/contract/contracts-list.tsx
View File

@ -19,7 +19,7 @@ export function ContractsGrid(props: {
const isBottomVisible = useIsVisible(elem) const isBottomVisible = useIsVisible(elem)
useEffect(() => { useEffect(() => {
if (isBottomVisible) { if (isBottomVisible && hasMore) {
loadMore() loadMore()
} }
}, [isBottomVisible, hasMore, loadMore]) }, [isBottomVisible, hasMore, loadMore])

9
web/components/contract/quick-bet.tsx
View File

@ -14,6 +14,7 @@ import {
NumericContract, NumericContract,
FreeResponseContract, FreeResponseContract,
} from 'common/contract' } from 'common/contract'
import { User } from 'common/user'
import { import {
formatLargeNumber, formatLargeNumber,
formatMoney, formatMoney,
@ -21,7 +22,6 @@ import {
} from 'common/util/format' } from 'common/util/format'
import { useState } from 'react' import { useState } from 'react'
import toast from 'react-hot-toast' import toast from 'react-hot-toast'
import { useUser } from 'web/hooks/use-user'
import { useUserContractBets } from 'web/hooks/use-user-bets' import { useUserContractBets } from 'web/hooks/use-user-bets'
import { placeBet } from 'web/lib/firebase/api-call' import { placeBet } from 'web/lib/firebase/api-call'
import { getBinaryProb, getBinaryProbPercent } from 'web/lib/firebase/contracts' import { getBinaryProb, getBinaryProbPercent } from 'web/lib/firebase/contracts'
@ -33,11 +33,10 @@ import { useSaveShares } from '../use-save-shares'
const BET_SIZE = 10 const BET_SIZE = 10
export function QuickBet(props: { contract: Contract }) { export function QuickBet(props: { contract: Contract; user: User }) {
const { contract } = props const { contract, user } = props
const user = useUser() const userBets = useUserContractBets(user.id, contract.id)
const userBets = useUserContractBets(user?.id, contract.id)
const topAnswer = const topAnswer =
contract.outcomeType === 'FREE_RESPONSE' contract.outcomeType === 'FREE_RESPONSE'
? getTopAnswer(contract as FreeResponseContract) ? getTopAnswer(contract as FreeResponseContract)