Merge branch 'main' into sell-shares-mobile

This commit is contained in:
Boa 2022-04-19 15:23:49 -06:00 committed by GitHub
commit d6434d2de3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions

View File

@ -331,6 +331,9 @@ function EditableCloseDate(props: {
closeTime && dayjs(closeTime).format('YYYY-MM-DDT23:59')
)
const isSameYear = dayjs(closeTime).isSame(dayjs(), 'year')
const isSameDay = dayjs(closeTime).isSame(dayjs(), 'day')
const onSave = () => {
const newCloseTime = dayjs(closeDate).valueOf()
if (newCloseTime === closeTime) setIsEditingCloseTime(false)
@ -366,7 +369,10 @@ function EditableCloseDate(props: {
text={closeTime > Date.now() ? 'Trading ends:' : 'Trading ended:'}
time={closeTime}
>
{dayjs(closeTime).format('MMM D')} ({fromNow(closeTime)})
{isSameYear
? dayjs(closeTime).format('MMM D')
: dayjs(closeTime).format('MMM D, YYYY')}
{isSameDay && <> ({fromNow(closeTime)})</>}
</DateTimeTooltip>
)}

View File

@ -8,10 +8,8 @@ import { Spacer } from '../components/layout/spacer'
import { useUser } from '../hooks/use-user'
import { Contract, contractPath } from '../lib/firebase/contracts'
import { createContract } from '../lib/firebase/api-call'
import { BuyAmountInput } from '../components/amount-input'
import { FIXED_ANTE, MINIMUM_ANTE } from '../../common/antes'
import { InfoTooltip } from '../components/info-tooltip'
import { CREATOR_FEE } from '../../common/fees'
import { Page } from '../components/page'
import { Title } from '../components/title'
import { ProbabilitySelector } from '../components/probability-selector'
@ -39,6 +37,7 @@ export default function Create() {
<Textarea
placeholder="e.g. Will the Democrats win the 2024 US presidential election?"
className="input input-bordered resize-none"
autoFocus
value={question}
onChange={(e) => setQuestion(e.target.value || '')}
/>