More iterating on range UI

common/calculate-cpmm.ts

@@ -123,6 +123,7 @@ export function calculateCpmmAmountToProb(
   prob: number,
   outcome: 'YES' | 'NO'
 ) {
+  if (prob <= 0 || prob >= 1 || isNaN(prob)) return Infinity
   if (outcome === 'NO') prob = 1 - prob
 
   // First, find an upper bound that leads to a more extreme probability than prob.

web/components/amount-input.tsx

@@ -41,7 +41,7 @@ export function AmountInput(props: {
         <span className="bg-gray-200 text-sm">{label}</span>
         <input
           className={clsx(
-            'input input-bordered max-w-[200px] text-lg',
+            'input input-bordered max-w-[200px] text-lg placeholder:text-gray-400',
             error && 'input-error',
             inputClassName
           )}

web/components/bet-panel.tsx

@@ -20,12 +20,12 @@ import { APIError, placeBet } from 'web/lib/firebase/api'
 import { sellShares } from 'web/lib/firebase/api'
 import { AmountInput, BuyAmountInput } from './amount-input'
 import { InfoTooltip } from './info-tooltip'
-import { BinaryOutcomeLabel } from './outcome-label'
+import { BinaryOutcomeLabel, HigherLabel, LowerLabel } from './outcome-label'
 import { getProbability } from 'common/calculate'
 import { useFocus } from 'web/hooks/use-focus'
 import { useUserContractBets } from 'web/hooks/use-user-bets'
 import { calculateCpmmSale, getCpmmProbability } from 'common/calculate-cpmm'
-import { getFormattedMappedValue } from 'common/pseudo-numeric'
+import { getFormattedMappedValue, getMappedValue } from 'common/pseudo-numeric'
 import { SellRow } from './sell-row'
 import { useSaveBinaryShares } from './use-save-binary-shares'
 import { SignUpPrompt } from './sign-up-prompt'
@@ -360,21 +360,48 @@ function LimitOrderPanel(props: {
     highLimitProb !== undefined &&
     lowLimitProb >= highLimitProb
 
-  const betDisabled = isSubmitting || !betAmount || rangeError || error
+  const outOfRangeError =
+    (lowLimitProb !== undefined &&
+      (lowLimitProb <= 0 || lowLimitProb >= 100)) ||
+    (highLimitProb !== undefined &&
+      (highLimitProb <= 0 || highLimitProb >= 100))
+
+  const initialLow = initialProb * 0.9
+  const initialHigh = initialProb + (1 - initialProb) * 0.1
+  const lowPlaceholder = Math.round(
+    isPseudoNumeric ? getMappedValue(contract)(initialLow) : initialLow * 100
+  ).toString()
+  const highPlaceholder = Math.round(
+    isPseudoNumeric ? getMappedValue(contract)(initialHigh) : initialHigh * 100
+  ).toString()
 
   const hasYesLimitBet = lowLimitProb !== undefined && !!betAmount
   const hasNoLimitBet = highLimitProb !== undefined && !!betAmount
   const hasTwoBets = hasYesLimitBet && hasNoLimitBet
 
-  const yesLimitProb = (lowLimitProb ?? initialProb * 100) / 100
+  const betDisabled =
-  const noLimitProb = (highLimitProb ?? initialProb * 100) / 100
+    isSubmitting ||
+    !betAmount ||
+    rangeError ||
+    outOfRangeError ||
+    error ||
+    (!hasYesLimitBet && !hasNoLimitBet)
 
-  const shares = Math.min(
+  const yesLimitProb =
-    (betAmount ?? 0) / yesLimitProb,
+    lowLimitProb === undefined ? undefined : lowLimitProb / 100
-    (betAmount ?? 0) / (1 - noLimitProb)
+  const noLimitProb =
-  )
+    highLimitProb === undefined ? undefined : highLimitProb / 100
-  const yesAmount = shares * yesLimitProb
+
-  const noAmount = shares * (1 - noLimitProb)
+  const shares =
+    yesLimitProb !== undefined && noLimitProb !== undefined
+      ? Math.min(
+          (betAmount ?? 0) / yesLimitProb,
+          (betAmount ?? 0) / (1 - noLimitProb)
+        )
+      : (betAmount ?? 0) / (yesLimitProb ?? 1 - (noLimitProb ?? 1))
+
+  const yesAmount = shares * (yesLimitProb ?? 1)
+  const noAmount = shares * (1 - (noLimitProb ?? 1))
 
   const profitIfBothFilled = shares - (yesAmount + noAmount)
 
@@ -466,7 +493,7 @@ function LimitOrderPanel(props: {
     'YES',
     yesAmount,
     contract,
-    yesLimitProb,
+    Math.min(yesLimitProb ?? initialLow, 0.999),
     unfilledBets as LimitBet[]
   )
   const yesReturnPercent = formatPercent(yesReturn)
@@ -480,7 +507,7 @@ function LimitOrderPanel(props: {
     'NO',
     noAmount,
     contract,
-    noLimitProb,
+    Math.max(noLimitProb ?? initialHigh, 0.01),
     unfilledBets as LimitBet[]
   )
   const noReturnPercent = formatPercent(noReturn)
@@ -488,8 +515,8 @@ function LimitOrderPanel(props: {
   return (
     <Col className={hidden ? 'hidden' : ''}>
       <div className="my-3 text-sm text-gray-500">
-        Bet only when the {isPseudoNumeric ? 'value' : 'probability'} reaches
+        Bet when the {isPseudoNumeric ? 'value' : 'probability'} reaches Low
-        Low or High limit.
+        and/or High limit.
       </div>
 
       <Row className="items-center gap-4">
@@ -500,7 +527,7 @@ function LimitOrderPanel(props: {
             prob={lowLimitProb}
             setProb={setLowLimitProb}
             isSubmitting={isSubmitting}
-            placeholder={''}
+            placeholder={lowPlaceholder}
           />
         </Col>
         <Col className="gap-2">
@@ -510,7 +537,7 @@ function LimitOrderPanel(props: {
             prob={highLimitProb}
             setProb={setHighLimitProb}
             isSubmitting={isSubmitting}
-            placeholder={''}
+            placeholder={highPlaceholder}
           />
         </Col>
       </Row>
@@ -520,6 +547,11 @@ function LimitOrderPanel(props: {
           Low limit must be less than High limit
         </div>
       )}
+      {outOfRangeError && (
+        <div className="mb-2 mr-auto self-center whitespace-nowrap text-xs font-medium tracking-wide text-red-500">
+          Limit is out of range
+        </div>
+      )}
 
       <div className="my-3 text-left text-sm text-gray-500">
         Max amount<span className="ml-1 text-red-500">*</span>
@@ -534,36 +566,35 @@ function LimitOrderPanel(props: {
       />
 
       <Col className="mt-3 w-full gap-3">
-        {hasYesLimitBet && (
+        {(hasTwoBets || (hasYesLimitBet && yesBet.amount !== 0)) && (
           <Row className="items-center justify-between gap-2 text-sm">
             <div className="whitespace-nowrap text-gray-500">
               {isPseudoNumeric ? (
-                'Bought now'
+                <HigherLabel />
               ) : (
-                <>
+                <BinaryOutcomeLabel outcome={'YES'} />
-                  <BinaryOutcomeLabel outcome={'YES'} /> bought now
+              )}{' '}
-                </>
+              current fill
-              )}
             </div>
             <div className="mr-2 whitespace-nowrap">
-              {formatMoney(yesBet.amount)}/
+              {formatMoney(yesBet.amount)} of{' '}
               {formatMoney(yesBet.orderAmount ?? 0)}
             </div>
           </Row>
         )}
-        {hasNoLimitBet && (
+        {(hasTwoBets || (hasNoLimitBet && noBet.amount !== 0)) && (
           <Row className="items-center justify-between gap-2 text-sm">
             <div className="whitespace-nowrap text-gray-500">
               {isPseudoNumeric ? (
-                'Bought now'
+                <LowerLabel />
               ) : (
-                <>
+                <BinaryOutcomeLabel outcome={'NO'} />
-                  <BinaryOutcomeLabel outcome={'NO'} /> bought now
+              )}{' '}
-                </>
+              current fill
-              )}
             </div>
             <div className="mr-2 whitespace-nowrap">
-              {formatMoney(noBet.amount)}/{formatMoney(noBet.orderAmount ?? 0)}
+              {formatMoney(noBet.amount)} of{' '}
+              {formatMoney(noBet.orderAmount ?? 0)}
             </div>
           </Row>
         )}

web/components/bucket-input.tsx

@@ -9,8 +9,9 @@ export function BucketInput(props: {
   contract: NumericContract | PseudoNumericContract
   isSubmitting?: boolean
   onBucketChange: (value?: number, bucket?: string) => void
+  placeholder?: string
 }) {
-  const { contract, isSubmitting, onBucketChange } = props
+  const { contract, isSubmitting, onBucketChange, placeholder } = props
 
   const [numberString, setNumberString] = useState('')
 
@@ -39,7 +40,7 @@ export function BucketInput(props: {
       error={undefined}
       disabled={isSubmitting}
       numberString={numberString}
-      label=""
+      placeholder={placeholder}
     />
   )
 }

web/components/number-input.tsx

@@ -9,8 +9,8 @@ export function NumberInput(props: {
   numberString: string
   onChange: (newNumberString: string) => void
   error: string | undefined
-  label: string
   disabled?: boolean
+  placeholder?: string
   className?: string
   inputClassName?: string
   // Needed to focus the amount input
@@ -21,8 +21,8 @@ export function NumberInput(props: {
     numberString,
     onChange,
     error,
-    label,
     disabled,
+    placeholder,
     className,
     inputClassName,
     inputRef,
@@ -32,16 +32,17 @@ export function NumberInput(props: {
   return (
     <Col className={className}>
       <label className="input-group">
-        <span className="bg-gray-200 text-sm">{label}</span>
         <input
           className={clsx(
-            'input input-bordered max-w-[200px] text-lg',
+            'input input-bordered max-w-[200px] text-lg placeholder:text-gray-400',
             error && 'input-error',
             inputClassName
           )}
           ref={inputRef}
           type="number"
-          placeholder="0"
+          pattern="[0-9]*"
+          inputMode="numeric"
+          placeholder={placeholder ?? '0'}
           maxLength={9}
           value={numberString}
           disabled={disabled}

web/components/probability-input.tsx

@@ -80,6 +80,7 @@ export function ProbabilityOrNumericInput(props: {
         )
       }
       isSubmitting={isSubmitting}
+      placeholder={placeholder}
     />
   ) : (
     <ProbabilityInput