From 95242d94acfe23e94a2f9967df9c14aca6238389 Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Wed, 16 Feb 2022 00:08:16 -0600
Subject: [PATCH 01/14] sort trades by resolved

---
 web/components/bets-list.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/web/components/bets-list.tsx b/web/components/bets-list.tsx
index 13f9e596..f101105d 100644
--- a/web/components/bets-list.tsx
+++ b/web/components/bets-list.tsx
@@ -33,7 +33,7 @@ import { sellBet } from '../lib/firebase/api-call'
 import { ConfirmationButton } from './confirmation-button'
 import { OutcomeLabel, YesLabel, NoLabel } from './outcome-label'
 
-type BetSort = 'newest' | 'profit'
+type BetSort = 'newest' | 'profit' | 'resolved'
 
 export function BetsList(props: { user: User }) {
   const { user } = props
@@ -111,6 +111,8 @@ export function BetsList(props: { user: User }) {
     (c) => c.isResolved
   )
 
+  const displayedContracts = sort === 'resolved' ? resolved : unresolved
+
   const currentInvestment = _.sumBy(
     unresolved,
     (c) => contractsInvestment[c.id]
@@ -161,10 +163,11 @@ export function BetsList(props: { user: User }) {
         >
           <option value="profit">By profit</option>
           <option value="newest">Newest</option>
+          <option value="resolved">Resolved</option>
         </select>
       </Col>
 
-      {[...unresolved, ...resolved].map((contract) => (
+      {displayedContracts.map((contract) => (
         <MyContractBets
           key={contract.id}
           contract={contract}

From a2e4893be89d0f5d5f88993306b5a2f83fa3f308 Mon Sep 17 00:00:00 2001
From: Austin Chen <akrolsmir@gmail.com>
Date: Wed, 16 Feb 2022 10:32:44 -0800
Subject: [PATCH 02/14] Don't include trailing !:,.; in links

---
 web/components/linkify.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/web/components/linkify.tsx b/web/components/linkify.tsx
index a1b617ad..21567b59 100644
--- a/web/components/linkify.tsx
+++ b/web/components/linkify.tsx
@@ -2,9 +2,11 @@ import { Fragment } from 'react'
 import { SiteLink } from './site-link'
 
 // Return a JSX span, linkifying @username, #hashtags, and https://...
+// TODO: Use a markdown parser instead of rolling our own here.
 export function Linkify(props: { text: string; gray?: boolean }) {
   const { text, gray } = props
-  const regex = /(?:^|\s)(?:[@#][a-z0-9_]+|https?:\/\/\S+)/gi
+  const regex =
+    /(?:^|\s)(?:[@#][a-z0-9_]+|https?:\/\/[-A-Za-z0-9+&@#\/%?=~_()|!:,.;]*[-A-Za-z0-9+&@#\/%=~_()|])/gi
   const matches = text.match(regex) || []
   const links = matches.map((match) => {
     // Matches are in the form: " @username" or "https://example.com"

From 2f7ab1842916bc903e60231cbf45b934db2f2658 Mon Sep 17 00:00:00 2001
From: Austin Chen <akrolsmir@gmail.com>
Date: Wed, 16 Feb 2022 18:48:59 -0800
Subject: [PATCH 03/14] Stop flooring inputs into formatMoney

---
 web/components/amount-input.tsx | 2 +-
 web/components/profile-menu.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/components/amount-input.tsx b/web/components/amount-input.tsx
index dcc29465..0a1c5431 100644
--- a/web/components/amount-input.tsx
+++ b/web/components/amount-input.tsx
@@ -79,7 +79,7 @@ export function AmountInput(props: {
             Remaining balance
           </div>
           <Row className="gap-4">
-            <div>{formatMoney(Math.floor(remainingBalance))}</div>
+            <div>{formatMoney(remainingBalance)}</div>
             {user.balance !== 1000 && <AddFundsButton />}
           </Row>
         </Col>
diff --git a/web/components/profile-menu.tsx b/web/components/profile-menu.tsx
index 50d2fcbc..1ded6378 100644
--- a/web/components/profile-menu.tsx
+++ b/web/components/profile-menu.tsx
@@ -87,7 +87,7 @@ function ProfileSummary(props: { user: User | undefined }) {
       <div className="truncate text-left sm:w-32">
         <div className="hidden sm:flex">{user?.name}</div>
         <div className="text-sm text-gray-700">
-          {user ? formatMoney(Math.floor(user.balance)) : ' '}
+          {user ? formatMoney(user.balance) : ' '}
         </div>
       </div>
     </Col>

From 87a33933e41c706e51f68e4a0448377513d013d4 Mon Sep 17 00:00:00 2001
From: Austin Chen <akrolsmir@gmail.com>
Date: Wed, 16 Feb 2022 19:14:12 -0800
Subject: [PATCH 04/14] Revert "Stop flooring inputs into formatMoney"

This reverts commit 2f7ab1842916bc903e60231cbf45b934db2f2658.
---
 web/components/amount-input.tsx | 2 +-
 web/components/profile-menu.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/components/amount-input.tsx b/web/components/amount-input.tsx
index 0a1c5431..dcc29465 100644
--- a/web/components/amount-input.tsx
+++ b/web/components/amount-input.tsx
@@ -79,7 +79,7 @@ export function AmountInput(props: {
             Remaining balance
           </div>
           <Row className="gap-4">
-            <div>{formatMoney(remainingBalance)}</div>
+            <div>{formatMoney(Math.floor(remainingBalance))}</div>
             {user.balance !== 1000 && <AddFundsButton />}
           </Row>
         </Col>
diff --git a/web/components/profile-menu.tsx b/web/components/profile-menu.tsx
index 1ded6378..50d2fcbc 100644
--- a/web/components/profile-menu.tsx
+++ b/web/components/profile-menu.tsx
@@ -87,7 +87,7 @@ function ProfileSummary(props: { user: User | undefined }) {
       <div className="truncate text-left sm:w-32">
         <div className="hidden sm:flex">{user?.name}</div>
         <div className="text-sm text-gray-700">
-          {user ? formatMoney(user.balance) : ' '}
+          {user ? formatMoney(Math.floor(user.balance)) : ' '}
         </div>
       </div>
     </Col>

From 515676f885ad231ea5622dc22b63bd6d2ea960cc Mon Sep 17 00:00:00 2001
From: Austin Chen <akrolsmir@gmail.com>
Date: Wed, 16 Feb 2022 19:19:11 -0800
Subject: [PATCH 05/14] Consistently floor user.balance

---
 web/components/bets-list.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/components/bets-list.tsx b/web/components/bets-list.tsx
index f101105d..e68d4fbc 100644
--- a/web/components/bets-list.tsx
+++ b/web/components/bets-list.tsx
@@ -144,7 +144,7 @@ export function BetsList(props: { user: User }) {
           <Col>
             <div className="text-sm text-gray-500">Balance</div>
             <div className="whitespace-nowrap text-lg">
-              {formatMoney(user.balance)}{' '}
+              {formatMoney(Math.floor(user.balance))}{' '}
             </div>
           </Col>
           <Col>

From a12a8bcd6a6ec6735e14ef9f897b9011957b2f7e Mon Sep 17 00:00:00 2001
From: Austin Chen <akrolsmir@gmail.com>
Date: Wed, 16 Feb 2022 19:37:54 -0800
Subject: [PATCH 06/14] Expand create panel on focus

From Richard Hanania's feedback
---
 web/components/feed-create.tsx | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/web/components/feed-create.tsx b/web/components/feed-create.tsx
index a2d52135..7ed1a213 100644
--- a/web/components/feed-create.tsx
+++ b/web/components/feed-create.tsx
@@ -61,6 +61,7 @@ export default function FeedCreate(props: {
 }) {
   const { user, tag, className } = props
   const [question, setQuestion] = useState('')
+  const [focused, setFocused] = useState(false)
 
   const placeholders = [
     'Will anyone I know get engaged this year?',
@@ -81,7 +82,11 @@ export default function FeedCreate(props: {
 
   return (
     <div
-      className={clsx('mt-2 w-full bg-white p-4 shadow-md', className)}
+      className={clsx(
+        'mt-2 w-full rounded bg-white p-4 shadow-md',
+        question || focused ? 'ring-2 ring-indigo-300' : '',
+        className
+      )}
       onClick={() => !question && inputRef.current?.focus()}
     >
       <div className="relative flex items-start space-x-3">
@@ -99,17 +104,19 @@ export default function FeedCreate(props: {
             value={question}
             onClick={(e) => e.stopPropagation()}
             onChange={(e) => setQuestion(e.target.value.replace('\n', ''))}
+            onFocus={() => setFocused(true)}
+            onBlur={() => setFocused(false)}
           />
         </div>
       </div>
 
       {/* Hide component instead of deleting, so edits to NewContract don't get lost */}
-      <div className={question ? '' : 'hidden'}>
+      <div className={question || focused ? '' : 'hidden'}>
         <NewContract question={question} tag={tag} />
       </div>
 
       {/* Show a fake "Create Market" button, which gets replaced with the NewContract one*/}
-      {!question && (
+      {!(question || focused) && (
         <div className="flex justify-end">
           <button className="btn btn-sm" disabled>
             Create Market

From 482a72f4e1d7f685a0f313187aca48c1d1d9a903 Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Wed, 16 Feb 2022 22:42:52 -0600
Subject: [PATCH 07/14] welcome email: include link to manifold

---
 functions/src/emails.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/functions/src/emails.ts b/functions/src/emails.ts
index 15f1e8b9..3dbfeb53 100644
--- a/functions/src/emails.ts
+++ b/functions/src/emails.ts
@@ -84,6 +84,7 @@ Questions? Feedback? I'd love to hear from you - just reply to this email!
 Or come chat with us on Discord: https://discord.gg/eHQBNBqXuh
 
 Best,
-Austin from Manifold`
+Austin from Manifold
+https://manifold.markets/`
   )
 }

From d6f15deff4fe8450e12bcc7fb465bc870f645b51 Mon Sep 17 00:00:00 2001
From: James Grugett <jahooma@gmail.com>
Date: Thu, 17 Feb 2022 01:02:48 -0600
Subject: [PATCH 08/14] Fix home page in dev on branches that are not
 free-response

---
 web/pages/home.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/web/pages/home.tsx b/web/pages/home.tsx
index 2e37b7fa..1568b778 100644
--- a/web/pages/home.tsx
+++ b/web/pages/home.tsx
@@ -25,11 +25,15 @@ import { useFollowedFolds } from '../hooks/use-fold'
 import { SiteLink } from '../components/site-link'
 
 export async function getStaticProps() {
-  const [contracts, folds] = await Promise.all([
+  let [contracts, folds] = await Promise.all([
     listAllContracts().catch((_) => []),
     listAllFolds().catch(() => []),
   ])
 
+  // TODO(James): Remove this line. We are filtering out non-binary contracts so that
+  // branches other than free-response work.
+  contracts = contracts.filter((contract) => contract.outcomeType === 'BINARY')
+
   const [contractBets, contractComments] = await Promise.all([
     Promise.all(contracts.map((contract) => listAllBets(contract.id))),
     Promise.all(contracts.map((contract) => listAllComments(contract.id))),

From dcbdc66df52cfddb551ea9091395496591835961 Mon Sep 17 00:00:00 2001
From: mantikoros <95266179+mantikoros@users.noreply.github.com>
Date: Thu, 17 Feb 2022 12:18:02 -0600
Subject: [PATCH 09/14] Close emails (#50)

* script init for stephen dev

* market close emails

* order of operations

* template email

* sendMarketCloseEmail: handle unsubscribe

* remove debugging

* marketCloseEmails: every hour
---
 common/contract.ts                   |  1 +
 functions/src/emails.ts              | 38 +++++++++++++++++-
 functions/src/index.ts               |  1 +
 functions/src/market-close-emails.ts | 58 ++++++++++++++++++++++++++++
 functions/src/scripts/script-init.ts |  2 +-
 5 files changed, 98 insertions(+), 2 deletions(-)
 create mode 100644 functions/src/market-close-emails.ts

diff --git a/common/contract.ts b/common/contract.ts
index ed642cfa..f5733059 100644
--- a/common/contract.ts
+++ b/common/contract.ts
@@ -28,6 +28,7 @@ export type Contract = {
   resolutionTime?: number // When the contract creator resolved the market
   resolution?: outcome // Chosen by creator; must be one of outcomes
   resolutionProbability?: number
+  closeEmailsSent?: number
 
   volume24Hours: number
   volume7Days: number
diff --git a/functions/src/emails.ts b/functions/src/emails.ts
index 3dbfeb53..ba20df1e 100644
--- a/functions/src/emails.ts
+++ b/functions/src/emails.ts
@@ -1,7 +1,9 @@
+import _ = require('lodash')
 import { getProbability } from '../../common/calculate'
 import { Contract } from '../../common/contract'
+import { CREATOR_FEE } from '../../common/fees'
 import { PrivateUser, User } from '../../common/user'
-import { formatPercent } from '../../common/util/format'
+import { formatMoney, formatPercent } from '../../common/util/format'
 import { sendTemplateEmail, sendTextEmail } from './send-email'
 import { getPrivateUser, getUser } from './utils'
 
@@ -88,3 +90,37 @@ Austin from Manifold
 https://manifold.markets/`
   )
 }
+
+export const sendMarketCloseEmail = async (
+  user: User,
+  privateUser: PrivateUser,
+  contract: Contract
+) => {
+  if (
+    !privateUser ||
+    privateUser.unsubscribedFromResolutionEmails ||
+    !privateUser.email
+  )
+    return
+
+  const { username, name, id: userId } = user
+  const firstName = name.split(' ')[0]
+
+  const { question, pool: pools, slug } = contract
+  const pool = formatMoney(_.sum(_.values(pools)))
+  const url = `https://manifold.markets/${username}/${slug}`
+
+  await sendTemplateEmail(
+    privateUser.email,
+    'Your market has closed',
+    'market-close',
+    {
+      name: firstName,
+      question,
+      pool,
+      url,
+      userId,
+      creatorFee: (CREATOR_FEE * 100).toString(),
+    }
+  )
+}
diff --git a/functions/src/index.ts b/functions/src/index.ts
index f46e72a8..202136c9 100644
--- a/functions/src/index.ts
+++ b/functions/src/index.ts
@@ -18,3 +18,4 @@ export * from './update-contract-metrics'
 export * from './update-user-metrics'
 export * from './backup-db'
 export * from './change-user-info'
+export * from './market-close-emails'
diff --git a/functions/src/market-close-emails.ts b/functions/src/market-close-emails.ts
new file mode 100644
index 00000000..83caca89
--- /dev/null
+++ b/functions/src/market-close-emails.ts
@@ -0,0 +1,58 @@
+import * as functions from 'firebase-functions'
+import * as admin from 'firebase-admin'
+
+import { Contract } from '../../common/contract'
+import { getPrivateUser, getUserByUsername } from './utils'
+import { sendMarketCloseEmail } from './emails'
+
+export const marketCloseEmails = functions.pubsub
+  .schedule('every hour')
+  .onRun(async () => {
+    await sendMarketCloseEmails()
+  })
+
+const firestore = admin.firestore()
+
+async function sendMarketCloseEmails() {
+  const contracts = await firestore.runTransaction(async (transaction) => {
+    const snap = await transaction.get(
+      firestore.collection('contracts').where('isResolved', '!=', true)
+    )
+
+    return snap.docs
+      .map((doc) => {
+        const contract = doc.data() as Contract
+
+        if (
+          contract.resolution ||
+          (contract.closeEmailsSent ?? 0) >= 1 ||
+          (contract.closeTime ?? 0) > Date.now()
+        )
+          return undefined
+
+        transaction.update(doc.ref, {
+          closeEmailsSent: (contract.closeEmailsSent ?? 0) + 1,
+        })
+
+        return contract
+      })
+      .filter((x) => !!x) as Contract[]
+  })
+
+  for (let contract of contracts) {
+    console.log(
+      'sending close email for',
+      contract.slug,
+      'closed',
+      contract.closeTime
+    )
+
+    const user = await getUserByUsername(contract.creatorUsername)
+    if (!user) continue
+
+    const privateUser = await getPrivateUser(user.id)
+    if (!privateUser) continue
+
+    await sendMarketCloseEmail(user, privateUser, contract)
+  }
+}
diff --git a/functions/src/scripts/script-init.ts b/functions/src/scripts/script-init.ts
index 5924ad1d..9a7c1b5d 100644
--- a/functions/src/scripts/script-init.ts
+++ b/functions/src/scripts/script-init.ts
@@ -14,7 +14,7 @@ const pathsToPrivateKey = {
   stephen:
     '../../../../../../Downloads/mantic-markets-firebase-adminsdk-1ep46-351a65eca3.json',
   stephenDev:
-    '../../../../Downloads/dev-mantic-markets-firebase-adminsdk-sir5m-b2d27f8970.json',
+    '../../../../../../Downloads/dev-mantic-markets-firebase-adminsdk-sir5m-b2d27f8970.json',
 }
 
 export const initAdmin = (who: keyof typeof pathsToPrivateKey) => {

From 1036c2df0d2abdf383a9d9f43f43f0a164951dd7 Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Thu, 17 Feb 2022 12:34:57 -0600
Subject: [PATCH 10/14] sendMarketCloseEmails: check undefined

---
 functions/src/market-close-emails.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/functions/src/market-close-emails.ts b/functions/src/market-close-emails.ts
index 83caca89..6b490e9d 100644
--- a/functions/src/market-close-emails.ts
+++ b/functions/src/market-close-emails.ts
@@ -26,6 +26,7 @@ async function sendMarketCloseEmails() {
         if (
           contract.resolution ||
           (contract.closeEmailsSent ?? 0) >= 1 ||
+          contract.closeTime === undefined ||
           (contract.closeTime ?? 0) > Date.now()
         )
           return undefined

From 6701bfca0d3e08dd333a27dd911489f7779437b6 Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Thu, 17 Feb 2022 12:50:47 -0600
Subject: [PATCH 11/14] marketCloseEmails: "every hour" => "every 1 hours"

---
 functions/src/market-close-emails.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions/src/market-close-emails.ts b/functions/src/market-close-emails.ts
index 6b490e9d..bb144600 100644
--- a/functions/src/market-close-emails.ts
+++ b/functions/src/market-close-emails.ts
@@ -6,7 +6,7 @@ import { getPrivateUser, getUserByUsername } from './utils'
 import { sendMarketCloseEmail } from './emails'
 
 export const marketCloseEmails = functions.pubsub
-  .schedule('every hour')
+  .schedule('every 1 hours')
   .onRun(async () => {
     await sendMarketCloseEmails()
   })

From 51aa8df010b4e542fdb039668b514525f97ac5bb Mon Sep 17 00:00:00 2001
From: Austin Chen <akrolsmir@gmail.com>
Date: Thu, 17 Feb 2022 12:56:24 -0800
Subject: [PATCH 12/14] Set up a read API using Vercel serverless functions
 (#49)

* Set up read API using Vercel serverless functions

Featuring:
/api/v0/markets
/api/v0/market/[contractId]
/api/v0/slug/[contractSlug]

* Include tags in API
---
 web/pages/api/hello.ts          | 13 -------
 web/pages/api/v0/_types.ts      | 67 +++++++++++++++++++++++++++++++++
 web/pages/api/v0/market/[id].ts | 32 ++++++++++++++++
 web/pages/api/v0/markets.ts     | 16 ++++++++
 web/pages/api/v0/slug/[slug].ts | 32 ++++++++++++++++
 5 files changed, 147 insertions(+), 13 deletions(-)
 delete mode 100644 web/pages/api/hello.ts
 create mode 100644 web/pages/api/v0/_types.ts
 create mode 100644 web/pages/api/v0/market/[id].ts
 create mode 100644 web/pages/api/v0/markets.ts
 create mode 100644 web/pages/api/v0/slug/[slug].ts

diff --git a/web/pages/api/hello.ts b/web/pages/api/hello.ts
deleted file mode 100644
index f8bcc7e5..00000000
--- a/web/pages/api/hello.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
-import type { NextApiRequest, NextApiResponse } from 'next'
-
-type Data = {
-  name: string
-}
-
-export default function handler(
-  req: NextApiRequest,
-  res: NextApiResponse<Data>
-) {
-  res.status(200).json({ name: 'John Doe' })
-}
diff --git a/web/pages/api/v0/_types.ts b/web/pages/api/v0/_types.ts
new file mode 100644
index 00000000..f63a0980
--- /dev/null
+++ b/web/pages/api/v0/_types.ts
@@ -0,0 +1,67 @@
+import { Bet } from '../../../../common/bet'
+import { getProbability } from '../../../../common/calculate'
+import { Comment } from '../../../../common/comment'
+import { Contract } from '../../../../common/contract'
+
+export type LiteContract = {
+  id: string
+  creatorUsername: string
+  creatorName: string
+  createdTime: number
+  closeTime?: number
+  question: string
+  description: string
+  tags: string[]
+  url: string
+  pool: number
+  probability: number
+  volume7Days: number
+  volume24Hours: number
+  isResolved: boolean
+  resolution?: string
+}
+
+export type FullContract = LiteContract & {
+  bets: Bet[]
+  comments: Comment[]
+}
+
+export type ApiError = {
+  error: string
+}
+
+export function toLiteContract({
+  id,
+  creatorUsername,
+  creatorName,
+  createdTime,
+  closeTime,
+  question,
+  description,
+  tags,
+  slug,
+  pool,
+  totalShares,
+  volume7Days,
+  volume24Hours,
+  isResolved,
+  resolution,
+}: Contract): LiteContract {
+  return {
+    id,
+    creatorUsername,
+    creatorName,
+    createdTime,
+    closeTime,
+    question,
+    description,
+    tags,
+    url: `https://manifold.markets/${creatorUsername}/${slug}`,
+    pool: pool.YES + pool.NO,
+    probability: getProbability(totalShares),
+    volume7Days,
+    volume24Hours,
+    isResolved,
+    resolution,
+  }
+}
diff --git a/web/pages/api/v0/market/[id].ts b/web/pages/api/v0/market/[id].ts
new file mode 100644
index 00000000..48993866
--- /dev/null
+++ b/web/pages/api/v0/market/[id].ts
@@ -0,0 +1,32 @@
+import { NextApiRequest, NextApiResponse } from 'next'
+import { listAllBets } from '../../../../lib/firebase/bets'
+import { listAllComments } from '../../../../lib/firebase/comments'
+import { getContractFromId } from '../../../../lib/firebase/contracts'
+import { FullContract, ApiError, toLiteContract } from '../_types'
+
+export default async function handler(
+  req: NextApiRequest,
+  res: NextApiResponse<FullContract | ApiError>
+) {
+  const { id } = req.query
+  const contractId = id as string
+
+  const [contract, bets, comments] = await Promise.all([
+    getContractFromId(contractId),
+    listAllBets(contractId),
+    listAllComments(contractId),
+  ])
+
+  if (!contract) {
+    res.status(404).json({ error: 'Contract not found' })
+    return
+  }
+
+  // Cache on Vercel edge servers for 2min
+  res.setHeader('Cache-Control', 'max-age=0, s-maxage=120')
+  return res.status(200).json({
+    ...toLiteContract(contract),
+    bets,
+    comments,
+  })
+}
diff --git a/web/pages/api/v0/markets.ts b/web/pages/api/v0/markets.ts
new file mode 100644
index 00000000..5106dde0
--- /dev/null
+++ b/web/pages/api/v0/markets.ts
@@ -0,0 +1,16 @@
+// Next.js API route support: https://vercel.com/docs/concepts/functions/serverless-functions
+import type { NextApiRequest, NextApiResponse } from 'next'
+import { listAllContracts } from '../../../lib/firebase/contracts'
+import { toLiteContract } from './_types'
+
+type Data = any[]
+
+export default async function handler(
+  req: NextApiRequest,
+  res: NextApiResponse<Data>
+) {
+  const contracts = await listAllContracts()
+  // Serve from Vercel cache, then update. see https://vercel.com/docs/concepts/functions/edge-caching
+  res.setHeader('Cache-Control', 's-maxage=1, stale-while-revalidate')
+  res.status(200).json(contracts.map(toLiteContract))
+}
diff --git a/web/pages/api/v0/slug/[slug].ts b/web/pages/api/v0/slug/[slug].ts
new file mode 100644
index 00000000..122fa5c1
--- /dev/null
+++ b/web/pages/api/v0/slug/[slug].ts
@@ -0,0 +1,32 @@
+import { NextApiRequest, NextApiResponse } from 'next'
+import { listAllBets } from '../../../../lib/firebase/bets'
+import { listAllComments } from '../../../../lib/firebase/comments'
+import { getContractFromSlug } from '../../../../lib/firebase/contracts'
+import { FullContract, ApiError, toLiteContract } from '../_types'
+
+export default async function handler(
+  req: NextApiRequest,
+  res: NextApiResponse<FullContract | ApiError>
+) {
+  const { slug } = req.query
+
+  const contract = await getContractFromSlug(slug as string)
+
+  if (!contract) {
+    res.status(404).json({ error: 'Contract not found' })
+    return
+  }
+
+  const [bets, comments] = await Promise.all([
+    listAllBets(contract.id),
+    listAllComments(contract.id),
+  ])
+
+  // Cache on Vercel edge servers for 2min
+  res.setHeader('Cache-Control', 'max-age=0, s-maxage=120')
+  return res.status(200).json({
+    ...toLiteContract(contract),
+    bets,
+    comments,
+  })
+}

From 3609255342b593bcde28424cff44bd40a75538cd Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Thu, 17 Feb 2022 16:44:23 -0600
Subject: [PATCH 13/14] sort trades by value

---
 web/components/bets-list.tsx | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/web/components/bets-list.tsx b/web/components/bets-list.tsx
index e68d4fbc..631cd945 100644
--- a/web/components/bets-list.tsx
+++ b/web/components/bets-list.tsx
@@ -33,7 +33,7 @@ import { sellBet } from '../lib/firebase/api-call'
 import { ConfirmationButton } from './confirmation-button'
 import { OutcomeLabel, YesLabel, NoLabel } from './outcome-label'
 
-type BetSort = 'newest' | 'profit' | 'resolved'
+type BetSort = 'newest' | 'profit' | 'resolved' | 'value'
 
 export function BetsList(props: { user: User }) {
   const { user } = props
@@ -41,7 +41,7 @@ export function BetsList(props: { user: User }) {
 
   const [contracts, setContracts] = useState<Contract[]>([])
 
-  const [sort, setSort] = useState<BetSort>('profit')
+  const [sort, setSort] = useState<BetSort>('value')
 
   useEffect(() => {
     const loadedBets = bets ? bets : []
@@ -104,6 +104,8 @@ export function BetsList(props: { user: User }) {
       contracts,
       (c) => -1 * (contractsCurrentValue[c.id] - contractsInvestment[c.id])
     )
+  } else if (sort === 'value') {
+    sortedContracts = _.sortBy(contracts, (c) => -contractsCurrentValue[c.id])
   }
 
   const [resolved, unresolved] = _.partition(
@@ -161,6 +163,7 @@ export function BetsList(props: { user: User }) {
           value={sort}
           onChange={(e) => setSort(e.target.value as BetSort)}
         >
+          <option value="value">By value</option>
           <option value="profit">By profit</option>
           <option value="newest">Newest</option>
           <option value="resolved">Resolved</option>
@@ -280,6 +283,10 @@ export function MyBetsSummary(props: {
     calculatePayout(contract, bet, 'NO')
   )
 
+  const p = getProbability(contract.totalShares)
+
+  const expectation = p * yesWinnings + (1 - p) * noWinnings
+
   const marketWinnings = _.sumBy(excludeSales, (bet) =>
     calculatePayout(contract, bet, 'MKT')
   )
@@ -330,6 +337,14 @@ export function MyBetsSummary(props: {
             payoutCol
           ) : (
             <>
+              <Col>
+                <div className="whitespace-nowrap text-sm text-gray-500">
+                  Expectation
+                </div>
+                <div className="whitespace-nowrap">
+                  {formatMoney(expectation)}
+                </div>
+              </Col>
               <Col>
                 <div className="whitespace-nowrap text-sm text-gray-500">
                   Payout if <YesLabel />

From d3fdd4cd1f1fb32882940b2a631b1c0e710b6822 Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Thu, 17 Feb 2022 16:49:00 -0600
Subject: [PATCH 14/14] bets list: comment out expectation

---
 web/components/bets-list.tsx | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/web/components/bets-list.tsx b/web/components/bets-list.tsx
index 631cd945..caa38891 100644
--- a/web/components/bets-list.tsx
+++ b/web/components/bets-list.tsx
@@ -283,9 +283,8 @@ export function MyBetsSummary(props: {
     calculatePayout(contract, bet, 'NO')
   )
 
-  const p = getProbability(contract.totalShares)
-
-  const expectation = p * yesWinnings + (1 - p) * noWinnings
+  // const p = getProbability(contract.totalShares)
+  // const expectation = p * yesWinnings + (1 - p) * noWinnings
 
   const marketWinnings = _.sumBy(excludeSales, (bet) =>
     calculatePayout(contract, bet, 'MKT')
@@ -337,14 +336,14 @@ export function MyBetsSummary(props: {
             payoutCol
           ) : (
             <>
-              <Col>
+              {/* <Col>
                 <div className="whitespace-nowrap text-sm text-gray-500">
                   Expectation
                 </div>
                 <div className="whitespace-nowrap">
                   {formatMoney(expectation)}
                 </div>
-              </Col>
+              </Col> */}
               <Col>
                 <div className="whitespace-nowrap text-sm text-gray-500">
                   Payout if <YesLabel />