diff --git a/web/components/answers-panel.tsx b/web/components/answers-panel.tsx index ae991621..7e34c533 100644 --- a/web/components/answers-panel.tsx +++ b/web/components/answers-panel.tsx @@ -14,7 +14,7 @@ import { Avatar } from './avatar' import { SiteLink } from './site-link' import { DateTimeTooltip } from './datetime-tooltip' import dayjs from 'dayjs' -import { BuyButton, ChooseNoneCancelSelector } from './yes-no-selector' +import { BuyButton, ChooseCancelSelector } from './yes-no-selector' import { Spacer } from './layout/spacer' import { formatMoney, @@ -55,10 +55,14 @@ export function AnswersPanel(props: { contract: Contract; answers: Answer[] }) { const user = useUser() const [resolveOption, setResolveOption] = useState< - 'CHOOSE' | 'NONE' | 'CANCEL' | undefined + 'CHOOSE' | 'CANCEL' | undefined >() const [answerChoice, setAnswerChoice] = useState() + useEffect(() => { + if (resolveOption !== 'CHOOSE' && answerChoice) setAnswerChoice(undefined) + }, [answerChoice, resolveOption]) + return ( {sortedAnswers.map((answer) => ( @@ -89,7 +93,6 @@ export function AnswersPanel(props: { contract: Contract; answers: Answer[] }) { resolveOption={resolveOption} setResolveOption={setResolveOption} answer={answerChoice} - clearAnswerChoice={() => setAnswerChoice(undefined)} /> )} @@ -421,18 +424,11 @@ function CreateAnswerInput(props: { contract: Contract }) { function AnswerResolvePanel(props: { contract: Contract - resolveOption: 'CHOOSE' | 'NONE' | 'CANCEL' | undefined - setResolveOption: (option: 'CHOOSE' | 'NONE' | 'CANCEL' | undefined) => void + resolveOption: 'CHOOSE' | 'CANCEL' | undefined + setResolveOption: (option: 'CHOOSE' | 'CANCEL' | undefined) => void answer: string | undefined - clearAnswerChoice: () => void }) { - const { - contract, - resolveOption, - setResolveOption, - answer, - clearAnswerChoice, - } = props + const { contract, resolveOption, setResolveOption, answer } = props const [isSubmitting, setIsSubmitting] = useState(false) const [error, setError] = useState(undefined) @@ -443,12 +439,7 @@ function AnswerResolvePanel(props: { setIsSubmitting(true) const result = await resolveMarket({ - outcome: - resolveOption === 'CHOOSE' - ? (answer as string) - : resolveOption === 'NONE' - ? '0' - : 'CANCEL', + outcome: resolveOption === 'CHOOSE' ? (answer as string) : 'CANCEL', contractId: contract.id, }).then((r) => r.data as any) @@ -458,15 +449,12 @@ function AnswerResolvePanel(props: { setError(result?.error || 'Error resolving market') } setResolveOption(undefined) - clearAnswerChoice() setIsSubmitting(false) } const resolutionButtonClass = resolveOption === 'CANCEL' ? 'bg-yellow-400 hover:bg-yellow-500' - : resolveOption === 'NONE' - ? 'bg-red-400 hover:bg-red-500' : resolveOption === 'CHOOSE' && answer ? 'btn-primary' : 'btn-disabled' @@ -475,7 +463,7 @@ function AnswerResolvePanel(props: {
Resolve your market
- { setResolveOption(undefined) - clearAnswerChoice() }} > Clear diff --git a/web/components/contract-card.tsx b/web/components/contract-card.tsx index 2f731163..89c4c7ec 100644 --- a/web/components/contract-card.tsx +++ b/web/components/contract-card.tsx @@ -76,7 +76,6 @@ export function ResolutionOrChance(props: { NO: 'text-red-400', MKT: 'text-blue-400', CANCEL: 'text-yellow-400', - '0': 'text-red-400', '': '', // Empty if unresolved }[resolution || ''] ?? 'text-primary' @@ -88,7 +87,6 @@ export function ResolutionOrChance(props: { NO: 'NO', MKT: getBinaryProbPercent(contract), CANCEL: 'N/A', - '0': 'NONE', '': '', }[resolution || ''] ?? `#${resolution}` diff --git a/web/components/outcome-label.tsx b/web/components/outcome-label.tsx index 1f01c58c..a86ab560 100644 --- a/web/components/outcome-label.tsx +++ b/web/components/outcome-label.tsx @@ -27,7 +27,5 @@ export function ProbLabel() { } export function AnswerNumberLabel(props: { number: string }) { - if (props.number == '0') return NONE - return #{props.number} } diff --git a/web/components/yes-no-selector.tsx b/web/components/yes-no-selector.tsx index 70f91e6a..ebc0ab7b 100644 --- a/web/components/yes-no-selector.tsx +++ b/web/components/yes-no-selector.tsx @@ -90,9 +90,9 @@ export function YesNoCancelSelector(props: { ) } -export function ChooseNoneCancelSelector(props: { - selected: 'CHOOSE' | 'NONE' | 'CANCEL' | undefined - onSelect: (selected: 'CHOOSE' | 'NONE' | 'CANCEL') => void +export function ChooseCancelSelector(props: { + selected: 'CHOOSE' | 'CANCEL' | undefined + onSelect: (selected: 'CHOOSE' | 'CANCEL') => void className?: string btnClassName?: string }) { @@ -110,14 +110,6 @@ export function ChooseNoneCancelSelector(props: { Choose an answer - -