Merge branch 'main' into sell-shares-mobile
This commit is contained in:
commit
d6434d2de3
|
@ -331,6 +331,9 @@ function EditableCloseDate(props: {
|
||||||
closeTime && dayjs(closeTime).format('YYYY-MM-DDT23:59')
|
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 onSave = () => {
|
||||||
const newCloseTime = dayjs(closeDate).valueOf()
|
const newCloseTime = dayjs(closeDate).valueOf()
|
||||||
if (newCloseTime === closeTime) setIsEditingCloseTime(false)
|
if (newCloseTime === closeTime) setIsEditingCloseTime(false)
|
||||||
|
@ -366,7 +369,10 @@ function EditableCloseDate(props: {
|
||||||
text={closeTime > Date.now() ? 'Trading ends:' : 'Trading ended:'}
|
text={closeTime > Date.now() ? 'Trading ends:' : 'Trading ended:'}
|
||||||
time={closeTime}
|
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>
|
</DateTimeTooltip>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
|
|
@ -8,10 +8,8 @@ import { Spacer } from '../components/layout/spacer'
|
||||||
import { useUser } from '../hooks/use-user'
|
import { useUser } from '../hooks/use-user'
|
||||||
import { Contract, contractPath } from '../lib/firebase/contracts'
|
import { Contract, contractPath } from '../lib/firebase/contracts'
|
||||||
import { createContract } from '../lib/firebase/api-call'
|
import { createContract } from '../lib/firebase/api-call'
|
||||||
import { BuyAmountInput } from '../components/amount-input'
|
|
||||||
import { FIXED_ANTE, MINIMUM_ANTE } from '../../common/antes'
|
import { FIXED_ANTE, MINIMUM_ANTE } from '../../common/antes'
|
||||||
import { InfoTooltip } from '../components/info-tooltip'
|
import { InfoTooltip } from '../components/info-tooltip'
|
||||||
import { CREATOR_FEE } from '../../common/fees'
|
|
||||||
import { Page } from '../components/page'
|
import { Page } from '../components/page'
|
||||||
import { Title } from '../components/title'
|
import { Title } from '../components/title'
|
||||||
import { ProbabilitySelector } from '../components/probability-selector'
|
import { ProbabilitySelector } from '../components/probability-selector'
|
||||||
|
@ -39,6 +37,7 @@ export default function Create() {
|
||||||
<Textarea
|
<Textarea
|
||||||
placeholder="e.g. Will the Democrats win the 2024 US presidential election?"
|
placeholder="e.g. Will the Democrats win the 2024 US presidential election?"
|
||||||
className="input input-bordered resize-none"
|
className="input input-bordered resize-none"
|
||||||
|
autoFocus
|
||||||
value={question}
|
value={question}
|
||||||
onChange={(e) => setQuestion(e.target.value || '')}
|
onChange={(e) => setQuestion(e.target.value || '')}
|
||||||
/>
|
/>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user