None option converted to none of the above label at bottom of list. Button to resolve none.
This commit is contained in:
parent
95a63db6ea
commit
a05c5dcf65
|
@ -14,7 +14,7 @@ import { Avatar } from './avatar'
|
||||||
import { SiteLink } from './site-link'
|
import { SiteLink } from './site-link'
|
||||||
import { DateTimeTooltip } from './datetime-tooltip'
|
import { DateTimeTooltip } from './datetime-tooltip'
|
||||||
import dayjs from 'dayjs'
|
import dayjs from 'dayjs'
|
||||||
import { BuyButton, ChooseCancelSelector } from './yes-no-selector'
|
import { BuyButton, ChooseNoneCancelSelector } from './yes-no-selector'
|
||||||
import { Spacer } from './layout/spacer'
|
import { Spacer } from './layout/spacer'
|
||||||
import {
|
import {
|
||||||
formatMoney,
|
formatMoney,
|
||||||
|
@ -44,7 +44,7 @@ export function AnswersPanel(props: {
|
||||||
|
|
||||||
const answers = useAnswers(contract.id) ?? props.answers
|
const answers = useAnswers(contract.id) ?? props.answers
|
||||||
const [chosenAnswer, otherAnswers] = _.partition(
|
const [chosenAnswer, otherAnswers] = _.partition(
|
||||||
answers,
|
answers.filter((answer) => answer.id !== '0'),
|
||||||
(answer) => answer.id === resolution
|
(answer) => answer.id === resolution
|
||||||
)
|
)
|
||||||
const sortedAnswers = [
|
const sortedAnswers = [
|
||||||
|
@ -58,7 +58,7 @@ export function AnswersPanel(props: {
|
||||||
const user = useUser()
|
const user = useUser()
|
||||||
|
|
||||||
const [resolveOption, setResolveOption] = useState<
|
const [resolveOption, setResolveOption] = useState<
|
||||||
'CHOOSE' | 'CANCEL' | undefined
|
'CHOOSE' | 'NONE' | 'CANCEL' | undefined
|
||||||
>()
|
>()
|
||||||
const [answerChoice, setAnswerChoice] = useState<string | undefined>()
|
const [answerChoice, setAnswerChoice] = useState<string | undefined>()
|
||||||
|
|
||||||
|
@ -75,6 +75,15 @@ export function AnswersPanel(props: {
|
||||||
/>
|
/>
|
||||||
))}
|
))}
|
||||||
|
|
||||||
|
{sortedAnswers.length === 0 && (
|
||||||
|
<div className="text-gray-500">No answers yet...</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<div className="self-end p-4">
|
||||||
|
None of the above:{' '}
|
||||||
|
{formatPercent(getOutcomeProbability(contract.totalShares, '0'))}
|
||||||
|
</div>
|
||||||
|
|
||||||
{tradingAllowed(contract) && <CreateAnswerInput contract={contract} />}
|
{tradingAllowed(contract) && <CreateAnswerInput contract={contract} />}
|
||||||
|
|
||||||
{user?.id === creatorId && !resolution && (
|
{user?.id === creatorId && !resolution && (
|
||||||
|
@ -418,8 +427,8 @@ function CreateAnswerInput(props: { contract: Contract<'MULTI'> }) {
|
||||||
|
|
||||||
function AnswerResolvePanel(props: {
|
function AnswerResolvePanel(props: {
|
||||||
contract: Contract<'MULTI'>
|
contract: Contract<'MULTI'>
|
||||||
resolveOption: 'CHOOSE' | 'CANCEL' | undefined
|
resolveOption: 'CHOOSE' | 'NONE' | 'CANCEL' | undefined
|
||||||
setResolveOption: (option: 'CHOOSE' | 'CANCEL' | undefined) => void
|
setResolveOption: (option: 'CHOOSE' | 'NONE' | 'CANCEL' | undefined) => void
|
||||||
answer: string | undefined
|
answer: string | undefined
|
||||||
clearAnswerChoice: () => void
|
clearAnswerChoice: () => void
|
||||||
}) {
|
}) {
|
||||||
|
@ -440,7 +449,12 @@ function AnswerResolvePanel(props: {
|
||||||
setIsSubmitting(true)
|
setIsSubmitting(true)
|
||||||
|
|
||||||
const result = await resolveMarket({
|
const result = await resolveMarket({
|
||||||
outcome: resolveOption === 'CHOOSE' ? (answer as string) : 'CANCEL',
|
outcome:
|
||||||
|
resolveOption === 'CHOOSE'
|
||||||
|
? (answer as string)
|
||||||
|
: resolveOption === 'NONE'
|
||||||
|
? '0'
|
||||||
|
: 'CANCEL',
|
||||||
contractId: contract.id,
|
contractId: contract.id,
|
||||||
}).then((r) => r.data as any)
|
}).then((r) => r.data as any)
|
||||||
|
|
||||||
|
@ -455,6 +469,8 @@ function AnswerResolvePanel(props: {
|
||||||
const resolutionButtonClass =
|
const resolutionButtonClass =
|
||||||
resolveOption === 'CANCEL'
|
resolveOption === 'CANCEL'
|
||||||
? 'bg-yellow-400 hover:bg-yellow-500'
|
? 'bg-yellow-400 hover:bg-yellow-500'
|
||||||
|
: resolveOption === 'NONE'
|
||||||
|
? 'bg-red-400 hover:bg-red-500'
|
||||||
: resolveOption === 'CHOOSE' && answer
|
: resolveOption === 'CHOOSE' && answer
|
||||||
? 'btn-primary'
|
? 'btn-primary'
|
||||||
: 'btn-disabled'
|
: 'btn-disabled'
|
||||||
|
@ -463,7 +479,7 @@ function AnswerResolvePanel(props: {
|
||||||
<Col className="gap-4 p-4 bg-gray-50 rounded">
|
<Col className="gap-4 p-4 bg-gray-50 rounded">
|
||||||
<div>Resolve your market</div>
|
<div>Resolve your market</div>
|
||||||
<Col className="sm:flex-row sm:items-center gap-4">
|
<Col className="sm:flex-row sm:items-center gap-4">
|
||||||
<ChooseCancelSelector
|
<ChooseNoneCancelSelector
|
||||||
className="!flex-row flex-wrap items-center"
|
className="!flex-row flex-wrap items-center"
|
||||||
selected={resolveOption}
|
selected={resolveOption}
|
||||||
onSelect={setResolveOption}
|
onSelect={setResolveOption}
|
||||||
|
|
|
@ -76,6 +76,7 @@ export function ResolutionOrChance(props: {
|
||||||
NO: 'text-red-400',
|
NO: 'text-red-400',
|
||||||
MKT: 'text-blue-400',
|
MKT: 'text-blue-400',
|
||||||
CANCEL: 'text-yellow-400',
|
CANCEL: 'text-yellow-400',
|
||||||
|
'0': 'text-red-400',
|
||||||
'': '', // Empty if unresolved
|
'': '', // Empty if unresolved
|
||||||
}[resolution || ''] ?? 'text-primary'
|
}[resolution || ''] ?? 'text-primary'
|
||||||
|
|
||||||
|
@ -87,6 +88,7 @@ export function ResolutionOrChance(props: {
|
||||||
NO: 'NO',
|
NO: 'NO',
|
||||||
MKT: getBinaryProbPercent(contract),
|
MKT: getBinaryProbPercent(contract),
|
||||||
CANCEL: 'N/A',
|
CANCEL: 'N/A',
|
||||||
|
'0': 'NONE',
|
||||||
'': '',
|
'': '',
|
||||||
}[resolution || ''] ?? `#${resolution}`
|
}[resolution || ''] ?? `#${resolution}`
|
||||||
|
|
||||||
|
|
|
@ -27,5 +27,7 @@ export function ProbLabel() {
|
||||||
}
|
}
|
||||||
|
|
||||||
export function AnswerNumberLabel(props: { number: string }) {
|
export function AnswerNumberLabel(props: { number: string }) {
|
||||||
|
if (props.number == '0') return <span className="text-red-400">NONE</span>
|
||||||
|
|
||||||
return <span className="text-primary">#{props.number}</span>
|
return <span className="text-primary">#{props.number}</span>
|
||||||
}
|
}
|
||||||
|
|
|
@ -90,9 +90,9 @@ export function YesNoCancelSelector(props: {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
export function ChooseCancelSelector(props: {
|
export function ChooseNoneCancelSelector(props: {
|
||||||
selected: 'CHOOSE' | 'CANCEL' | undefined
|
selected: 'CHOOSE' | 'NONE' | 'CANCEL' | undefined
|
||||||
onSelect: (selected: 'CHOOSE' | 'CANCEL') => void
|
onSelect: (selected: 'CHOOSE' | 'NONE' | 'CANCEL') => void
|
||||||
className?: string
|
className?: string
|
||||||
btnClassName?: string
|
btnClassName?: string
|
||||||
}) {
|
}) {
|
||||||
|
@ -110,6 +110,14 @@ export function ChooseCancelSelector(props: {
|
||||||
Choose an answer
|
Choose an answer
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
color={selected === 'NONE' ? 'red' : 'gray'}
|
||||||
|
onClick={() => onSelect('NONE')}
|
||||||
|
className={clsx('whitespace-nowrap', btnClassName)}
|
||||||
|
>
|
||||||
|
None
|
||||||
|
</Button>
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
color={selected === 'CANCEL' ? 'yellow' : 'gray'}
|
color={selected === 'CANCEL' ? 'yellow' : 'gray'}
|
||||||
onClick={() => onSelect('CANCEL')}
|
onClick={() => onSelect('CANCEL')}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user