+ onMouseOver?: (p: P | undefined) => void
Tooltip?: TooltipComponent
}) => {
const { color, data, yScale, w, h, Tooltip } = props
@@ -71,12 +72,9 @@ export const DistributionChart =
(props: {
const onMouseOver = useEvent((mouseX: number) => {
const queryX = xScale.invert(mouseX)
const item = data[xBisector.left(data, queryX) - 1]
- if (item == null) {
- // this can happen if you are on the very left or right edge of the chart,
- // so your queryX is out of bounds
- return
- }
- return { ...item, x: queryX }
+ const result = item ? { ...item, x: queryX } : undefined
+ props.onMouseOver?.(result)
+ return result
})
return (
@@ -108,6 +106,7 @@ export const MultiValueHistoryChart =
(props: {
colors: readonly string[]
xScale: ScaleTime
yScale: ScaleContinuousNumeric
+ onMouseOver?: (p: P | undefined) => void
Tooltip?: TooltipComponent
pct?: boolean
}) => {
@@ -156,12 +155,9 @@ export const MultiValueHistoryChart =
(props: {
const onMouseOver = useEvent((mouseX: number) => {
const queryX = xScale.invert(mouseX)
const item = data[xBisector.left(data, queryX) - 1]
- if (item == null) {
- // this can happen if you are on the very left or right edge of the chart,
- // so your queryX is out of bounds
- return
- }
- return { ...item, x: queryX }
+ const result = item ? { ...item, x: queryX } : undefined
+ props.onMouseOver?.(result)
+ return result
})
return (
@@ -196,10 +192,11 @@ export const SingleValueHistoryChart =
(props: {
color: string
xScale: ScaleTime
yScale: ScaleContinuousNumeric
+ onMouseOver?: (p: P | undefined) => void
Tooltip?: TooltipComponent
pct?: boolean
}) => {
- const { color, data, pct, yScale, w, h, Tooltip } = props
+ const { color, data, yScale, w, h, Tooltip, pct } = props
const [viewXScale, setViewXScale] = useState>()
const xScale = viewXScale ?? props.xScale
@@ -235,12 +232,9 @@ export const SingleValueHistoryChart = (props: {
const onMouseOver = useEvent((mouseX: number) => {
const queryX = xScale.invert(mouseX)
const item = data[xBisector.left(data, queryX) - 1]
- if (item == null) {
- // this can happen if you are on the very left or right edge of the chart,
- // so your queryX is out of bounds
- return
- }
- return { ...item, x: queryX }
+ const result = item ? { ...item, x: queryX } : undefined
+ props.onMouseOver?.(result)
+ return result
})
return (
From 715bae57e09a72286be89f94b6a35ebd3643dea2 Mon Sep 17 00:00:00 2001
From: Marshall Polaris
Date: Thu, 29 Sep 2022 21:35:20 -0700
Subject: [PATCH 004/101] Fix date memoization in charts (#972)
* Memoize on numbers, not dates
* Use numbers instead of dates to calculate visible range
---
web/components/charts/contract/binary.tsx | 16 ++++++++--------
web/components/charts/contract/choice.tsx | 8 ++++----
.../charts/contract/pseudo-numeric.tsx | 16 ++++++++--------
web/components/charts/helpers.tsx | 10 +++++-----
4 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/web/components/charts/contract/binary.tsx b/web/components/charts/contract/binary.tsx
index a5740a3e..a6ba9bee 100644
--- a/web/components/charts/contract/binary.tsx
+++ b/web/components/charts/contract/binary.tsx
@@ -49,24 +49,24 @@ export const BinaryContractChart = (props: {
onMouseOver?: (p: HistoryPoint | undefined) => void
}) => {
const { contract, bets, onMouseOver } = props
- const [startDate, endDate] = getDateRange(contract)
+ const [start, end] = getDateRange(contract)
const startP = getInitialProbability(contract)
const endP = getProbability(contract)
const betPoints = useMemo(() => getBetPoints(bets), [bets])
const data = useMemo(() => {
return [
- { x: startDate, y: startP },
+ { x: new Date(start), y: startP },
...betPoints,
- { x: endDate ?? new Date(Date.now() + DAY_MS), y: endP },
+ { x: new Date(end ?? Date.now() + DAY_MS), y: endP },
]
- }, [startDate, startP, endDate, endP, betPoints])
+ }, [start, startP, end, endP, betPoints])
const rightmostDate = getRightmostVisibleDate(
- endDate,
- last(betPoints)?.x,
- new Date(Date.now())
+ end,
+ last(betPoints)?.x?.getTime(),
+ Date.now()
)
- const visibleRange = [startDate, rightmostDate]
+ const visibleRange = [start, rightmostDate]
const isMobile = useIsMobile(800)
const containerRef = useRef(null)
const width = useElementWidth(containerRef) ?? 0
diff --git a/web/components/charts/contract/choice.tsx b/web/components/charts/contract/choice.tsx
index 05d3255e..127e7d9c 100644
--- a/web/components/charts/contract/choice.tsx
+++ b/web/components/charts/contract/choice.tsx
@@ -136,10 +136,10 @@ export const ChoiceContractChart = (props: {
const betPoints = useMemo(() => getBetPoints(answers, bets), [answers, bets])
const data = useMemo(
() => [
- { x: start, y: answers.map((_) => 0) },
+ { x: new Date(start), y: answers.map((_) => 0) },
...betPoints,
{
- x: end ?? new Date(Date.now() + DAY_MS),
+ x: new Date(end ?? Date.now() + DAY_MS),
y: answers.map((a) => getOutcomeProbability(contract, a.id)),
},
],
@@ -147,8 +147,8 @@ export const ChoiceContractChart = (props: {
)
const rightmostDate = getRightmostVisibleDate(
end,
- last(betPoints)?.x,
- new Date(Date.now())
+ last(betPoints)?.x?.getTime(),
+ Date.now()
)
const visibleRange = [start, rightmostDate]
const isMobile = useIsMobile(800)
diff --git a/web/components/charts/contract/pseudo-numeric.tsx b/web/components/charts/contract/pseudo-numeric.tsx
index 385e56dd..1232a96c 100644
--- a/web/components/charts/contract/pseudo-numeric.tsx
+++ b/web/components/charts/contract/pseudo-numeric.tsx
@@ -62,7 +62,7 @@ export const PseudoNumericContractChart = (props: {
}) => {
const { contract, bets, onMouseOver } = props
const { min, max, isLogScale } = contract
- const [startDate, endDate] = getDateRange(contract)
+ const [start, end] = getDateRange(contract)
const scaleP = useMemo(
() => getScaleP(min, max, isLogScale),
[min, max, isLogScale]
@@ -72,18 +72,18 @@ export const PseudoNumericContractChart = (props: {
const betPoints = useMemo(() => getBetPoints(bets, scaleP), [bets, scaleP])
const data = useMemo(
() => [
- { x: startDate, y: startP },
+ { x: new Date(start), y: startP },
...betPoints,
- { x: endDate ?? new Date(Date.now() + DAY_MS), y: endP },
+ { x: new Date(end ?? Date.now() + DAY_MS), y: endP },
],
- [betPoints, startDate, startP, endDate, endP]
+ [betPoints, start, startP, end, endP]
)
const rightmostDate = getRightmostVisibleDate(
- endDate,
- last(betPoints)?.x,
- new Date(Date.now())
+ end,
+ last(betPoints)?.x?.getTime(),
+ Date.now()
)
- const visibleRange = [startDate, rightmostDate]
+ const visibleRange = [start, rightmostDate]
const isMobile = useIsMobile(800)
const containerRef = useRef(null)
const width = useElementWidth(containerRef) ?? 0
diff --git a/web/components/charts/helpers.tsx b/web/components/charts/helpers.tsx
index 35c8a335..ea436213 100644
--- a/web/components/charts/helpers.tsx
+++ b/web/components/charts/helpers.tsx
@@ -259,19 +259,19 @@ export const getDateRange = (contract: Contract) => {
const { createdTime, closeTime, resolutionTime } = contract
const isClosed = !!closeTime && Date.now() > closeTime
const endDate = resolutionTime ?? (isClosed ? closeTime : null)
- return [new Date(createdTime), endDate ? new Date(endDate) : null] as const
+ return [createdTime, endDate ?? null] as const
}
export const getRightmostVisibleDate = (
- contractEnd: Date | null | undefined,
- lastActivity: Date | null | undefined,
- now: Date
+ contractEnd: number | null | undefined,
+ lastActivity: number | null | undefined,
+ now: number
) => {
if (contractEnd != null) {
return contractEnd
} else if (lastActivity != null) {
// client-DB clock divergence may cause last activity to be later than now
- return new Date(Math.max(lastActivity.getTime(), now.getTime()))
+ return Math.max(lastActivity, now)
} else {
return now
}
From 13b3613460d56f9c1b086f202e485ca338c16137 Mon Sep 17 00:00:00 2001
From: James Grugett
Date: Thu, 29 Sep 2022 23:57:45 -0500
Subject: [PATCH 005/101] Show number of limit orders
---
web/components/limit-bets.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/web/components/limit-bets.tsx b/web/components/limit-bets.tsx
index 606bc7e0..bd9ed246 100644
--- a/web/components/limit-bets.tsx
+++ b/web/components/limit-bets.tsx
@@ -182,7 +182,7 @@ export function OrderBookButton(props: {
size="xs"
color="blue"
>
- Order book
+ {limitBets.length} Limit orders
From b83e5db56370b6992ce0d556a39354a501eda633 Mon Sep 17 00:00:00 2001
From: ingawei <46611122+ingawei@users.noreply.github.com>
Date: Fri, 30 Sep 2022 00:41:22 -0500
Subject: [PATCH 006/101] getting rid of daisy buttons (#969)
* getting rid of daisy buttons so bet button does not turn black on mobile
---
web/components/answers/answer-bet-panel.tsx | 6 +--
.../answers/answer-resolve-panel.tsx | 32 +++++++------
web/components/bet-panel.tsx | 14 ++----
web/components/bets-list.tsx | 3 +-
web/components/button.tsx | 28 +++++++-----
web/components/confirmation-button.tsx | 34 +++++++++-----
web/components/groups/create-group-button.tsx | 7 +--
web/components/numeric-resolution-panel.tsx | 4 +-
web/components/resolution-panel.tsx | 32 +++++--------
.../warning-confirmation-button.tsx | 45 ++++++++-----------
web/components/yes-no-selector.tsx | 4 +-
web/pages/profile.tsx | 5 ++-
12 files changed, 107 insertions(+), 107 deletions(-)
diff --git a/web/components/answers/answer-bet-panel.tsx b/web/components/answers/answer-bet-panel.tsx
index 85f61034..9867abab 100644
--- a/web/components/answers/answer-bet-panel.tsx
+++ b/web/components/answers/answer-bet-panel.tsx
@@ -184,16 +184,14 @@ export function AnswerBetPanel(props: {
@@ -129,11 +118,28 @@ export function AnswerResolvePanel(props: {
Clear
)}
+
1 &&
+ answers.every((answer) => chosenAnswers[answer] > 0)
+ ? 'blue'
+ : 'indigo'
+ }
+ disabled={
+ !resolveOption ||
+ (resolveOption === 'CHOOSE' && !answers.length) ||
+ (resolveOption === 'CHOOSE_MULTIPLE' &&
+ (!(answers.length > 1) ||
+ !answers.every((answer) => chosenAnswers[answer] > 0)))
+ }
onResolve={onResolve}
isSubmitting={isSubmitting}
- openModalButtonClass={resolutionButtonClass}
- submitButtonClass={resolutionButtonClass}
/>
diff --git a/web/components/bet-panel.tsx b/web/components/bet-panel.tsx
index 5d908937..e93c0e62 100644
--- a/web/components/bet-panel.tsx
+++ b/web/components/bet-panel.tsx
@@ -395,22 +395,16 @@ export function BuyPanel(props: {
setSeeLimit(true)}
>
Advanced
diff --git a/web/components/bets-list.tsx b/web/components/bets-list.tsx
index 5a95f22f..0ba90c54 100644
--- a/web/components/bets-list.tsx
+++ b/web/components/bets-list.tsx
@@ -2,7 +2,6 @@ import Link from 'next/link'
import { keyBy, groupBy, mapValues, sortBy, partition, sumBy } from 'lodash'
import dayjs from 'dayjs'
import { useMemo, useState } from 'react'
-import clsx from 'clsx'
import { ChevronDownIcon, ChevronUpIcon } from '@heroicons/react/solid'
import { Bet } from 'web/lib/firebase/bets'
@@ -599,8 +598,8 @@ function SellButton(props: {
return (
{
diff --git a/web/components/button.tsx b/web/components/button.tsx
index ea9a3e88..51e25ea1 100644
--- a/web/components/button.tsx
+++ b/web/components/button.tsx
@@ -46,21 +46,27 @@ export function Button(props: {
- updateOpen(true)}
+ disabled={openModalBtn.disabled}
+ color={openModalBtn.color}
+ size={openModalBtn.size}
>
{openModalBtn.icon}
{openModalBtn.label}
-
+
)
}
@@ -84,18 +91,25 @@ export function ResolveConfirmationButton(props: {
isSubmitting: boolean
openModalButtonClass?: string
submitButtonClass?: string
+ color?: ColorType
+ disabled?: boolean
}) {
- const { onResolve, isSubmitting, openModalButtonClass, submitButtonClass } =
- props
+ const {
+ onResolve,
+ isSubmitting,
+ openModalButtonClass,
+ submitButtonClass,
+ color,
+ disabled,
+ } = props
return (
Resolve market
-
Outcome
-
{outcome === 'YES' ? (
<>
@@ -123,16 +108,23 @@ export function ResolutionPanel(props: {
<>Resolving this market will immediately pay out {BETTORS}.
)}
-
{error}
}
-
{isSubmitting
? 'Submitting...'
: amount
? `Wager ${formatMoney(amount)}`
: 'Wager'}
-
+
)
}
return (
diff --git a/web/components/yes-no-selector.tsx b/web/components/yes-no-selector.tsx
index f73cdef2..10a58a42 100644
--- a/web/components/yes-no-selector.tsx
+++ b/web/components/yes-no-selector.tsx
@@ -213,7 +213,7 @@ export function NumberCancelSelector(props: {
return (
onSelect('NUMBER')}
className={clsx('whitespace-nowrap', btnClassName)}
>
@@ -244,7 +244,7 @@ function Button(props: {
type="button"
className={clsx(
'inline-flex flex-1 items-center justify-center rounded-md border border-transparent px-8 py-3 font-medium shadow-sm',
- color === 'green' && 'btn-primary text-white',
+ color === 'green' && 'bg-teal-500 bg-teal-600 text-white',
color === 'red' && 'bg-red-400 text-white hover:bg-red-500',
color === 'yellow' && 'bg-yellow-400 text-white hover:bg-yellow-500',
color === 'blue' && 'bg-blue-400 text-white hover:bg-blue-500',
diff --git a/web/pages/profile.tsx b/web/pages/profile.tsx
index caa9f47a..5773f30f 100644
--- a/web/pages/profile.tsx
+++ b/web/pages/profile.tsx
@@ -218,9 +218,10 @@ export default function ProfilePage(props: {
/>
Date: Thu, 29 Sep 2022 22:45:31 -0700
Subject: [PATCH 007/101] Keep tooltip within bounds of chart (well, for non-FR
charts) (#970)
---
web/components/charts/helpers.tsx | 53 ++++++++++++++++++++++++-------
1 file changed, 42 insertions(+), 11 deletions(-)
diff --git a/web/components/charts/helpers.tsx b/web/components/charts/helpers.tsx
index ea436213..b7948298 100644
--- a/web/components/charts/helpers.tsx
+++ b/web/components/charts/helpers.tsx
@@ -25,6 +25,8 @@ export type YScale = P extends Point ? AxisScale : never
export const MARGIN = { top: 20, right: 10, bottom: 20, left: 40 }
export const MARGIN_X = MARGIN.right + MARGIN.left
export const MARGIN_Y = MARGIN.top + MARGIN.bottom
+const MARGIN_STYLE = `${MARGIN.top}px ${MARGIN.right}px ${MARGIN.bottom}px ${MARGIN.left}px`
+const MARGIN_XFORM = `translate(${MARGIN.left}, ${MARGIN.top})`
export const XAxis = (props: { w: number; h: number; axis: Axis }) => {
const { h, axis } = props
@@ -128,7 +130,7 @@ export const SVGChart = >(props: {
Tooltip?: TooltipComponent
}) => {
const { children, w, h, xAxis, yAxis, onMouseOver, onSelect, Tooltip } = props
- const [mouseState, setMouseState] = useState()
+ const [mouseState, setMouseState] = useState<{ pos: TooltipPosition; p: P }>()
const overlayRef = useRef(null)
const innerW = w - MARGIN_X
const innerH = h - MARGIN_Y
@@ -170,7 +172,8 @@ export const SVGChart = >(props: {
const [mouseX, mouseY] = pointer(ev)
const p = onMouseOver(mouseX, mouseY)
if (p != null) {
- setMouseState({ top: mouseY - 10, left: mouseX + 60, p })
+ const pos = getTooltipPosition(mouseX, mouseY, innerW, innerH)
+ setMouseState({ pos, p })
} else {
setMouseState(undefined)
}
@@ -184,15 +187,15 @@ export const SVGChart = >(props: {
return (
{mouseState && Tooltip && (
-
+
)}
-
+
-
+
{children}
@@ -214,20 +217,48 @@ export const SVGChart = >(props: {
)
}
+export type TooltipPosition = {
+ top?: number
+ right?: number
+ bottom?: number
+ left?: number
+}
+
+export const getTooltipPosition = (
+ mouseX: number,
+ mouseY: number,
+ w: number,
+ h: number
+) => {
+ const result: TooltipPosition = {}
+ if (mouseX <= (3 * w) / 4) {
+ result.left = mouseX + 10 // in the left three quarters
+ } else {
+ result.right = w - mouseX + 10 // in the right quarter
+ }
+ if (mouseY <= h / 4) {
+ result.top = mouseY + 10 // in the top quarter
+ } else {
+ result.bottom = h - mouseY + 10 // in the bottom three quarters
+ }
+ return result
+}
+
export type TooltipProps = { p: P; xScale: XScale
}
export type TooltipComponent
= React.ComponentType>
-export type TooltipPosition = { top: number; left: number }
-export const TooltipContainer = (
- props: TooltipPosition & { className?: string; children: React.ReactNode }
-) => {
- const { top, left, className, children } = props
+export const TooltipContainer = (props: {
+ pos: TooltipPosition
+ className?: string
+ children: React.ReactNode
+}) => {
+ const { pos, className, children } = props
return (
{children}
From 7e91133229e176527e06bed3fa3d3ceacd3e2c5d Mon Sep 17 00:00:00 2001
From: Marshall Polaris
Date: Thu, 29 Sep 2022 22:45:51 -0700
Subject: [PATCH 008/101] Change styles on contract tooltips to be more like
portfolio graph (#966)
---
web/components/charts/contract/binary.tsx | 6 ++--
web/components/charts/contract/choice.tsx | 34 ++++++++++++++++---
web/components/charts/contract/numeric.tsx | 7 ++--
.../charts/contract/pseudo-numeric.tsx | 6 ++--
web/components/charts/helpers.tsx | 24 +------------
5 files changed, 40 insertions(+), 37 deletions(-)
diff --git a/web/components/charts/contract/binary.tsx b/web/components/charts/contract/binary.tsx
index a6ba9bee..264e1e3b 100644
--- a/web/components/charts/contract/binary.tsx
+++ b/web/components/charts/contract/binary.tsx
@@ -34,10 +34,10 @@ const BinaryChartTooltip = (props: TooltipProps>) => {
const { x, y, datum } = p
const [start, end] = xScale.domain()
return (
-
+
{datum && {formatPct(y)}
- {formatDateInRange(x, start, end)}
+ {formatDateInRange(x, start, end)}
+ {formatPct(y)}
)
}
diff --git a/web/components/charts/contract/choice.tsx b/web/components/charts/contract/choice.tsx
index 127e7d9c..1908f98f 100644
--- a/web/components/charts/contract/choice.tsx
+++ b/web/components/charts/contract/choice.tsx
@@ -9,7 +9,6 @@ import { getOutcomeProbability } from 'common/calculate'
import { useIsMobile } from 'web/hooks/use-is-mobile'
import { DAY_MS } from 'common/util/time'
import {
- Legend,
TooltipProps,
MARGIN_X,
MARGIN_Y,
@@ -121,6 +120,29 @@ const getBetPoints = (answers: Answer[], bets: Bet[]) => {
return points
}
+type LegendItem = { color: string; label: string; value?: string }
+const Legend = (props: { className?: string; items: LegendItem[] }) => {
+ const { items, className } = props
+ return (
+
+ {items.map((item) => (
+
+
+
+ {item.label}
+
+
+ {item.value}
+
+ ))}
+
+ )
+}
+
export const ChoiceContractChart = (props: {
contract: FreeResponseContract | MultipleChoiceContract
bets: Bet[]
@@ -173,13 +195,15 @@ export const ChoiceContractChart = (props: {
(item) => -item.p
).slice(0, 10)
return (
-
+ <>
{datum && {formatDateInRange(x, start, end)}
+
+ {formatDateInRange(x, start, end)}
+
-
-
) => {
const { x, y } = props.p
return (
-
- {formatPct(y, 2)} {formatLargeNumber(x)}
-
+ <>
+ {formatLargeNumber(x)}
+ {formatPct(y, 2)}
+
)
}
diff --git a/web/components/charts/contract/pseudo-numeric.tsx b/web/components/charts/contract/pseudo-numeric.tsx
index 1232a96c..adf2e493 100644
--- a/web/components/charts/contract/pseudo-numeric.tsx
+++ b/web/components/charts/contract/pseudo-numeric.tsx
@@ -46,10 +46,10 @@ const PseudoNumericChartTooltip = (props: TooltipProps>) => {
const { x, y, datum } = p
const [start, end] = xScale.domain()
return (
-
+
{datum && {formatLargeNumber(y)}
- {formatDateInRange(x, start, end)}
+ {formatDateInRange(x, start, end)}
+ {formatLargeNumber(y)}
)
}
diff --git a/web/components/charts/helpers.tsx b/web/components/charts/helpers.tsx
index b7948298..acd88a4f 100644
--- a/web/components/charts/helpers.tsx
+++ b/web/components/charts/helpers.tsx
@@ -16,7 +16,6 @@ import dayjs from 'dayjs'
import clsx from 'clsx'
import { Contract } from 'common/contract'
-import { Row } from 'web/components/layout/row'
export type Point = { x: X; y: Y; datum?: T }
export type XScale = P extends Point ? AxisScale : never
@@ -256,7 +255,7 @@ export const TooltipContainer = (props: {
@@ -265,27 +264,6 @@ export const TooltipContainer = (props: {
)
}
-export type LegendItem = { color: string; label: string; value?: string }
-export const Legend = (props: { className?: string; items: LegendItem[] }) => {
- const { items, className } = props
- return (
-
- {items.map((item) => (
-
-
- {item.label}
-
- {item.value}
-
- ))}
-
- )
-}
-
export const getDateRange = (contract: Contract) => {
const { createdTime, closeTime, resolutionTime } = contract
const isClosed = !!closeTime && Date.now() > closeTime
From f892c92e262d027f6198d75c21bc0eafad7b0085 Mon Sep 17 00:00:00 2001
From: James Grugett
Date: Fri, 30 Sep 2022 01:11:04 -0500
Subject: [PATCH 009/101] Save portfolio sort and filter to local storage!
---
web/components/bets-list.tsx | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/web/components/bets-list.tsx b/web/components/bets-list.tsx
index 0ba90c54..c2773741 100644
--- a/web/components/bets-list.tsx
+++ b/web/components/bets-list.tsx
@@ -45,6 +45,11 @@ import { UserLink } from 'web/components/user-link'
import { useUserBetContracts } from 'web/hooks/use-contracts'
import { BetsSummary } from './bet-summary'
import { ProfitBadge } from './profit-badge'
+import {
+ storageStore,
+ usePersistentState,
+} from 'web/hooks/use-persistent-state'
+import { safeLocalStorage } from 'web/lib/util/local'
type BetSort = 'newest' | 'profit' | 'closeTime' | 'value'
type BetFilter = 'open' | 'limit_bet' | 'sold' | 'closed' | 'resolved' | 'all'
@@ -75,8 +80,14 @@ export function BetsList(props: { user: User }) {
return contractList ? keyBy(contractList, 'id') : undefined
}, [contractList])
- const [sort, setSort] = useState('newest')
- const [filter, setFilter] = useState('all')
+ const [sort, setSort] = usePersistentState('newest', {
+ key: 'bets-list-sort',
+ store: storageStore(safeLocalStorage()),
+ })
+ const [filter, setFilter] = usePersistentState('all', {
+ key: 'bets-list-filter',
+ store: storageStore(safeLocalStorage()),
+ })
const [page, setPage] = useState(0)
const start = page * CONTRACTS_PER_PAGE
const end = start + CONTRACTS_PER_PAGE
From 95c47aba1afc1a2e4eeb22d83525eda71b53c870 Mon Sep 17 00:00:00 2001
From: mantikoros
Date: Fri, 30 Sep 2022 01:30:45 -0500
Subject: [PATCH 010/101] midterms: add CO, additional markets
---
web/pages/midterms.tsx | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/web/pages/midterms.tsx b/web/pages/midterms.tsx
index 1ae72f7a..d508743c 100644
--- a/web/pages/midterms.tsx
+++ b/web/pages/midterms.tsx
@@ -67,6 +67,12 @@ const senateMidterms: StateElectionMarket[] = [
slug: 'will-mike-lee-win-the-2022-utah-sen',
isWinRepublican: true,
},
+ {
+ state: 'CO',
+ creatorUsername: 'SG',
+ slug: 'will-michael-bennet-win-the-2022-co',
+ isWinRepublican: false,
+ },
]
const App = () => {
@@ -84,6 +90,25 @@ const App = () => {
height={400}
className="mt-8"
>
+
+ Related markets
+
+
+
)
From 608ee7b865d85d11d9e4f3e86428658a3dfc191c Mon Sep 17 00:00:00 2001
From: Marshall Polaris
Date: Fri, 30 Sep 2022 00:03:31 -0700
Subject: [PATCH 011/101] Chart visual style adjustment (#971)
* Adjust area fill opacity on line charts
* Light gray border on tooltips
---
web/components/charts/helpers.tsx | 4 ++--
web/components/portfolio/portfolio-value-graph.tsx | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/web/components/charts/helpers.tsx b/web/components/charts/helpers.tsx
index acd88a4f..ba9865b2 100644
--- a/web/components/charts/helpers.tsx
+++ b/web/components/charts/helpers.tsx
@@ -111,7 +111,7 @@ export const AreaWithTopStroke = (props: {
py1={py1}
curve={curve}
fill={color}
- opacity={0.3}
+ opacity={0.2}
/>
diff --git a/web/components/portfolio/portfolio-value-graph.tsx b/web/components/portfolio/portfolio-value-graph.tsx
index 6ed5d195..e329457d 100644
--- a/web/components/portfolio/portfolio-value-graph.tsx
+++ b/web/components/portfolio/portfolio-value-graph.tsx
@@ -105,7 +105,7 @@ export const PortfolioValueGraph = memo(function PortfolioValueGraph(props: {
sliceTooltip={({ slice }) => {
handleGraphDisplayChange(slice.points[0].data.yFormatted)
return (
-
+
Date: Fri, 30 Sep 2022 00:05:36 -0700
Subject: [PATCH 012/101] Fix default sizes on charts to make more sense
---
web/components/charts/contract/binary.tsx | 2 +-
web/components/charts/contract/choice.tsx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/web/components/charts/contract/binary.tsx b/web/components/charts/contract/binary.tsx
index 264e1e3b..a3f04a29 100644
--- a/web/components/charts/contract/binary.tsx
+++ b/web/components/charts/contract/binary.tsx
@@ -70,7 +70,7 @@ export const BinaryContractChart = (props: {
const isMobile = useIsMobile(800)
const containerRef = useRef
(null)
const width = useElementWidth(containerRef) ?? 0
- const height = props.height ?? (isMobile ? 250 : 350)
+ const height = props.height ?? (isMobile ? 150 : 250)
const xScale = scaleTime(visibleRange, [0, width - MARGIN_X])
const yScale = scaleLinear([0, 1], [height - MARGIN_Y, 0])
diff --git a/web/components/charts/contract/choice.tsx b/web/components/charts/contract/choice.tsx
index 1908f98f..7c9ec07a 100644
--- a/web/components/charts/contract/choice.tsx
+++ b/web/components/charts/contract/choice.tsx
@@ -176,7 +176,7 @@ export const ChoiceContractChart = (props: {
const isMobile = useIsMobile(800)
const containerRef = useRef(null)
const width = useElementWidth(containerRef) ?? 0
- const height = props.height ?? (isMobile ? 150 : 250)
+ const height = props.height ?? (isMobile ? 250 : 350)
const xScale = scaleTime(visibleRange, [0, width - MARGIN_X])
const yScale = scaleLinear([0, 1], [height - MARGIN_Y, 0])
From c16e5189f71207895164465f58263a70ead9e78f Mon Sep 17 00:00:00 2001
From: Ian Philips
Date: Fri, 30 Sep 2022 07:53:47 -0600
Subject: [PATCH 013/101] Don't send portfolio email to user less than 5 days
old
---
functions/src/weekly-portfolio-emails.ts | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/functions/src/weekly-portfolio-emails.ts b/functions/src/weekly-portfolio-emails.ts
index 0167be35..ab46c5f1 100644
--- a/functions/src/weekly-portfolio-emails.ts
+++ b/functions/src/weekly-portfolio-emails.ts
@@ -117,7 +117,8 @@ export async function sendPortfolioUpdateEmailsToAllUsers() {
await Promise.all(
privateUsersToSendEmailsTo.map(async (privateUser) => {
const user = await getUser(privateUser.id)
- if (!user) return
+ // Don't send to a user unless they're over 5 days old
+ if (!user || user.createdTime > Date.now() - 5 * DAY_MS) return
const userBets = usersBets[privateUser.id] as Bet[]
const contractsUserBetOn = contractsUsersBetOn.filter((contract) =>
userBets.some((bet) => bet.contractId === contract.id)
From 138f34fc666a8e18a5d2222980e0139ab20684c2 Mon Sep 17 00:00:00 2001
From: Ian Philips
Date: Fri, 30 Sep 2022 08:40:46 -0600
Subject: [PATCH 014/101] Add close now button to contract edit time
---
web/components/contract/contract-details.tsx | 28 ++++++++++++++------
1 file changed, 20 insertions(+), 8 deletions(-)
diff --git a/web/components/contract/contract-details.tsx b/web/components/contract/contract-details.tsx
index 3525b9f9..fc4bcfcf 100644
--- a/web/components/contract/contract-details.tsx
+++ b/web/components/contract/contract-details.tsx
@@ -356,18 +356,22 @@ function EditableCloseDate(props: {
closeTime && dayJsCloseTime.format('HH:mm')
)
- const newCloseTime = closeDate
- ? dayjs(`${closeDate}T${closeHoursMinutes}`).valueOf()
- : undefined
-
const isSameYear = dayJsCloseTime.isSame(dayJsNow, 'year')
const isSameDay = dayJsCloseTime.isSame(dayJsNow, 'day')
- const onSave = () => {
+ let newCloseTime = closeDate
+ ? dayjs(`${closeDate}T${closeHoursMinutes}`).valueOf()
+ : undefined
+ function onSave(customTime?: number) {
+ if (customTime) {
+ newCloseTime = customTime
+ setCloseDate(dayjs(newCloseTime).format('YYYY-MM-DD'))
+ setCloseHoursMinutes(dayjs(newCloseTime).format('HH:mm'))
+ }
if (!newCloseTime) return
if (newCloseTime === closeTime) setIsEditingCloseTime(false)
- else if (newCloseTime > Date.now()) {
+ else {
const content = contract.description
const formattedCloseDate = dayjs(newCloseTime).format('YYYY-MM-DD h:mm a')
@@ -416,13 +420,21 @@ function EditableCloseDate(props: {
/>
onSave()}
>
Done
+ onSave(Date.now())}
+ >
+ Close Now
+
Date: Fri, 30 Sep 2022 08:48:33 -0600
Subject: [PATCH 015/101] Remove green circle from resolution prob input
---
web/components/probability-selector.tsx | 14 ++-------
web/components/resolution-panel.tsx | 41 ++++++++++++++-----------
2 files changed, 26 insertions(+), 29 deletions(-)
diff --git a/web/components/probability-selector.tsx b/web/components/probability-selector.tsx
index 2fc03787..b13dcfd9 100644
--- a/web/components/probability-selector.tsx
+++ b/web/components/probability-selector.tsx
@@ -8,12 +8,12 @@ export function ProbabilitySelector(props: {
const { probabilityInt, setProbabilityInt, isSubmitting } = props
return (
-
-
+
+
%
-
)
}
diff --git a/web/components/resolution-panel.tsx b/web/components/resolution-panel.tsx
index b3237eb4..f39284a5 100644
--- a/web/components/resolution-panel.tsx
+++ b/web/components/resolution-panel.tsx
@@ -11,6 +11,8 @@ import { ProbabilitySelector } from './probability-selector'
import { getProbability } from 'common/calculate'
import { BinaryContract, resolution } from 'common/contract'
import { BETTOR, BETTORS, PAST_BETS } from 'common/user'
+import { Row } from 'web/components/layout/row'
+import { capitalize } from 'lodash'
export function ResolutionPanel(props: {
isAdmin: boolean
@@ -94,9 +96,10 @@ export function ResolutionPanel(props: {
withdrawn from your account
) : outcome === 'MKT' ? (
-
- {PAST_BETS} will be paid out at the probability you specify:
+ {capitalize(PAST_BETS)} will be paid out at the probability you
+ specify:
{error}
}
-
+
)
}
From a90b7656703a7e167c6e023044fb2ab387bca612 Mon Sep 17 00:00:00 2001
From: Ian Philips
Date: Fri, 30 Sep 2022 09:27:42 -0600
Subject: [PATCH 016/101] Bounty comments (#944)
* Adding, awarding, and sorting by bounties
* Add notification for bounty award as tip
* Fix merge
* Wording
* Allow adding in batches of m250
* import
* imports
* Style tabs
* Refund unused bounties
* Show curreantly available, reset open to 0
* Refactor
* Rerun check prs
* reset yarn.lock
* Revert "reset yarn.lock"
This reverts commit 4606984276821f403efd5ef7e1eca45b19ee4081.
* undo yarn.lock changes
* Track comment bounties
---
common/comment.ts | 1 +
common/contract.ts | 1 +
common/economy.ts | 1 +
common/envs/prod.ts | 1 +
common/txn.ts | 33 ++++
functions/src/create-notification.ts | 44 +++++
functions/src/index.ts | 6 +
functions/src/on-update-contract.ts | 134 +++++++++++----
functions/src/serve.ts | 3 +
functions/src/update-comment-bounty.ts | 162 ++++++++++++++++++
web/components/award-bounty-button.tsx | 46 +++++
.../contract/add-comment-bounty.tsx | 74 ++++++++
.../contract/bountied-contract-badge.tsx | 9 +
web/components/contract/contract-details.tsx | 3 +
.../contract/contract-info-dialog.tsx | 6 +-
web/components/contract/contract-tabs.tsx | 58 ++++++-
.../liquidity-bounty-panel.tsx} | 63 ++++---
web/components/feed/feed-comments.tsx | 29 +++-
web/components/layout/tabs.tsx | 22 ++-
web/components/tipper.tsx | 4 +-
web/components/user-page.tsx | 6 +-
web/lib/firebase/api.ts | 8 +
web/lib/firebase/comments.ts | 27 ++-
web/package.json | 2 +-
24 files changed, 648 insertions(+), 95 deletions(-)
create mode 100644 functions/src/update-comment-bounty.ts
create mode 100644 web/components/award-bounty-button.tsx
create mode 100644 web/components/contract/add-comment-bounty.tsx
create mode 100644 web/components/contract/bountied-contract-badge.tsx
rename web/components/{liquidity-panel.tsx => contract/liquidity-bounty-panel.tsx} (77%)
diff --git a/common/comment.ts b/common/comment.ts
index cdb62fd3..71c04af4 100644
--- a/common/comment.ts
+++ b/common/comment.ts
@@ -18,6 +18,7 @@ export type Comment = {
userName: string
userUsername: string
userAvatarUrl?: string
+ bountiesAwarded?: number
} & T
export type OnContract = {
diff --git a/common/contract.ts b/common/contract.ts
index 248c9745..2e9d94c4 100644
--- a/common/contract.ts
+++ b/common/contract.ts
@@ -62,6 +62,7 @@ export type Contract = {
featuredOnHomeRank?: number
likedByUserIds?: string[]
likedByUserCount?: number
+ openCommentBounties?: number
} & T
export type BinaryContract = Contract & Binary
diff --git a/common/economy.ts b/common/economy.ts
index 7ec52b30..d25a0c71 100644
--- a/common/economy.ts
+++ b/common/economy.ts
@@ -15,3 +15,4 @@ export const BETTING_STREAK_BONUS_AMOUNT =
export const BETTING_STREAK_BONUS_MAX = econ?.BETTING_STREAK_BONUS_MAX ?? 50
export const BETTING_STREAK_RESET_HOUR = econ?.BETTING_STREAK_RESET_HOUR ?? 7
export const FREE_MARKETS_PER_USER_MAX = econ?.FREE_MARKETS_PER_USER_MAX ?? 5
+export const COMMENT_BOUNTY_AMOUNT = econ?.COMMENT_BOUNTY_AMOUNT ?? 250
diff --git a/common/envs/prod.ts b/common/envs/prod.ts
index d0469d84..38dd4feb 100644
--- a/common/envs/prod.ts
+++ b/common/envs/prod.ts
@@ -41,6 +41,7 @@ export type Economy = {
BETTING_STREAK_BONUS_MAX?: number
BETTING_STREAK_RESET_HOUR?: number
FREE_MARKETS_PER_USER_MAX?: number
+ COMMENT_BOUNTY_AMOUNT?: number
}
type FirebaseConfig = {
diff --git a/common/txn.ts b/common/txn.ts
index 2b7a32e8..c404059d 100644
--- a/common/txn.ts
+++ b/common/txn.ts
@@ -8,6 +8,7 @@ type AnyTxnType =
| UniqueBettorBonus
| BettingStreakBonus
| CancelUniqueBettorBonus
+ | CommentBountyRefund
type SourceType = 'USER' | 'CONTRACT' | 'CHARITY' | 'BANK'
export type Txn = {
@@ -31,6 +32,8 @@ export type Txn = {
| 'UNIQUE_BETTOR_BONUS'
| 'BETTING_STREAK_BONUS'
| 'CANCEL_UNIQUE_BETTOR_BONUS'
+ | 'COMMENT_BOUNTY'
+ | 'REFUND_COMMENT_BOUNTY'
// Any extra data
data?: { [key: string]: any }
@@ -98,6 +101,34 @@ type CancelUniqueBettorBonus = {
}
}
+type CommentBountyDeposit = {
+ fromType: 'USER'
+ toType: 'BANK'
+ category: 'COMMENT_BOUNTY'
+ data: {
+ contractId: string
+ }
+}
+
+type CommentBountyWithdrawal = {
+ fromType: 'BANK'
+ toType: 'USER'
+ category: 'COMMENT_BOUNTY'
+ data: {
+ contractId: string
+ commentId: string
+ }
+}
+
+type CommentBountyRefund = {
+ fromType: 'BANK'
+ toType: 'USER'
+ category: 'REFUND_COMMENT_BOUNTY'
+ data: {
+ contractId: string
+ }
+}
+
export type DonationTxn = Txn & Donation
export type TipTxn = Txn & Tip
export type ManalinkTxn = Txn & Manalink
@@ -105,3 +136,5 @@ export type ReferralTxn = Txn & Referral
export type BettingStreakBonusTxn = Txn & BettingStreakBonus
export type UniqueBettorBonusTxn = Txn & UniqueBettorBonus
export type CancelUniqueBettorBonusTxn = Txn & CancelUniqueBettorBonus
+export type CommentBountyDepositTxn = Txn & CommentBountyDeposit
+export type CommentBountyWithdrawalTxn = Txn & CommentBountyWithdrawal
diff --git a/functions/src/create-notification.ts b/functions/src/create-notification.ts
index 038e0142..9bd73d05 100644
--- a/functions/src/create-notification.ts
+++ b/functions/src/create-notification.ts
@@ -1046,3 +1046,47 @@ export const createContractResolvedNotifications = async (
)
)
}
+
+export const createBountyNotification = async (
+ fromUser: User,
+ toUserId: string,
+ amount: number,
+ idempotencyKey: string,
+ contract: Contract,
+ commentId?: string
+) => {
+ const privateUser = await getPrivateUser(toUserId)
+ if (!privateUser) return
+ const { sendToBrowser } = getNotificationDestinationsForUser(
+ privateUser,
+ 'tip_received'
+ )
+ if (!sendToBrowser) return
+
+ const slug = commentId
+ const notificationRef = firestore
+ .collection(`/users/${toUserId}/notifications`)
+ .doc(idempotencyKey)
+ const notification: Notification = {
+ id: idempotencyKey,
+ userId: toUserId,
+ reason: 'tip_received',
+ createdTime: Date.now(),
+ isSeen: false,
+ sourceId: commentId ? commentId : contract.id,
+ sourceType: 'tip',
+ sourceUpdateType: 'created',
+ sourceUserName: fromUser.name,
+ sourceUserUsername: fromUser.username,
+ sourceUserAvatarUrl: fromUser.avatarUrl,
+ sourceText: amount.toString(),
+ sourceContractCreatorUsername: contract.creatorUsername,
+ sourceContractTitle: contract.question,
+ sourceContractSlug: contract.slug,
+ sourceSlug: slug,
+ sourceTitle: contract.question,
+ }
+ return await notificationRef.set(removeUndefinedProps(notification))
+
+ // maybe TODO: send email notification to comment creator
+}
diff --git a/functions/src/index.ts b/functions/src/index.ts
index 9a8ec232..f5c45004 100644
--- a/functions/src/index.ts
+++ b/functions/src/index.ts
@@ -52,6 +52,7 @@ export * from './unsubscribe'
export * from './stripe'
export * from './mana-bonus-email'
export * from './close-market'
+export * from './update-comment-bounty'
import { health } from './health'
import { transact } from './transact'
@@ -65,6 +66,7 @@ import { sellshares } from './sell-shares'
import { claimmanalink } from './claim-manalink'
import { createmarket } from './create-market'
import { addliquidity } from './add-liquidity'
+import { addcommentbounty, awardcommentbounty } from './update-comment-bounty'
import { withdrawliquidity } from './withdraw-liquidity'
import { creategroup } from './create-group'
import { resolvemarket } from './resolve-market'
@@ -91,6 +93,8 @@ const sellSharesFunction = toCloudFunction(sellshares)
const claimManalinkFunction = toCloudFunction(claimmanalink)
const createMarketFunction = toCloudFunction(createmarket)
const addLiquidityFunction = toCloudFunction(addliquidity)
+const addCommentBounty = toCloudFunction(addcommentbounty)
+const awardCommentBounty = toCloudFunction(awardcommentbounty)
const withdrawLiquidityFunction = toCloudFunction(withdrawliquidity)
const createGroupFunction = toCloudFunction(creategroup)
const resolveMarketFunction = toCloudFunction(resolvemarket)
@@ -127,4 +131,6 @@ export {
acceptChallenge as acceptchallenge,
createPostFunction as createpost,
saveTwitchCredentials as savetwitchcredentials,
+ addCommentBounty as addcommentbounty,
+ awardCommentBounty as awardcommentbounty,
}
diff --git a/functions/src/on-update-contract.ts b/functions/src/on-update-contract.ts
index 5e2a94c0..d667f0d2 100644
--- a/functions/src/on-update-contract.ts
+++ b/functions/src/on-update-contract.ts
@@ -1,44 +1,118 @@
import * as functions from 'firebase-functions'
-import { getUser } from './utils'
+import { getUser, getValues, log } from './utils'
import { createCommentOrAnswerOrUpdatedContractNotification } from './create-notification'
import { Contract } from '../../common/contract'
+import { Txn } from '../../common/txn'
+import { partition, sortBy } from 'lodash'
+import { runTxn, TxnData } from './transact'
+import * as admin from 'firebase-admin'
export const onUpdateContract = functions.firestore
.document('contracts/{contractId}')
.onUpdate(async (change, context) => {
const contract = change.after.data() as Contract
+ const previousContract = change.before.data() as Contract
const { eventId } = context
-
- const contractUpdater = await getUser(contract.creatorId)
- if (!contractUpdater) throw new Error('Could not find contract updater')
-
- const previousValue = change.before.data() as Contract
-
- // Resolution is handled in resolve-market.ts
- if (!previousValue.isResolved && contract.isResolved) return
+ const { openCommentBounties, closeTime, question } = contract
if (
- previousValue.closeTime !== contract.closeTime ||
- previousValue.question !== contract.question
+ !previousContract.isResolved &&
+ contract.isResolved &&
+ (openCommentBounties ?? 0) > 0
) {
- let sourceText = ''
- if (
- previousValue.closeTime !== contract.closeTime &&
- contract.closeTime
- ) {
- sourceText = contract.closeTime.toString()
- } else if (previousValue.question !== contract.question) {
- sourceText = contract.question
- }
-
- await createCommentOrAnswerOrUpdatedContractNotification(
- contract.id,
- 'contract',
- 'updated',
- contractUpdater,
- eventId,
- sourceText,
- contract
- )
+ await handleUnusedCommentBountyRefunds(contract)
+ // No need to notify users of resolution, that's handled in resolve-market
+ return
+ }
+ if (
+ previousContract.closeTime !== closeTime ||
+ previousContract.question !== question
+ ) {
+ await handleUpdatedCloseTime(previousContract, contract, eventId)
}
})
+
+async function handleUpdatedCloseTime(
+ previousContract: Contract,
+ contract: Contract,
+ eventId: string
+) {
+ const contractUpdater = await getUser(contract.creatorId)
+ if (!contractUpdater) throw new Error('Could not find contract updater')
+ let sourceText = ''
+ if (previousContract.closeTime !== contract.closeTime && contract.closeTime) {
+ sourceText = contract.closeTime.toString()
+ } else if (previousContract.question !== contract.question) {
+ sourceText = contract.question
+ }
+
+ await createCommentOrAnswerOrUpdatedContractNotification(
+ contract.id,
+ 'contract',
+ 'updated',
+ contractUpdater,
+ eventId,
+ sourceText,
+ contract
+ )
+}
+
+async function handleUnusedCommentBountyRefunds(contract: Contract) {
+ const outstandingCommentBounties = await getValues(
+ firestore.collection('txns').where('category', '==', 'COMMENT_BOUNTY')
+ )
+
+ const commentBountiesOnThisContract = sortBy(
+ outstandingCommentBounties.filter(
+ (bounty) => bounty.data?.contractId === contract.id
+ ),
+ (bounty) => bounty.createdTime
+ )
+
+ const [toBank, fromBank] = partition(
+ commentBountiesOnThisContract,
+ (bounty) => bounty.toType === 'BANK'
+ )
+ if (toBank.length <= fromBank.length) return
+
+ await firestore
+ .collection('contracts')
+ .doc(contract.id)
+ .update({ openCommentBounties: 0 })
+
+ const refunds = toBank.slice(fromBank.length)
+ await Promise.all(
+ refunds.map(async (extraBountyTxn) => {
+ const result = await firestore.runTransaction(async (trans) => {
+ const bonusTxn: TxnData = {
+ fromId: extraBountyTxn.toId,
+ fromType: 'BANK',
+ toId: extraBountyTxn.fromId,
+ toType: 'USER',
+ amount: extraBountyTxn.amount,
+ token: 'M$',
+ category: 'REFUND_COMMENT_BOUNTY',
+ data: {
+ contractId: contract.id,
+ },
+ }
+ return await runTxn(trans, bonusTxn)
+ })
+
+ if (result.status != 'success' || !result.txn) {
+ log(
+ `Couldn't refund bonus for user: ${extraBountyTxn.fromId} - status:`,
+ result.status
+ )
+ log('message:', result.message)
+ } else {
+ log(
+ `Refund bonus txn for user: ${extraBountyTxn.fromId} completed:`,
+ result.txn?.id
+ )
+ }
+ })
+ )
+}
+
+const firestore = admin.firestore()
diff --git a/functions/src/serve.ts b/functions/src/serve.ts
index 99ac6281..d861dcbc 100644
--- a/functions/src/serve.ts
+++ b/functions/src/serve.ts
@@ -29,6 +29,7 @@ import { getcurrentuser } from './get-current-user'
import { createpost } from './create-post'
import { savetwitchcredentials } from './save-twitch-credentials'
import { testscheduledfunction } from './test-scheduled-function'
+import { addcommentbounty, awardcommentbounty } from './update-comment-bounty'
type Middleware = (req: Request, res: Response, next: NextFunction) => void
const app = express()
@@ -61,6 +62,8 @@ addJsonEndpointRoute('/sellshares', sellshares)
addJsonEndpointRoute('/claimmanalink', claimmanalink)
addJsonEndpointRoute('/createmarket', createmarket)
addJsonEndpointRoute('/addliquidity', addliquidity)
+addJsonEndpointRoute('/addCommentBounty', addcommentbounty)
+addJsonEndpointRoute('/awardCommentBounty', awardcommentbounty)
addJsonEndpointRoute('/withdrawliquidity', withdrawliquidity)
addJsonEndpointRoute('/creategroup', creategroup)
addJsonEndpointRoute('/resolvemarket', resolvemarket)
diff --git a/functions/src/update-comment-bounty.ts b/functions/src/update-comment-bounty.ts
new file mode 100644
index 00000000..af1d6c0a
--- /dev/null
+++ b/functions/src/update-comment-bounty.ts
@@ -0,0 +1,162 @@
+import * as admin from 'firebase-admin'
+import { z } from 'zod'
+
+import { Contract } from '../../common/contract'
+import { User } from '../../common/user'
+import { removeUndefinedProps } from '../../common/util/object'
+import { APIError, newEndpoint, validate } from './api'
+import {
+ DEV_HOUSE_LIQUIDITY_PROVIDER_ID,
+ HOUSE_LIQUIDITY_PROVIDER_ID,
+} from '../../common/antes'
+import { isProd } from './utils'
+import {
+ CommentBountyDepositTxn,
+ CommentBountyWithdrawalTxn,
+} from '../../common/txn'
+import { runTxn } from './transact'
+import { Comment } from '../../common/comment'
+import { createBountyNotification } from './create-notification'
+
+const bodySchema = z.object({
+ contractId: z.string(),
+ amount: z.number().gt(0),
+})
+const awardBodySchema = z.object({
+ contractId: z.string(),
+ commentId: z.string(),
+ amount: z.number().gt(0),
+})
+
+export const addcommentbounty = newEndpoint({}, async (req, auth) => {
+ const { amount, contractId } = validate(bodySchema, req.body)
+
+ if (!isFinite(amount)) throw new APIError(400, 'Invalid amount')
+
+ // run as transaction to prevent race conditions
+ return await firestore.runTransaction(async (transaction) => {
+ const userDoc = firestore.doc(`users/${auth.uid}`)
+ const userSnap = await transaction.get(userDoc)
+ if (!userSnap.exists) throw new APIError(400, 'User not found')
+ const user = userSnap.data() as User
+
+ const contractDoc = firestore.doc(`contracts/${contractId}`)
+ const contractSnap = await transaction.get(contractDoc)
+ if (!contractSnap.exists) throw new APIError(400, 'Invalid contract')
+ const contract = contractSnap.data() as Contract
+
+ if (user.balance < amount)
+ throw new APIError(400, 'Insufficient user balance')
+
+ const newCommentBountyTxn = {
+ fromId: user.id,
+ fromType: 'USER',
+ toId: isProd()
+ ? HOUSE_LIQUIDITY_PROVIDER_ID
+ : DEV_HOUSE_LIQUIDITY_PROVIDER_ID,
+ toType: 'BANK',
+ amount,
+ token: 'M$',
+ category: 'COMMENT_BOUNTY',
+ data: {
+ contractId,
+ },
+ description: `Deposit M$${amount} from ${user.id} for comment bounty for contract ${contractId}`,
+ } as CommentBountyDepositTxn
+
+ const result = await runTxn(transaction, newCommentBountyTxn)
+
+ transaction.update(
+ contractDoc,
+ removeUndefinedProps({
+ openCommentBounties: (contract.openCommentBounties ?? 0) + amount,
+ })
+ )
+
+ return result
+ })
+})
+export const awardcommentbounty = newEndpoint({}, async (req, auth) => {
+ const { amount, commentId, contractId } = validate(awardBodySchema, req.body)
+
+ if (!isFinite(amount)) throw new APIError(400, 'Invalid amount')
+
+ // run as transaction to prevent race conditions
+ const res = await firestore.runTransaction(async (transaction) => {
+ const userDoc = firestore.doc(`users/${auth.uid}`)
+ const userSnap = await transaction.get(userDoc)
+ if (!userSnap.exists) throw new APIError(400, 'User not found')
+ const user = userSnap.data() as User
+
+ const contractDoc = firestore.doc(`contracts/${contractId}`)
+ const contractSnap = await transaction.get(contractDoc)
+ if (!contractSnap.exists) throw new APIError(400, 'Invalid contract')
+ const contract = contractSnap.data() as Contract
+
+ if (user.id !== contract.creatorId)
+ throw new APIError(
+ 400,
+ 'Only contract creator can award comment bounties'
+ )
+
+ const commentDoc = firestore.doc(
+ `contracts/${contractId}/comments/${commentId}`
+ )
+ const commentSnap = await transaction.get(commentDoc)
+ if (!commentSnap.exists) throw new APIError(400, 'Invalid comment')
+
+ const comment = commentSnap.data() as Comment
+ const amountAvailable = contract.openCommentBounties ?? 0
+ if (amountAvailable < amount)
+ throw new APIError(400, 'Insufficient open bounty balance')
+
+ const newCommentBountyTxn = {
+ fromId: isProd()
+ ? HOUSE_LIQUIDITY_PROVIDER_ID
+ : DEV_HOUSE_LIQUIDITY_PROVIDER_ID,
+ fromType: 'BANK',
+ toId: comment.userId,
+ toType: 'USER',
+ amount,
+ token: 'M$',
+ category: 'COMMENT_BOUNTY',
+ data: {
+ contractId,
+ commentId,
+ },
+ description: `Withdrawal M$${amount} from BANK for comment ${comment.id} bounty for contract ${contractId}`,
+ } as CommentBountyWithdrawalTxn
+
+ const result = await runTxn(transaction, newCommentBountyTxn)
+
+ await transaction.update(
+ contractDoc,
+ removeUndefinedProps({
+ openCommentBounties: amountAvailable - amount,
+ })
+ )
+ await transaction.update(
+ commentDoc,
+ removeUndefinedProps({
+ bountiesAwarded: (comment.bountiesAwarded ?? 0) + amount,
+ })
+ )
+
+ return { ...result, comment, contract, user }
+ })
+ if (res.txn?.id) {
+ const { comment, contract, user } = res
+ await createBountyNotification(
+ user,
+ comment.userId,
+ amount,
+ res.txn.id,
+ contract,
+ comment.id
+ )
+ }
+
+ return res
+})
+
+const firestore = admin.firestore()
diff --git a/web/components/award-bounty-button.tsx b/web/components/award-bounty-button.tsx
new file mode 100644
index 00000000..7a69cf15
--- /dev/null
+++ b/web/components/award-bounty-button.tsx
@@ -0,0 +1,46 @@
+import clsx from 'clsx'
+import { ContractComment } from 'common/comment'
+import { useUser } from 'web/hooks/use-user'
+import { awardCommentBounty } from 'web/lib/firebase/api'
+import { track } from 'web/lib/service/analytics'
+import { Row } from './layout/row'
+import { Contract } from 'common/contract'
+import { TextButton } from 'web/components/text-button'
+import { COMMENT_BOUNTY_AMOUNT } from 'common/economy'
+import { formatMoney } from 'common/util/format'
+
+export function AwardBountyButton(prop: {
+ comment: ContractComment
+ contract: Contract
+}) {
+ const { comment, contract } = prop
+
+ const me = useUser()
+
+ const submit = () => {
+ const data = {
+ amount: COMMENT_BOUNTY_AMOUNT,
+ commentId: comment.id,
+ contractId: contract.id,
+ }
+
+ awardCommentBounty(data)
+ .then((_) => {
+ console.log('success')
+ track('award comment bounty', data)
+ })
+ .catch((reason) => console.log('Server error:', reason))
+
+ track('award comment bounty', data)
+ }
+
+ const canUp = me && me.id !== comment.userId && contract.creatorId === me.id
+ if (!canUp) return
+ return (
+
+
+ Award {formatMoney(COMMENT_BOUNTY_AMOUNT)}
+
+
+ )
+}
diff --git a/web/components/contract/add-comment-bounty.tsx b/web/components/contract/add-comment-bounty.tsx
new file mode 100644
index 00000000..8b716e71
--- /dev/null
+++ b/web/components/contract/add-comment-bounty.tsx
@@ -0,0 +1,74 @@
+import { Contract } from 'common/contract'
+import { useUser } from 'web/hooks/use-user'
+import { useState } from 'react'
+import { addCommentBounty } from 'web/lib/firebase/api'
+import { track } from 'web/lib/service/analytics'
+import { Row } from 'web/components/layout/row'
+import clsx from 'clsx'
+import { formatMoney } from 'common/util/format'
+import { COMMENT_BOUNTY_AMOUNT } from 'common/economy'
+import { Button } from 'web/components/button'
+
+export function AddCommentBountyPanel(props: { contract: Contract }) {
+ const { contract } = props
+ const { id: contractId, slug } = contract
+
+ const user = useUser()
+ const amount = COMMENT_BOUNTY_AMOUNT
+ const totalAdded = contract.openCommentBounties ?? 0
+ const [error, setError] = useState(undefined)
+ const [isSuccess, setIsSuccess] = useState(false)
+ const [isLoading, setIsLoading] = useState(false)
+
+ const submit = () => {
+ if ((user?.balance ?? 0) < amount) {
+ setError('Insufficient balance')
+ return
+ }
+
+ setIsLoading(true)
+ setIsSuccess(false)
+
+ addCommentBounty({ amount, contractId })
+ .then((_) => {
+ track('offer comment bounty', {
+ amount,
+ contractId,
+ })
+ setIsSuccess(true)
+ setError(undefined)
+ setIsLoading(false)
+ })
+ .catch((_) => setError('Server error'))
+
+ track('add comment bounty', { amount, contractId, slug })
+ }
+
+ return (
+ <>
+
+ Add a {formatMoney(amount)} bounty for good comments that the creator
+ can award.{' '}
+ {totalAdded > 0 && `(${formatMoney(totalAdded)} currently added)`}
+
+
+
+
+ Add {formatMoney(amount)} bounty
+
+ {error}
+
+
+ {isSuccess && amount && (
+ Success! Added {formatMoney(amount)} in bounties.
+ )}
+
+ {isLoading && Processing...
}
+
+ )
+}
diff --git a/web/components/contract/bountied-contract-badge.tsx b/web/components/contract/bountied-contract-badge.tsx
new file mode 100644
index 00000000..8e3e8c5b
--- /dev/null
+++ b/web/components/contract/bountied-contract-badge.tsx
@@ -0,0 +1,9 @@
+import { CurrencyDollarIcon } from '@heroicons/react/outline'
+
+export function BountiedContractBadge() {
+ return (
+
+
+ )
+}
diff --git a/web/components/contract/contract-details.tsx b/web/components/contract/contract-details.tsx
index fc4bcfcf..22167a9c 100644
--- a/web/components/contract/contract-details.tsx
+++ b/web/components/contract/contract-details.tsx
@@ -32,6 +32,7 @@ import { PlusCircleIcon } from '@heroicons/react/solid'
import { GroupLink } from 'common/group'
import { Subtitle } from '../subtitle'
import { useIsMobile } from 'web/hooks/use-is-mobile'
+import { BountiedContractBadge } from 'web/components/contract/bountied-contract-badge'
export type ShowTime = 'resolve-date' | 'close-date'
@@ -63,6 +64,8 @@ export function MiscDetails(props: {
) : (contract?.featuredOnHomeRank ?? 0) > 0 ? (
{formatMoney(volume)} bet
) : (
diff --git a/web/components/contract/contract-info-dialog.tsx b/web/components/contract/contract-info-dialog.tsx
index 5187030d..df6695ed 100644
--- a/web/components/contract/contract-info-dialog.tsx
+++ b/web/components/contract/contract-info-dialog.tsx
@@ -7,7 +7,7 @@ import { capitalize } from 'lodash'
import { Contract } from 'common/contract'
import { formatMoney } from 'common/util/format'
import { contractPool, updateContract } from 'web/lib/firebase/contracts'
-import { LiquidityPanel } from '../liquidity-panel'
+import { LiquidityBountyPanel } from 'web/components/contract/liquidity-bounty-panel'
import { Col } from '../layout/col'
import { Modal } from '../layout/modal'
import { Title } from '../title'
@@ -196,9 +196,7 @@ export function ContractInfoDialog(props: {
- {contract.mechanism === 'cpmm-1' && !contract.resolution && (
-
@@ -43,8 +51,16 @@ export function ContractTabs(props: {
const tabs = buildArray(
{
- title: 'Comments',
+ title: `Comments`,
+ tooltip: openCommentBounties
+ ? `The creator of this market may award ${formatMoney(
+ COMMENT_BOUNTY_AMOUNT
+ )} for good comments. ${formatMoney(
+ openCommentBounties
+ )} currently available.`
+ : undefined,
content:
,
+ inlineTabIcon:
({formatMoney(COMMENT_BOUNTY_AMOUNT)}) ,
},
{
title: capitalize(PAST_BETS),
@@ -68,6 +84,8 @@ const CommentsTabContent = memo(function CommentsTabContent(props: {
const { contract } = props
const tips = useTipTxns({ contractId: contract.id })
const comments = useComments(contract.id) ?? props.comments
+ const [sort, setSort] = useState<'Newest' | 'Best'>('Best')
+ const me = useUser()
if (comments == null) {
return
}
@@ -119,12 +137,44 @@ const CommentsTabContent = memo(function CommentsTabContent(props: {
)
} else {
- const commentsByParent = groupBy(comments, (c) => c.replyToCommentId ?? '_')
+ const tipsOrBountiesAwarded =
+ Object.keys(tips).length > 0 || comments.some((c) => c.bountiesAwarded)
+
+ const commentsByParent = groupBy(
+ sortBy(comments, (c) =>
+ sort === 'Newest'
+ ? -c.createdTime
+ : // Is this too magic? If there are tips/bounties, 'Best' shows your own comments made within the last 10 minutes first, then sorts by score
+ tipsOrBountiesAwarded &&
+ c.createdTime > Date.now() - 10 * MINUTE_MS &&
+ c.userId === me?.id
+ ? -Infinity
+ : -((c.bountiesAwarded ?? 0) + sum(Object.values(tips[c.id] ?? [])))
+ ),
+ (c) => c.replyToCommentId ?? '_'
+ )
+
const topLevelComments = commentsByParent['_'] ?? []
return (
<>
+
setSort(sort === 'Newest' ? 'Best' : 'Newest')}
+ >
+
+ Sorted by: {sort}
+
+
- {sortBy(topLevelComments, (c) => -c.createdTime).map((parent) => (
+ {topLevelComments.map((parent) => (
-
return (
+ +{formatMoney(totalAwarded)}
+
+ )}
{tips && void
}) {
const user = useUser()
+ const { contract, parentAnswerOutcome, parentCommentId, replyTo, className } =
+ props
+ const { openCommentBounties } = contract
async function onSubmitComment(editor: Editor) {
if (!user) {
track('sign in to comment')
return await firebaseLogin()
}
await createCommentOnContract(
- props.contract.id,
+ contract.id,
editor.getJSON(),
user,
- props.parentAnswerOutcome,
- props.parentCommentId
+ !!openCommentBounties,
+ parentAnswerOutcome,
+ parentCommentId
)
props.onSubmitComment?.()
}
return (
{tab.badge}
- ) : null}
{tab.tabIcon}
}
- {tab.title}
+
+ {tab.stackedTabIcon && (
+ {tab.stackedTabIcon}
+ )}
+
+ {tab.title}
+ {tab.inlineTabIcon}
+
+
))}
diff --git a/web/components/tipper.tsx b/web/components/tipper.tsx
index ccb8361f..1dcb0f05 100644
--- a/web/components/tipper.tsx
+++ b/web/components/tipper.tsx
@@ -116,7 +116,7 @@ function DownTip(props: { onClick?: () => void }) {
noTap
>
@@ -137,7 +137,7 @@ function UpTip(props: { onClick?: () => void; value: number }) {
noTap
>
diff --git a/web/components/user-page.tsx b/web/components/user-page.tsx
index 623b4d35..f9f77cf6 100644
--- a/web/components/user-page.tsx
+++ b/web/components/user-page.tsx
@@ -192,7 +192,7 @@ export function UserPage(props: { user: User }) {
tabs={[
{
title: 'Markets',
- tabIcon: ,
- replyToCommentId?: string
+ replyToCommentId?: string,
+ onContractWithBounty?: boolean
) {
const comment = removeUndefinedProps({
id: ref.id,
@@ -108,13 +111,19 @@ async function createComment(
replyToCommentId: replyToCommentId,
...extraFields,
})
-
- track(`${extraFields.commentType} message`, {
- user,
- commentId: ref.id,
- surfaceId,
- replyToCommentId: replyToCommentId,
- })
+ track(
+ `${extraFields.commentType} message`,
+ removeUndefinedProps({
+ user,
+ commentId: ref.id,
+ surfaceId,
+ replyToCommentId: replyToCommentId,
+ onContractWithBounty:
+ extraFields.commentType === 'contract'
+ ? onContractWithBounty
+ : undefined,
+ })
+ )
return await setDoc(ref, comment)
}
diff --git a/web/package.json b/web/package.json
index a3ec9aaa..a5fa8ced 100644
--- a/web/package.json
+++ b/web/package.json
@@ -22,7 +22,7 @@
"@amplitude/analytics-browser": "0.4.1",
"@floating-ui/react-dom-interactions": "0.9.2",
"@headlessui/react": "1.6.1",
- "@heroicons/react": "1.0.5",
+ "@heroicons/react": "1.0.6",
"@nivo/core": "0.80.0",
"@nivo/line": "0.80.0",
"@nivo/tooltip": "0.80.0",
From 31de3636fdcb09437ad47dae33bfc7402f8783b5 Mon Sep 17 00:00:00 2001
From: Ian Philips
Date: Fri, 30 Sep 2022 09:34:58 -0600
Subject: [PATCH 017/101] Fix comment tab title
---
web/components/contract/contract-tabs.tsx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/web/components/contract/contract-tabs.tsx b/web/components/contract/contract-tabs.tsx
index e53881d3..9b732224 100644
--- a/web/components/contract/contract-tabs.tsx
+++ b/web/components/contract/contract-tabs.tsx
@@ -60,7 +60,9 @@ export function ContractTabs(props: {
)} currently available.`
: undefined,
content: ({formatMoney(COMMENT_BOUNTY_AMOUNT)}) ,
+ inlineTabIcon: openCommentBounties ? (
+ ({formatMoney(COMMENT_BOUNTY_AMOUNT)})
+ ) : undefined,
},
{
title: capitalize(PAST_BETS),
From 3677de58c3131d317c6ea0ce8097215ccf8f6dee Mon Sep 17 00:00:00 2001
From: Ian Philips
Date: Fri, 30 Sep 2022 10:00:55 -0600
Subject: [PATCH 018/101] Add tooltip and badge on contract for bounties
---
.../contract/bountied-contract-badge.tsx | 25 +++++++++++++++++++
web/components/contract/contract-details.tsx | 19 +++++++++-----
web/components/contract/contract-tabs.tsx | 7 ++----
3 files changed, 40 insertions(+), 11 deletions(-)
diff --git a/web/components/contract/bountied-contract-badge.tsx b/web/components/contract/bountied-contract-badge.tsx
index 8e3e8c5b..3e1ed68c 100644
--- a/web/components/contract/bountied-contract-badge.tsx
+++ b/web/components/contract/bountied-contract-badge.tsx
@@ -1,4 +1,8 @@
import { CurrencyDollarIcon } from '@heroicons/react/outline'
+import { Contract } from 'common/contract'
+import { Tooltip } from 'web/components/tooltip'
+import { formatMoney } from 'common/lib/util/format'
+import { COMMENT_BOUNTY_AMOUNT } from 'common/economy'
export function BountiedContractBadge() {
return (
@@ -7,3 +11,24 @@ export function BountiedContractBadge() {
)
}
+
+export function BountiedContractSmallBadge(props: { contract: Contract }) {
+ const { contract } = props
+ const { openCommentBounties } = contract
+ if (!openCommentBounties) return
+
+ return (
+
+
+
+
+ )
+}
+
+export const CommentBountiesTooltipText = (openCommentBounties: number) =>
+ `The creator of this market may award ${formatMoney(
+ COMMENT_BOUNTY_AMOUNT
+ )} for good comments. ${formatMoney(
+ openCommentBounties
+ )} currently available.`
diff --git a/web/components/contract/contract-details.tsx b/web/components/contract/contract-details.tsx
index 22167a9c..7c84fadf 100644
--- a/web/components/contract/contract-details.tsx
+++ b/web/components/contract/contract-details.tsx
@@ -32,7 +32,10 @@ import { PlusCircleIcon } from '@heroicons/react/solid'
import { GroupLink } from 'common/group'
import { Subtitle } from '../subtitle'
import { useIsMobile } from 'web/hooks/use-is-mobile'
-import { BountiedContractBadge } from 'web/components/contract/bountied-contract-badge'
+import {
+ BountiedContractBadge,
+ BountiedContractSmallBadge,
+} from 'web/components/contract/bountied-contract-badge'
export type ShowTime = 'resolve-date' | 'close-date'
@@ -129,9 +132,10 @@ export function ContractDetails(props: {
{/* GROUPS */}
{isMobile && (
-
+
+
+
)}
)
@@ -181,7 +185,10 @@ export function MarketSubheader(props: {
isCreator={isCreator}
/>
{!isMobile && (
-
+
)}
@@ -328,14 +335,14 @@ export function GroupDisplay(props: { groupToDisplay?: GroupLink | null }) {
if (groupToDisplay) {
return (
+
{groupToDisplay.name}
)
} else
return (
-
+
No Group
)
diff --git a/web/components/contract/contract-tabs.tsx b/web/components/contract/contract-tabs.tsx
index 9b732224..d29806b5 100644
--- a/web/components/contract/contract-tabs.tsx
+++ b/web/components/contract/contract-tabs.tsx
@@ -31,6 +31,7 @@ import { MINUTE_MS } from 'common/util/time'
import { useUser } from 'web/hooks/use-user'
import { COMMENT_BOUNTY_AMOUNT } from 'common/economy'
import { Tooltip } from 'web/components/tooltip'
+import { CommentBountiesTooltipText } from 'web/components/contract/bountied-contract-badge'
export function ContractTabs(props: {
contract: Contract
@@ -53,11 +54,7 @@ export function ContractTabs(props: {
{
title: `Comments`,
tooltip: openCommentBounties
- ? `The creator of this market may award ${formatMoney(
- COMMENT_BOUNTY_AMOUNT
- )} for good comments. ${formatMoney(
- openCommentBounties
- )} currently available.`
+ ? CommentBountiesTooltipText(openCommentBounties)
: undefined,
content:
,
inlineTabIcon: openCommentBounties ? (
From ab883ea7777a9d8428a7a467d6fe6c5eae3ee77d Mon Sep 17 00:00:00 2001
From: James Grugett
Date: Fri, 30 Sep 2022 12:00:14 -0500
Subject: [PATCH 019/101] Order home group sections by daily score.
---
web/pages/home/edit.tsx | 16 ++-----
web/pages/home/index.tsx | 93 ++++++++++++++++++++++------------------
2 files changed, 56 insertions(+), 53 deletions(-)
diff --git a/web/pages/home/edit.tsx b/web/pages/home/edit.tsx
index 8c5f8ab5..0b496757 100644
--- a/web/pages/home/edit.tsx
+++ b/web/pages/home/edit.tsx
@@ -7,12 +7,11 @@ import { Row } from 'web/components/layout/row'
import { Page } from 'web/components/page'
import { SiteLink } from 'web/components/site-link'
import { Title } from 'web/components/title'
-import { useMemberGroupsSubscription } from 'web/hooks/use-group'
import { useTracking } from 'web/hooks/use-tracking'
import { useUser } from 'web/hooks/use-user'
import { updateUser } from 'web/lib/firebase/users'
import { track } from 'web/lib/service/analytics'
-import { getHomeItems, TrendingGroupsSection } from '.'
+import { getHomeItems } from '.'
export default function Home() {
const user = useUser()
@@ -27,8 +26,7 @@ export default function Home() {
setHomeSections(newHomeSections)
}
- const groups = useMemberGroupsSubscription(user)
- const { sections } = getHomeItems(groups ?? [], homeSections)
+ const { sections } = getHomeItems(homeSections)
return (
@@ -38,14 +36,8 @@ export default function Home() {
diff --git a/web/pages/home/index.tsx b/web/pages/home/index.tsx
index e920b20f..de5e95f2 100644
--- a/web/pages/home/index.tsx
+++ b/web/pages/home/index.tsx
@@ -8,7 +8,7 @@ import {
import { PlusCircleIcon, XCircleIcon } from '@heroicons/react/outline'
import clsx from 'clsx'
import { toast, Toaster } from 'react-hot-toast'
-import { Dictionary } from 'lodash'
+import { Dictionary, sortBy, sum } from 'lodash'
import { Page } from 'web/components/page'
import { Col } from 'web/components/layout/col'
@@ -62,16 +62,16 @@ export default function Home() {
}
})
- const groups = useMemberGroupsSubscription(user)
-
- const { sections } = getHomeItems(groups ?? [], user?.homeSections ?? [])
+ const { sections } = getHomeItems(user?.homeSections ?? [])
useEffect(() => {
- if (user && !user.homeSections && sections.length > 0 && groups) {
+ if (user && !user.homeSections && sections.length > 0) {
// Save initial home sections.
updateUser(user.id, { homeSections: sections.map((s) => s.id) })
}
- }, [user, sections, groups])
+ }, [user, sections])
+
+ const groups = useMemberGroupsSubscription(user)
const groupContracts = useContractsByDailyScoreGroups(
groups?.map((g) => g.slug)
@@ -94,14 +94,15 @@ export default function Home() {
{
+export const getHomeItems = (sections: string[]) => {
// Accommodate old home sections.
if (!isArray(sections)) sections = []
const items: { id: string; label: string; group?: Group }[] = [
...HOME_SECTIONS,
- ...groups.map((g) => ({
- label: g.name,
- id: g.id,
- group: g,
- })),
]
const itemsById = keyBy(items, 'id')
@@ -152,12 +148,7 @@ export const getHomeItems = (groups: Group[], sections: string[]) => {
}
}
-function renderSection(
- section: { id: string; label: string },
- user: User,
- groups: Group[] | undefined,
- groupContracts: Dictionary | undefined
-) {
+function renderSection(section: { id: string; label: string }, user: User) {
const { id, label } = section
if (id === 'daily-movers') {
return | undefined
+) {
+ if (!groups || !groupContracts) {
+ return
- {!full &&
+
{chosenGroups.map((g) => (
Date: Fri, 30 Sep 2022 13:22:10 -0500
Subject: [PATCH 020/101] Fix import
---
web/components/contract/bountied-contract-badge.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/web/components/contract/bountied-contract-badge.tsx b/web/components/contract/bountied-contract-badge.tsx
index 3e1ed68c..b3e230cb 100644
--- a/web/components/contract/bountied-contract-badge.tsx
+++ b/web/components/contract/bountied-contract-badge.tsx
@@ -1,7 +1,7 @@
import { CurrencyDollarIcon } from '@heroicons/react/outline'
import { Contract } from 'common/contract'
import { Tooltip } from 'web/components/tooltip'
-import { formatMoney } from 'common/lib/util/format'
+import { formatMoney } from 'common/util/format'
import { COMMENT_BOUNTY_AMOUNT } from 'common/economy'
export function BountiedContractBadge() {
From b2f81c11496a54cd86b6b87144952ac4bb98272a Mon Sep 17 00:00:00 2001
From: Phil
Date: Fri, 30 Sep 2022 20:01:51 +0100
Subject: [PATCH 021/101] Twitch minor fix (#973)
* Made Twitch copy link buttons links so right-click -> copy URL works.
* Added Twitch OBS screenshot to public folder.
---
web/pages/twitch.tsx | 120 +++++++++++++----------
web/public/twitch-bot-obs-screenshot.jpg | Bin 0 -> 130637 bytes
2 files changed, 70 insertions(+), 50 deletions(-)
create mode 100644 web/public/twitch-bot-obs-screenshot.jpg
diff --git a/web/pages/twitch.tsx b/web/pages/twitch.tsx
index 6508a69e..2331fa1c 100644
--- a/web/pages/twitch.tsx
+++ b/web/pages/twitch.tsx
@@ -257,6 +257,30 @@ function BotSetupStep(props: {
)
}
+function CopyLinkButton(props: { link: string; text: string }) {
+ const { link, text } = props
+ const toastTheme = {
+ className: '!bg-primary !text-white',
+ icon: e.preventDefault()}>
+
+ {text}
+
+
+ )
+}
+
function BotConnectButton(props: {
privateUser: PrivateUser | null | undefined
}) {
@@ -338,39 +362,67 @@ function SetUpBot(props: {
}) {
const { user, privateUser } = props
const twitchLinked =
+ privateUser &&
privateUser?.twitchInfo?.twitchName &&
!privateUser?.twitchInfo?.needsRelinking
? true
: undefined
- const toastTheme = {
- className: '!bg-primary !text-white',
- icon:
+ /mod ManifoldBot
+
+ ) : (
- /mod ManifoldBot
-
- Create a new browser source in your streaming software such as OBS.
- Paste in the above link and type in the desired size. We recommend
- 450x375.
-
-
- The bot can be controlled entirely through chat. But we made an easy
- to use control panel. Share the link with your mods or embed it into
- your OBS as a custom dock.
-
-
Need help? Contact SirSalty#5770 in Discord or email
david@manifold.markets
diff --git a/web/public/twitch-bot-obs-screenshot.jpg b/web/public/twitch-bot-obs-screenshot.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..2f14e0f14b7d05a24956f5e53b209ba217ebca3b
GIT binary patch
literal 130637
zcmeFZ1ymf(_AlC4u;3Eh2^QSlf(^k2_h3N>8Js{MNC*yt1$TFX2T5@EK(HV|0t5)|
za3}e`bIy0}I`{w1eQ&+>{&&4oOn2|zwXJ@=tEZ~Ehx;%0D*!G?UP&H6KtKSV!~cN$
zRUli=%k~8TsHgy}005u?C
E&!@VQ=L|V{T<_
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