From c1d77f48e36cfd4dd3f27f6e4f9a12198b7ebde4 Mon Sep 17 00:00:00 2001
From: James Grugett <jahooma@gmail.com>
Date: Sat, 16 Jul 2022 18:56:21 -0500
Subject: [PATCH 01/71] Fix tag filter

---
 web/components/contract-search.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/components/contract-search.tsx b/web/components/contract-search.tsx
index f7972a3d..78b28a94 100644
--- a/web/components/contract-search.tsx
+++ b/web/components/contract-search.tsx
@@ -121,6 +121,7 @@ export function ContractSearch(props: {
       additionalFilter?.creatorId
         ? `creatorId:${additionalFilter.creatorId}`
         : '',
+      additionalFilter?.tag ? `lowercaseTags:${additionalFilter.tag}` : '',
       additionalFilter?.groupSlug
         ? `groupSlugs:${additionalFilter.groupSlug}`
         : '',

From 07bfdadd25fa1ea75a8c6f3f774c858acf39a9f9 Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Sun, 17 Jul 2022 14:40:14 -0500
Subject: [PATCH 02/71] remove OnlineUserList b/c of responsiveness issues

---
 web/pages/group/[...slugs]/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/pages/group/[...slugs]/index.tsx b/web/pages/group/[...slugs]/index.tsx
index 5fd564ea..df1c7e2f 100644
--- a/web/pages/group/[...slugs]/index.tsx
+++ b/web/pages/group/[...slugs]/index.tsx
@@ -178,7 +178,7 @@ export default function GroupPage(props: {
         user={user}
         isMember={!!isMember}
       />
-      <OnlineUserList users={members} />
+      {/* <OnlineUserList users={members} /> */}
     </Col>
   )
   const leaderboard = (

From b5f0b5889827fbb5f864418110d83532558199dd Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Sun, 17 Jul 2022 15:17:31 -0500
Subject: [PATCH 03/71] usePing

---
 web/components/nav/sidebar.tsx | 15 ++++-----------
 web/hooks/use-ping.ts          | 16 ++++++++++++++++
 2 files changed, 20 insertions(+), 11 deletions(-)
 create mode 100644 web/hooks/use-ping.ts

diff --git a/web/components/nav/sidebar.tsx b/web/components/nav/sidebar.tsx
index 55f11b16..5c3b9128 100644
--- a/web/components/nav/sidebar.tsx
+++ b/web/components/nav/sidebar.tsx
@@ -13,7 +13,7 @@ import clsx from 'clsx'
 import Link from 'next/link'
 import { useRouter } from 'next/router'
 import { usePrivateUser, useUser } from 'web/hooks/use-user'
-import { firebaseLogout, updateUser, User } from 'web/lib/firebase/users'
+import { firebaseLogout, User } from 'web/lib/firebase/users'
 import { ManifoldLogo } from './manifold-logo'
 import { MenuButton } from './menu'
 import { ProfileSummary } from './profile-menu'
@@ -193,10 +193,13 @@ export default function Sidebar(props: { className?: string }) {
 
   const user = useUser()
   const privateUser = usePrivateUser(user?.id)
+  // usePing(user?.id)
+
   const navigationOptions = !user ? signedOutNavigation : getNavigation()
   const mobileNavigationOptions = !user
     ? signedOutMobileNavigation
     : signedInMobileNavigation
+
   const memberItems = (
     useMemberGroups(
       user?.id,
@@ -208,16 +211,6 @@ export default function Sidebar(props: { className?: string }) {
     href: `${groupPath(group.slug)}/${GROUP_CHAT_SLUG}`,
   }))
 
-  useEffect(() => {
-    if (!user) return
-    const pingInterval = setInterval(() => {
-      updateUser(user.id, {
-        lastPingTime: Date.now(),
-      })
-    }, 1000 * 30)
-    return () => clearInterval(pingInterval)
-  }, [user])
-
   return (
     <nav aria-label="Sidebar" className={className}>
       <ManifoldLogo className="py-6" twoLine />
diff --git a/web/hooks/use-ping.ts b/web/hooks/use-ping.ts
new file mode 100644
index 00000000..31daa770
--- /dev/null
+++ b/web/hooks/use-ping.ts
@@ -0,0 +1,16 @@
+import { useEffect } from 'react'
+import { updateUser } from 'web/lib/firebase/users'
+
+export const usePing = (userId: string | undefined) => {
+  useEffect(() => {
+    if (!userId) return
+
+    const pingInterval = setInterval(() => {
+      updateUser(userId, {
+        lastPingTime: Date.now(),
+      })
+    }, 1000 * 30)
+
+    return () => clearInterval(pingInterval)
+  }, [userId])
+}

From 281b7122583cf96bdb487db783d0c36c28f308b1 Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Sun, 17 Jul 2022 15:56:39 -0500
Subject: [PATCH 04/71] move group chat to sidebar on desktop

---
 web/components/page.tsx              | 10 ++++--
 web/pages/group/[...slugs]/index.tsx | 47 ++++++++++++++--------------
 2 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/web/components/page.tsx b/web/components/page.tsx
index e76a4dc2..40cbf7f7 100644
--- a/web/components/page.tsx
+++ b/web/components/page.tsx
@@ -8,9 +8,11 @@ export function Page(props: {
   rightSidebar?: ReactNode
   suspend?: boolean
   className?: string
+  rightSidebarClassName?: string
   children?: ReactNode
 }) {
-  const { children, rightSidebar, suspend, className } = props
+  const { children, rightSidebar, suspend, className, rightSidebarClassName } =
+    props
 
   const bottomBarPadding = 'pb-[58px] lg:pb-0 '
   return (
@@ -37,7 +39,11 @@ export function Page(props: {
           <div className="block xl:hidden">{rightSidebar}</div>
         </main>
         <aside className="hidden xl:col-span-3 xl:block">
-          <div className="sticky top-4 space-y-4">{rightSidebar}</div>
+          <div
+            className={clsx('sticky top-4 space-y-4', rightSidebarClassName)}
+          >
+            {rightSidebar}
+          </div>
         </aside>
       </div>
 
diff --git a/web/pages/group/[...slugs]/index.tsx b/web/pages/group/[...slugs]/index.tsx
index df1c7e2f..c914b7f0 100644
--- a/web/pages/group/[...slugs]/index.tsx
+++ b/web/pages/group/[...slugs]/index.tsx
@@ -52,8 +52,8 @@ import { FollowList } from 'web/components/follow-list'
 import { SearchIcon } from '@heroicons/react/outline'
 import { useTipTxns } from 'web/hooks/use-tip-txns'
 import { JoinOrLeaveGroupButton } from 'web/components/groups/groups-button'
-import { OnlineUserList } from 'web/components/online-user-list'
 import { searchInAny } from 'common/util/parse'
+import { useWindowSize } from 'web/hooks/use-window-size'
 
 export const getStaticProps = fromPropz(getStaticPropz)
 export async function getStaticPropz(props: { params: { slugs: string[] } }) {
@@ -164,6 +164,9 @@ export default function GroupPage(props: {
       writeReferralInfo(creator.username, undefined, referrer, group?.slug)
   }, [user, creator, group, router])
 
+  const { width } = useWindowSize()
+  const showChatSidebar = (width ?? 1280) >= 1280
+
   if (group === null || !groupSubpages.includes(page) || slugs[2]) {
     return <Custom404 />
   }
@@ -171,16 +174,6 @@ export default function GroupPage(props: {
   const isCreator = user && group && user.id === group.creatorId
   const isMember = user && memberIds.includes(user.id)
 
-  const rightSidebar = (
-    <Col className="mt-6 hidden xl:block">
-      <JoinOrAddQuestionsButtons
-        group={group}
-        user={user}
-        isMember={!!isMember}
-      />
-      {/* <OnlineUserList users={members} /> */}
-    </Col>
-  )
   const leaderboard = (
     <Col>
       <GroupLeaderboards
@@ -206,22 +199,25 @@ export default function GroupPage(props: {
     </Col>
   )
 
+  const chatTab = group.chatDisabled ? (
+    <></>
+  ) : (
+    <Col className="">
+      {messages ? (
+        <GroupChat messages={messages} user={user} group={group} tips={tips} />
+      ) : (
+        <LoadingIndicator />
+      )}
+    </Col>
+  )
+
   const tabs = [
-    ...(group.chatDisabled
+    ...(group.chatDisabled || showChatSidebar
       ? []
       : [
           {
             title: 'Chat',
-            content: messages ? (
-              <GroupChat
-                messages={messages}
-                user={user}
-                group={group}
-                tips={tips}
-              />
-            ) : (
-              <LoadingIndicator />
-            ),
+            content: chatTab,
             href: groupPath(group.slug, GROUP_CHAT_SLUG),
           },
         ]),
@@ -251,8 +247,13 @@ export default function GroupPage(props: {
     },
   ]
   const tabIndex = tabs.map((t) => t.title).indexOf(page ?? GROUP_CHAT_SLUG)
+
   return (
-    <Page rightSidebar={rightSidebar} className="!pb-0">
+    <Page
+      rightSidebar={showChatSidebar ? chatTab : undefined}
+      rightSidebarClassName="!top-0"
+      className="!max-w-none !pb-0"
+    >
       <SEO
         title={group.name}
         description={`Created by ${creator.name}. ${group.about}`}

From f393246e4faae3508a85e7aaf25e09e8a5ddf52d Mon Sep 17 00:00:00 2001
From: Austin Chen <akrolsmir@gmail.com>
Date: Sun, 17 Jul 2022 22:22:44 -0700
Subject: [PATCH 05/71] Let users edit descriptions and questions (#654)

* Use rich text editor on the description

* Write a new line to description when the question is changed

* Stop showing categories

* Allow anyone to edit their own question
---
 .../contract/contract-description.tsx         | 211 ++++++++++--------
 web/components/editor.tsx                     |   6 +-
 2 files changed, 119 insertions(+), 98 deletions(-)

diff --git a/web/components/contract/contract-description.tsx b/web/components/contract/contract-description.tsx
index b2f839e9..d9864186 100644
--- a/web/components/contract/contract-description.tsx
+++ b/web/components/contract/contract-description.tsx
@@ -2,16 +2,17 @@ import clsx from 'clsx'
 import dayjs from 'dayjs'
 import { useState } from 'react'
 import Textarea from 'react-expanding-textarea'
-import { CATEGORY_LIST } from '../../../common/categories'
 
-import { Contract } from 'common/contract'
-import { parseTags, exhibitExts } from 'common/util/parse'
+import { Contract, MAX_DESCRIPTION_LENGTH } from 'common/contract'
+import { exhibitExts, parseTags } from 'common/util/parse'
 import { useAdmin } from 'web/hooks/use-admin'
 import { updateContract } from 'web/lib/firebase/contracts'
 import { Row } from '../layout/row'
-import { TagsList } from '../tags-list'
 import { Content } from '../editor'
-import { Editor } from '@tiptap/react'
+import { TextEditor, useTextEditor } from 'web/components/editor'
+import { Button } from '../button'
+import { Spacer } from '../layout/spacer'
+import { Editor, Content as ContentType } from '@tiptap/react'
 
 export function ContractDescription(props: {
   contract: Contract
@@ -19,20 +20,39 @@ export function ContractDescription(props: {
   className?: string
 }) {
   const { contract, isCreator, className } = props
-  const descriptionTimestamp = () => `${dayjs().format('MMM D, h:mma')}: `
   const isAdmin = useAdmin()
+  return (
+    <div className={clsx('mt-2 text-gray-700', className)}>
+      {isCreator || isAdmin ? (
+        <RichEditContract contract={contract} />
+      ) : (
+        <Content content={contract.description} />
+      )}
+      {isAdmin && !isCreator && (
+        <div className="mt-2 text-red-400">(👆 admin powers)</div>
+      )}
+    </div>
+  )
+}
 
-  const desc = contract.description ?? ''
+function editTimestamp() {
+  return `${dayjs().format('MMM D, h:mma')}: `
+}
 
-  // Append the new description (after a newline)
-  async function saveDescription(newText: string) {
-    const editor = new Editor({ content: desc, extensions: exhibitExts })
-    editor
-      .chain()
-      .focus('end')
-      .insertContent('<br /><br />')
-      .insertContent(newText.trim())
-      .run()
+function RichEditContract(props: { contract: Contract }) {
+  const { contract } = props
+  const [editing, setEditing] = useState(false)
+  const [editingQ, setEditingQ] = useState(false)
+  const [isSubmitting, setIsSubmitting] = useState(false)
+
+  const { editor, upload } = useTextEditor({
+    max: MAX_DESCRIPTION_LENGTH,
+    defaultValue: contract.description,
+    disabled: isSubmitting,
+  })
+
+  async function saveDescription() {
+    if (!editor) return
 
     const tags = parseTags(
       `${editor.getText()} ${contract.tags.map((tag) => `#${tag}`).join(' ')}`
@@ -46,76 +66,92 @@ export function ContractDescription(props: {
     })
   }
 
-  const { tags } = contract
-  const categories = tags.filter((tag) =>
-    CATEGORY_LIST.includes(tag.toLowerCase())
-  )
-
-  return (
-    <div
-      className={clsx(
-        'mt-2 whitespace-pre-line break-words text-gray-700',
-        className
-      )}
-    >
-      <Content content={desc} />
-
-      {categories.length > 0 && (
-        <div className="mt-4">
-          <TagsList tags={categories} noLabel />
-        </div>
-      )}
-
-      <br />
-
-      {isCreator && (
-        <EditContract
-          // Note: Because descriptionTimestamp is called once, later edits use
-          // a stale timestamp. Ideally this is a function that gets called when
-          // isEditing is set to true.
-          text={descriptionTimestamp()}
-          onSave={saveDescription}
-          buttonText="Add to description"
-        />
-      )}
-      {isAdmin && (
-        <EditContract
-          text={contract.question}
-          onSave={(question) => updateContract(contract.id, { question })}
-          buttonText="ADMIN: Edit question"
-        />
-      )}
-      {/* {isAdmin && (
-        <EditContract
-          text={contract.createdTime.toString()}
-          onSave={(time) =>
-            updateContract(contract.id, { createdTime: Number(time) })
-          }
-          buttonText="ADMIN: Edit createdTime"
-        />
-      )} */}
-    </div>
+  return editing ? (
+    <>
+      <TextEditor editor={editor} upload={upload} />
+      <Spacer h={2} />
+      <Row className="gap-2">
+        <Button
+          onClick={async () => {
+            setIsSubmitting(true)
+            await saveDescription()
+            setEditing(false)
+            setIsSubmitting(false)
+          }}
+        >
+          Save
+        </Button>
+        <Button color="gray" onClick={() => setEditing(false)}>
+          Cancel
+        </Button>
+      </Row>
+    </>
+  ) : (
+    <>
+      <Content content={contract.description} />
+      <Spacer h={2} />
+      <Row className="gap-2">
+        <Button
+          color="gray"
+          onClick={() => {
+            setEditing(true)
+            editor
+              ?.chain()
+              .setContent(contract.description)
+              .focus('end')
+              .insertContent(`<p>${editTimestamp()}</p>`)
+              .run()
+          }}
+        >
+          Edit description
+        </Button>
+        <Button color="gray" onClick={() => setEditingQ(true)}>
+          Edit question
+        </Button>
+      </Row>
+      <EditQuestion
+        contract={contract}
+        editing={editingQ}
+        setEditing={setEditingQ}
+      />
+    </>
   )
 }
 
-function EditContract(props: {
-  text: string
-  onSave: (newText: string) => void
-  buttonText: string
+function EditQuestion(props: {
+  contract: Contract
+  editing: boolean
+  setEditing: (editing: boolean) => void
 }) {
-  const [text, setText] = useState(props.text)
-  const [editing, setEditing] = useState(false)
-  const onSave = (newText: string) => {
+  const { contract, editing, setEditing } = props
+  const [text, setText] = useState(contract.question)
+
+  function questionChanged(oldQ: string, newQ: string) {
+    return `<p>${editTimestamp()}<s>${oldQ}</s> → ${newQ}</p>`
+  }
+
+  function joinContent(oldContent: ContentType, newContent: string) {
+    const editor = new Editor({ content: oldContent, extensions: exhibitExts })
+    editor.chain().focus('end').insertContent(newContent).run()
+    return editor.getJSON()
+  }
+
+  const onSave = async (newText: string) => {
     setEditing(false)
-    setText(props.text) // Reset to original text
-    props.onSave(newText)
+    await updateContract(contract.id, {
+      question: newText,
+      description: joinContent(
+        contract.description,
+        questionChanged(contract.question, newText)
+      ),
+    })
   }
 
   return editing ? (
     <div className="mt-4">
       <Textarea
         className="textarea textarea-bordered mb-1 h-24 w-full resize-none"
-        rows={3}
+        rows={2}
         value={text}
         onChange={(e) => setText(e.target.value || '')}
         autoFocus
@@ -130,28 +166,11 @@ function EditContract(props: {
         }}
       />
       <Row className="gap-2">
-        <button
-          className="btn btn-neutral btn-outline btn-sm"
-          onClick={() => onSave(text)}
-        >
-          Save
-        </button>
-        <button
-          className="btn btn-error btn-outline btn-sm"
-          onClick={() => setEditing(false)}
-        >
+        <Button onClick={() => onSave(text)}>Save</Button>
+        <Button color="gray" onClick={() => setEditing(false)}>
           Cancel
-        </button>
+        </Button>
       </Row>
     </div>
-  ) : (
-    <Row>
-      <button
-        className="btn btn-neutral btn-outline btn-xs mt-4"
-        onClick={() => setEditing(true)}
-      >
-        {props.buttonText}
-      </button>
-    </Row>
-  )
+  ) : null
 }
diff --git a/web/components/editor.tsx b/web/components/editor.tsx
index 43d69c26..fabce934 100644
--- a/web/components/editor.tsx
+++ b/web/components/editor.tsx
@@ -21,7 +21,7 @@ import { FileUploadButton } from './file-upload-button'
 import { linkClass } from './site-link'
 
 const proseClass = clsx(
-  'prose prose-p:my-0 prose-li:my-0 prose-blockquote:not-italic max-w-none prose-quoteless font-light'
+  'prose prose-p:my-2 prose-li:my-0 prose-blockquote:not-italic max-w-none prose-quoteless font-light'
 )
 
 export function useTextEditor(props: {
@@ -155,7 +155,9 @@ function RichContent(props: { content: JSONContent }) {
 export function Content(props: { content: JSONContent | string }) {
   const { content } = props
   return typeof content === 'string' ? (
-    <Linkify text={content} />
+    <div className="whitespace-pre-line break-words">
+      <Linkify text={content} />
+    </div>
   ) : (
     <RichContent content={content} />
   )

From a247e6d0de37c5cf6dacf7ed5e548b8deba5ca85 Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Mon, 18 Jul 2022 07:38:02 -0600
Subject: [PATCH 06/71] Default to created time if no chat activity

---
 web/lib/firebase/groups.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/lib/firebase/groups.ts b/web/lib/firebase/groups.ts
index e49b012a..6dfc1b88 100644
--- a/web/lib/firebase/groups.ts
+++ b/web/lib/firebase/groups.ts
@@ -68,10 +68,10 @@ export function listenForMemberGroups(
   const q = query(groups, where('memberIds', 'array-contains', userId))
   const sorter = (group: Group) => {
     if (sort?.by === 'mostRecentChatActivityTime') {
-      return group.mostRecentChatActivityTime ?? group.mostRecentActivityTime
+      return group.mostRecentChatActivityTime ?? group.createdTime
     }
     if (sort?.by === 'mostRecentContractAddedTime') {
-      return group.mostRecentContractAddedTime ?? group.mostRecentActivityTime
+      return group.mostRecentContractAddedTime ?? group.createdTime
     }
     return group.mostRecentActivityTime
   }

From 906cfc29c88a428d07a573555f37bdc947750da9 Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Mon, 18 Jul 2022 07:59:21 -0600
Subject: [PATCH 07/71] Endswith=>includes to handle sort query in group chat

---
 functions/src/create-notification.ts | 1 +
 web/components/nav/sidebar.tsx       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/functions/src/create-notification.ts b/functions/src/create-notification.ts
index 4c42b00e..56493043 100644
--- a/functions/src/create-notification.ts
+++ b/functions/src/create-notification.ts
@@ -411,6 +411,7 @@ export const createGroupCommentNotification = async (
   group: Group,
   idempotencyKey: string
 ) => {
+  if (toUserId === fromUser.id) return
   const notificationRef = firestore
     .collection(`/users/${toUserId}/notifications`)
     .doc(idempotencyKey)
diff --git a/web/components/nav/sidebar.tsx b/web/components/nav/sidebar.tsx
index 5c3b9128..821d1397 100644
--- a/web/components/nav/sidebar.tsx
+++ b/web/components/nav/sidebar.tsx
@@ -294,7 +294,7 @@ function GroupsList(props: {
       if (
         notification.isSeenOnHref === currentPage ||
         // Old chat style group chat notif ended just with the group slug
-        notification.isSeenOnHref?.endsWith(currentPageGroupSlug) ||
+        notification.isSeenOnHref?.includes(currentPageGroupSlug) ||
         // They're on the home page, so if they've a chat notif, they're seeing the chat
         (notification.isSeenOnHref?.endsWith(GROUP_CHAT_SLUG) &&
           currentPage.endsWith(currentPageGroupSlug))

From d012561c50819687a6490271fa10da9e1096d8b2 Mon Sep 17 00:00:00 2001
From: SirSaltyy <104849031+SirSaltyy@users.noreply.github.com>
Date: Mon, 18 Jul 2022 15:13:16 +0100
Subject: [PATCH 08/71] Create 500-mana.html (#658)

---
 functions/src/email-templates/500-mana.html | 29 +++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 functions/src/email-templates/500-mana.html

diff --git a/functions/src/email-templates/500-mana.html b/functions/src/email-templates/500-mana.html
new file mode 100644
index 00000000..5f0c450e
--- /dev/null
+++ b/functions/src/email-templates/500-mana.html
@@ -0,0 +1,29 @@
+<iframe
+  style="border: 0px; width: 100%; height: 100%"
+  seamless
+  sandbox
+  srcdoc='<!doctype html><html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office"><head><title>7th Day Anniversary Gift!</title><!--[if !mso]><!--><meta http-equiv="X-UA-Compatible" content="IE=edge"><!--<![endif]--><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="viewport" content="width=device-width,initial-scale=1"><style type="text/css">#outlook a { padding:0; }
+          body { margin:0;padding:0;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%; }
+          table, td { border-collapse:collapse;mso-table-lspace:0pt;mso-table-rspace:0pt; }
+          img { border:0;height:auto;line-height:100%; outline:none;text-decoration:none;-ms-interpolation-mode:bicubic; }
+          p { display:block;margin:13px 0; }</style><!--[if mso]>
+        <noscript>
+        <xml>
+        <o:OfficeDocumentSettings>
+          <o:AllowPNG/>
+          <o:PixelsPerInch>96</o:PixelsPerInch>
+        </o:OfficeDocumentSettings>
+        </xml>
+        </noscript>
+        <![endif]--><!--[if lte mso 11]>
+        <style type="text/css">
+          .mj-outlook-group-fix { width:100% !important; }
+        </style>
+        <![endif]--><style type="text/css">@media only screen and (min-width:480px) {
+        .mj-column-per-100 { width:100% !important; max-width: 100%; }
+      }</style><style media="screen and (min-width:480px)">.moz-text-html .mj-column-per-100 { width:100% !important; max-width: 100%; }</style><style type="text/css">[owa] .mj-column-per-100 { width:100% !important; max-width: 100%; }</style><style type="text/css">@media only screen and (max-width:480px) {
+      table.mj-full-width-mobile { width: 100% !important; }
+      td.mj-full-width-mobile { width: auto !important; }
+    }</style></head><body style="word-spacing:normal;background-color:#F4F4F4;"><div style="background-color:#F4F4F4;"><!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" bgcolor="#ffffff" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]--><div style="background:#ffffff;background-color:#ffffff;margin:0px auto;max-width:600px;"><table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="background:#ffffff;background-color:#ffffff;width:100%;"><tbody><tr><td style="direction:ltr;font-size:0px;padding:0px 0px 0px 0px;padding-bottom:0px;padding-left:0px;padding-right:0px;padding-top:0px;text-align:center;"><!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]--><div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;"><table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%"><tbody><tr><td align="center" style="font-size:0px;padding:0px 25px 0px 25px;padding-top:0px;padding-right:25px;padding-bottom:0px;padding-left:25px;word-break:break-word;"><table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;"><tbody><tr><td style="width:550px;"><a href="https://manifold.markets/home" target="_blank"><img alt="" height="auto" src="https://03jlj.mjt.lu/img/03jlj/b/u71/sjvu.gif" style="border:none;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="550"></a></td></tr></tbody></table></td></tr><tr><td align="left" style="font-size:0px;padding:10px 25px;padding-top:0px;padding-bottom:0px;word-break:break-word;"><div style="font-family:Arial, sans-serif;font-size:18px;letter-spacing:normal;line-height:1;text-align:left;color:#000000;"><p class="text-build-content" style="text-align: center; margin: 10px 0; margin-top: 10px; margin-bottom: 10px;" data-testid="4XoHRGw1Y"><span style="color:#000000;font-family:Arial, Helvetica, sans-serif;font-size:18px;">Running low on Mana? Click the link below to recieve a one time gift of 500 Mana!</span></p></div></td></tr><tr><td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;"><table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;"><tbody><tr><td style="width:550px;"><a href="https://manifold.markets/link/lj4JbBvE" target="_blank"><img alt="" height="auto" src="https://03jlj.mjt.lu/img/03jlj/b/u71/4pg3.png" style="border:none;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="550"></a></td></tr></tbody></table></td></tr><tr><td align="left" style="font-size:0px;padding:15px 25px 0px 25px;padding-top:15px;padding-right:25px;padding-bottom:0px;padding-left:25px;word-break:break-word;"><div style="font-family:Arial, sans-serif;font-size:18px;letter-spacing:normal;line-height:1;text-align:left;color:#000000;"><p class="text-build-content" style="line-height: 23px; margin: 10px 0; margin-top: 10px;" data-testid="3Q8BP69fq"><span style="font-family:Arial, sans-serif;font-size:18px;">Did you know, besides making correct predictions, there are plenty of other ways to earn Mana?</span></p><ul><li style="line-height:23px;"><span style="font-family:Arial, sans-serif;font-size:18px;">Recieving tips on comments</span></li><li style="line-height:23px;"><span style="font-family:Arial, sans-serif;font-size:18px;">Unique trader bonus for each user who bets on you markets</span></li><li style="line-height:23px;"><span style="font-family:Arial, sans-serif;font-size:18px;">Reffering friends (click the share button on &nbsp;a market or group!)</span></li><li style="line-height:23px;"><a class="link-build-content" style="color:inherit;; text-decoration: none;" target="_blank" href="https://manifold.markets/group/bugs?s=most-traded"><span style="color:#55575d;font-family:Arial;font-size:18px;"><u>Reporting bugs</u></span></a><span style="font-family:Arial, sans-serif;font-size:18px;"> and </span><a class="link-build-content" style="color:inherit;; text-decoration: none;" target="_blank" href="https://manifold.markets/group/manifold-features-25bad7c7792e/chat?s=most-traded"><span style="color:#55575d;font-family:Arial;font-size:18px;"><u>giving feedback</u></span></a></li></ul><p class="text-build-content" data-testid="3Q8BP69fq" style="margin: 10px 0;">&nbsp;</p><p class="text-build-content" data-testid="3Q8BP69fq" style="margin: 10px 0;"><span style="color:#000000;font-family:Arial;font-size:18px;">Cheers,</span></p><p class="text-build-content" data-testid="3Q8BP69fq" style="margin: 10px 0;"><span style="color:#000000;font-family:Arial;font-size:18px;">David from Manifold</span></p><p class="text-build-content" data-testid="3Q8BP69fq" style="margin: 10px 0; margin-bottom: 10px;">&nbsp;</p></div></td></tr></tbody></table></div><!--[if mso | IE]></td></tr></table><![endif]--></td></tr></tbody></table></div><!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]--><div style="margin:0px auto;max-width:600px;"><table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;"><tbody><tr><td style="direction:ltr;font-size:0px;padding:0 0 20px 0;text-align:center;"><!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]--><div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;"><table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%"><tbody><tr><td align="center" style="font-size:0px;padding:0px;word-break:break-word;"><table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;">
+       </div><!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]--><div style="margin:0px auto;max-width:600px;"><table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;"><tbody><tr><td style="direction:ltr;font-size:0px;padding:20px 0px 20px 0px;text-align:center;"><!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]--><div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;"><table border="0" cellpadding="0" cellspacing="0" role="presentation" width="100%"><tbody><tr><td style="vertical-align:top;padding:0;"><table border="0" cellpadding="0" cellspacing="0" role="presentation" width="100%"><tbody><tr><td align="center" style="font-size:0px;padding:10px 25px;padding-top:0px;padding-bottom:0px;word-break:break-word;"><div style="font-family:Arial, sans-serif;font-size:11px;letter-spacing:normal;line-height:22px;text-align:center;color:#000000;"><p style="margin: 10px 0;">This e-mail has been sent to [[EMAIL_TO]], <a href="{{unsubscribeLink}}” style="color:inherit;text-decoration:none;" target="_blank">click here to unsubscribe</a>.</p></div></td></tr><tr><td align="center" style="font-size:0px;padding:10px 25px;padding-top:0px;padding-bottom:0px;word-break:break-word;"><div style="font-family:Arial, sans-serif;font-size:11px;letter-spacing:normal;line-height:22px;text-align:center;color:#000000;"></div></td></tr></tbody></table></td></tr></tbody></table></div><!--[if mso | IE]></td></tr></table><![endif]--></td></tr></tbody></table></div><!--[if mso | IE]></td></tr></table><![endif]--></div></body></html>'
+></iframe>

From eb4906cb97a961d5cd781f9556059cd41c2c0dd6 Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Mon, 18 Jul 2022 08:18:40 -0600
Subject: [PATCH 09/71] Remove query from notif isSeen logic

---
 web/components/nav/sidebar.tsx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/web/components/nav/sidebar.tsx b/web/components/nav/sidebar.tsx
index 821d1397..77af99e0 100644
--- a/web/components/nav/sidebar.tsx
+++ b/web/components/nav/sidebar.tsx
@@ -289,15 +289,17 @@ function GroupsList(props: {
 
   // Set notification as seen if our current page is equal to the isSeenOnHref property
   useEffect(() => {
-    const currentPageGroupSlug = currentPage.split('/')[2]
+    const currentPageWithoutQuery = currentPage.split('?')[0]
+    const currentPageGroupSlug = currentPageWithoutQuery.split('/')[2]
     preferredNotifications.forEach((notification) => {
       if (
         notification.isSeenOnHref === currentPage ||
-        // Old chat style group chat notif ended just with the group slug
-        notification.isSeenOnHref?.includes(currentPageGroupSlug) ||
+        // Old chat style group chat notif was just /group/slug
+        (notification.isSeenOnHref &&
+          currentPageWithoutQuery.includes(notification.isSeenOnHref)) ||
         // They're on the home page, so if they've a chat notif, they're seeing the chat
         (notification.isSeenOnHref?.endsWith(GROUP_CHAT_SLUG) &&
-          currentPage.endsWith(currentPageGroupSlug))
+          currentPageWithoutQuery.endsWith(currentPageGroupSlug))
       ) {
         setNotificationsAsSeen([notification])
       }

From 229d270d2546e545e48e1a87d44c54c7539e08a0 Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Mon, 18 Jul 2022 08:34:20 -0600
Subject: [PATCH 10/71] Set max width on avatars

---
 web/components/avatar.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/components/avatar.tsx b/web/components/avatar.tsx
index 53257deb..0436d61c 100644
--- a/web/components/avatar.tsx
+++ b/web/components/avatar.tsx
@@ -31,6 +31,7 @@ export function Avatar(props: {
         !noLink && 'cursor-pointer',
         className
       )}
+      style={{ maxWidth: `${s * 0.25}rem` }}
       src={avatarUrl}
       onClick={onClick}
       alt={username}

From db537a97bafdeb6c4163903bc90fa9af66ecc567 Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Mon, 18 Jul 2022 08:35:59 -0600
Subject: [PATCH 11/71] Allow click on group card avatar

---
 web/pages/groups.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/pages/groups.tsx b/web/pages/groups.tsx
index 9e21c346..c87f801b 100644
--- a/web/pages/groups.tsx
+++ b/web/pages/groups.tsx
@@ -185,7 +185,7 @@ export function GroupCard(props: { group: Group; creator: User | undefined }) {
       </Link>
       <div>
         <Avatar
-          className={'absolute top-2 right-2'}
+          className={'absolute top-2 right-2 z-10'}
           username={creator?.username}
           avatarUrl={creator?.avatarUrl}
           noLink={false}

From 39c38a669e3a104be9ee2c0fd3da6f91615ee195 Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Mon, 18 Jul 2022 10:40:44 -0600
Subject: [PATCH 12/71] Referrals bug fix and attribute group

---
 common/notification.ts               |  1 +
 common/user.ts                       |  1 +
 firestore.rules                      |  4 +-
 functions/src/create-notification.ts | 65 +++++++++++++++++++++-------
 functions/src/on-update-user.ts      | 25 +++++++----
 web/lib/firebase/groups.ts           |  6 +--
 web/lib/firebase/users.ts            | 22 +++++-----
 web/pages/group/[...slugs]/index.tsx |  2 +-
 web/pages/notifications.tsx          | 10 ++++-
 9 files changed, 94 insertions(+), 42 deletions(-)

diff --git a/common/notification.ts b/common/notification.ts
index 63a44a52..5fd4236b 100644
--- a/common/notification.ts
+++ b/common/notification.ts
@@ -63,3 +63,4 @@ export type notification_reason_types =
   | 'on_group_you_are_member_of'
   | 'tip_received'
   | 'bet_fill'
+  | 'user_joined_from_your_group_invite'
diff --git a/common/user.ts b/common/user.ts
index 6eed3bdb..1995ce34 100644
--- a/common/user.ts
+++ b/common/user.ts
@@ -38,6 +38,7 @@ export type User = {
 
   referredByUserId?: string
   referredByContractId?: string
+  referredByGroupId?: string
   lastPingTime?: number
 }
 
diff --git a/firestore.rules b/firestore.rules
index 84c3e990..63df4d16 100644
--- a/firestore.rules
+++ b/firestore.rules
@@ -22,11 +22,11 @@ service cloud.firestore {
       allow read;
       allow update: if resource.data.id == request.auth.uid
                        && request.resource.data.diff(resource.data).affectedKeys()
-                                                                    .hasOnly(['bio', 'bannerUrl', 'website', 'twitterHandle', 'discordHandle', 'followedCategories', 'referredByContractId', 'lastPingTime']);
+                                                                    .hasOnly(['bio', 'bannerUrl', 'website', 'twitterHandle', 'discordHandle', 'followedCategories', 'lastPingTime']);
       // User referral rules
       allow update: if resource.data.id == request.auth.uid
                          && request.resource.data.diff(resource.data).affectedKeys()
-                          .hasOnly(['referredByUserId'])
+                          .hasOnly(['referredByUserId', 'referredByContractId', 'referredByGroupId'])
                           // only one referral allowed per user
                           && !("referredByUserId" in resource.data)
                           // user can't refer themselves
diff --git a/functions/src/create-notification.ts b/functions/src/create-notification.ts
index 56493043..bf2dd28a 100644
--- a/functions/src/create-notification.ts
+++ b/functions/src/create-notification.ts
@@ -253,20 +253,6 @@ export const createNotification = async (
       }
   }
 
-  const notifyUserReceivedReferralBonus = async (
-    userToReasonTexts: user_to_reason_texts,
-    relatedUserId: string
-  ) => {
-    if (shouldGetNotification(relatedUserId, userToReasonTexts))
-      userToReasonTexts[relatedUserId] = {
-        // If the referrer is the market creator, just tell them they joined to bet on their market
-        reason:
-          sourceContract?.creatorId === relatedUserId
-            ? 'user_joined_to_bet_on_your_market'
-            : 'you_referred_user',
-      }
-  }
-
   const notifyContractCreatorOfUniqueBettorsBonus = async (
     userToReasonTexts: user_to_reason_texts,
     userId: string
@@ -284,8 +270,6 @@ export const createNotification = async (
     } else if (sourceType === 'group' && relatedUserId) {
       if (sourceUpdateType === 'created')
         await notifyUserAddedToGroup(userToReasonTexts, relatedUserId)
-    } else if (sourceType === 'user' && relatedUserId) {
-      await notifyUserReceivedReferralBonus(userToReasonTexts, relatedUserId)
     }
 
     // The following functions need sourceContract to be defined.
@@ -435,3 +419,52 @@ export const createGroupCommentNotification = async (
   }
   await notificationRef.set(removeUndefinedProps(notification))
 }
+
+export const createReferralNotification = async (
+  toUser: User,
+  referredUser: User,
+  idempotencyKey: string,
+  bonusAmount: string,
+  referredByContract?: Contract,
+  referredByGroup?: Group
+) => {
+  const notificationRef = firestore
+    .collection(`/users/${toUser.id}/notifications`)
+    .doc(idempotencyKey)
+  const notification: Notification = {
+    id: idempotencyKey,
+    userId: toUser.id,
+    reason: referredByGroup
+      ? 'user_joined_from_your_group_invite'
+      : referredByContract?.creatorId === toUser.id
+      ? 'user_joined_to_bet_on_your_market'
+      : 'you_referred_user',
+    createdTime: Date.now(),
+    isSeen: false,
+    sourceId: referredUser.id,
+    sourceType: 'user',
+    sourceUpdateType: 'updated',
+    sourceContractId: referredByContract?.id,
+    sourceUserName: referredUser.name,
+    sourceUserUsername: referredUser.username,
+    sourceUserAvatarUrl: referredUser.avatarUrl,
+    sourceText: bonusAmount,
+    // Only pass the contract referral details if they weren't referred to a group
+    sourceContractCreatorUsername: !referredByGroup
+      ? referredByContract?.creatorUsername
+      : undefined,
+    sourceContractTitle: !referredByGroup
+      ? referredByContract?.question
+      : undefined,
+    sourceContractSlug: !referredByGroup ? referredByContract?.slug : undefined,
+    sourceSlug: referredByGroup
+      ? groupPath(referredByGroup.slug)
+      : referredByContract?.slug,
+    sourceTitle: referredByGroup
+      ? referredByGroup.name
+      : referredByContract?.question,
+  }
+  await notificationRef.set(removeUndefinedProps(notification))
+}
+
+const groupPath = (groupSlug: string) => `/group/${groupSlug}`
diff --git a/functions/src/on-update-user.ts b/functions/src/on-update-user.ts
index 0ace3c53..f5558730 100644
--- a/functions/src/on-update-user.ts
+++ b/functions/src/on-update-user.ts
@@ -2,11 +2,12 @@ import * as functions from 'firebase-functions'
 import * as admin from 'firebase-admin'
 import { REFERRAL_AMOUNT, User } from '../../common/user'
 import { HOUSE_LIQUIDITY_PROVIDER_ID } from '../../common/antes'
-import { createNotification } from './create-notification'
+import { createReferralNotification } from './create-notification'
 import { ReferralTxn } from '../../common/txn'
 import { Contract } from '../../common/contract'
 import { LimitBet } from 'common/bet'
 import { QuerySnapshot } from 'firebase-admin/firestore'
+import { Group } from 'common/group'
 const firestore = admin.firestore()
 
 export const onUpdateUser = functions.firestore
@@ -54,6 +55,17 @@ async function handleUserUpdatedReferral(user: User, eventId: string) {
     }
     console.log(`referredByContract: ${referredByContract}`)
 
+    let referredByGroup: Group | undefined = undefined
+    if (user.referredByGroupId) {
+      const referredByGroupDoc = firestore.doc(
+        `groups/${user.referredByGroupId}`
+      )
+      referredByGroup = await transaction
+        .get(referredByGroupDoc)
+        .then((snap) => snap.data() as Group)
+    }
+    console.log(`referredByGroup: ${referredByGroup}`)
+
     const txns = (
       await firestore
         .collection('txns')
@@ -100,18 +112,13 @@ async function handleUserUpdatedReferral(user: User, eventId: string) {
       totalDeposits: referredByUser.totalDeposits + REFERRAL_AMOUNT,
     })
 
-    await createNotification(
-      user.id,
-      'user',
-      'updated',
+    await createReferralNotification(
+      referredByUser,
       user,
       eventId,
       txn.amount.toString(),
       referredByContract,
-      'user',
-      referredByUser.id,
-      referredByContract?.slug,
-      referredByContract?.question
+      referredByGroup
     )
   })
 }
diff --git a/web/lib/firebase/groups.ts b/web/lib/firebase/groups.ts
index 6dfc1b88..8adb5606 100644
--- a/web/lib/firebase/groups.ts
+++ b/web/lib/firebase/groups.ts
@@ -89,11 +89,11 @@ export async function getGroupsWithContractId(
   setGroups(await getValues<Group>(q))
 }
 
-export async function addUserToGroupViaSlug(groupSlug: string, userId: string) {
+export async function addUserToGroupViaId(groupId: string, userId: string) {
   // get group to get the member ids
-  const group = await getGroupBySlug(groupSlug)
+  const group = await getGroup(groupId)
   if (!group) {
-    console.error(`Group not found: ${groupSlug}`)
+    console.error(`Group not found: ${groupId}`)
     return
   }
   return await joinGroup(group, userId)
diff --git a/web/lib/firebase/users.ts b/web/lib/firebase/users.ts
index 29cc9266..f3242a7e 100644
--- a/web/lib/firebase/users.ts
+++ b/web/lib/firebase/users.ts
@@ -35,7 +35,7 @@ import { feed } from 'common/feed'
 import { CATEGORY_LIST } from 'common/categories'
 import { safeLocalStorage } from '../util/local'
 import { filterDefined } from 'common/util/array'
-import { addUserToGroupViaSlug } from 'web/lib/firebase/groups'
+import { addUserToGroupViaId } from 'web/lib/firebase/groups'
 import { removeUndefinedProps } from 'common/util/object'
 import { randomString } from 'common/util/random'
 import dayjs from 'dayjs'
@@ -99,13 +99,13 @@ export function listenForPrivateUser(
 const CACHED_USER_KEY = 'CACHED_USER_KEY'
 const CACHED_REFERRAL_USERNAME_KEY = 'CACHED_REFERRAL_KEY'
 const CACHED_REFERRAL_CONTRACT_ID_KEY = 'CACHED_REFERRAL_CONTRACT_KEY'
-const CACHED_REFERRAL_GROUP_SLUG_KEY = 'CACHED_REFERRAL_GROUP_KEY'
+const CACHED_REFERRAL_GROUP_ID_KEY = 'CACHED_REFERRAL_GROUP_KEY'
 
 export function writeReferralInfo(
   defaultReferrerUsername: string,
   contractId?: string,
   referralUsername?: string,
-  groupSlug?: string
+  groupId?: string
 ) {
   const local = safeLocalStorage()
   const cachedReferralUser = local?.getItem(CACHED_REFERRAL_USERNAME_KEY)
@@ -121,7 +121,7 @@ export function writeReferralInfo(
     local?.setItem(CACHED_REFERRAL_USERNAME_KEY, referralUsername)
 
   // Always write the most recent explicit group invite query value
-  if (groupSlug) local?.setItem(CACHED_REFERRAL_GROUP_SLUG_KEY, groupSlug)
+  if (groupId) local?.setItem(CACHED_REFERRAL_GROUP_ID_KEY, groupId)
 
   // Write the first contract id that we see.
   const cachedReferralContract = local?.getItem(CACHED_REFERRAL_CONTRACT_ID_KEY)
@@ -134,14 +134,14 @@ async function setCachedReferralInfoForUser(user: User | null) {
   // if the user wasn't created in the last minute, don't bother
   const now = dayjs().utc()
   const userCreatedTime = dayjs(user.createdTime)
-  if (now.diff(userCreatedTime, 'minute') > 1) return
+  if (now.diff(userCreatedTime, 'minute') > 5) return
 
   const local = safeLocalStorage()
   const cachedReferralUsername = local?.getItem(CACHED_REFERRAL_USERNAME_KEY)
   const cachedReferralContractId = local?.getItem(
     CACHED_REFERRAL_CONTRACT_ID_KEY
   )
-  const cachedReferralGroupSlug = local?.getItem(CACHED_REFERRAL_GROUP_SLUG_KEY)
+  const cachedReferralGroupId = local?.getItem(CACHED_REFERRAL_GROUP_ID_KEY)
 
   // get user via username
   if (cachedReferralUsername)
@@ -155,6 +155,9 @@ async function setCachedReferralInfoForUser(user: User | null) {
           referredByContractId: cachedReferralContractId
             ? cachedReferralContractId
             : undefined,
+          referredByGroupId: cachedReferralGroupId
+            ? cachedReferralGroupId
+            : undefined,
         })
       )
         .catch((err) => {
@@ -165,15 +168,14 @@ async function setCachedReferralInfoForUser(user: User | null) {
             userId: user.id,
             referredByUserId: referredByUser.id,
             referredByContractId: cachedReferralContractId,
-            referredByGroupSlug: cachedReferralGroupSlug,
+            referredByGroupId: cachedReferralGroupId,
           })
         })
     })
 
-  if (cachedReferralGroupSlug)
-    addUserToGroupViaSlug(cachedReferralGroupSlug, user.id)
+  if (cachedReferralGroupId) addUserToGroupViaId(cachedReferralGroupId, user.id)
 
-  local?.removeItem(CACHED_REFERRAL_GROUP_SLUG_KEY)
+  local?.removeItem(CACHED_REFERRAL_GROUP_ID_KEY)
   local?.removeItem(CACHED_REFERRAL_USERNAME_KEY)
   local?.removeItem(CACHED_REFERRAL_CONTRACT_ID_KEY)
 }
diff --git a/web/pages/group/[...slugs]/index.tsx b/web/pages/group/[...slugs]/index.tsx
index c914b7f0..3ec688b8 100644
--- a/web/pages/group/[...slugs]/index.tsx
+++ b/web/pages/group/[...slugs]/index.tsx
@@ -161,7 +161,7 @@ export default function GroupPage(props: {
       referrer?: string
     }
     if (!user && router.isReady)
-      writeReferralInfo(creator.username, undefined, referrer, group?.slug)
+      writeReferralInfo(creator.username, undefined, referrer, group?.id)
   }, [user, creator, group, router])
 
   const { width } = useWindowSize()
diff --git a/web/pages/notifications.tsx b/web/pages/notifications.tsx
index 2d4d2f2b..9166109f 100644
--- a/web/pages/notifications.tsx
+++ b/web/pages/notifications.tsx
@@ -713,8 +713,12 @@ function QuestionOrGroupLink(props: {
       href={
         sourceContractCreatorUsername
           ? `/${sourceContractCreatorUsername}/${sourceContractSlug}`
-          : (sourceType === 'group' || sourceType === 'tip') && sourceSlug
+          : // User's added to group or received a tip there
+          (sourceType === 'group' || sourceType === 'tip') && sourceSlug
           ? `${groupPath(sourceSlug)}`
+          : // User referral via group
+          sourceSlug?.includes('/group/')
+          ? `${sourceSlug}`
           : ''
       }
       onClick={() =>
@@ -745,12 +749,16 @@ function getSourceUrl(notification: Notification) {
   } = notification
   if (sourceType === 'follow') return `/${sourceUserUsername}`
   if (sourceType === 'group' && sourceSlug) return `${groupPath(sourceSlug)}`
+  // User referral via contract:
   if (
     sourceContractCreatorUsername &&
     sourceContractSlug &&
     sourceType === 'user'
   )
     return `/${sourceContractCreatorUsername}/${sourceContractSlug}`
+  // User referral:
+  if (sourceType === 'user' && !sourceContractSlug)
+    return `/${sourceUserUsername}`
   if (sourceType === 'tip' && sourceContractSlug)
     return `/${sourceContractCreatorUsername}/${sourceContractSlug}#${sourceSlug}`
   if (sourceType === 'tip' && sourceSlug) return `${groupPath(sourceSlug)}`

From 65e4f2453181bb33f0aedae888823c97ef7083c3 Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Mon, 18 Jul 2022 12:55:31 -0500
Subject: [PATCH 13/71] groups: only change layout if sidebar chat, smaller
 leave button

---
 web/components/groups/groups-button.tsx |  2 +-
 web/pages/group/[...slugs]/index.tsx    | 36 +++++++++++++------------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/web/components/groups/groups-button.tsx b/web/components/groups/groups-button.tsx
index b510f44d..39c75d40 100644
--- a/web/components/groups/groups-button.tsx
+++ b/web/components/groups/groups-button.tsx
@@ -135,7 +135,7 @@ export function JoinOrLeaveGroupButton(props: {
     return (
       <button
         className={clsx(
-          'btn btn-outline btn-sm',
+          'btn btn-outline btn-xs',
           small && smallStyle,
           className
         )}
diff --git a/web/pages/group/[...slugs]/index.tsx b/web/pages/group/[...slugs]/index.tsx
index 3ec688b8..4039fe17 100644
--- a/web/pages/group/[...slugs]/index.tsx
+++ b/web/pages/group/[...slugs]/index.tsx
@@ -165,7 +165,9 @@ export default function GroupPage(props: {
   }, [user, creator, group, router])
 
   const { width } = useWindowSize()
-  const showChatSidebar = (width ?? 1280) >= 1280
+  const chatDisabled = !group || group.chatDisabled
+  const showChatSidebar = !chatDisabled && (width ?? 1280) >= 1280
+  const showChatTab = !chatDisabled && !showChatSidebar
 
   if (group === null || !groupSubpages.includes(page) || slugs[2]) {
     return <Custom404 />
@@ -199,9 +201,7 @@ export default function GroupPage(props: {
     </Col>
   )
 
-  const chatTab = group.chatDisabled ? (
-    <></>
-  ) : (
+  const chatTab = (
     <Col className="">
       {messages ? (
         <GroupChat messages={messages} user={user} group={group} tips={tips} />
@@ -211,8 +211,19 @@ export default function GroupPage(props: {
     </Col>
   )
 
+  const questionsTab = (
+    <ContractSearch
+      querySortOptions={{
+        shouldLoadFromStorage: true,
+        defaultSort: getSavedSort() ?? 'newest',
+        defaultFilter: 'open',
+      }}
+      additionalFilter={{ groupSlug: group.slug }}
+    />
+  )
+
   const tabs = [
-    ...(group.chatDisabled || showChatSidebar
+    ...(!showChatTab
       ? []
       : [
           {
@@ -223,16 +234,7 @@ export default function GroupPage(props: {
         ]),
     {
       title: 'Questions',
-      content: (
-        <ContractSearch
-          querySortOptions={{
-            shouldLoadFromStorage: true,
-            defaultSort: getSavedSort() ?? 'newest',
-            defaultFilter: 'open',
-          }}
-          additionalFilter={{ groupSlug: group.slug }}
-        />
-      ),
+      content: questionsTab,
       href: groupPath(group.slug, 'questions'),
     },
     {
@@ -251,8 +253,8 @@ export default function GroupPage(props: {
   return (
     <Page
       rightSidebar={showChatSidebar ? chatTab : undefined}
-      rightSidebarClassName="!top-0"
-      className="!max-w-none !pb-0"
+      rightSidebarClassName={showChatSidebar ? '!top-0' : ''}
+      className={showChatSidebar ? '!max-w-none !pb-0' : ''}
     >
       <SEO
         title={group.name}

From f2a16afc903a12904f16d454fc7b7af33c2c8a2f Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Mon, 18 Jul 2022 14:52:28 -0600
Subject: [PATCH 14/71] Update firestore rules for question editing

---
 firestore.rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/firestore.rules b/firestore.rules
index 63df4d16..96378d8b 100644
--- a/firestore.rules
+++ b/firestore.rules
@@ -76,7 +76,7 @@ service cloud.firestore {
       allow update: if request.resource.data.diff(resource.data).affectedKeys()
                                                                  .hasOnly(['tags', 'lowercaseTags', 'groupSlugs']);
       allow update: if request.resource.data.diff(resource.data).affectedKeys()
-                                                                 .hasOnly(['description', 'closeTime'])
+                                                                 .hasOnly(['description', 'closeTime', 'question'])
                        && resource.data.creatorId == request.auth.uid;
       allow update: if isAdmin();
           match /comments/{commentId} {

From e2a72dd0a23d8721ae4229b03842c58574ecdd6d Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Mon, 18 Jul 2022 15:01:50 -0600
Subject: [PATCH 15/71] Fix /create date input

---
 web/pages/create.tsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/web/pages/create.tsx b/web/pages/create.tsx
index 8d4c3662..a3801223 100644
--- a/web/pages/create.tsx
+++ b/web/pages/create.tsx
@@ -379,12 +379,10 @@ export function NewContract(props: {
             type={'date'}
             className="input input-bordered mt-4"
             onClick={(e) => e.stopPropagation()}
-            onChange={(e) =>
-              setCloseDate(dayjs(e.target.value).format('YYYY-MM-DD') || '')
-            }
+            onChange={(e) => setCloseDate(e.target.value)}
             min={Date.now()}
             disabled={isSubmitting}
-            value={dayjs(closeDate).format('YYYY-MM-DD')}
+            value={closeDate}
           />
           <input
             type={'time'}

From 781de79b97a1353275801c97a7be361f45132005 Mon Sep 17 00:00:00 2001
From: Sinclair Chen <abc.sinclair@gmail.com>
Date: Mon, 18 Jul 2022 14:02:27 -0700
Subject: [PATCH 16/71] Make description text style more consistent

- links and blockquotes have light font weight, like other text
- font size in editor matches font size in description
- old descriptions have same style as new
- placeholder text matches editor style
- decrease line-height a bit
---
 web/components/editor.tsx | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/web/components/editor.tsx b/web/components/editor.tsx
index fabce934..7063fa42 100644
--- a/web/components/editor.tsx
+++ b/web/components/editor.tsx
@@ -21,7 +21,8 @@ import { FileUploadButton } from './file-upload-button'
 import { linkClass } from './site-link'
 
 const proseClass = clsx(
-  'prose prose-p:my-2 prose-li:my-0 prose-blockquote:not-italic max-w-none prose-quoteless font-light'
+  'prose prose-p:my-0 prose-li:my-0 prose-blockquote:not-italic max-w-none prose-quoteless leading-relaxed',
+  'font-light prose-a:font-light prose-blockquote:font-light'
 )
 
 export function useTextEditor(props: {
@@ -34,7 +35,7 @@ export function useTextEditor(props: {
 
   const editorClass = clsx(
     proseClass,
-    'box-content min-h-[6em] textarea textarea-bordered'
+    'box-content min-h-[6em] textarea textarea-bordered text-base'
   )
 
   const editor = useEditor({
@@ -98,7 +99,7 @@ export function TextEditor(props: {
         {editor && (
           <FloatingMenu
             editor={editor}
-            className="-ml-2 mr-2 w-full text-sm text-slate-300"
+            className={clsx(proseClass, '-ml-2 mr-2 w-full text-slate-300 ')}
           >
             Type <em>*markdown*</em>. Paste or{' '}
             <FileUploadButton
@@ -155,7 +156,7 @@ function RichContent(props: { content: JSONContent }) {
 export function Content(props: { content: JSONContent | string }) {
   const { content } = props
   return typeof content === 'string' ? (
-    <div className="whitespace-pre-line break-words">
+    <div className="whitespace-pre-line font-light leading-relaxed">
       <Linkify text={content} />
     </div>
   ) : (

From 47a27bf3febd238c6acd89e1817826076b85dee6 Mon Sep 17 00:00:00 2001
From: Austin Chen <akrolsmir@gmail.com>
Date: Mon, 18 Jul 2022 15:55:17 -0700
Subject: [PATCH 17/71] Label "Since June" for users who had an account prior
 to 2022-06-20 (#659)

---
 web/components/portfolio/portfolio-value-section.tsx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/web/components/portfolio/portfolio-value-section.tsx b/web/components/portfolio/portfolio-value-section.tsx
index 22f1478f..1fabbd06 100644
--- a/web/components/portfolio/portfolio-value-section.tsx
+++ b/web/components/portfolio/portfolio-value-section.tsx
@@ -15,6 +15,13 @@ export const PortfolioValueSection = memo(
     const lastPortfolioMetrics = last(portfolioHistory)
     const [portfolioPeriod, setPortfolioPeriod] = useState<Period>('allTime')
 
+    // PATCH: If portfolio history started on June 1st, then we label it as "Since June"
+    // instead of "All time"
+    const allTimeLabel =
+      portfolioHistory[0].timestamp < Date.parse('2022-06-20T00:00:00.000Z')
+        ? 'Since June'
+        : 'All time'
+
     if (portfolioHistory.length === 0 || !lastPortfolioMetrics) {
       return <></>
     }
@@ -39,7 +46,7 @@ export const PortfolioValueSection = memo(
               setPortfolioPeriod(e.target.value as Period)
             }}
           >
-            <option value="allTime">All time</option>
+            <option value="allTime">{allTimeLabel}</option>
             <option value="weekly">7 days</option>
             <option value="daily">24 hours</option>
           </select>

From 61a21d34b2501a315f7ac2fa10bea24a52c52b96 Mon Sep 17 00:00:00 2001
From: James Grugett <jahooma@gmail.com>
Date: Mon, 18 Jul 2022 18:19:30 -0500
Subject: [PATCH 18/71] Order limit bets in sorted order on mobile

---
 web/components/limit-bets.tsx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/web/components/limit-bets.tsx b/web/components/limit-bets.tsx
index 70e06d79..7e32db25 100644
--- a/web/components/limit-bets.tsx
+++ b/web/components/limit-bets.tsx
@@ -178,7 +178,7 @@ export function OrderBookButton(props: {
       <Modal open={open} setOpen={setOpen} size="lg">
         <Col className="rounded bg-white p-4 py-6">
           <Title className="!mt-0" text="Order book" />
-          <Col className="justify-start gap-2 lg:flex-row lg:items-start">
+          <Row className="hidden items-start justify-start gap-2 md:flex">
             <LimitOrderTable
               limitBets={yesBets}
               contract={contract}
@@ -189,6 +189,13 @@ export function OrderBookButton(props: {
               contract={contract}
               isYou={false}
             />
+          </Row>
+          <Col className="md:hidden">
+            <LimitOrderTable
+              limitBets={limitBets}
+              contract={contract}
+              isYou={false}
+            />
           </Col>
         </Col>
       </Modal>

From f2a7a145e4296fad2aba467499587279a41c1b43 Mon Sep 17 00:00:00 2001
From: Marshall Polaris <marshall@pol.rs>
Date: Mon, 18 Jul 2022 16:37:46 -0700
Subject: [PATCH 19/71] Add React key prop to homepage filter widget (#661)

---
 web/components/contract-search.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/web/components/contract-search.tsx b/web/components/contract-search.tsx
index 78b28a94..013208d8 100644
--- a/web/components/contract-search.tsx
+++ b/web/components/contract-search.tsx
@@ -188,7 +188,11 @@ export function ContractSearch(props: {
       <Row className="gap-2">
         {toPairs<filter>(filterOptions).map(([label, f]) => {
           return (
-            <PillButton selected={filter === f} onSelect={() => setFilter(f)}>
+            <PillButton
+              key={f}
+              selected={filter === f}
+              onSelect={() => setFilter(f)}
+            >
               {label}
             </PillButton>
           )

From 8793288dc8e324f193d1477ec6e4ea829b5c09ea Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Mon, 18 Jul 2022 19:17:45 -0500
Subject: [PATCH 20/71] contract description: less prominent edit buttons

---
 web/components/button.tsx                        |  2 +-
 web/components/contract/contract-description.tsx | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/web/components/button.tsx b/web/components/button.tsx
index 8cdeacdd..d279d9a0 100644
--- a/web/components/button.tsx
+++ b/web/components/button.tsx
@@ -39,7 +39,7 @@ export function Button(props: {
         color === 'yellow' && 'bg-yellow-400 text-white hover:bg-yellow-500',
         color === 'blue' && 'bg-blue-400 text-white hover:bg-blue-500',
         color === 'indigo' && 'bg-indigo-500 text-white hover:bg-indigo-600',
-        color === 'gray' && 'bg-gray-200 text-gray-700 hover:bg-gray-300',
+        color === 'gray' && 'bg-gray-100 text-gray-600 hover:bg-gray-200',
         className
       )}
       disabled={disabled}
diff --git a/web/components/contract/contract-description.tsx b/web/components/contract/contract-description.tsx
index d9864186..f9db0cd9 100644
--- a/web/components/contract/contract-description.tsx
+++ b/web/components/contract/contract-description.tsx
@@ -24,13 +24,10 @@ export function ContractDescription(props: {
   return (
     <div className={clsx('mt-2 text-gray-700', className)}>
       {isCreator || isAdmin ? (
-        <RichEditContract contract={contract} />
+        <RichEditContract contract={contract} isAdmin={isAdmin && !isCreator} />
       ) : (
         <Content content={contract.description} />
       )}
-      {isAdmin && !isCreator && (
-        <div className="mt-2 text-red-400">(👆 admin powers)</div>
-      )}
     </div>
   )
 }
@@ -39,8 +36,8 @@ function editTimestamp() {
   return `${dayjs().format('MMM D, h:mma')}: `
 }
 
-function RichEditContract(props: { contract: Contract }) {
-  const { contract } = props
+function RichEditContract(props: { contract: Contract; isAdmin?: boolean }) {
+  const { contract, isAdmin } = props
   const [editing, setEditing] = useState(false)
   const [editingQ, setEditingQ] = useState(false)
   const [isSubmitting, setIsSubmitting] = useState(false)
@@ -90,9 +87,11 @@ function RichEditContract(props: { contract: Contract }) {
     <>
       <Content content={contract.description} />
       <Spacer h={2} />
-      <Row className="gap-2">
+      <Row className="items-center gap-2">
+        {isAdmin && 'Admin: '}
         <Button
           color="gray"
+          size="xs"
           onClick={() => {
             setEditing(true)
             editor
@@ -105,7 +104,7 @@ function RichEditContract(props: { contract: Contract }) {
         >
           Edit description
         </Button>
-        <Button color="gray" onClick={() => setEditingQ(true)}>
+        <Button color="gray" size="xs" onClick={() => setEditingQ(true)}>
           Edit question
         </Button>
       </Row>

From dcd2ccae1bdc9eff61c712f2a9c5999f47b6870b Mon Sep 17 00:00:00 2001
From: Austin Chen <akrolsmir@gmail.com>
Date: Mon, 18 Jul 2022 23:29:32 -0700
Subject: [PATCH 21/71] Allow environments to override the referral bonus

---
 common/envs/prod.ts | 1 +
 common/user.ts      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/envs/prod.ts b/common/envs/prod.ts
index f8aaf4cc..5bd12095 100644
--- a/common/envs/prod.ts
+++ b/common/envs/prod.ts
@@ -22,6 +22,7 @@ export type EnvConfig = {
   // Currency controls
   fixedAnte?: number
   startingBalance?: number
+  referralBonus?: number
 }
 
 type FirebaseConfig = {
diff --git a/common/user.ts b/common/user.ts
index 1995ce34..0dac5a19 100644
--- a/common/user.ts
+++ b/common/user.ts
@@ -45,7 +45,7 @@ export type User = {
 export const STARTING_BALANCE = ENV_CONFIG.startingBalance ?? 1000
 // for sus users, i.e. multiple sign ups for same person
 export const SUS_STARTING_BALANCE = ENV_CONFIG.startingBalance ?? 10
-export const REFERRAL_AMOUNT = 500
+export const REFERRAL_AMOUNT = ENV_CONFIG.referralBonus ?? 500
 export type PrivateUser = {
   id: string // same as User.id
   username: string // denormalized from User

From b501776e3327abfe39468cb06b487569bd1a211d Mon Sep 17 00:00:00 2001
From: Austin Chen <akrolsmir@gmail.com>
Date: Tue, 19 Jul 2022 00:20:18 -0700
Subject: [PATCH 22/71] Remove quadratic matching from /charity

---
 web/components/charity/charity-card.tsx | 13 +++++-----
 web/pages/charity/index.tsx             | 32 +++++++++++++++++--------
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/web/components/charity/charity-card.tsx b/web/components/charity/charity-card.tsx
index 31995284..fc327b9f 100644
--- a/web/components/charity/charity-card.tsx
+++ b/web/components/charity/charity-card.tsx
@@ -6,10 +6,9 @@ import { Charity } from 'common/charity'
 import { useCharityTxns } from 'web/hooks/use-charity-txns'
 import { manaToUSD } from '../../../common/util/format'
 import { Row } from '../layout/row'
-import { Col } from '../layout/col'
 
 export function CharityCard(props: { charity: Charity; match?: number }) {
-  const { charity, match } = props
+  const { charity } = props
   const { slug, photo, preview, id, tags } = charity
 
   const txns = useCharityTxns(id)
@@ -36,18 +35,18 @@ export function CharityCard(props: { charity: Charity; match?: number }) {
           {raised > 0 && (
             <>
               <Row className="mt-4 flex-1 items-end justify-center gap-6 text-gray-900">
-                <Col>
+                <Row className="items-baseline gap-1">
                   <span className="text-3xl font-semibold">
                     {formatUsd(raised)}
                   </span>
-                  <span>raised</span>
-                </Col>
-                {match && (
+                  raised
+                </Row>
+                {/* {match && (
                   <Col className="text-gray-500">
                     <span className="text-xl">+{formatUsd(match)}</span>
                     <span className="">match</span>
                   </Col>
-                )}
+                )} */}
               </Row>
             </>
           )}
diff --git a/web/pages/charity/index.tsx b/web/pages/charity/index.tsx
index 92e6b69f..f5295c59 100644
--- a/web/pages/charity/index.tsx
+++ b/web/pages/charity/index.tsx
@@ -13,7 +13,6 @@ import { CharityCard } from 'web/components/charity/charity-card'
 import { Col } from 'web/components/layout/col'
 import { Spacer } from 'web/components/layout/spacer'
 import { Page } from 'web/components/page'
-import { SiteLink } from 'web/components/site-link'
 import { Title } from 'web/components/title'
 import { getAllCharityTxns } from 'web/lib/firebase/txns'
 import { manaToUSD } from 'common/util/format'
@@ -21,6 +20,9 @@ import { quadraticMatches } from 'common/quadratic-funding'
 import { Txn } from 'common/txn'
 import { useTracking } from 'web/hooks/use-tracking'
 import { searchInAny } from 'common/util/parse'
+import { getUser } from 'web/lib/firebase/users'
+import { User } from 'common/lib/user'
+import { SiteLink } from 'web/components/site-link'
 
 export async function getStaticProps() {
   const txns = await getAllCharityTxns()
@@ -34,6 +36,7 @@ export async function getStaticProps() {
   ])
   const matches = quadraticMatches(txns, totalRaised)
   const numDonors = uniqBy(txns, (txn) => txn.fromId).length
+  const mostRecentDonor = await getUser(txns[txns.length - 1].fromId)
 
   return {
     props: {
@@ -42,6 +45,7 @@ export async function getStaticProps() {
       matches,
       txns,
       numDonors,
+      mostRecentDonor,
     },
     revalidate: 60,
   }
@@ -50,22 +54,28 @@ export async function getStaticProps() {
 type Stat = {
   name: string
   stat: string
+  url?: string
 }
 
 function DonatedStats(props: { stats: Stat[] }) {
   const { stats } = props
   return (
     <dl className="mt-3 grid grid-cols-1 gap-5 rounded-lg bg-gradient-to-r from-pink-300 via-purple-300 to-indigo-400 p-4 sm:grid-cols-3">
-      {stats.map((item) => (
+      {stats.map((stat) => (
         <div
-          key={item.name}
+          key={stat.name}
           className="overflow-hidden rounded-lg bg-white px-4 py-5 shadow sm:p-6"
         >
           <dt className="truncate text-sm font-medium text-gray-500">
-            {item.name}
+            {stat.name}
           </dt>
+
           <dd className="mt-1 text-3xl font-semibold text-gray-900">
-            {item.stat}
+            {stat.url ? (
+              <SiteLink href={stat.url}>{stat.stat}</SiteLink>
+            ) : (
+              <span>{stat.stat}</span>
+            )}
           </dd>
         </div>
       ))}
@@ -79,8 +89,9 @@ export default function Charity(props: {
   matches: { [charityId: string]: number }
   txns: Txn[]
   numDonors: number
+  mostRecentDonor: User
 }) {
-  const { totalRaised, charities, matches, numDonors } = props
+  const { totalRaised, charities, matches, numDonors, mostRecentDonor } = props
 
   const [query, setQuery] = useState('')
   const debouncedQuery = debounce(setQuery, 50)
@@ -106,7 +117,7 @@ export default function Charity(props: {
       <Col className="w-full rounded px-4 py-6 sm:px-8 xl:w-[125%]">
         <Col className="">
           <Title className="!mt-0" text="Manifold for Charity" />
-          <span className="text-gray-600">
+          {/* <span className="text-gray-600">
             Through July 15, up to $25k of donations will be matched via{' '}
             <SiteLink href="https://wtfisqf.com/" className="font-bold">
               quadratic funding
@@ -116,7 +127,7 @@ export default function Charity(props: {
               the FTX Future Fund
             </SiteLink>
             !
-          </span>
+          </span> */}
           <DonatedStats
             stats={[
               {
@@ -128,8 +139,9 @@ export default function Charity(props: {
                 stat: `${numDonors}`,
               },
               {
-                name: 'Matched via quadratic funding',
-                stat: manaToUSD(sum(Object.values(matches))),
+                name: 'Most recent donor',
+                stat: mostRecentDonor.name ?? 'Nobody',
+                url: `/${mostRecentDonor.username}`,
               },
             ]}
           />

From d1ad0716c8ce7724b6e612cfc83e41ec453d9fc2 Mon Sep 17 00:00:00 2001
From: Austin Chen <akrolsmir@gmail.com>
Date: Tue, 19 Jul 2022 00:34:53 -0700
Subject: [PATCH 23/71] Fix import

---
 web/pages/charity/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/pages/charity/index.tsx b/web/pages/charity/index.tsx
index f5295c59..b1cfc353 100644
--- a/web/pages/charity/index.tsx
+++ b/web/pages/charity/index.tsx
@@ -21,8 +21,8 @@ import { Txn } from 'common/txn'
 import { useTracking } from 'web/hooks/use-tracking'
 import { searchInAny } from 'common/util/parse'
 import { getUser } from 'web/lib/firebase/users'
-import { User } from 'common/lib/user'
 import { SiteLink } from 'web/components/site-link'
+import { User } from 'common/user'
 
 export async function getStaticProps() {
   const txns = await getAllCharityTxns()

From a103a2ee2cccb9b34c19fd9d5e613dae23b7058d Mon Sep 17 00:00:00 2001
From: Marshall Polaris <marshall@pol.rs>
Date: Tue, 19 Jul 2022 00:50:11 -0700
Subject: [PATCH 24/71] Initial draft of Vercel Firebase auth (#593)

* Set a cookie with an up-to-date Firebase ID token

* Implement server-side authentication cookie reading logic

* Change index page to redirect for authed users

* No branch necessary for logged in users on index page

* Add helpers for creating server-side redirects

* Add some common sense redirects
---
 web/lib/firebase/auth.ts        | 54 +++++++++++++++++++++
 web/lib/firebase/server-auth.ts | 86 +++++++++++++++++++++++++++++++++
 web/lib/firebase/users.ts       | 10 ++--
 web/lib/util/cookie.ts          | 26 ++++++++++
 web/pages/add-funds.tsx         |  3 ++
 web/pages/admin.tsx             |  3 ++
 web/pages/create.tsx            | 11 ++---
 web/pages/home.tsx              | 12 ++---
 web/pages/index.tsx             | 25 ++--------
 web/pages/links.tsx             |  3 ++
 web/pages/profile.tsx           |  7 +--
 web/pages/trades.tsx            | 13 ++---
 12 files changed, 202 insertions(+), 51 deletions(-)
 create mode 100644 web/lib/firebase/auth.ts
 create mode 100644 web/lib/firebase/server-auth.ts
 create mode 100644 web/lib/util/cookie.ts

diff --git a/web/lib/firebase/auth.ts b/web/lib/firebase/auth.ts
new file mode 100644
index 00000000..d1c440ec
--- /dev/null
+++ b/web/lib/firebase/auth.ts
@@ -0,0 +1,54 @@
+import { PROJECT_ID } from 'common/envs/constants'
+import { setCookie, getCookies } from '../util/cookie'
+import { IncomingMessage, ServerResponse } from 'http'
+
+const TOKEN_KINDS = ['refresh', 'id'] as const
+type TokenKind = typeof TOKEN_KINDS[number]
+
+const getAuthCookieName = (kind: TokenKind) => {
+  const suffix = `${PROJECT_ID}_${kind}`.toUpperCase().replaceAll('-', '_')
+  return `FIREBASE_TOKEN_${suffix}`
+}
+
+const ID_COOKIE_NAME = getAuthCookieName('id')
+const REFRESH_COOKIE_NAME = getAuthCookieName('refresh')
+
+export const getAuthCookies = (request?: IncomingMessage) => {
+  const data = request != null ? request.headers.cookie ?? '' : document.cookie
+  const cookies = getCookies(data)
+  return {
+    idToken: cookies[ID_COOKIE_NAME] as string | undefined,
+    refreshToken: cookies[REFRESH_COOKIE_NAME] as string | undefined,
+  }
+}
+
+export const setAuthCookies = (
+  idToken?: string,
+  refreshToken?: string,
+  response?: ServerResponse
+) => {
+  // these tokens last an hour
+  const idMaxAge = idToken != null ? 60 * 60 : 0
+  const idCookie = setCookie(ID_COOKIE_NAME, idToken ?? '', [
+    ['path', '/'],
+    ['max-age', idMaxAge.toString()],
+    ['samesite', 'lax'],
+    ['secure'],
+  ])
+  // these tokens don't expire
+  const refreshMaxAge = refreshToken != null ? 60 * 60 * 24 * 365 * 10 : 0
+  const refreshCookie = setCookie(REFRESH_COOKIE_NAME, refreshToken ?? '', [
+    ['path', '/'],
+    ['max-age', refreshMaxAge.toString()],
+    ['samesite', 'lax'],
+    ['secure'],
+  ])
+  if (response != null) {
+    response.setHeader('Set-Cookie', [idCookie, refreshCookie])
+  } else {
+    document.cookie = idCookie
+    document.cookie = refreshCookie
+  }
+}
+
+export const deleteAuthCookies = () => setAuthCookies()
diff --git a/web/lib/firebase/server-auth.ts b/web/lib/firebase/server-auth.ts
new file mode 100644
index 00000000..5f828683
--- /dev/null
+++ b/web/lib/firebase/server-auth.ts
@@ -0,0 +1,86 @@
+import * as admin from 'firebase-admin'
+import fetch from 'node-fetch'
+import { IncomingMessage, ServerResponse } from 'http'
+import { FIREBASE_CONFIG, PROJECT_ID } from 'common/envs/constants'
+import { getAuthCookies, setAuthCookies } from './auth'
+import { GetServerSideProps, GetServerSidePropsContext } from 'next'
+
+const ensureApp = async () => {
+  // Note: firebase-admin can only be imported from a server context,
+  // because it relies on Node standard library dependencies.
+  if (admin.apps.length === 0) {
+    // never initialize twice
+    return admin.initializeApp({ projectId: PROJECT_ID })
+  }
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+  return admin.apps[0]!
+}
+
+const requestFirebaseIdToken = async (refreshToken: string) => {
+  // See https://firebase.google.com/docs/reference/rest/auth/#section-refresh-token
+  const refreshUrl = new URL('https://securetoken.googleapis.com/v1/token')
+  refreshUrl.searchParams.append('key', FIREBASE_CONFIG.apiKey)
+  const result = await fetch(refreshUrl.toString(), {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded',
+    },
+    body: new URLSearchParams({
+      grant_type: 'refresh_token',
+      refresh_token: refreshToken,
+    }),
+  })
+  if (!result.ok) {
+    throw new Error(`Could not refresh ID token: ${await result.text()}`)
+  }
+  return (await result.json()) as any
+}
+
+type RequestContext = {
+  req: IncomingMessage
+  res: ServerResponse
+}
+
+export const getServerAuthenticatedUid = async (ctx: RequestContext) => {
+  const app = await ensureApp()
+  const auth = app.auth()
+  const { idToken, refreshToken } = getAuthCookies(ctx.req)
+
+  // If we have a valid ID token, verify the user immediately with no network trips.
+  // If the ID token doesn't verify, we'll have to refresh it to see who they are.
+  // If they don't have any tokens, then we have no idea who they are.
+  if (idToken != null) {
+    try {
+      return (await auth.verifyIdToken(idToken))?.uid
+    } catch (e) {
+      if (refreshToken != null) {
+        const resp = await requestFirebaseIdToken(refreshToken)
+        setAuthCookies(resp.id_token, resp.refresh_token, ctx.res)
+        return (await auth.verifyIdToken(resp.id_token))?.uid
+      }
+    }
+  }
+  return undefined
+}
+
+export const redirectIfLoggedIn = (dest: string, fn?: GetServerSideProps) => {
+  return async (ctx: GetServerSidePropsContext) => {
+    const uid = await getServerAuthenticatedUid(ctx)
+    if (uid == null) {
+      return fn != null ? await fn(ctx) : { props: {} }
+    } else {
+      return { redirect: { destination: dest, permanent: false } }
+    }
+  }
+}
+
+export const redirectIfLoggedOut = (dest: string, fn?: GetServerSideProps) => {
+  return async (ctx: GetServerSidePropsContext) => {
+    const uid = await getServerAuthenticatedUid(ctx)
+    if (uid == null) {
+      return { redirect: { destination: dest, permanent: false } }
+    } else {
+      return fn != null ? await fn(ctx) : { props: {} }
+    }
+  }
+}
diff --git a/web/lib/firebase/users.ts b/web/lib/firebase/users.ts
index f3242a7e..77c5c48d 100644
--- a/web/lib/firebase/users.ts
+++ b/web/lib/firebase/users.ts
@@ -16,7 +16,7 @@ import {
 import { getAuth } from 'firebase/auth'
 import { ref, getStorage, uploadBytes, getDownloadURL } from 'firebase/storage'
 import {
-  onAuthStateChanged,
+  onIdTokenChanged,
   GoogleAuthProvider,
   signInWithPopup,
 } from 'firebase/auth'
@@ -43,6 +43,7 @@ import utc from 'dayjs/plugin/utc'
 dayjs.extend(utc)
 
 import { track } from '@amplitude/analytics-browser'
+import { deleteAuthCookies, setAuthCookies } from './auth'
 
 export const users = coll<User>('users')
 export const privateUsers = coll<PrivateUser>('private-users')
@@ -188,10 +189,9 @@ export function listenForLogin(onUser: (user: User | null) => void) {
   const cachedUser = local?.getItem(CACHED_USER_KEY)
   onUser(cachedUser && JSON.parse(cachedUser))
 
-  return onAuthStateChanged(auth, async (fbUser) => {
+  return onIdTokenChanged(auth, async (fbUser) => {
     if (fbUser) {
       let user: User | null = await getUser(fbUser.uid)
-
       if (!user) {
         if (createUserPromise == null) {
           const local = safeLocalStorage()
@@ -204,17 +204,19 @@ export function listenForLogin(onUser: (user: User | null) => void) {
         }
         user = await createUserPromise
       }
-
       onUser(user)
 
       // Persist to local storage, to reduce login blink next time.
       // Note: Cap on localStorage size is ~5mb
       local?.setItem(CACHED_USER_KEY, JSON.stringify(user))
       setCachedReferralInfoForUser(user)
+      setAuthCookies(await fbUser.getIdToken(), fbUser.refreshToken)
     } else {
       // User logged out; reset to null
       onUser(null)
+      createUserPromise = undefined
       local?.removeItem(CACHED_USER_KEY)
+      deleteAuthCookies()
     }
   })
 }
diff --git a/web/lib/util/cookie.ts b/web/lib/util/cookie.ts
new file mode 100644
index 00000000..c0326cfc
--- /dev/null
+++ b/web/lib/util/cookie.ts
@@ -0,0 +1,26 @@
+type CookieOptions = string[][]
+
+const encodeCookie = (name: string, val: string) => {
+  return `${name}=${encodeURIComponent(val)}`
+}
+
+const decodeCookie = (cookie: string) => {
+  const parts = cookie.trim().split('=')
+  if (parts.length != 2) {
+    throw new Error(`Invalid cookie contents: ${cookie}`)
+  }
+  return [parts[0], decodeURIComponent(parts[1])] as const
+}
+
+export const setCookie = (name: string, val: string, opts?: CookieOptions) => {
+  const parts = [encodeCookie(name, val)]
+  if (opts != null) {
+    parts.push(...opts.map((opt) => opt.join('=')))
+  }
+  return parts.join('; ')
+}
+
+// Note that this intentionally ignores the case where multiple cookies have
+// the same name but different paths. Hopefully we never need to think about it.
+export const getCookies = (cookies: string) =>
+  Object.fromEntries(cookies.split(';').map(decodeCookie))
diff --git a/web/pages/add-funds.tsx b/web/pages/add-funds.tsx
index f680d47b..ed25a21a 100644
--- a/web/pages/add-funds.tsx
+++ b/web/pages/add-funds.tsx
@@ -8,6 +8,9 @@ import { checkoutURL } from 'web/lib/service/stripe'
 import { Page } from 'web/components/page'
 import { useTracking } from 'web/hooks/use-tracking'
 import { trackCallback } from 'web/lib/service/analytics'
+import { redirectIfLoggedOut } from 'web/lib/firebase/server-auth'
+
+export const getServerSideProps = redirectIfLoggedOut('/')
 
 export default function AddFundsPage() {
   const user = useUser()
diff --git a/web/pages/admin.tsx b/web/pages/admin.tsx
index e709e875..81f23ba9 100644
--- a/web/pages/admin.tsx
+++ b/web/pages/admin.tsx
@@ -9,6 +9,9 @@ import { useContracts } from 'web/hooks/use-contracts'
 import { mapKeys } from 'lodash'
 import { useAdmin } from 'web/hooks/use-admin'
 import { contractPath } from 'web/lib/firebase/contracts'
+import { redirectIfLoggedOut } from 'web/lib/firebase/server-auth'
+
+export const getServerSideProps = redirectIfLoggedOut('/')
 
 function avatarHtml(avatarUrl: string) {
   return `<img
diff --git a/web/pages/create.tsx b/web/pages/create.tsx
index a3801223..4294770e 100644
--- a/web/pages/create.tsx
+++ b/web/pages/create.tsx
@@ -28,6 +28,9 @@ import { GroupSelector } from 'web/components/groups/group-selector'
 import { User } from 'common/user'
 import { TextEditor, useTextEditor } from 'web/components/editor'
 import { Checkbox } from 'web/components/checkbox'
+import { redirectIfLoggedOut } from 'web/lib/firebase/server-auth'
+
+export const getServerSideProps = redirectIfLoggedOut('/')
 
 type NewQuestionParams = {
   groupId?: string
@@ -55,11 +58,7 @@ export default function Create() {
   }, [params.q])
 
   const creator = useUser()
-  useEffect(() => {
-    if (creator === null) router.push('/')
-  }, [creator, router])
-
-  if (!router.isReady || !creator) return <div />
+  if (!router.isReady || creator) return <div />
 
   return (
     <Page>
@@ -93,7 +92,7 @@ export default function Create() {
 
 // Allow user to create a new contract
 export function NewContract(props: {
-  creator: User
+  creator?: User | null
   question: string
   params?: NewQuestionParams
 }) {
diff --git a/web/pages/home.tsx b/web/pages/home.tsx
index 98d5036e..6aa99a07 100644
--- a/web/pages/home.tsx
+++ b/web/pages/home.tsx
@@ -1,10 +1,9 @@
 import React, { useEffect, useState } from 'react'
-import Router, { useRouter } from 'next/router'
+import { useRouter } from 'next/router'
 import { PlusSmIcon } from '@heroicons/react/solid'
 
 import { Page } from 'web/components/page'
 import { Col } from 'web/components/layout/col'
-import { useUser } from 'web/hooks/use-user'
 import { getSavedSort } from 'web/hooks/use-sort-and-query-params'
 import { ContractSearch } from 'web/components/contract-search'
 import { Contract } from 'common/contract'
@@ -12,19 +11,16 @@ import { ContractPageContent } from './[username]/[contractSlug]'
 import { getContractFromSlug } from 'web/lib/firebase/contracts'
 import { useTracking } from 'web/hooks/use-tracking'
 import { track } from 'web/lib/service/analytics'
+import { redirectIfLoggedOut } from 'web/lib/firebase/server-auth'
+
+export const getServerSideProps = redirectIfLoggedOut('/')
 
 const Home = () => {
-  const user = useUser()
   const [contract, setContract] = useContractPage()
 
   const router = useRouter()
   useTracking('view home')
 
-  if (user === null) {
-    Router.replace('/')
-    return <></>
-  }
-
   return (
     <>
       <Page suspend={!!contract}>
diff --git a/web/pages/index.tsx b/web/pages/index.tsx
index 904fc014..44683a4f 100644
--- a/web/pages/index.tsx
+++ b/web/pages/index.tsx
@@ -1,14 +1,13 @@
 import React from 'react'
-import Router from 'next/router'
 
 import { Contract, getContractsBySlugs } from 'web/lib/firebase/contracts'
 import { Page } from 'web/components/page'
 import { LandingPagePanel } from 'web/components/landing-page-panel'
 import { Col } from 'web/components/layout/col'
-import { useUser } from 'web/hooks/use-user'
 import { ManifoldLogo } from 'web/components/nav/manifold-logo'
+import { redirectIfLoggedIn } from 'web/lib/firebase/server-auth'
 
-export async function getStaticProps() {
+export const getServerSideProps = redirectIfLoggedIn('/home', async (_) => {
   // These hardcoded markets will be shown in the frontpage for signed-out users:
   const hotContracts = await getContractsBySlugs([
     'will-max-go-to-prom-with-a-girl',
@@ -22,23 +21,11 @@ export async function getStaticProps() {
     'will-congress-hold-any-hearings-abo-e21f987033b3',
     'will-at-least-10-world-cities-have',
   ])
+  return { props: { hotContracts } }
+})
 
-  return {
-    props: { hotContracts },
-    revalidate: 60, // regenerate after a minute
-  }
-}
-
-const Home = (props: { hotContracts: Contract[] }) => {
+export default function Home(props: { hotContracts: Contract[] }) {
   const { hotContracts } = props
-
-  const user = useUser()
-
-  if (user) {
-    Router.replace('/home')
-    return <></>
-  }
-
   return (
     <Page>
       <div className="px-4 pt-2 md:mt-0 lg:hidden">
@@ -58,5 +45,3 @@ const Home = (props: { hotContracts: Contract[] }) => {
     </Page>
   )
 }
-
-export default Home
diff --git a/web/pages/links.tsx b/web/pages/links.tsx
index 76c62978..490f1878 100644
--- a/web/pages/links.tsx
+++ b/web/pages/links.tsx
@@ -18,11 +18,14 @@ import { Avatar } from 'web/components/avatar'
 import { RelativeTimestamp } from 'web/components/relative-timestamp'
 import { UserLink } from 'web/components/user-page'
 import { CreateLinksButton } from 'web/components/manalinks/create-links-button'
+import { redirectIfLoggedOut } from 'web/lib/firebase/server-auth'
 
 import dayjs from 'dayjs'
 import customParseFormat from 'dayjs/plugin/customParseFormat'
 dayjs.extend(customParseFormat)
 
+export const getServerSideProps = redirectIfLoggedOut('/')
+
 export function getManalinkUrl(slug: string) {
   return `${location.protocol}//${location.host}/link/${slug}`
 }
diff --git a/web/pages/profile.tsx b/web/pages/profile.tsx
index b80698ae..541f5de9 100644
--- a/web/pages/profile.tsx
+++ b/web/pages/profile.tsx
@@ -1,6 +1,5 @@
 import React, { useEffect, useState } from 'react'
 import { RefreshIcon } from '@heroicons/react/outline'
-import Router from 'next/router'
 
 import { AddFundsButton } from 'web/components/add-funds-button'
 import { Page } from 'web/components/page'
@@ -18,6 +17,9 @@ import { updateUser, updatePrivateUser } from 'web/lib/firebase/users'
 import { defaultBannerUrl } from 'web/components/user-page'
 import { SiteLink } from 'web/components/site-link'
 import Textarea from 'react-expanding-textarea'
+import { redirectIfLoggedOut } from 'web/lib/firebase/server-auth'
+
+export const getServerSideProps = redirectIfLoggedOut('/')
 
 function EditUserField(props: {
   user: User
@@ -134,8 +136,7 @@ export default function ProfilePage() {
       })
   }
 
-  if (user === null) {
-    Router.replace('/')
+  if (user == null) {
     return <></>
   }
 
diff --git a/web/pages/trades.tsx b/web/pages/trades.tsx
index 55a08bc6..a29fb7f0 100644
--- a/web/pages/trades.tsx
+++ b/web/pages/trades.tsx
@@ -1,17 +1,10 @@
 import Router from 'next/router'
-import { useEffect } from 'react'
+import { redirectIfLoggedOut } from 'web/lib/firebase/server-auth'
 
-import { useUser } from 'web/hooks/use-user'
+export const getServerSideProps = redirectIfLoggedOut('/')
 
 // Deprecated: redirects to /portfolio.
 // Eventually, this will be removed.
 export default function TradesPage() {
-  const user = useUser()
-
-  useEffect(() => {
-    if (user === null) Router.replace('/')
-    else Router.replace('/portfolio')
-  })
-
-  return <></>
+  Router.replace('/portfolio')
 }

From f6d2c56e430f1fffb89636667430a736c3c6a8e6 Mon Sep 17 00:00:00 2001
From: Austin Chen <akrolsmir@gmail.com>
Date: Tue, 19 Jul 2022 01:23:36 -0700
Subject: [PATCH 25/71] Fix /create

---
 web/pages/create.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/pages/create.tsx b/web/pages/create.tsx
index 4294770e..45eb120f 100644
--- a/web/pages/create.tsx
+++ b/web/pages/create.tsx
@@ -58,7 +58,7 @@ export default function Create() {
   }, [params.q])
 
   const creator = useUser()
-  if (!router.isReady || creator) return <div />
+  if (!router.isReady || !creator) return <div />
 
   return (
     <Page>

From c256e9c0cc8c64b143c5144d2f5cd6d87765bd71 Mon Sep 17 00:00:00 2001
From: Marshall Polaris <marshall@pol.rs>
Date: Tue, 19 Jul 2022 01:32:38 -0700
Subject: [PATCH 26/71] Attempt to fix up overly sensitive cookie parsing

---
 web/lib/util/cookie.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/web/lib/util/cookie.ts b/web/lib/util/cookie.ts
index c0326cfc..4ffee21e 100644
--- a/web/lib/util/cookie.ts
+++ b/web/lib/util/cookie.ts
@@ -6,10 +6,11 @@ const encodeCookie = (name: string, val: string) => {
 
 const decodeCookie = (cookie: string) => {
   const parts = cookie.trim().split('=')
-  if (parts.length != 2) {
+  if (parts.length < 2) {
     throw new Error(`Invalid cookie contents: ${cookie}`)
   }
-  return [parts[0], decodeURIComponent(parts[1])] as const
+  const rest = parts.slice(1).join('') // there may be more = in the value
+  return [parts[0], decodeURIComponent(rest)] as const
 }
 
 export const setCookie = (name: string, val: string, opts?: CookieOptions) => {

From 55775d9d37872fc133650d7d26104af87bce79b9 Mon Sep 17 00:00:00 2001
From: Marshall Polaris <marshall@pol.rs>
Date: Tue, 19 Jul 2022 01:35:34 -0700
Subject: [PATCH 27/71] Also handle case where there are no cookies yet

---
 web/lib/util/cookie.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/web/lib/util/cookie.ts b/web/lib/util/cookie.ts
index 4ffee21e..14999fd4 100644
--- a/web/lib/util/cookie.ts
+++ b/web/lib/util/cookie.ts
@@ -23,5 +23,11 @@ export const setCookie = (name: string, val: string, opts?: CookieOptions) => {
 
 // Note that this intentionally ignores the case where multiple cookies have
 // the same name but different paths. Hopefully we never need to think about it.
-export const getCookies = (cookies: string) =>
-  Object.fromEntries(cookies.split(';').map(decodeCookie))
+export const getCookies = (cookies: string) => {
+  const data = cookies.trim()
+  if (!data) {
+    return {}
+  } else {
+    return Object.fromEntries(data.split(';').map(decodeCookie))
+  }
+}

From 2bae7dc200d9160ac8ba33ceb7454b0670f37351 Mon Sep 17 00:00:00 2001
From: Austin Chen <akrolsmir@gmail.com>
Date: Tue, 19 Jul 2022 02:54:05 -0700
Subject: [PATCH 28/71] Fix error on no portfolio history

---
 .../portfolio/portfolio-value-section.tsx          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/web/components/portfolio/portfolio-value-section.tsx b/web/components/portfolio/portfolio-value-section.tsx
index 1fabbd06..fa50365b 100644
--- a/web/components/portfolio/portfolio-value-section.tsx
+++ b/web/components/portfolio/portfolio-value-section.tsx
@@ -15,17 +15,17 @@ export const PortfolioValueSection = memo(
     const lastPortfolioMetrics = last(portfolioHistory)
     const [portfolioPeriod, setPortfolioPeriod] = useState<Period>('allTime')
 
-    // PATCH: If portfolio history started on June 1st, then we label it as "Since June"
-    // instead of "All time"
-    const allTimeLabel =
-      portfolioHistory[0].timestamp < Date.parse('2022-06-20T00:00:00.000Z')
-        ? 'Since June'
-        : 'All time'
-
     if (portfolioHistory.length === 0 || !lastPortfolioMetrics) {
       return <></>
     }
 
+    // PATCH: If portfolio history started on June 1st, then we label it as "Since June"
+    // instead of "All time"
+    const allTimeLabel =
+      lastPortfolioMetrics.timestamp < Date.parse('2022-06-20T00:00:00.000Z')
+        ? 'Since June'
+        : 'All time'
+
     return (
       <div>
         <Row className="gap-8">

From c236eb15b167fd6bdf8b409f65662301afe0b874 Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Tue, 19 Jul 2022 09:04:47 -0600
Subject: [PATCH 29/71] Cache notifs in local, gives instant load of old notifs
 (#662)

* Cache notifs in local, gives instant load of old notifs

* Small refactor, add ss auth

* unused vars

* Add back in replaceAll

* Save all notifs

* Memoize paginated notifs

* Replace all => replace with regexp
---
 web/hooks/use-notifications.ts |  52 ++++++-------
 web/lib/firebase/auth.ts       |   2 +-
 web/pages/notifications.tsx    | 132 ++++++++++++++++++++++++---------
 3 files changed, 123 insertions(+), 63 deletions(-)

diff --git a/web/hooks/use-notifications.ts b/web/hooks/use-notifications.ts
index f5502b85..b9bef469 100644
--- a/web/hooks/use-notifications.ts
+++ b/web/hooks/use-notifications.ts
@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'react'
+import { useEffect, useMemo, useState } from 'react'
 import { notification_subscribe_types, PrivateUser } from 'common/user'
 import { Notification } from 'common/notification'
 import {
@@ -6,7 +6,7 @@ import {
   listenForNotifications,
 } from 'web/lib/firebase/notifications'
 import { groupBy, map } from 'lodash'
-import { useFirestoreQuery } from '@react-query-firebase/firestore'
+import { useFirestoreQueryData } from '@react-query-firebase/firestore'
 import { NOTIFICATIONS_PER_PAGE } from 'web/pages/notifications'
 
 export type NotificationGroup = {
@@ -19,36 +19,38 @@ export type NotificationGroup = {
 
 // For some reason react-query subscriptions don't actually listen for notifications
 // Use useUnseenPreferredNotificationGroups to listen for new notifications
-export function usePreferredGroupedNotifications(privateUser: PrivateUser) {
-  const [notificationGroups, setNotificationGroups] = useState<
-    NotificationGroup[] | undefined
-  >(undefined)
-  const [notifications, setNotifications] = useState<Notification[]>([])
-  const key = `notifications-${privateUser.id}-all`
-
-  const result = useFirestoreQuery([key], getNotificationsQuery(privateUser.id))
-  useEffect(() => {
-    if (result.isLoading) return
-    if (!result.data) return setNotifications([])
-    const notifications = result.data.docs.map(
-      (doc) => doc.data() as Notification
-    )
+export function usePreferredGroupedNotifications(
+  privateUser: PrivateUser,
+  cachedNotifications?: Notification[]
+) {
+  const result = useFirestoreQueryData(
+    ['notifications-all', privateUser.id],
+    getNotificationsQuery(privateUser.id)
+  )
+  const notifications = useMemo(() => {
+    if (result.isLoading) return cachedNotifications ?? []
+    if (!result.data) return cachedNotifications ?? []
+    const notifications = result.data as Notification[]
 
     const notificationsToShow = getAppropriateNotifications(
       notifications,
       privateUser.notificationPreferences
     ).filter((n) => !n.isSeenOnHref)
-    setNotifications(notificationsToShow)
-  }, [privateUser.notificationPreferences, result.data, result.isLoading])
+    const cachedIds = cachedNotifications?.map((n) => n.id)
+    if (notificationsToShow.some((n) => !cachedIds?.includes(n.id))) {
+      return notificationsToShow
+    }
+    return cachedNotifications
+  }, [
+    cachedNotifications,
+    privateUser.notificationPreferences,
+    result.data,
+    result.isLoading,
+  ])
 
-  useEffect(() => {
-    if (!notifications) return
-
-    const groupedNotifications = groupNotifications(notifications)
-    setNotificationGroups(groupedNotifications)
+  return useMemo(() => {
+    if (notifications) return groupNotifications(notifications)
   }, [notifications])
-
-  return notificationGroups
 }
 
 export function useUnseenPreferredNotificationGroups(privateUser: PrivateUser) {
diff --git a/web/lib/firebase/auth.ts b/web/lib/firebase/auth.ts
index d1c440ec..b6daea6e 100644
--- a/web/lib/firebase/auth.ts
+++ b/web/lib/firebase/auth.ts
@@ -6,7 +6,7 @@ const TOKEN_KINDS = ['refresh', 'id'] as const
 type TokenKind = typeof TOKEN_KINDS[number]
 
 const getAuthCookieName = (kind: TokenKind) => {
-  const suffix = `${PROJECT_ID}_${kind}`.toUpperCase().replaceAll('-', '_')
+  const suffix = `${PROJECT_ID}_${kind}`.toUpperCase().replace(/-/g, '_')
   return `FIREBASE_TOKEN_${suffix}`
 }
 
diff --git a/web/pages/notifications.tsx b/web/pages/notifications.tsx
index 9166109f..7500c2a8 100644
--- a/web/pages/notifications.tsx
+++ b/web/pages/notifications.tsx
@@ -1,6 +1,6 @@
 import { Tabs } from 'web/components/layout/tabs'
 import { usePrivateUser, useUser } from 'web/hooks/use-user'
-import React, { useEffect, useState } from 'react'
+import React, { useEffect, useMemo, useState } from 'react'
 import { Notification, notification_source_types } from 'common/notification'
 import { Avatar, EmptyAvatar } from 'web/components/avatar'
 import { Row } from 'web/components/layout/row'
@@ -14,9 +14,14 @@ import {
   MANIFOLD_USERNAME,
   notification_subscribe_types,
   PrivateUser,
+  User,
 } from 'common/user'
 import { ChoicesToggleGroup } from 'web/components/choices-toggle-group'
-import { listenForPrivateUser, updatePrivateUser } from 'web/lib/firebase/users'
+import {
+  getUser,
+  listenForPrivateUser,
+  updatePrivateUser,
+} from 'web/lib/firebase/users'
 import { LoadingIndicator } from 'web/components/loading-indicator'
 import clsx from 'clsx'
 import { RelativeTimestamp } from 'web/components/relative-timestamp'
@@ -43,14 +48,38 @@ import { track } from '@amplitude/analytics-browser'
 import { Pagination } from 'web/components/pagination'
 import { useWindowSize } from 'web/hooks/use-window-size'
 import Router from 'next/router'
+import { safeLocalStorage } from 'web/lib/util/local'
+import {
+  getServerAuthenticatedUid,
+  redirectIfLoggedOut,
+} from 'web/lib/firebase/server-auth'
 
 export const NOTIFICATIONS_PER_PAGE = 30
 const MULTIPLE_USERS_KEY = 'multipleUsers'
 const HIGHLIGHT_CLASS = 'bg-indigo-50'
 
-export default function Notifications() {
-  const user = useUser()
+export const getServerSideProps = redirectIfLoggedOut('/', async (ctx) => {
+  const uid = await getServerAuthenticatedUid(ctx)
+  if (!uid) {
+    return { props: { user: null } }
+  }
+  const user = await getUser(uid)
+  return { props: { user } }
+})
+
+export default function Notifications(props: { user: User }) {
+  const { user } = props
   const privateUser = usePrivateUser(user?.id)
+  const local = safeLocalStorage()
+  let localNotifications = [] as Notification[]
+  const localSavedNotificationGroups = local?.getItem('notification-groups')
+  let localNotificationGroups = [] as NotificationGroup[]
+  if (localSavedNotificationGroups) {
+    localNotificationGroups = JSON.parse(localSavedNotificationGroups)
+    localNotifications = localNotificationGroups
+      .map((g) => g.notifications)
+      .flat()
+  }
 
   if (!user) return <Custom404 />
   return (
@@ -67,7 +96,16 @@ export default function Notifications() {
               {
                 title: 'Notifications',
                 content: privateUser ? (
-                  <NotificationsList privateUser={privateUser} />
+                  <NotificationsList
+                    privateUser={privateUser}
+                    cachedNotifications={localNotifications}
+                  />
+                ) : localNotifications && localNotifications.length > 0 ? (
+                  <div className={'min-h-[100vh]'}>
+                    <RenderNotificationGroups
+                      notificationGroups={localNotificationGroups}
+                    />
+                  </div>
                 ) : (
                   <LoadingIndicator />
                 ),
@@ -88,39 +126,13 @@ export default function Notifications() {
   )
 }
 
-function NotificationsList(props: { privateUser: PrivateUser }) {
-  const { privateUser } = props
-  const [page, setPage] = useState(0)
-  const allGroupedNotifications = usePreferredGroupedNotifications(privateUser)
-  const [paginatedGroupedNotifications, setPaginatedGroupedNotifications] =
-    useState<NotificationGroup[] | undefined>(undefined)
-
-  useEffect(() => {
-    if (!allGroupedNotifications) return
-    const start = page * NOTIFICATIONS_PER_PAGE
-    const end = start + NOTIFICATIONS_PER_PAGE
-    const maxNotificationsToShow = allGroupedNotifications.slice(start, end)
-    const remainingNotification = allGroupedNotifications.slice(end)
-    for (const notification of remainingNotification) {
-      if (notification.isSeen) break
-      else setNotificationsAsSeen(notification.notifications)
-    }
-    setPaginatedGroupedNotifications(maxNotificationsToShow)
-  }, [allGroupedNotifications, page])
-
-  if (!paginatedGroupedNotifications || !allGroupedNotifications)
-    return <LoadingIndicator />
-
+function RenderNotificationGroups(props: {
+  notificationGroups: NotificationGroup[]
+}) {
+  const { notificationGroups } = props
   return (
-    <div className={'min-h-[100vh]'}>
-      {paginatedGroupedNotifications.length === 0 && (
-        <div className={'mt-2'}>
-          You don't have any notifications. Try changing your settings to see
-          more.
-        </div>
-      )}
-
-      {paginatedGroupedNotifications.map((notification) =>
+    <>
+      {notificationGroups.map((notification) =>
         notification.type === 'income' ? (
           <IncomeNotificationGroupItem
             notificationGroup={notification}
@@ -138,6 +150,52 @@ function NotificationsList(props: { privateUser: PrivateUser }) {
           />
         )
       )}
+    </>
+  )
+}
+
+function NotificationsList(props: {
+  privateUser: PrivateUser
+  cachedNotifications: Notification[]
+}) {
+  const { privateUser, cachedNotifications } = props
+  const [page, setPage] = useState(0)
+  const allGroupedNotifications = usePreferredGroupedNotifications(
+    privateUser,
+    cachedNotifications
+  )
+  const paginatedGroupedNotifications = useMemo(() => {
+    if (!allGroupedNotifications) return
+    const start = page * NOTIFICATIONS_PER_PAGE
+    const end = start + NOTIFICATIONS_PER_PAGE
+    const maxNotificationsToShow = allGroupedNotifications.slice(start, end)
+    const remainingNotification = allGroupedNotifications.slice(end)
+    for (const notification of remainingNotification) {
+      if (notification.isSeen) break
+      else setNotificationsAsSeen(notification.notifications)
+    }
+    const local = safeLocalStorage()
+    local?.setItem(
+      'notification-groups',
+      JSON.stringify(maxNotificationsToShow)
+    )
+    return maxNotificationsToShow
+  }, [allGroupedNotifications, page])
+
+  if (!paginatedGroupedNotifications || !allGroupedNotifications) return <div />
+
+  return (
+    <div className={'min-h-[100vh]'}>
+      {paginatedGroupedNotifications.length === 0 && (
+        <div className={'mt-2'}>
+          You don't have any notifications. Try changing your settings to see
+          more.
+        </div>
+      )}
+
+      <RenderNotificationGroups
+        notificationGroups={paginatedGroupedNotifications}
+      />
       {paginatedGroupedNotifications.length > 0 &&
         allGroupedNotifications.length > NOTIFICATIONS_PER_PAGE && (
           <Pagination

From a203f43142532c8ed99edce011e0a26d3f493144 Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Tue, 19 Jul 2022 09:29:12 -0600
Subject: [PATCH 30/71] Cache all notifs

---
 web/pages/notifications.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/pages/notifications.tsx b/web/pages/notifications.tsx
index 7500c2a8..084b143c 100644
--- a/web/pages/notifications.tsx
+++ b/web/pages/notifications.tsx
@@ -177,7 +177,7 @@ function NotificationsList(props: {
     const local = safeLocalStorage()
     local?.setItem(
       'notification-groups',
-      JSON.stringify(maxNotificationsToShow)
+      JSON.stringify(allGroupedNotifications)
     )
     return maxNotificationsToShow
   }, [allGroupedNotifications, page])

From 0d282a962c4ecfe929e6db9b1572e3bf46040d19 Mon Sep 17 00:00:00 2001
From: Marshall Polaris <marshall@pol.rs>
Date: Tue, 19 Jul 2022 08:35:43 -0700
Subject: [PATCH 31/71] Don't `setQuery` on group selector component during
 initial render (#660)

---
 web/components/groups/group-selector.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/web/components/groups/group-selector.tsx b/web/components/groups/group-selector.tsx
index 2417403a..c7b4cb39 100644
--- a/web/components/groups/group-selector.tsx
+++ b/web/components/groups/group-selector.tsx
@@ -53,9 +53,8 @@ export function GroupSelector(props: {
         nullable={true}
         className={'text-sm'}
       >
-        {({ open }) => (
+        {() => (
           <>
-            {!open && setQuery('')}
             <Combobox.Label className="label justify-start gap-2 text-base">
               Add to Group
               <InfoTooltip text="Question will be displayed alongside the other questions in the group." />

From 4b3370e374a97c454562626be59903bedd120094 Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Tue, 19 Jul 2022 12:30:13 -0500
Subject: [PATCH 32/71] fix formatting

---
 common/util/format.ts | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/common/util/format.ts b/common/util/format.ts
index 7dc1a341..4f123535 100644
--- a/common/util/format.ts
+++ b/common/util/format.ts
@@ -33,20 +33,24 @@ export function formatPercent(zeroToOne: number) {
   return (zeroToOne * 100).toFixed(decimalPlaces) + '%'
 }
 
+const showPrecision = (x: number, sigfigs: number) =>
+  // convert back to number for weird formatting reason
+  `${Number(x.toPrecision(sigfigs))}`
+
 // Eg 1234567.89 => 1.23M; 5678 => 5.68K
 export function formatLargeNumber(num: number, sigfigs = 2): string {
   const absNum = Math.abs(num)
-  if (absNum < 1) return num.toPrecision(sigfigs)
+  if (absNum < 1) return showPrecision(num, sigfigs)
 
-  if (absNum < 100) return num.toPrecision(2)
-  if (absNum < 1000) return num.toPrecision(3)
-  if (absNum < 10000) return num.toPrecision(4)
+  if (absNum < 100) return showPrecision(num, 2)
+  if (absNum < 1000) return showPrecision(num, 3)
+  if (absNum < 10000) return showPrecision(num, 4)
 
   const suffix = ['', 'K', 'M', 'B', 'T', 'Q']
   const i = Math.floor(Math.log10(absNum) / 3)
 
-  const numStr = (num / Math.pow(10, 3 * i)).toPrecision(sigfigs)
-  return `${numStr}${suffix[i]}`
+  const numStr = showPrecision(num / Math.pow(10, 3 * i), sigfigs)
+  return `${numStr}${suffix[i] ?? ''}`
 }
 
 export function toCamelCase(words: string) {

From 12567074cc4430ac15295f9dca61ed5487dd36d2 Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Tue, 19 Jul 2022 12:31:11 -0500
Subject: [PATCH 33/71] fix log scale graph

---
 common/pseudo-numeric.ts                      |  6 ++---
 .../contract/contract-prob-graph.tsx          | 25 ++++++++++++-------
 web/pages/create.tsx                          | 18 ++++++-------
 3 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/common/pseudo-numeric.ts b/common/pseudo-numeric.ts
index c99e670f..73f9fd01 100644
--- a/common/pseudo-numeric.ts
+++ b/common/pseudo-numeric.ts
@@ -16,8 +16,8 @@ export const getMappedValue =
     const { min, max, isLogScale } = contract
 
     if (isLogScale) {
-      const logValue = p * Math.log10(max - min)
-      return 10 ** logValue + min
+      const logValue = p * Math.log10(max - min + 1)
+      return 10 ** logValue + min - 1
     }
 
     return p * (max - min) + min
@@ -38,7 +38,7 @@ export const getPseudoProbability = (
   isLogScale = false
 ) => {
   if (isLogScale) {
-    return Math.log10(value - min) / Math.log10(max - min)
+    return Math.log10(value - min + 1) / Math.log10(max - min + 1)
   }
 
   return (value - min) / (max - min)
diff --git a/web/components/contract/contract-prob-graph.tsx b/web/components/contract/contract-prob-graph.tsx
index a9d26e2e..c6e17cd6 100644
--- a/web/components/contract/contract-prob-graph.tsx
+++ b/web/components/contract/contract-prob-graph.tsx
@@ -7,7 +7,6 @@ import { Bet } from 'common/bet'
 import { getInitialProbability } from 'common/calculate'
 import { BinaryContract, PseudoNumericContract } from 'common/contract'
 import { useWindowSize } from 'web/hooks/use-window-size'
-import { getMappedValue } from 'common/pseudo-numeric'
 import { formatLargeNumber } from 'common/util/format'
 
 export const ContractProbGraph = memo(function ContractProbGraph(props: {
@@ -29,7 +28,11 @@ export const ContractProbGraph = memo(function ContractProbGraph(props: {
     ...bets.map((bet) => bet.createdTime),
   ].map((time) => new Date(time))
 
-  const f = getMappedValue(contract)
+  const f: (p: number) => number = isBinary
+    ? (p) => p
+    : isLogScale
+    ? (p) => p * Math.log10(contract.max - contract.min + 1)
+    : (p) => p * (contract.max - contract.min) + contract.min
 
   const probs = [startProb, ...bets.map((bet) => bet.probAfter)].map(f)
 
@@ -69,10 +72,9 @@ export const ContractProbGraph = memo(function ContractProbGraph(props: {
 
   const points: { x: Date; y: number }[] = []
   const s = isBinary ? 100 : 1
-  const c = isLogScale && contract.min === 0 ? 1 : 0
 
   for (let i = 0; i < times.length - 1; i++) {
-    points[points.length] = { x: times[i], y: s * probs[i] + c }
+    points[points.length] = { x: times[i], y: s * probs[i] }
     const numPoints: number = Math.floor(
       dayjs(times[i + 1]).diff(dayjs(times[i]), 'ms') / timeStep
     )
@@ -84,7 +86,7 @@ export const ContractProbGraph = memo(function ContractProbGraph(props: {
           x: dayjs(times[i])
             .add(thisTimeStep * n, 'ms')
             .toDate(),
-          y: s * probs[i] + c,
+          y: s * probs[i],
         }
       }
     }
@@ -99,6 +101,9 @@ export const ContractProbGraph = memo(function ContractProbGraph(props: {
 
   const formatter = isBinary
     ? formatPercent
+    : isLogScale
+    ? (x: DatumValue) =>
+        formatLargeNumber(10 ** +x.valueOf() + contract.min - 1)
     : (x: DatumValue) => formatLargeNumber(+x.valueOf())
 
   return (
@@ -111,11 +116,13 @@ export const ContractProbGraph = memo(function ContractProbGraph(props: {
         yScale={
           isBinary
             ? { min: 0, max: 100, type: 'linear' }
-            : {
-                min: contract.min + c,
-                max: contract.max + c,
-                type: contract.isLogScale ? 'log' : 'linear',
+            : isLogScale
+            ? {
+                min: 0,
+                max: Math.log10(contract.max - contract.min + 1),
+                type: 'linear',
               }
+            : { min: contract.min, max: contract.max, type: 'linear' }
         }
         yFormat={formatter}
         gridYValues={yTickValues}
diff --git a/web/pages/create.tsx b/web/pages/create.tsx
index 45eb120f..78ad8d19 100644
--- a/web/pages/create.tsx
+++ b/web/pages/create.tsx
@@ -206,7 +206,7 @@ export function NewContract(props: {
           min,
           max,
           initialValue,
-          isLogScale: (min ?? 0) < 0 ? false : isLogScale,
+          isLogScale,
           groupId: selectedGroup?.id,
         })
       )
@@ -293,15 +293,13 @@ export function NewContract(props: {
               />
             </Row>
 
-            {!(min !== undefined && min < 0) && (
-              <Checkbox
-                className="my-2 text-sm"
-                label="Log scale"
-                checked={isLogScale}
-                toggle={() => setIsLogScale(!isLogScale)}
-                disabled={isSubmitting}
-              />
-            )}
+            <Checkbox
+              className="my-2 text-sm"
+              label="Log scale"
+              checked={isLogScale}
+              toggle={() => setIsLogScale(!isLogScale)}
+              disabled={isSubmitting}
+            />
 
             {min !== undefined && max !== undefined && min >= max && (
               <div className="mt-2 mb-2 text-sm text-red-500">

From 61cbb07bd50978bd15badc12c341fd90e2e52e94 Mon Sep 17 00:00:00 2001
From: Marshall Polaris <marshall@pol.rs>
Date: Tue, 19 Jul 2022 12:33:53 -0700
Subject: [PATCH 34/71] Fix some broken stuff on the homepage contract search
 routing (#664)

* Use Next router more appropriately

* Replace instead of push when modifying search query params
---
 web/hooks/use-sort-and-query-params.tsx | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/web/hooks/use-sort-and-query-params.tsx b/web/hooks/use-sort-and-query-params.tsx
index a2248c2e..5c9a247f 100644
--- a/web/hooks/use-sort-and-query-params.tsx
+++ b/web/hooks/use-sort-and-query-params.tsx
@@ -53,9 +53,12 @@ export function useInitialQueryAndSort(options?: {
         console.log('ready loading from storage ', sort ?? defaultSort)
         const localSort = getSavedSort()
         if (localSort) {
-          router.query.s = localSort
           // Use replace to not break navigating back.
-          router.replace(router, undefined, { shallow: true })
+          router.replace(
+            { query: { ...router.query, s: localSort } },
+            undefined,
+            { shallow: true }
+          )
         }
         setInitialSort(localSort ?? defaultSort)
       } else {
@@ -79,7 +82,9 @@ export function useUpdateQueryAndSort(props: {
   const setSort = (sort: Sort | undefined) => {
     if (sort !== router.query.s) {
       router.query.s = sort
-      router.push(router, undefined, { shallow: true })
+      router.replace({ query: { ...router.query, s: sort } }, undefined, {
+        shallow: true,
+      })
       if (shouldLoadFromStorage) {
         localStorage.setItem(MARKETS_SORT, sort || '')
       }
@@ -97,7 +102,9 @@ export function useUpdateQueryAndSort(props: {
         } else {
           delete router.query.q
         }
-        router.push(router, undefined, { shallow: true })
+        router.replace({ query: router.query }, undefined, {
+          shallow: true,
+        })
         track('search', { query })
       }, 500),
     [router]

From 74760b1062f72fa7e08394374872be569b8a3df6 Mon Sep 17 00:00:00 2001
From: James Grugett <jahooma@gmail.com>
Date: Tue, 19 Jul 2022 14:53:33 -0500
Subject: [PATCH 35/71] Reorder orderbook columns

---
 web/components/limit-bets.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/components/limit-bets.tsx b/web/components/limit-bets.tsx
index 7e32db25..7aaa0601 100644
--- a/web/components/limit-bets.tsx
+++ b/web/components/limit-bets.tsx
@@ -78,8 +78,8 @@ export function LimitOrderTable(props: {
       <thead>
         {!isYou && <th></th>}
         <th>Outcome</th>
-        <th>Amount</th>
         <th>{isPseudoNumeric ? 'Value' : 'Prob'}</th>
+        <th>Amount</th>
         {isYou && <th></th>}
       </thead>
       <tbody>
@@ -129,12 +129,12 @@ function LimitBet(props: {
           )}
         </div>
       </td>
-      <td>{formatMoney(orderAmount - amount)}</td>
       <td>
         {isPseudoNumeric
           ? getFormattedMappedValue(contract)(limitProb)
           : formatPercent(limitProb)}
       </td>
+      <td>{formatMoney(orderAmount - amount)}</td>
       {isYou && (
         <td>
           {isCancelling ? (

From 93b9ace47715618c16c98b9052897a674c4a0b41 Mon Sep 17 00:00:00 2001
From: James Grugett <jahooma@gmail.com>
Date: Tue, 19 Jul 2022 14:54:42 -0500
Subject: [PATCH 36/71] Comment email: Subject no longer varies between
 questions so emails are threaded in gmail

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

diff --git a/functions/src/emails.ts b/functions/src/emails.ts
index 60534679..a29f982c 100644
--- a/functions/src/emails.ts
+++ b/functions/src/emails.ts
@@ -302,7 +302,7 @@ export const sendNewCommentEmail = async (
     )}`
   }
 
-  const subject = `Comment from ${commentorName} on ${question}`
+  const subject = `Comment on ${question}`
   const from = `${commentorName} on Manifold <no-reply@manifold.markets>`
 
   if (contract.outcomeType === 'FREE_RESPONSE' && answerId && answerText) {

From a1e03c3a25f1003c64e8d02982d9323f1994b3bf Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Tue, 19 Jul 2022 13:58:51 -0600
Subject: [PATCH 37/71] Allow opening notifs in new tabs, return newest notifs

---
 web/hooks/use-notifications.ts |  7 +---
 web/pages/notifications.tsx    | 61 ++++++++++++++++++----------------
 2 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/web/hooks/use-notifications.ts b/web/hooks/use-notifications.ts
index b9bef469..a3ddeb29 100644
--- a/web/hooks/use-notifications.ts
+++ b/web/hooks/use-notifications.ts
@@ -32,15 +32,10 @@ export function usePreferredGroupedNotifications(
     if (!result.data) return cachedNotifications ?? []
     const notifications = result.data as Notification[]
 
-    const notificationsToShow = getAppropriateNotifications(
+    return getAppropriateNotifications(
       notifications,
       privateUser.notificationPreferences
     ).filter((n) => !n.isSeenOnHref)
-    const cachedIds = cachedNotifications?.map((n) => n.id)
-    if (notificationsToShow.some((n) => !cachedIds?.includes(n.id))) {
-      return notificationsToShow
-    }
-    return cachedNotifications
   }, [
     cachedNotifications,
     privateUser.notificationPreferences,
diff --git a/web/pages/notifications.tsx b/web/pages/notifications.tsx
index 084b143c..a45bf030 100644
--- a/web/pages/notifications.tsx
+++ b/web/pages/notifications.tsx
@@ -47,12 +47,12 @@ import Custom404 from 'web/pages/404'
 import { track } from '@amplitude/analytics-browser'
 import { Pagination } from 'web/components/pagination'
 import { useWindowSize } from 'web/hooks/use-window-size'
-import Router from 'next/router'
 import { safeLocalStorage } from 'web/lib/util/local'
 import {
   getServerAuthenticatedUid,
   redirectIfLoggedOut,
 } from 'web/lib/firebase/server-auth'
+import { SiteLink } from 'web/components/site-link'
 
 export const NOTIFICATIONS_PER_PAGE = 30
 const MULTIPLE_USERS_KEY = 'multipleUsers'
@@ -100,7 +100,8 @@ export default function Notifications(props: { user: User }) {
                     privateUser={privateUser}
                     cachedNotifications={localNotifications}
                   />
-                ) : localNotifications && localNotifications.length > 0 ? (
+                ) : localNotificationGroups &&
+                  localNotificationGroups.length > 0 ? (
                   <div className={'min-h-[100vh]'}>
                     <RenderNotificationGroups
                       notificationGroups={localNotificationGroups}
@@ -440,7 +441,11 @@ function IncomeNotificationItem(props: {
         highlighted && HIGHLIGHT_CLASS
       )}
     >
-      <a href={getSourceUrl(notification)}>
+      <div className={'relative'}>
+        <SiteLink
+          href={getSourceUrl(notification) ?? ''}
+          className={'absolute left-0 right-0 top-0 bottom-0 z-0'}
+        />
         <Row className={'items-center text-gray-500 sm:justify-start'}>
           <div className={'line-clamp-2 flex max-w-xl shrink '}>
             <div className={'inline'}>
@@ -466,7 +471,7 @@ function IncomeNotificationItem(props: {
           </div>
         </Row>
         <div className={'mt-4 border-b border-gray-300'} />
-      </a>
+      </div>
     </div>
   )
 }
@@ -655,24 +660,24 @@ function NotificationItem(props: {
         highlighted && HIGHLIGHT_CLASS
       )}
     >
-      <div
-        className={'cursor-pointer'}
-        onClick={(event) => {
-          event.stopPropagation()
-          Router.push(getSourceUrl(notification) ?? '')
-          track('Notification Clicked', {
-            type: 'notification item',
-            sourceType,
-            sourceUserName,
-            sourceUserAvatarUrl,
-            sourceUpdateType,
-            reasonText,
-            reason,
-            sourceUserUsername,
-            sourceText,
-          })
-        }}
-      >
+      <div className={'relative cursor-pointer'}>
+        <SiteLink
+          href={getSourceUrl(notification) ?? ''}
+          className={'absolute left-0 right-0 top-0 bottom-0 z-0'}
+          onClick={() =>
+            track('Notification Clicked', {
+              type: 'notification item',
+              sourceType,
+              sourceUserName,
+              sourceUserAvatarUrl,
+              sourceUpdateType,
+              reasonText,
+              reason,
+              sourceUserUsername,
+              sourceText,
+            })
+          }
+        />
         <Row className={'items-center text-gray-500 sm:justify-start'}>
           <Avatar
             avatarUrl={
@@ -681,7 +686,7 @@ function NotificationItem(props: {
                 : sourceUserAvatarUrl
             }
             size={'sm'}
-            className={'mr-2'}
+            className={'z-10 mr-2'}
             username={
               questionNeedsResolution ? MANIFOLD_USERNAME : sourceUserUsername
             }
@@ -697,7 +702,7 @@ function NotificationItem(props: {
                   <UserLink
                     name={sourceUserName || ''}
                     username={sourceUserUsername || ''}
-                    className={'mr-1 flex-shrink-0'}
+                    className={'relative mr-1 flex-shrink-0'}
                     justFirstName={true}
                   />
                 )}
@@ -764,10 +769,8 @@ function QuestionOrGroupLink(props: {
       </span>
     )
   return (
-    <a
-      className={
-        'ml-1 font-bold hover:underline hover:decoration-indigo-400 hover:decoration-2 '
-      }
+    <SiteLink
+      className={'relative ml-1 font-bold'}
       href={
         sourceContractCreatorUsername
           ? `/${sourceContractCreatorUsername}/${sourceContractSlug}`
@@ -792,7 +795,7 @@ function QuestionOrGroupLink(props: {
       }
     >
       {sourceContractTitle || sourceTitle}
-    </a>
+    </SiteLink>
   )
 }
 

From b6c8390a460febbcf92a81cdb0e1d23809383409 Mon Sep 17 00:00:00 2001
From: James Grugett <jahooma@gmail.com>
Date: Tue, 19 Jul 2022 15:01:13 -0500
Subject: [PATCH 38/71] Show order book button even on Quick bet

---
 web/components/bet-panel.tsx | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/web/components/bet-panel.tsx b/web/components/bet-panel.tsx
index 351b012e..0cbee7b5 100644
--- a/web/components/bet-panel.tsx
+++ b/web/components/bet-panel.tsx
@@ -50,14 +50,10 @@ export function BetPanel(props: {
   const user = useUser()
   const userBets = useUserContractBets(user?.id, contract.id)
   const unfilledBets = useUnfilledBets(contract.id) ?? []
-  const yourUnfilledBets = unfilledBets.filter((bet) => bet.userId === user?.id)
   const { sharesOutcome } = useSaveBinaryShares(contract, userBets)
 
   const [isLimitOrder, setIsLimitOrder] = useState(false)
 
-  const showLimitOrders =
-    (isLimitOrder && unfilledBets.length > 0) || yourUnfilledBets.length > 0
-
   return (
     <Col className={className}>
       <SellRow
@@ -85,7 +81,7 @@ export function BetPanel(props: {
 
         <SignUpPrompt />
       </Col>
-      {showLimitOrders && (
+      {unfilledBets.length > 0 && (
         <LimitBets className="mt-4" contract={contract} bets={unfilledBets} />
       )}
     </Col>
@@ -105,9 +101,6 @@ export function SimpleBetPanel(props: {
   const [isLimitOrder, setIsLimitOrder] = useState(false)
 
   const unfilledBets = useUnfilledBets(contract.id) ?? []
-  const yourUnfilledBets = unfilledBets.filter((bet) => bet.userId === user?.id)
-  const showLimitOrders =
-    (isLimitOrder && unfilledBets.length > 0) || yourUnfilledBets.length > 0
 
   return (
     <Col className={className}>
@@ -138,7 +131,7 @@ export function SimpleBetPanel(props: {
         <SignUpPrompt />
       </Col>
 
-      {showLimitOrders && (
+      {unfilledBets.length > 0 && (
         <LimitBets className="mt-4" contract={contract} bets={unfilledBets} />
       )}
     </Col>

From 6dcad6225b797e4c536097a7e7d6d8456f91a258 Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Tue, 19 Jul 2022 14:16:20 -0600
Subject: [PATCH 39/71] Next/Previous => Older/Newer

---
 web/components/pagination.tsx | 30 +++++++++++++++++++++---------
 web/pages/notifications.tsx   |  2 ++
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/web/components/pagination.tsx b/web/components/pagination.tsx
index a585985d..069ebda7 100644
--- a/web/components/pagination.tsx
+++ b/web/components/pagination.tsx
@@ -4,8 +4,18 @@ export function Pagination(props: {
   totalItems: number
   setPage: (page: number) => void
   scrollToTop?: boolean
+  nextTitle?: string
+  prevTitle?: string
 }) {
-  const { page, itemsPerPage, totalItems, setPage, scrollToTop } = props
+  const {
+    page,
+    itemsPerPage,
+    totalItems,
+    setPage,
+    scrollToTop,
+    nextTitle,
+    prevTitle,
+  } = props
 
   const maxPage = Math.ceil(totalItems / itemsPerPage) - 1
 
@@ -25,19 +35,21 @@ export function Pagination(props: {
         </p>
       </div>
       <div className="flex flex-1 justify-between sm:justify-end">
-        <a
-          href={scrollToTop ? '#' : undefined}
-          className="relative inline-flex cursor-pointer select-none items-center rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50"
-          onClick={() => page > 0 && setPage(page - 1)}
-        >
-          Previous
-        </a>
+        {page > 0 && (
+          <a
+            href={scrollToTop ? '#' : undefined}
+            className="relative inline-flex cursor-pointer select-none items-center rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50"
+            onClick={() => page > 0 && setPage(page - 1)}
+          >
+            {prevTitle ?? 'Previous'}
+          </a>
+        )}
         <a
           href={scrollToTop ? '#' : undefined}
           className="relative ml-3 inline-flex cursor-pointer select-none items-center rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50"
           onClick={() => page < maxPage && setPage(page + 1)}
         >
-          Next
+          {nextTitle ?? 'Next'}
         </a>
       </div>
     </nav>
diff --git a/web/pages/notifications.tsx b/web/pages/notifications.tsx
index a45bf030..7867e197 100644
--- a/web/pages/notifications.tsx
+++ b/web/pages/notifications.tsx
@@ -205,6 +205,8 @@ function NotificationsList(props: {
             totalItems={allGroupedNotifications.length}
             setPage={setPage}
             scrollToTop
+            nextTitle={'Older'}
+            prevTitle={'Newer'}
           />
         )}
     </div>

From b5ef7490c3cb9b6713ed9214365448c2a394355b Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Tue, 19 Jul 2022 14:24:36 -0600
Subject: [PATCH 40/71] NotificationSettings to its own file

---
 web/components/NotificationSettings.tsx | 210 +++++++++++++++++++++++
 web/pages/notifications.tsx             | 214 +-----------------------
 2 files changed, 214 insertions(+), 210 deletions(-)
 create mode 100644 web/components/NotificationSettings.tsx

diff --git a/web/components/NotificationSettings.tsx b/web/components/NotificationSettings.tsx
new file mode 100644
index 00000000..2c657857
--- /dev/null
+++ b/web/components/NotificationSettings.tsx
@@ -0,0 +1,210 @@
+import { useUser } from 'web/hooks/use-user'
+import React, { useEffect, useState } from 'react'
+import { notification_subscribe_types, PrivateUser } from 'common/lib/user'
+import { listenForPrivateUser, updatePrivateUser } from 'web/lib/firebase/users'
+import toast from 'react-hot-toast'
+import { track } from '@amplitude/analytics-browser'
+import { LoadingIndicator } from 'web/components/loading-indicator'
+import { Row } from 'web/components/layout/row'
+import clsx from 'clsx'
+import { CheckIcon, XIcon } from '@heroicons/react/outline'
+import { ChoicesToggleGroup } from 'web/components/choices-toggle-group'
+
+export function NotificationSettings() {
+  const user = useUser()
+  const [notificationSettings, setNotificationSettings] =
+    useState<notification_subscribe_types>('all')
+  const [emailNotificationSettings, setEmailNotificationSettings] =
+    useState<notification_subscribe_types>('all')
+  const [privateUser, setPrivateUser] = useState<PrivateUser | null>(null)
+
+  useEffect(() => {
+    if (user) listenForPrivateUser(user.id, setPrivateUser)
+  }, [user])
+
+  useEffect(() => {
+    if (!privateUser) return
+    if (privateUser.notificationPreferences) {
+      setNotificationSettings(privateUser.notificationPreferences)
+    }
+    if (
+      privateUser.unsubscribedFromResolutionEmails &&
+      privateUser.unsubscribedFromCommentEmails &&
+      privateUser.unsubscribedFromAnswerEmails
+    ) {
+      setEmailNotificationSettings('none')
+    } else if (
+      !privateUser.unsubscribedFromResolutionEmails &&
+      !privateUser.unsubscribedFromCommentEmails &&
+      !privateUser.unsubscribedFromAnswerEmails
+    ) {
+      setEmailNotificationSettings('all')
+    } else {
+      setEmailNotificationSettings('less')
+    }
+  }, [privateUser])
+
+  const loading = 'Changing Notifications Settings'
+  const success = 'Notification Settings Changed!'
+  function changeEmailNotifications(newValue: notification_subscribe_types) {
+    if (!privateUser) return
+    if (newValue === 'all') {
+      toast.promise(
+        updatePrivateUser(privateUser.id, {
+          unsubscribedFromResolutionEmails: false,
+          unsubscribedFromCommentEmails: false,
+          unsubscribedFromAnswerEmails: false,
+        }),
+        {
+          loading,
+          success,
+          error: (err) => `${err.message}`,
+        }
+      )
+    } else if (newValue === 'less') {
+      toast.promise(
+        updatePrivateUser(privateUser.id, {
+          unsubscribedFromResolutionEmails: false,
+          unsubscribedFromCommentEmails: true,
+          unsubscribedFromAnswerEmails: true,
+        }),
+        {
+          loading,
+          success,
+          error: (err) => `${err.message}`,
+        }
+      )
+    } else if (newValue === 'none') {
+      toast.promise(
+        updatePrivateUser(privateUser.id, {
+          unsubscribedFromResolutionEmails: true,
+          unsubscribedFromCommentEmails: true,
+          unsubscribedFromAnswerEmails: true,
+        }),
+        {
+          loading,
+          success,
+          error: (err) => `${err.message}`,
+        }
+      )
+    }
+  }
+
+  function changeInAppNotificationSettings(
+    newValue: notification_subscribe_types
+  ) {
+    if (!privateUser) return
+    track('In-App Notification Preferences Changed', {
+      newPreference: newValue,
+      oldPreference: privateUser.notificationPreferences,
+    })
+    toast.promise(
+      updatePrivateUser(privateUser.id, {
+        notificationPreferences: newValue,
+      }),
+      {
+        loading,
+        success,
+        error: (err) => `${err.message}`,
+      }
+    )
+  }
+
+  useEffect(() => {
+    if (privateUser && privateUser.notificationPreferences)
+      setNotificationSettings(privateUser.notificationPreferences)
+    else setNotificationSettings('all')
+  }, [privateUser])
+
+  if (!privateUser) {
+    return <LoadingIndicator spinnerClassName={'border-gray-500 h-4 w-4'} />
+  }
+
+  function NotificationSettingLine(props: {
+    label: string
+    highlight: boolean
+  }) {
+    const { label, highlight } = props
+    return (
+      <Row className={clsx('my-1 text-gray-300', highlight && '!text-black')}>
+        {highlight ? <CheckIcon height={20} /> : <XIcon height={20} />}
+        {label}
+      </Row>
+    )
+  }
+
+  return (
+    <div className={'p-2'}>
+      <div>In App Notifications</div>
+      <ChoicesToggleGroup
+        currentChoice={notificationSettings}
+        choicesMap={{ All: 'all', Less: 'less', None: 'none' }}
+        setChoice={(choice) =>
+          changeInAppNotificationSettings(
+            choice as notification_subscribe_types
+          )
+        }
+        className={'col-span-4 p-2'}
+        toggleClassName={'w-24'}
+      />
+      <div className={'mt-4 text-sm'}>
+        <div>
+          <div className={''}>
+            You will receive notifications for:
+            <NotificationSettingLine
+              label={"Resolution of questions you've interacted with"}
+              highlight={notificationSettings !== 'none'}
+            />
+            <NotificationSettingLine
+              highlight={notificationSettings !== 'none'}
+              label={'Activity on your own questions, comments, & answers'}
+            />
+            <NotificationSettingLine
+              highlight={notificationSettings !== 'none'}
+              label={"Activity on questions you're betting on"}
+            />
+            <NotificationSettingLine
+              highlight={notificationSettings !== 'none'}
+              label={"Income & referral bonuses you've received"}
+            />
+            <NotificationSettingLine
+              label={"Activity on questions you've ever bet or commented on"}
+              highlight={notificationSettings === 'all'}
+            />
+          </div>
+        </div>
+      </div>
+      <div className={'mt-4'}>Email Notifications</div>
+      <ChoicesToggleGroup
+        currentChoice={emailNotificationSettings}
+        choicesMap={{ All: 'all', Less: 'less', None: 'none' }}
+        setChoice={(choice) =>
+          changeEmailNotifications(choice as notification_subscribe_types)
+        }
+        className={'col-span-4 p-2'}
+        toggleClassName={'w-24'}
+      />
+      <div className={'mt-4 text-sm'}>
+        <div>
+          You will receive emails for:
+          <NotificationSettingLine
+            label={"Resolution of questions you're betting on"}
+            highlight={emailNotificationSettings !== 'none'}
+          />
+          <NotificationSettingLine
+            label={'Closure of your questions'}
+            highlight={emailNotificationSettings !== 'none'}
+          />
+          <NotificationSettingLine
+            label={'Activity on your questions'}
+            highlight={emailNotificationSettings === 'all'}
+          />
+          <NotificationSettingLine
+            label={"Activity on questions you've answered or commented on"}
+            highlight={emailNotificationSettings === 'all'}
+          />
+        </div>
+      </div>
+    </div>
+  )
+}
diff --git a/web/pages/notifications.tsx b/web/pages/notifications.tsx
index 7867e197..0d5ecdb9 100644
--- a/web/pages/notifications.tsx
+++ b/web/pages/notifications.tsx
@@ -1,5 +1,5 @@
 import { Tabs } from 'web/components/layout/tabs'
-import { usePrivateUser, useUser } from 'web/hooks/use-user'
+import { usePrivateUser } from 'web/hooks/use-user'
 import React, { useEffect, useMemo, useState } from 'react'
 import { Notification, notification_source_types } from 'common/notification'
 import { Avatar, EmptyAvatar } from 'web/components/avatar'
@@ -12,16 +12,10 @@ import { UserLink } from 'web/components/user-page'
 import {
   MANIFOLD_AVATAR_URL,
   MANIFOLD_USERNAME,
-  notification_subscribe_types,
   PrivateUser,
   User,
 } from 'common/user'
-import { ChoicesToggleGroup } from 'web/components/choices-toggle-group'
-import {
-  getUser,
-  listenForPrivateUser,
-  updatePrivateUser,
-} from 'web/lib/firebase/users'
+import { getUser } from 'web/lib/firebase/users'
 import { LoadingIndicator } from 'web/components/loading-indicator'
 import clsx from 'clsx'
 import { RelativeTimestamp } from 'web/components/relative-timestamp'
@@ -37,8 +31,7 @@ import {
   NotificationGroup,
   usePreferredGroupedNotifications,
 } from 'web/hooks/use-notifications'
-import { CheckIcon, TrendingUpIcon, XIcon } from '@heroicons/react/outline'
-import toast from 'react-hot-toast'
+import { TrendingUpIcon } from '@heroicons/react/outline'
 import { formatMoney } from 'common/util/format'
 import { groupPath } from 'web/lib/firebase/groups'
 import { UNIQUE_BETTOR_BONUS_AMOUNT } from 'common/numeric-constants'
@@ -53,6 +46,7 @@ import {
   redirectIfLoggedOut,
 } from 'web/lib/firebase/server-auth'
 import { SiteLink } from 'web/components/site-link'
+import { NotificationSettings } from 'web/components/NotificationSettings'
 
 export const NOTIFICATIONS_PER_PAGE = 30
 const MULTIPLE_USERS_KEY = 'multipleUsers'
@@ -986,203 +980,3 @@ function getReasonForShowingNotification(
   }
   return reasonText
 }
-
-// TODO: where should we put referral bonus notifications?
-function NotificationSettings() {
-  const user = useUser()
-  const [notificationSettings, setNotificationSettings] =
-    useState<notification_subscribe_types>('all')
-  const [emailNotificationSettings, setEmailNotificationSettings] =
-    useState<notification_subscribe_types>('all')
-  const [privateUser, setPrivateUser] = useState<PrivateUser | null>(null)
-
-  useEffect(() => {
-    if (user) listenForPrivateUser(user.id, setPrivateUser)
-  }, [user])
-
-  useEffect(() => {
-    if (!privateUser) return
-    if (privateUser.notificationPreferences) {
-      setNotificationSettings(privateUser.notificationPreferences)
-    }
-    if (
-      privateUser.unsubscribedFromResolutionEmails &&
-      privateUser.unsubscribedFromCommentEmails &&
-      privateUser.unsubscribedFromAnswerEmails
-    ) {
-      setEmailNotificationSettings('none')
-    } else if (
-      !privateUser.unsubscribedFromResolutionEmails &&
-      !privateUser.unsubscribedFromCommentEmails &&
-      !privateUser.unsubscribedFromAnswerEmails
-    ) {
-      setEmailNotificationSettings('all')
-    } else {
-      setEmailNotificationSettings('less')
-    }
-  }, [privateUser])
-
-  const loading = 'Changing Notifications Settings'
-  const success = 'Notification Settings Changed!'
-  function changeEmailNotifications(newValue: notification_subscribe_types) {
-    if (!privateUser) return
-    if (newValue === 'all') {
-      toast.promise(
-        updatePrivateUser(privateUser.id, {
-          unsubscribedFromResolutionEmails: false,
-          unsubscribedFromCommentEmails: false,
-          unsubscribedFromAnswerEmails: false,
-        }),
-        {
-          loading,
-          success,
-          error: (err) => `${err.message}`,
-        }
-      )
-    } else if (newValue === 'less') {
-      toast.promise(
-        updatePrivateUser(privateUser.id, {
-          unsubscribedFromResolutionEmails: false,
-          unsubscribedFromCommentEmails: true,
-          unsubscribedFromAnswerEmails: true,
-        }),
-        {
-          loading,
-          success,
-          error: (err) => `${err.message}`,
-        }
-      )
-    } else if (newValue === 'none') {
-      toast.promise(
-        updatePrivateUser(privateUser.id, {
-          unsubscribedFromResolutionEmails: true,
-          unsubscribedFromCommentEmails: true,
-          unsubscribedFromAnswerEmails: true,
-        }),
-        {
-          loading,
-          success,
-          error: (err) => `${err.message}`,
-        }
-      )
-    }
-  }
-
-  function changeInAppNotificationSettings(
-    newValue: notification_subscribe_types
-  ) {
-    if (!privateUser) return
-    track('In-App Notification Preferences Changed', {
-      newPreference: newValue,
-      oldPreference: privateUser.notificationPreferences,
-    })
-    toast.promise(
-      updatePrivateUser(privateUser.id, {
-        notificationPreferences: newValue,
-      }),
-      {
-        loading,
-        success,
-        error: (err) => `${err.message}`,
-      }
-    )
-  }
-
-  useEffect(() => {
-    if (privateUser && privateUser.notificationPreferences)
-      setNotificationSettings(privateUser.notificationPreferences)
-    else setNotificationSettings('all')
-  }, [privateUser])
-
-  if (!privateUser) {
-    return <LoadingIndicator spinnerClassName={'border-gray-500 h-4 w-4'} />
-  }
-
-  function NotificationSettingLine(props: {
-    label: string
-    highlight: boolean
-  }) {
-    const { label, highlight } = props
-    return (
-      <Row className={clsx('my-1 text-gray-300', highlight && '!text-black')}>
-        {highlight ? <CheckIcon height={20} /> : <XIcon height={20} />}
-        {label}
-      </Row>
-    )
-  }
-
-  return (
-    <div className={'p-2'}>
-      <div>In App Notifications</div>
-      <ChoicesToggleGroup
-        currentChoice={notificationSettings}
-        choicesMap={{ All: 'all', Less: 'less', None: 'none' }}
-        setChoice={(choice) =>
-          changeInAppNotificationSettings(
-            choice as notification_subscribe_types
-          )
-        }
-        className={'col-span-4 p-2'}
-        toggleClassName={'w-24'}
-      />
-      <div className={'mt-4 text-sm'}>
-        <div>
-          <div className={''}>
-            You will receive notifications for:
-            <NotificationSettingLine
-              label={"Resolution of questions you've interacted with"}
-              highlight={notificationSettings !== 'none'}
-            />
-            <NotificationSettingLine
-              highlight={notificationSettings !== 'none'}
-              label={'Activity on your own questions, comments, & answers'}
-            />
-            <NotificationSettingLine
-              highlight={notificationSettings !== 'none'}
-              label={"Activity on questions you're betting on"}
-            />
-            <NotificationSettingLine
-              highlight={notificationSettings !== 'none'}
-              label={"Income & referral bonuses you've received"}
-            />
-            <NotificationSettingLine
-              label={"Activity on questions you've ever bet or commented on"}
-              highlight={notificationSettings === 'all'}
-            />
-          </div>
-        </div>
-      </div>
-      <div className={'mt-4'}>Email Notifications</div>
-      <ChoicesToggleGroup
-        currentChoice={emailNotificationSettings}
-        choicesMap={{ All: 'all', Less: 'less', None: 'none' }}
-        setChoice={(choice) =>
-          changeEmailNotifications(choice as notification_subscribe_types)
-        }
-        className={'col-span-4 p-2'}
-        toggleClassName={'w-24'}
-      />
-      <div className={'mt-4 text-sm'}>
-        <div>
-          You will receive emails for:
-          <NotificationSettingLine
-            label={"Resolution of questions you're betting on"}
-            highlight={emailNotificationSettings !== 'none'}
-          />
-          <NotificationSettingLine
-            label={'Closure of your questions'}
-            highlight={emailNotificationSettings !== 'none'}
-          />
-          <NotificationSettingLine
-            label={'Activity on your questions'}
-            highlight={emailNotificationSettings === 'all'}
-          />
-          <NotificationSettingLine
-            label={"Activity on questions you've answered or commented on"}
-            highlight={emailNotificationSettings === 'all'}
-          />
-        </div>
-      </div>
-    </div>
-  )
-}

From 6c070464dd5ffaebaa70e90c2f89f0cf19515f10 Mon Sep 17 00:00:00 2001
From: James Grugett <jahooma@gmail.com>
Date: Tue, 19 Jul 2022 15:39:15 -0500
Subject: [PATCH 41/71] Use static props to load leaderboard fast

---
 web/lib/firebase/users.ts  |   4 +-
 web/pages/leaderboards.tsx | 152 ++++++++++++++++++-------------------
 2 files changed, 76 insertions(+), 80 deletions(-)

diff --git a/web/lib/firebase/users.ts b/web/lib/firebase/users.ts
index 77c5c48d..884dde04 100644
--- a/web/lib/firebase/users.ts
+++ b/web/lib/firebase/users.ts
@@ -275,7 +275,7 @@ export function getTopTraders(period: Period) {
     limit(20)
   )
 
-  return getValues(topTraders)
+  return getValues<User>(topTraders)
 }
 
 export function getTopCreators(period: Period) {
@@ -284,7 +284,7 @@ export function getTopCreators(period: Period) {
     orderBy('creatorVolumeCached.' + period, 'desc'),
     limit(20)
   )
-  return getValues(topCreators)
+  return getValues<User>(topCreators)
 }
 
 export async function getTopFollowed() {
diff --git a/web/pages/leaderboards.tsx b/web/pages/leaderboards.tsx
index 061f3a19..6f15e13e 100644
--- a/web/pages/leaderboards.tsx
+++ b/web/pages/leaderboards.tsx
@@ -9,97 +9,96 @@ import {
   User,
 } from 'web/lib/firebase/users'
 import { formatMoney } from 'common/util/format'
-import { fromPropz, usePropz } from 'web/hooks/use-propz'
 import { useEffect, useState } from 'react'
-import { LoadingIndicator } from 'web/components/loading-indicator'
 import { Title } from 'web/components/title'
 import { Tabs } from 'web/components/layout/tabs'
 import { useTracking } from 'web/hooks/use-tracking'
 
-export const getStaticProps = fromPropz(getStaticPropz)
-export async function getStaticPropz() {
-  return queryLeaderboardUsers('allTime')
-}
-const queryLeaderboardUsers = async (period: Period) => {
-  const [topTraders, topCreators, topFollowed] = await Promise.all([
-    getTopTraders(period).catch(() => {}),
-    getTopCreators(period).catch(() => {}),
-    getTopFollowed().catch(() => {}),
-  ])
+export async function getStaticProps() {
+  const props = await fetchProps()
+
   return {
-    props: {
-      topTraders,
-      topCreators,
-      topFollowed,
-    },
+    props,
     revalidate: 60, // regenerate after a minute
   }
 }
 
-export default function Leaderboards(props: {
+const fetchProps = async () => {
+  const [allTime, monthly, weekly, daily] = await Promise.all([
+    queryLeaderboardUsers('allTime'),
+    queryLeaderboardUsers('monthly'),
+    queryLeaderboardUsers('weekly'),
+    queryLeaderboardUsers('daily'),
+  ])
+  const topFollowed = await getTopFollowed()
+
+  return {
+    allTime,
+    monthly,
+    weekly,
+    daily,
+    topFollowed,
+  }
+}
+
+const queryLeaderboardUsers = async (period: Period) => {
+  const [topTraders, topCreators] = await Promise.all([
+    getTopTraders(period),
+    getTopCreators(period),
+  ])
+  return {
+    topTraders,
+    topCreators,
+  }
+}
+
+type leaderboard = {
   topTraders: User[]
   topCreators: User[]
+}
+
+export default function Leaderboards(_props: {
+  allTime: leaderboard
+  monthly: leaderboard
+  weekly: leaderboard
+  daily: leaderboard
   topFollowed: User[]
 }) {
-  props = usePropz(props, getStaticPropz) ?? {
-    topTraders: [],
-    topCreators: [],
-    topFollowed: [],
-  }
-  const { topFollowed } = props
-  const [topTradersState, setTopTraders] = useState(props.topTraders)
-  const [topCreatorsState, setTopCreators] = useState(props.topCreators)
-  const [isLoading, setLoading] = useState(false)
-  const [period, setPeriod] = useState<Period>('allTime')
-
+  const [props, setProps] = useState<Parameters<typeof Leaderboards>[0]>(_props)
   useEffect(() => {
-    setLoading(true)
-    queryLeaderboardUsers(period).then((res) => {
-      setTopTraders(res.props.topTraders as User[])
-      setTopCreators(res.props.topCreators as User[])
-      setLoading(false)
-    })
-  }, [period])
+    fetchProps().then((props) => setProps(props))
+  }, [])
+
+  const { topFollowed } = props
 
   const LeaderboardWithPeriod = (period: Period) => {
+    const { topTraders, topCreators } = props[period]
+
     return (
       <>
         <Col className="mx-4 items-center gap-10 lg:flex-row">
-          {!isLoading ? (
-            <>
-              {period === 'allTime' ||
-              period == 'weekly' ||
-              period === 'daily' ? ( //TODO: show other periods once they're available
-                <Leaderboard
-                  title="🏅 Top bettors"
-                  users={topTradersState}
-                  columns={[
-                    {
-                      header: 'Total profit',
-                      renderCell: (user) =>
-                        formatMoney(user.profitCached[period]),
-                    },
-                  ]}
-                />
-              ) : (
-                <></>
-              )}
+          <Leaderboard
+            title="🏅 Top bettors"
+            users={topTraders}
+            columns={[
+              {
+                header: 'Total profit',
+                renderCell: (user) => formatMoney(user.profitCached[period]),
+              },
+            ]}
+          />
 
-              <Leaderboard
-                title="🏅 Top creators"
-                users={topCreatorsState}
-                columns={[
-                  {
-                    header: 'Total bet',
-                    renderCell: (user) =>
-                      formatMoney(user.creatorVolumeCached[period]),
-                  },
-                ]}
-              />
-            </>
-          ) : (
-            <LoadingIndicator spinnerClassName={'border-gray-500'} />
-          )}
+          <Leaderboard
+            title="🏅 Top creators"
+            users={topCreators}
+            columns={[
+              {
+                header: 'Total bet',
+                renderCell: (user) =>
+                  formatMoney(user.creatorVolumeCached[period]),
+              },
+            ]}
+          />
         </Col>
         {period === 'allTime' ? (
           <Col className="mx-4 my-10 items-center gap-10 lg:mx-0 lg:w-1/2 lg:flex-row">
@@ -128,19 +127,16 @@ export default function Leaderboards(props: {
       <Tabs
         currentPageForAnalytics={'leaderboards'}
         defaultIndex={0}
-        onClick={(title, index) => {
-          const period = ['allTime', 'monthly', 'weekly', 'daily'][index]
-          setPeriod(period as Period)
-        }}
         tabs={[
           {
             title: 'All Time',
             content: LeaderboardWithPeriod('allTime'),
           },
-          {
-            title: 'Monthly',
-            content: LeaderboardWithPeriod('monthly'),
-          },
+          // TODO: Enable this near the end of July!
+          // {
+          //   title: 'Monthly',
+          //   content: LeaderboardWithPeriod('monthly'),
+          // },
           {
             title: 'Weekly',
             content: LeaderboardWithPeriod('weekly'),

From 2684c8bcca3bd5659b0ba92fed35959a789e1379 Mon Sep 17 00:00:00 2001
From: James Grugett <jahooma@gmail.com>
Date: Tue, 19 Jul 2022 15:39:40 -0500
Subject: [PATCH 42/71] Default to weekly leaderboard

---
 web/pages/leaderboards.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/pages/leaderboards.tsx b/web/pages/leaderboards.tsx
index 6f15e13e..7ee13172 100644
--- a/web/pages/leaderboards.tsx
+++ b/web/pages/leaderboards.tsx
@@ -126,7 +126,7 @@ export default function Leaderboards(_props: {
       <Title text={'Leaderboards'} className={'hidden md:block'} />
       <Tabs
         currentPageForAnalytics={'leaderboards'}
-        defaultIndex={0}
+        defaultIndex={1}
         tabs={[
           {
             title: 'All Time',

From e9ad30cc74440ad53e6bcd664a4b8f4500a4fadc Mon Sep 17 00:00:00 2001
From: James Grugett <jahooma@gmail.com>
Date: Tue, 19 Jul 2022 15:43:37 -0500
Subject: [PATCH 43/71] Increase number of contracts shown in bets list

---
 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 db6b0d05..2114ec2b 100644
--- a/web/components/bets-list.tsx
+++ b/web/components/bets-list.tsx
@@ -50,7 +50,7 @@ import { LimitOrderTable } from './limit-bets'
 type BetSort = 'newest' | 'profit' | 'closeTime' | 'value'
 type BetFilter = 'open' | 'limit_bet' | 'sold' | 'closed' | 'resolved' | 'all'
 
-const CONTRACTS_PER_PAGE = 20
+const CONTRACTS_PER_PAGE = 50
 
 export function BetsList(props: {
   user: User

From fc9e26160108ca8025e16c6112a13e7920d3db67 Mon Sep 17 00:00:00 2001
From: James Grugett <jahooma@gmail.com>
Date: Tue, 19 Jul 2022 15:45:47 -0500
Subject: [PATCH 44/71] Fix build

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

diff --git a/web/components/NotificationSettings.tsx b/web/components/NotificationSettings.tsx
index 2c657857..7a839a7a 100644
--- a/web/components/NotificationSettings.tsx
+++ b/web/components/NotificationSettings.tsx
@@ -1,6 +1,6 @@
 import { useUser } from 'web/hooks/use-user'
 import React, { useEffect, useState } from 'react'
-import { notification_subscribe_types, PrivateUser } from 'common/lib/user'
+import { notification_subscribe_types, PrivateUser } from 'common/user'
 import { listenForPrivateUser, updatePrivateUser } from 'web/lib/firebase/users'
 import toast from 'react-hot-toast'
 import { track } from '@amplitude/analytics-browser'

From f9aab390399f62e7bf9f1dbe98387222c48e3b31 Mon Sep 17 00:00:00 2001
From: Marshall Polaris <marshall@pol.rs>
Date: Tue, 19 Jul 2022 13:57:32 -0700
Subject: [PATCH 45/71] Clean up font loading and see if it fixes our problem
 (#667)

---
 web/pages/_document.tsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/web/pages/_document.tsx b/web/pages/_document.tsx
index 2ff0b494..b8cb657c 100644
--- a/web/pages/_document.tsx
+++ b/web/pages/_document.tsx
@@ -6,16 +6,15 @@ export default function Document() {
     <Html data-theme="mantic" className="min-h-screen">
       <Head>
         <link rel="icon" href={ENV_CONFIG.faviconPath} />
-
-        <link rel="preconnect" href="https://fonts.googleapis.com" />
         <link
           rel="preconnect"
           href="https://fonts.gstatic.com"
-          crossOrigin="true"
+          crossOrigin="anonymous"
         />
         <link
           href="https://fonts.googleapis.com/css2?family=Major+Mono+Display&family=Readex+Pro:wght@300;400;600;700&display=swap"
           rel="stylesheet"
+          crossOrigin="anonymous"
         />
         <link
           rel="stylesheet"
@@ -24,7 +23,6 @@ export default function Document() {
           crossOrigin="anonymous"
         />
       </Head>
-
       <body className="font-readex-pro bg-base-200 min-h-screen">
         <Main />
         <NextScript />

From af6552958fd669b6ac7573faa149173d0bddce65 Mon Sep 17 00:00:00 2001
From: James Grugett <jahooma@gmail.com>
Date: Tue, 19 Jul 2022 16:05:49 -0500
Subject: [PATCH 46/71] Show all-time profit on UserPage

---
 web/components/user-page.tsx | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/web/components/user-page.tsx b/web/components/user-page.tsx
index 38efe345..09c28920 100644
--- a/web/components/user-page.tsx
+++ b/web/components/user-page.tsx
@@ -39,6 +39,7 @@ import { PortfolioValueSection } from './portfolio/portfolio-value-section'
 import { filterDefined } from 'common/util/array'
 import { useUserBets } from 'web/hooks/use-user-bets'
 import { ReferralsButton } from 'web/components/referrals-button'
+import { formatMoney } from 'common/util/format'
 
 export function UserLink(props: {
   name: string
@@ -123,6 +124,7 @@ export function UserPage(props: {
 
   const yourFollows = useFollows(currentUser?.id)
   const isFollowing = yourFollows?.includes(user.id)
+  const profit = user.profitCached.allTime
 
   const onFollow = () => {
     if (!currentUser) return
@@ -187,6 +189,17 @@ export function UserPage(props: {
       <Col className="mx-4 -mt-6">
         <span className="text-2xl font-bold">{user.name}</span>
         <span className="text-gray-500">@{user.username}</span>
+        <span className="text-gray-500">
+          <span
+            className={clsx(
+              'text-md',
+              profit >= 0 ? 'text-green-600' : 'text-red-400'
+            )}
+          >
+            {formatMoney(profit)}
+          </span>{' '}
+          profit
+        </span>
 
         <Spacer h={4} />
 

From 6d3490cd689f14248718537b9757b6ac760d4f8b Mon Sep 17 00:00:00 2001
From: Marshall Polaris <marshall@pol.rs>
Date: Tue, 19 Jul 2022 14:20:23 -0700
Subject: [PATCH 47/71] Turn off Next.js font inlining (#668)

---
 web/next.config.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/next.config.js b/web/next.config.js
index 56f643d3..37758952 100644
--- a/web/next.config.js
+++ b/web/next.config.js
@@ -4,6 +4,7 @@ const API_DOCS_URL = 'https://docs.manifold.markets/api'
 module.exports = {
   staticPageGenerationTimeout: 600, // e.g. stats page
   reactStrictMode: true,
+  optimizeFonts: false,
   experimental: {
     externalDir: true,
     optimizeCss: true,

From 6124ea01f694df4cd7eeeb4314b1565d79e502b0 Mon Sep 17 00:00:00 2001
From: James Grugett <jahooma@gmail.com>
Date: Tue, 19 Jul 2022 16:57:32 -0500
Subject: [PATCH 48/71] Fix a DOM error in console

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

diff --git a/web/components/limit-bets.tsx b/web/components/limit-bets.tsx
index 7aaa0601..8c9f4e6b 100644
--- a/web/components/limit-bets.tsx
+++ b/web/components/limit-bets.tsx
@@ -76,11 +76,13 @@ export function LimitOrderTable(props: {
   return (
     <table className="table-compact table w-full rounded text-gray-500">
       <thead>
-        {!isYou && <th></th>}
-        <th>Outcome</th>
-        <th>{isPseudoNumeric ? 'Value' : 'Prob'}</th>
-        <th>Amount</th>
-        {isYou && <th></th>}
+        <tr>
+          {!isYou && <th></th>}
+          <th>Outcome</th>
+          <th>{isPseudoNumeric ? 'Value' : 'Prob'}</th>
+          <th>Amount</th>
+          {isYou && <th></th>}
+        </tr>
       </thead>
       <tbody>
         {limitBets.map((bet) => (

From 58d62863615992ea33818cd9fc0f86b395cd49f5 Mon Sep 17 00:00:00 2001
From: James Grugett <jahooma@gmail.com>
Date: Tue, 19 Jul 2022 17:22:58 -0500
Subject: [PATCH 49/71] Fix chart area extending into labels below

---
 web/components/contract/contract-prob-graph.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/components/contract/contract-prob-graph.tsx b/web/components/contract/contract-prob-graph.tsx
index c6e17cd6..c829c646 100644
--- a/web/components/contract/contract-prob-graph.tsx
+++ b/web/components/contract/contract-prob-graph.tsx
@@ -150,7 +150,8 @@ export const ContractProbGraph = memo(function ContractProbGraph(props: {
         enableSlices="x"
         enableGridX={!!width && width >= 800}
         enableArea
-        margin={{ top: 20, right: 20, bottom: 25, left: 40 }}
+        areaBaselineValue={isBinary ? 0 : contract.min}
+        margin={{ top: 20, right: 20, bottom: 65, left: 40 }}
         animate={false}
         sliceTooltip={SliceTooltip}
       />

From 2152e5286af54ef1e8f3dc0a000b294f211b0df3 Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Tue, 19 Jul 2022 16:29:41 -0600
Subject: [PATCH 50/71] Score & sort by unique bettors in last 3 days

---
 common/contract.ts                      |  1 +
 functions/src/index.ts                  |  1 +
 functions/src/score-contracts.ts        | 41 +++++++++++++++++++++++++
 web/components/contract-search.tsx      |  5 +--
 web/hooks/use-sort-and-query-params.tsx |  5 +--
 web/pages/contract-search-firestore.tsx |  8 ++---
 web/pages/home.tsx                      |  4 +--
 7 files changed, 54 insertions(+), 11 deletions(-)
 create mode 100644 functions/src/score-contracts.ts

diff --git a/common/contract.ts b/common/contract.ts
index 5ddcf0b8..b1242ab9 100644
--- a/common/contract.ts
+++ b/common/contract.ts
@@ -48,6 +48,7 @@ export type Contract<T extends AnyContractType = AnyContractType> = {
   groupSlugs?: string[]
   uniqueBettorIds?: string[]
   uniqueBettorCount?: number
+  popularityScore?: number
 } & T
 
 export type BinaryContract = Contract & Binary
diff --git a/functions/src/index.ts b/functions/src/index.ts
index 3055f8dc..df311886 100644
--- a/functions/src/index.ts
+++ b/functions/src/index.ts
@@ -22,6 +22,7 @@ export * from './on-update-user'
 export * from './on-create-comment-on-group'
 export * from './on-create-txn'
 export * from './on-delete-group'
+export * from './score-contracts'
 
 // v2
 export * from './health'
diff --git a/functions/src/score-contracts.ts b/functions/src/score-contracts.ts
new file mode 100644
index 00000000..ab6512d0
--- /dev/null
+++ b/functions/src/score-contracts.ts
@@ -0,0 +1,41 @@
+import * as functions from 'firebase-functions'
+import * as admin from 'firebase-admin'
+import { Bet } from 'common/bet'
+import { uniq } from 'lodash'
+import { Contract } from 'common/contract'
+
+export const scoreContracts = functions.pubsub
+  .schedule('every 1 hours')
+  .onRun(async () => {
+    await scoreContractsInternal()
+  })
+const firestore = admin.firestore()
+
+async function scoreContractsInternal() {
+  const now = Date.now()
+  const lastHour = now - 3600000
+  const last3Days = now - 2592000000
+
+  const contracts = await firestore
+    .collection('contracts')
+    .where('lastUpdatedTime', '>', lastHour)
+    .get()
+
+  for (const contractSnap of contracts.docs) {
+    const contract = contractSnap.data() as Contract
+    const contractId = contractSnap.id
+    const bets = await firestore
+      .collection(`contracts/${contractId}/bets`)
+      .where('createdTime', '>', last3Days)
+      .get()
+    const bettors = bets.docs
+      .map((doc) => doc.data() as Bet)
+      .map((bet) => bet.userId)
+    const score = uniq(bettors).length
+    if (contract.popularityScore !== score)
+      await firestore
+        .collection('contracts')
+        .doc(contractId)
+        .update({ popularityScore: score })
+  }
+}
diff --git a/web/components/contract-search.tsx b/web/components/contract-search.tsx
index 013208d8..dc97f482 100644
--- a/web/components/contract-search.tsx
+++ b/web/components/contract-search.tsx
@@ -39,13 +39,14 @@ const indexPrefix = ENV === 'DEV' ? 'dev-' : ''
 const sortIndexes = [
   { label: 'Newest', value: indexPrefix + 'contracts-newest' },
   { label: 'Oldest', value: indexPrefix + 'contracts-oldest' },
-  { label: 'Most popular', value: indexPrefix + 'contracts-most-popular' },
+  { label: 'Most popular', value: indexPrefix + 'contracts-score' },
   { label: 'Most traded', value: indexPrefix + 'contracts-most-traded' },
   { label: '24h volume', value: indexPrefix + 'contracts-24-hour-vol' },
   { label: 'Last updated', value: indexPrefix + 'contracts-last-updated' },
   { label: 'Close date', value: indexPrefix + 'contracts-close-date' },
   { label: 'Resolve date', value: indexPrefix + 'contracts-resolve-date' },
 ]
+export const DEFAULT_SORT = 'score'
 
 type filter = 'personal' | 'open' | 'closed' | 'resolved' | 'all'
 const filterOptions: { [label: string]: filter } = {
@@ -95,7 +96,7 @@ export function ContractSearch(props: {
     .map(({ value }) => value)
     .includes(`${indexPrefix}contracts-${initialSort ?? ''}`)
     ? initialSort
-    : querySortOptions?.defaultSort ?? 'most-popular'
+    : querySortOptions?.defaultSort ?? DEFAULT_SORT
 
   const [filter, setFilter] = useState<filter>(
     querySortOptions?.defaultFilter ?? 'open'
diff --git a/web/hooks/use-sort-and-query-params.tsx b/web/hooks/use-sort-and-query-params.tsx
index 5c9a247f..9023dc1a 100644
--- a/web/hooks/use-sort-and-query-params.tsx
+++ b/web/hooks/use-sort-and-query-params.tsx
@@ -3,6 +3,7 @@ import { useRouter } from 'next/router'
 import { useEffect, useMemo, useState } from 'react'
 import { useSearchBox } from 'react-instantsearch-hooks-web'
 import { track } from 'web/lib/service/analytics'
+import { DEFAULT_SORT } from 'web/components/contract-search'
 
 const MARKETS_SORT = 'markets_sort'
 
@@ -10,11 +11,11 @@ export type Sort =
   | 'newest'
   | 'oldest'
   | 'most-traded'
-  | 'most-popular'
   | '24-hour-vol'
   | 'close-date'
   | 'resolve-date'
   | 'last-updated'
+  | 'score'
 
 export function getSavedSort() {
   // TODO: this obviously doesn't work with SSR, common sense would suggest
@@ -31,7 +32,7 @@ export function useInitialQueryAndSort(options?: {
   shouldLoadFromStorage?: boolean
 }) {
   const { defaultSort, shouldLoadFromStorage } = defaults(options, {
-    defaultSort: 'most-popular',
+    defaultSort: DEFAULT_SORT,
     shouldLoadFromStorage: true,
   })
   const router = useRouter()
diff --git a/web/pages/contract-search-firestore.tsx b/web/pages/contract-search-firestore.tsx
index 0ef8cdfe..2d45e831 100644
--- a/web/pages/contract-search-firestore.tsx
+++ b/web/pages/contract-search-firestore.tsx
@@ -54,10 +54,8 @@ export default function ContractSearchFirestore(props: {
     )
   } else if (sort === 'most-traded') {
     matches.sort((a, b) => b.volume - a.volume)
-  } else if (sort === 'most-popular') {
-    matches.sort(
-      (a, b) => (b.uniqueBettorCount ?? 0) - (a.uniqueBettorCount ?? 0)
-    )
+  } else if (sort === 'score') {
+    matches.sort((a, b) => (b.popularityScore ?? 0) - (a.popularityScore ?? 0))
   } else if (sort === '24-hour-vol') {
     // Use lodash for stable sort, so previous sort breaks all ties.
     matches = sortBy(matches, ({ volume7Days }) => -1 * volume7Days)
@@ -104,7 +102,7 @@ export default function ContractSearchFirestore(props: {
         >
           <option value="newest">Newest</option>
           <option value="oldest">Oldest</option>
-          <option value="most-popular">Most popular</option>
+          <option value="score">Most popular</option>
           <option value="most-traded">Most traded</option>
           <option value="24-hour-vol">24h volume</option>
           <option value="close-date">Closing soon</option>
diff --git a/web/pages/home.tsx b/web/pages/home.tsx
index 6aa99a07..53bb6ec9 100644
--- a/web/pages/home.tsx
+++ b/web/pages/home.tsx
@@ -5,7 +5,7 @@ import { PlusSmIcon } from '@heroicons/react/solid'
 import { Page } from 'web/components/page'
 import { Col } from 'web/components/layout/col'
 import { getSavedSort } from 'web/hooks/use-sort-and-query-params'
-import { ContractSearch } from 'web/components/contract-search'
+import { ContractSearch, DEFAULT_SORT } from 'web/components/contract-search'
 import { Contract } from 'common/contract'
 import { ContractPageContent } from './[username]/[contractSlug]'
 import { getContractFromSlug } from 'web/lib/firebase/contracts'
@@ -28,7 +28,7 @@ const Home = () => {
           <ContractSearch
             querySortOptions={{
               shouldLoadFromStorage: true,
-              defaultSort: getSavedSort() ?? 'most-popular',
+              defaultSort: getSavedSort() ?? DEFAULT_SORT,
             }}
             onContractClick={(c) => {
               // Show contract without navigating to contract page.

From 4aface583d921773eb7f158f63d0bee55624f4f3 Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Tue, 19 Jul 2022 16:41:11 -0600
Subject: [PATCH 51/71] Remove pesky loading spinner

---
 web/pages/notifications.tsx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/web/pages/notifications.tsx b/web/pages/notifications.tsx
index 0d5ecdb9..d011e757 100644
--- a/web/pages/notifications.tsx
+++ b/web/pages/notifications.tsx
@@ -94,15 +94,12 @@ export default function Notifications(props: { user: User }) {
                     privateUser={privateUser}
                     cachedNotifications={localNotifications}
                   />
-                ) : localNotificationGroups &&
-                  localNotificationGroups.length > 0 ? (
+                ) : (
                   <div className={'min-h-[100vh]'}>
                     <RenderNotificationGroups
                       notificationGroups={localNotificationGroups}
                     />
                   </div>
-                ) : (
-                  <LoadingIndicator />
                 ),
               },
               {

From 1f0983a145c2d82f679e6e174887eb2a4f26eff4 Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Tue, 19 Jul 2022 17:08:51 -0600
Subject: [PATCH 52/71] Find old contracts to decrement score on

---
 functions/src/score-contracts.ts | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/functions/src/score-contracts.ts b/functions/src/score-contracts.ts
index ab6512d0..733f1397 100644
--- a/functions/src/score-contracts.ts
+++ b/functions/src/score-contracts.ts
@@ -3,6 +3,7 @@ import * as admin from 'firebase-admin'
 import { Bet } from 'common/bet'
 import { uniq } from 'lodash'
 import { Contract } from 'common/contract'
+import { log } from './utils'
 
 export const scoreContracts = functions.pubsub
   .schedule('every 1 hours')
@@ -15,17 +16,29 @@ async function scoreContractsInternal() {
   const now = Date.now()
   const lastHour = now - 3600000
   const last3Days = now - 2592000000
-
-  const contracts = await firestore
+  const activeContractsSnap = await firestore
     .collection('contracts')
     .where('lastUpdatedTime', '>', lastHour)
     .get()
+  const activeContracts = activeContractsSnap.docs.map(
+    (doc) => doc.data() as Contract
+  )
+  // We have to downgrade previously active contracts to allow the new ones to bubble up
+  const previouslyActiveContractsSnap = await firestore
+    .collection('contracts')
+    .where('popularityScore', '>', 0)
+    .get()
+  const activeContractIds = activeContracts.map((c) => c.id)
+  const previouslyActiveContracts = previouslyActiveContractsSnap.docs
+    .map((doc) => doc.data() as Contract)
+    .filter((c) => !activeContractIds.includes(c.id))
 
-  for (const contractSnap of contracts.docs) {
-    const contract = contractSnap.data() as Contract
-    const contractId = contractSnap.id
+  const contracts = activeContracts.concat(previouslyActiveContracts)
+  log(`Found ${contracts.length} contracts to score`)
+
+  for (const contract of contracts) {
     const bets = await firestore
-      .collection(`contracts/${contractId}/bets`)
+      .collection(`contracts/${contract.id}/bets`)
       .where('createdTime', '>', last3Days)
       .get()
     const bettors = bets.docs
@@ -35,7 +48,7 @@ async function scoreContractsInternal() {
     if (contract.popularityScore !== score)
       await firestore
         .collection('contracts')
-        .doc(contractId)
+        .doc(contract.id)
         .update({ popularityScore: score })
   }
 }

From bab828412ba913686794e0a99e5e9da85929f07e Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Tue, 19 Jul 2022 18:15:55 -0500
Subject: [PATCH 53/71] group: add question button

---
 web/components/create-question-button.tsx |  1 +
 web/pages/group/[...slugs]/index.tsx      | 90 +++++++++--------------
 2 files changed, 35 insertions(+), 56 deletions(-)

diff --git a/web/components/create-question-button.tsx b/web/components/create-question-button.tsx
index a9161ac6..f2371d11 100644
--- a/web/components/create-question-button.tsx
+++ b/web/components/create-question-button.tsx
@@ -5,6 +5,7 @@ import React from 'react'
 
 export const createButtonStyle =
   'border-w-0 mx-auto mt-4 -ml-1 w-full rounded-md bg-gradient-to-r py-2.5 text-base font-semibold text-white shadow-sm lg:-ml-0 h-11'
+
 export const CreateQuestionButton = (props: {
   user: User | null | undefined
   overrideText?: string
diff --git a/web/pages/group/[...slugs]/index.tsx b/web/pages/group/[...slugs]/index.tsx
index 4039fe17..7cce843e 100644
--- a/web/pages/group/[...slugs]/index.tsx
+++ b/web/pages/group/[...slugs]/index.tsx
@@ -1,4 +1,5 @@
 import { take, sortBy, debounce } from 'lodash'
+import PlusSmIcon from '@heroicons/react/solid/PlusSmIcon'
 
 import { Group, GROUP_CHAT_SLUG } from 'common/group'
 import { Page } from 'web/components/page'
@@ -32,10 +33,7 @@ import { SEO } from 'web/components/SEO'
 import { Linkify } from 'web/components/linkify'
 import { fromPropz, usePropz } from 'web/hooks/use-propz'
 import { Tabs } from 'web/components/layout/tabs'
-import {
-  createButtonStyle,
-  CreateQuestionButton,
-} from 'web/components/create-question-button'
+import { CreateQuestionButton } from 'web/components/create-question-button'
 import React, { useEffect, useState } from 'react'
 import { GroupChat } from 'web/components/groups/group-chat'
 import { LoadingIndicator } from 'web/components/loading-indicator'
@@ -265,9 +263,7 @@ export default function GroupPage(props: {
         <Row className={'items-center justify-between gap-4'}>
           <div className={'sm:mb-1'}>
             <div
-              className={
-                'line-clamp-1 my-1 text-lg text-indigo-700 sm:my-3 sm:text-2xl'
-              }
+              className={'line-clamp-1 my-2 text-2xl text-indigo-700 sm:my-3'}
             >
               {group.name}
             </div>
@@ -275,7 +271,7 @@ export default function GroupPage(props: {
               <Linkify text={group.about} />
             </div>
           </div>
-          <div className="hidden sm:block xl:hidden">
+          <div className="mt-2">
             <JoinOrAddQuestionsButtons
               group={group}
               user={user}
@@ -283,13 +279,6 @@ export default function GroupPage(props: {
             />
           </div>
         </Row>
-        <div className="block sm:hidden">
-          <JoinOrAddQuestionsButtons
-            group={group}
-            user={user}
-            isMember={!!isMember}
-          />
-        </div>
       </Col>
       <Tabs
         currentPageForAnalytics={groupPath(group.slug)}
@@ -308,21 +297,7 @@ function JoinOrAddQuestionsButtons(props: {
 }) {
   const { group, user, isMember } = props
   return user && isMember ? (
-    <Row
-      className={'-mt-2 justify-between sm:mt-0 sm:flex-col sm:justify-center'}
-    >
-      <CreateQuestionButton
-        user={user}
-        overrideText={'Add a new question'}
-        className={'hidden w-48 flex-shrink-0 sm:block'}
-        query={`?groupId=${group.id}`}
-      />
-      <CreateQuestionButton
-        user={user}
-        overrideText={'New question'}
-        className={'block w-40 flex-shrink-0 sm:hidden'}
-        query={`?groupId=${group.id}`}
-      />
+    <Row className={'mt-0 justify-end'}>
       <AddContractButton group={group} user={user} />
     </Row>
   ) : group.anyoneCanJoin ? (
@@ -559,7 +534,7 @@ function GroupLeaderboards(props: {
 }
 
 function AddContractButton(props: { group: Group; user: User }) {
-  const { group } = props
+  const { group, user } = props
   const [open, setOpen] = useState(false)
 
   async function addContractToCurrentGroup(contract: Contract) {
@@ -569,16 +544,39 @@ function AddContractButton(props: { group: Group; user: User }) {
 
   return (
     <>
+      <div className={'flex justify-center'}>
+        <button
+          className={clsx('btn btn-sm btn-outline')}
+          onClick={() => setOpen(true)}
+        >
+          <PlusSmIcon className="h-6 w-6" aria-hidden="true" /> question
+        </button>
+      </div>
+
       <Modal open={open} setOpen={setOpen} className={'sm:p-0'}>
         <Col
           className={
-            'max-h-[60vh] min-h-[60vh] w-full gap-4 rounded-md bg-white p-8'
+            'max-h-[60vh] min-h-[60vh] w-full gap-4 rounded-md bg-white'
           }
         >
-          <div className={'text-lg text-indigo-700'}>
-            Add a question to your group
-          </div>
-          <div className={'overflow-y-scroll p-1'}>
+          <Col className="p-8 pb-0">
+            <div className={'text-xl text-indigo-700'}>
+              Add a question to your group
+            </div>
+
+            <Col className="items-center">
+              <CreateQuestionButton
+                user={user}
+                overrideText={'New question'}
+                className={'w-48 flex-shrink-0 '}
+                query={`?groupId=${group.id}`}
+              />
+
+              <div className={'mt-2 text-lg text-indigo-700'}>or</div>
+            </Col>
+          </Col>
+
+          <div className={'overflow-y-scroll sm:px-8'}>
             <ContractSearch
               hideOrderSelector={true}
               onContractClick={addContractToCurrentGroup}
@@ -590,26 +588,6 @@ function AddContractButton(props: { group: Group; user: User }) {
           </div>
         </Col>
       </Modal>
-      <div className={'flex justify-center'}>
-        <button
-          className={clsx(
-            createButtonStyle,
-            'hidden w-48 whitespace-nowrap border border-black text-black hover:bg-black hover:text-white sm:block'
-          )}
-          onClick={() => setOpen(true)}
-        >
-          Add an old question
-        </button>
-        <button
-          className={clsx(
-            createButtonStyle,
-            'block w-40 whitespace-nowrap border border-black text-black hover:bg-black hover:text-white sm:hidden'
-          )}
-          onClick={() => setOpen(true)}
-        >
-          Old question
-        </button>
-      </div>
     </>
   )
 }

From b48e910f703f11401986d62ee798bcd4af633bfe Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Tue, 19 Jul 2022 18:20:03 -0500
Subject: [PATCH 54/71] fix areaBaselineValue

---
 web/components/contract/contract-prob-graph.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/components/contract/contract-prob-graph.tsx b/web/components/contract/contract-prob-graph.tsx
index c829c646..bafb84fe 100644
--- a/web/components/contract/contract-prob-graph.tsx
+++ b/web/components/contract/contract-prob-graph.tsx
@@ -150,7 +150,7 @@ export const ContractProbGraph = memo(function ContractProbGraph(props: {
         enableSlices="x"
         enableGridX={!!width && width >= 800}
         enableArea
-        areaBaselineValue={isBinary ? 0 : contract.min}
+        areaBaselineValue={isBinary || isLogScale ? 0 : contract.min}
         margin={{ top: 20, right: 20, bottom: 65, left: 40 }}
         animate={false}
         sliceTooltip={SliceTooltip}

From 921ac4b2a9f1b1b6264facb3c9a9fd530460adf7 Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Tue, 19 Jul 2022 17:22:23 -0600
Subject: [PATCH 55/71] Fix last 3 days number

---
 functions/src/score-contracts.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/functions/src/score-contracts.ts b/functions/src/score-contracts.ts
index 733f1397..57976ff2 100644
--- a/functions/src/score-contracts.ts
+++ b/functions/src/score-contracts.ts
@@ -14,8 +14,8 @@ const firestore = admin.firestore()
 
 async function scoreContractsInternal() {
   const now = Date.now()
-  const lastHour = now - 3600000
-  const last3Days = now - 2592000000
+  const lastHour = now - 60 * 60 * 1000
+  const last3Days = now - 1000 * 60 * 60 * 24 * 3
   const activeContractsSnap = await firestore
     .collection('contracts')
     .where('lastUpdatedTime', '>', lastHour)

From b2c89d36cf4aeb03fb8d9a6c89e2397c2b2bb73c Mon Sep 17 00:00:00 2001
From: James Grugett <jahooma@gmail.com>
Date: Tue, 19 Jul 2022 18:22:55 -0500
Subject: [PATCH 56/71] Home: Show pills that are groups (in addition to All,
 For you)

---
 web/components/buttons/pill-button.tsx |   2 +-
 web/components/contract-search.tsx     | 101 ++++++++++++++++---------
 web/tailwind.config.js                 |  17 +++++
 3 files changed, 84 insertions(+), 36 deletions(-)

diff --git a/web/components/buttons/pill-button.tsx b/web/components/buttons/pill-button.tsx
index 796036d1..5b4962b7 100644
--- a/web/components/buttons/pill-button.tsx
+++ b/web/components/buttons/pill-button.tsx
@@ -13,7 +13,7 @@ export function PillButton(props: {
   return (
     <button
       className={clsx(
-        'cursor-pointer select-none rounded-full',
+        'cursor-pointer select-none whitespace-nowrap rounded-full',
         selected
           ? ['text-white', color ?? 'bg-gray-700']
           : 'bg-gray-100 hover:bg-gray-200',
diff --git a/web/components/contract-search.tsx b/web/components/contract-search.tsx
index dc97f482..fbbb9fe9 100644
--- a/web/components/contract-search.tsx
+++ b/web/components/contract-search.tsx
@@ -27,7 +27,7 @@ import ContractSearchFirestore from 'web/pages/contract-search-firestore'
 import { useMemberGroups } from 'web/hooks/use-group'
 import { NEW_USER_GROUP_SLUGS } from 'common/group'
 import { PillButton } from './buttons/pill-button'
-import { toPairs } from 'lodash'
+import { sortBy } from 'lodash'
 
 const searchClient = algoliasearch(
   'GJQPAYENIF',
@@ -49,13 +49,6 @@ const sortIndexes = [
 export const DEFAULT_SORT = 'score'
 
 type filter = 'personal' | 'open' | 'closed' | 'resolved' | 'all'
-const filterOptions: { [label: string]: filter } = {
-  All: 'all',
-  Open: 'open',
-  Closed: 'closed',
-  Resolved: 'resolved',
-  'For you': 'personal',
-}
 
 export function ContractSearch(props: {
   querySortOptions?: {
@@ -86,9 +79,14 @@ export function ContractSearch(props: {
   } = props
 
   const user = useUser()
-  const memberGroupSlugs = useMemberGroups(user?.id)
-    ?.map((g) => g.slug)
-    .filter((s) => !NEW_USER_GROUP_SLUGS.includes(s))
+  const memberGroups = (useMemberGroups(user?.id) ?? []).filter(
+    (group) => !NEW_USER_GROUP_SLUGS.includes(group.slug)
+  )
+  const memberGroupSlugs = memberGroups.map((g) => g.slug)
+  const pillGroups = sortBy(
+    memberGroups.filter((group) => group.contractIds.length > 0),
+    (group) => group.contractIds.length
+  ).reverse()
   const follows = useFollows(user?.id)
   const { initialSort } = useInitialQueryAndSort(querySortOptions)
 
@@ -101,15 +99,27 @@ export function ContractSearch(props: {
   const [filter, setFilter] = useState<filter>(
     querySortOptions?.defaultFilter ?? 'open'
   )
+  const [pillFilter, setPillFilter] = useState<string | undefined>()
 
   const { filters, numericFilters } = useMemo(() => {
     let filters = [
       filter === 'open' ? 'isResolved:false' : '',
       filter === 'closed' ? 'isResolved:false' : '',
       filter === 'resolved' ? 'isResolved:true' : '',
-      filter === 'personal'
+      additionalFilter?.creatorId
+        ? `creatorId:${additionalFilter.creatorId}`
+        : '',
+      additionalFilter?.tag ? `lowercaseTags:${additionalFilter.tag}` : '',
+      additionalFilter?.groupSlug
+        ? `groupSlugs:${additionalFilter.groupSlug}`
+        : '',
+      pillFilter && pillFilter !== 'personal'
+        ? `groupSlugs:${pillFilter}`
+        : '',
+      pillFilter === 'personal'
         ? // Show contracts in groups that the user is a member of
-          (memberGroupSlugs?.map((slug) => `groupSlugs:${slug}`) ?? [])
+          memberGroupSlugs
+            .map((slug) => `groupSlugs:${slug}`)
             // Show contracts created by users the user follows
             .concat(follows?.map((followId) => `creatorId:${followId}`) ?? [])
             // Show contracts bet on by users the user follows
@@ -119,13 +129,6 @@ export function ContractSearch(props: {
             )
             .concat(user ? `uniqueBettorIds:${user.id}` : [])
         : '',
-      additionalFilter?.creatorId
-        ? `creatorId:${additionalFilter.creatorId}`
-        : '',
-      additionalFilter?.tag ? `lowercaseTags:${additionalFilter.tag}` : '',
-      additionalFilter?.groupSlug
-        ? `groupSlugs:${additionalFilter.groupSlug}`
-        : '',
     ].filter((f) => f)
     // Hack to make Algolia work.
     filters = ['', ...filters]
@@ -139,8 +142,9 @@ export function ContractSearch(props: {
   }, [
     filter,
     Object.values(additionalFilter ?? {}).join(','),
-    (memberGroupSlugs ?? []).join(','),
+    memberGroupSlugs.join(','),
     (follows ?? []).join(','),
+    pillFilter,
   ])
 
   const indexName = `${indexPrefix}contracts-${sort}`
@@ -167,6 +171,17 @@ export function ContractSearch(props: {
           }}
         />
         {/*// TODO track WHICH filter users are using*/}
+        <select
+          className="!select !select-bordered"
+          value={filter}
+          onChange={(e) => setFilter(e.target.value as filter)}
+          onBlur={trackCallback('select search filter')}
+        >
+          <option value="open">Open</option>
+          <option value="closed">Closed</option>
+          <option value="resolved">Resolved</option>
+          <option value="all">All</option>
+        </select>
         {!hideOrderSelector && (
           <SortBy
             items={sortIndexes}
@@ -186,25 +201,41 @@ export function ContractSearch(props: {
 
       <Spacer h={3} />
 
-      <Row className="gap-2">
-        {toPairs<filter>(filterOptions).map(([label, f]) => {
-          return (
-            <PillButton
-              key={f}
-              selected={filter === f}
-              onSelect={() => setFilter(f)}
-            >
-              {label}
-            </PillButton>
-          )
-        })}
-      </Row>
+      {!additionalFilter?.creatorId && !additionalFilter?.groupSlug && (
+        <Row className="scrollbar-hide items-start gap-2 overflow-x-auto">
+          <PillButton
+            key={'all'}
+            selected={pillFilter === undefined}
+            onSelect={() => setPillFilter(undefined)}
+          >
+            All
+          </PillButton>
+          <PillButton
+            key={'personal'}
+            selected={pillFilter === 'personal'}
+            onSelect={() => setPillFilter('personal')}
+          >
+            For you
+          </PillButton>
+          {pillGroups.map(({ name, slug }) => {
+            return (
+              <PillButton
+                key={slug}
+                selected={pillFilter === slug}
+                onSelect={() => setPillFilter(slug)}
+              >
+                {name}
+              </PillButton>
+            )
+          })}
+        </Row>
+      )}
 
       <Spacer h={3} />
 
       {filter === 'personal' &&
       (follows ?? []).length === 0 &&
-      (memberGroupSlugs ?? []).length === 0 ? (
+      memberGroupSlugs.length === 0 ? (
         <>You're not following anyone, nor in any of your own groups yet.</>
       ) : (
         <ContractSearchInner
diff --git a/web/tailwind.config.js b/web/tailwind.config.js
index 0a1616b6..3457b7a6 100644
--- a/web/tailwind.config.js
+++ b/web/tailwind.config.js
@@ -1,4 +1,5 @@
 const defaultTheme = require('tailwindcss/defaultTheme')
+const plugin = require('tailwindcss/plugin')
 
 module.exports = {
   content: [
@@ -32,6 +33,22 @@ module.exports = {
     require('@tailwindcss/typography'),
     require('@tailwindcss/line-clamp'),
     require('daisyui'),
+    plugin(function ({ addUtilities }) {
+      addUtilities({
+        '.scrollbar-hide': {
+          /* IE and Edge */
+          '-ms-overflow-style': 'none',
+
+          /* Firefox */
+          'scrollbar-width': 'none',
+
+          /* Safari and Chrome */
+          '&::-webkit-scrollbar': {
+            display: 'none',
+          },
+        },
+      })
+    }),
   ],
   daisyui: {
     themes: [

From 61094ea17df5210c2002b495aa72d305aa2b933a Mon Sep 17 00:00:00 2001
From: Marshall Polaris <marshall@pol.rs>
Date: Tue, 19 Jul 2022 20:08:33 -0700
Subject: [PATCH 57/71] Properly handle expired ID token cookie, be robust to
 errors (#671)

---
 web/lib/firebase/server-auth.ts | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/web/lib/firebase/server-auth.ts b/web/lib/firebase/server-auth.ts
index 5f828683..47eadb45 100644
--- a/web/lib/firebase/server-auth.ts
+++ b/web/lib/firebase/server-auth.ts
@@ -52,12 +52,19 @@ export const getServerAuthenticatedUid = async (ctx: RequestContext) => {
   if (idToken != null) {
     try {
       return (await auth.verifyIdToken(idToken))?.uid
+    } catch {
+      // plausibly expired; try the refresh token, if it's present
+    }
+  }
+  if (refreshToken != null) {
+    try {
+      const resp = await requestFirebaseIdToken(refreshToken)
+      setAuthCookies(resp.id_token, resp.refresh_token, ctx.res)
+      return (await auth.verifyIdToken(resp.id_token))?.uid
     } catch (e) {
-      if (refreshToken != null) {
-        const resp = await requestFirebaseIdToken(refreshToken)
-        setAuthCookies(resp.id_token, resp.refresh_token, ctx.res)
-        return (await auth.verifyIdToken(resp.id_token))?.uid
-      }
+      // this is a big unexpected problem -- either their cookies are corrupt
+      // or the refresh token API is down. functionally, they are not logged in
+      console.error(e)
     }
   }
   return undefined

From bacd546e5d27863e460348c6ca3a504a1f6fef6d Mon Sep 17 00:00:00 2001
From: Marshall Polaris <marshall@pol.rs>
Date: Tue, 19 Jul 2022 20:10:54 -0700
Subject: [PATCH 58/71] Fix unused import from Ian's code

---
 web/pages/notifications.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/pages/notifications.tsx b/web/pages/notifications.tsx
index d011e757..3db345ef 100644
--- a/web/pages/notifications.tsx
+++ b/web/pages/notifications.tsx
@@ -16,7 +16,6 @@ import {
   User,
 } from 'common/user'
 import { getUser } from 'web/lib/firebase/users'
-import { LoadingIndicator } from 'web/components/loading-indicator'
 import clsx from 'clsx'
 import { RelativeTimestamp } from 'web/components/relative-timestamp'
 import { Linkify } from 'web/components/linkify'

From 83e9408d6958a957ee29508b359f69775b4f437d Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Tue, 19 Jul 2022 23:48:09 -0500
Subject: [PATCH 59/71] remove tags from info panel

---
 web/components/contract/contract-info-dialog.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/web/components/contract/contract-info-dialog.tsx b/web/components/contract/contract-info-dialog.tsx
index b5ecea15..81ef59c4 100644
--- a/web/components/contract/contract-info-dialog.tsx
+++ b/web/components/contract/contract-info-dialog.tsx
@@ -141,9 +141,10 @@ export function ContractInfoDialog(props: { contract: Contract; bets: Bet[] }) {
             </tbody>
           </table>
 
-          <div>Tags</div>
+          {/* <div>Tags</div>
           <TagsInput contract={contract} />
-          <div />
+          <div /> */}
+
           {contract.mechanism === 'cpmm-1' && !contract.resolution && (
             <LiquidityPanel contract={contract} />
           )}

From 0013f76873e958ea01a7b5beb657553f8ecc5d2f Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Wed, 20 Jul 2022 00:03:03 -0500
Subject: [PATCH 60/71] search defaults to 'for you'; hide pills for additional
 filters

---
 web/components/contract-search.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/components/contract-search.tsx b/web/components/contract-search.tsx
index fbbb9fe9..95075986 100644
--- a/web/components/contract-search.tsx
+++ b/web/components/contract-search.tsx
@@ -99,7 +99,7 @@ export function ContractSearch(props: {
   const [filter, setFilter] = useState<filter>(
     querySortOptions?.defaultFilter ?? 'open'
   )
-  const [pillFilter, setPillFilter] = useState<string | undefined>()
+  const [pillFilter, setPillFilter] = useState<string | undefined>('personal')
 
   const { filters, numericFilters } = useMemo(() => {
     let filters = [
@@ -201,7 +201,7 @@ export function ContractSearch(props: {
 
       <Spacer h={3} />
 
-      {!additionalFilter?.creatorId && !additionalFilter?.groupSlug && (
+      {!additionalFilter && (
         <Row className="scrollbar-hide items-start gap-2 overflow-x-auto">
           <PillButton
             key={'all'}

From 2b13085dff4a112b048716fbc833cc81fb83bba3 Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Wed, 20 Jul 2022 00:23:00 -0500
Subject: [PATCH 61/71] search: use default categories for non-authed users

---
 common/categories.ts               |  6 ++++++
 web/components/contract-search.tsx | 22 ++++++++++++++++------
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/common/categories.ts b/common/categories.ts
index 232aa526..672f3200 100644
--- a/common/categories.ts
+++ b/common/categories.ts
@@ -1,6 +1,7 @@
 import { difference } from 'lodash'
 
 export const CATEGORIES_GROUP_SLUG_POSTFIX = '-default'
+
 export const CATEGORIES = {
   politics: 'Politics',
   technology: 'Technology',
@@ -37,3 +38,8 @@ export const EXCLUDED_CATEGORIES: category[] = [
 ]
 
 export const DEFAULT_CATEGORIES = difference(CATEGORY_LIST, EXCLUDED_CATEGORIES)
+
+export const DEFAULT_CATEGORY_GROUPS = DEFAULT_CATEGORIES.map((c) => ({
+  slug: c.toLowerCase() + CATEGORIES_GROUP_SLUG_POSTFIX,
+  name: CATEGORIES[c as category],
+}))
diff --git a/web/components/contract-search.tsx b/web/components/contract-search.tsx
index 95075986..65c09608 100644
--- a/web/components/contract-search.tsx
+++ b/web/components/contract-search.tsx
@@ -25,9 +25,10 @@ import { useFollows } from 'web/hooks/use-follows'
 import { trackCallback } from 'web/lib/service/analytics'
 import ContractSearchFirestore from 'web/pages/contract-search-firestore'
 import { useMemberGroups } from 'web/hooks/use-group'
-import { NEW_USER_GROUP_SLUGS } from 'common/group'
+import { Group, NEW_USER_GROUP_SLUGS } from 'common/group'
 import { PillButton } from './buttons/pill-button'
 import { sortBy } from 'lodash'
+import { DEFAULT_CATEGORY_GROUPS } from 'common/categories'
 
 const searchClient = algoliasearch(
   'GJQPAYENIF',
@@ -82,11 +83,21 @@ export function ContractSearch(props: {
   const memberGroups = (useMemberGroups(user?.id) ?? []).filter(
     (group) => !NEW_USER_GROUP_SLUGS.includes(group.slug)
   )
-  const memberGroupSlugs = memberGroups.map((g) => g.slug)
-  const pillGroups = sortBy(
+  const memberGroupSlugs =
+    memberGroups.length > 0
+      ? memberGroups.map((g) => g.slug)
+      : DEFAULT_CATEGORY_GROUPS.map((g) => g.slug)
+
+  const memberPillGroups = sortBy(
     memberGroups.filter((group) => group.contractIds.length > 0),
     (group) => group.contractIds.length
   ).reverse()
+
+  const defaultPillGroups = DEFAULT_CATEGORY_GROUPS as Group[]
+
+  const pillGroups =
+    memberPillGroups.length > 0 ? memberPillGroups : defaultPillGroups
+
   const follows = useFollows(user?.id)
   const { initialSort } = useInitialQueryAndSort(querySortOptions)
 
@@ -113,9 +124,7 @@ export function ContractSearch(props: {
       additionalFilter?.groupSlug
         ? `groupSlugs:${additionalFilter.groupSlug}`
         : '',
-      pillFilter && pillFilter !== 'personal'
-        ? `groupSlugs:${pillFilter}`
-        : '',
+      pillFilter && pillFilter !== 'personal' ? `groupSlugs:${pillFilter}` : '',
       pillFilter === 'personal'
         ? // Show contracts in groups that the user is a member of
           memberGroupSlugs
@@ -217,6 +226,7 @@ export function ContractSearch(props: {
           >
             For you
           </PillButton>
+
           {pillGroups.map(({ name, slug }) => {
             return (
               <PillButton

From b517f7cfa744f9660308f35aaecdd3ec65926451 Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Wed, 20 Jul 2022 00:35:27 -0500
Subject: [PATCH 62/71] eslint; remove unused tags import

---
 web/components/contract/contract-info-dialog.tsx | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/web/components/contract/contract-info-dialog.tsx b/web/components/contract/contract-info-dialog.tsx
index 81ef59c4..a0c7fcc9 100644
--- a/web/components/contract/contract-info-dialog.tsx
+++ b/web/components/contract/contract-info-dialog.tsx
@@ -16,7 +16,6 @@ import { ShareEmbedButton } from '../share-embed-button'
 import { Title } from '../title'
 import { TweetButton } from '../tweet-button'
 import { InfoTooltip } from '../info-tooltip'
-import { TagsInput } from 'web/components/tags-input'
 import { DuplicateContractButton } from '../copy-contract-button'
 
 export const contractDetailsButtonClassName =
@@ -141,10 +140,6 @@ export function ContractInfoDialog(props: { contract: Contract; bets: Bet[] }) {
             </tbody>
           </table>
 
-          {/* <div>Tags</div>
-          <TagsInput contract={contract} />
-          <div /> */}
-
           {contract.mechanism === 'cpmm-1' && !contract.resolution && (
             <LiquidityPanel contract={contract} />
           )}

From c8361f1748d73bdc0633c2762ab478706fb2e25d Mon Sep 17 00:00:00 2001
From: Marshall Polaris <marshall@pol.rs>
Date: Wed, 20 Jul 2022 01:59:14 -0700
Subject: [PATCH 63/71] Make it so that if you sign in on / you get redirected
 to /home (#672)

---
 web/pages/index.tsx | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/web/pages/index.tsx b/web/pages/index.tsx
index 44683a4f..d9ff7f51 100644
--- a/web/pages/index.tsx
+++ b/web/pages/index.tsx
@@ -1,5 +1,6 @@
-import React from 'react'
-
+import React, { useEffect } from 'react'
+import { useRouter } from 'next/router'
+import { useUser } from 'web/hooks/use-user'
 import { Contract, getContractsBySlugs } from 'web/lib/firebase/contracts'
 import { Page } from 'web/components/page'
 import { LandingPagePanel } from 'web/components/landing-page-panel'
@@ -26,6 +27,17 @@ export const getServerSideProps = redirectIfLoggedIn('/home', async (_) => {
 
 export default function Home(props: { hotContracts: Contract[] }) {
   const { hotContracts } = props
+
+  // for now this redirect in the component is how we handle the case where they are
+  // on this page and they log in -- in the future we will make some cleaner way
+  const user = useUser()
+  const router = useRouter()
+  useEffect(() => {
+    if (user != null) {
+      router.replace('/home')
+    }
+  }, [router, user])
+
   return (
     <Page>
       <div className="px-4 pt-2 md:mt-0 lg:hidden">

From b60892fada294e42481e1372a3f0474ee419fa64 Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Wed, 20 Jul 2022 11:15:55 -0500
Subject: [PATCH 64/71] group 'rankings' => 'leaderboards' (friendlier, more
 consistent terminology)

---
 web/lib/firebase/groups.ts           |  2 +-
 web/pages/group/[...slugs]/index.tsx | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/web/lib/firebase/groups.ts b/web/lib/firebase/groups.ts
index 8adb5606..0122e2ee 100644
--- a/web/lib/firebase/groups.ts
+++ b/web/lib/firebase/groups.ts
@@ -22,7 +22,7 @@ export const groups = coll<Group>('groups')
 
 export function groupPath(
   groupSlug: string,
-  subpath?: 'edit' | 'questions' | 'about' | typeof GROUP_CHAT_SLUG | 'rankings'
+  subpath?: 'edit' | 'questions' | 'about' | typeof GROUP_CHAT_SLUG | 'leaderboards'
 ) {
   return `/group/${groupSlug}${subpath ? `/${subpath}` : ''}`
 }
diff --git a/web/pages/group/[...slugs]/index.tsx b/web/pages/group/[...slugs]/index.tsx
index 7cce843e..c6485a0e 100644
--- a/web/pages/group/[...slugs]/index.tsx
+++ b/web/pages/group/[...slugs]/index.tsx
@@ -113,7 +113,7 @@ const groupSubpages = [
   undefined,
   GROUP_CHAT_SLUG,
   'questions',
-  'rankings',
+  'leaderboards',
   'about',
 ] as const
 
@@ -236,9 +236,9 @@ export default function GroupPage(props: {
       href: groupPath(group.slug, 'questions'),
     },
     {
-      title: 'Rankings',
+      title: 'Leaderboards',
       content: leaderboard,
-      href: groupPath(group.slug, 'rankings'),
+      href: groupPath(group.slug, 'leaderboards'),
     },
     {
       title: 'About',
@@ -487,14 +487,14 @@ function GroupLeaderboards(props: {
             <SortedLeaderboard
               users={members}
               scoreFunction={(user) => traderScores[user.id] ?? 0}
-              title="🏅 Bettor rankings"
+              title="🏅 Top bettors"
               header="Profit"
               maxToShow={maxToShow}
             />
             <SortedLeaderboard
               users={members}
               scoreFunction={(user) => creatorScores[user.id] ?? 0}
-              title="🏅 Creator rankings"
+              title="🏅 Top creators"
               header="Market volume"
               maxToShow={maxToShow}
             />

From 45b883477dae977cda488616db5736fe369fadab Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Wed, 20 Jul 2022 11:42:49 -0500
Subject: [PATCH 65/71] generic copy link button

---
 web/components/copy-link-button.tsx | 87 +++++++++++++++--------------
 web/components/share-market.tsx     | 16 +++---
 2 files changed, 54 insertions(+), 49 deletions(-)

diff --git a/web/components/copy-link-button.tsx b/web/components/copy-link-button.tsx
index ab6dd66f..4ce4140d 100644
--- a/web/components/copy-link-button.tsx
+++ b/web/components/copy-link-button.tsx
@@ -3,58 +3,63 @@ import { LinkIcon } from '@heroicons/react/outline'
 import { Menu, Transition } from '@headlessui/react'
 import clsx from 'clsx'
 
-import { Contract } from 'common/contract'
 import { copyToClipboard } from 'web/lib/util/copy'
-import { contractPath } from 'web/lib/firebase/contracts'
-import { ENV_CONFIG } from 'common/envs/constants'
 import { ToastClipboard } from 'web/components/toast-clipboard'
 import { track } from 'web/lib/service/analytics'
-
-function copyContractUrl(contract: Contract) {
-  copyToClipboard(`https://${ENV_CONFIG.domain}${contractPath(contract)}`)
-}
+import { Row } from './layout/row'
 
 export function CopyLinkButton(props: {
-  contract: Contract
+  url: string
+  displayUrl?: string
+  tracking?: string
   buttonClassName?: string
   toastClassName?: string
 }) {
-  const { contract, buttonClassName, toastClassName } = props
+  const { url, displayUrl, tracking, buttonClassName, toastClassName } = props
 
   return (
-    <Menu
-      as="div"
-      className="relative z-10 flex-shrink-0"
-      onMouseUp={() => {
-        copyContractUrl(contract)
-        track('copy share link')
-      }}
-    >
-      <Menu.Button
-        className={clsx(
-          'btn btn-xs border-2 border-green-600 bg-white normal-case text-green-600 hover:border-green-600 hover:bg-white',
-          buttonClassName
-        )}
-      >
-        <LinkIcon className="mr-1.5 h-4 w-4" aria-hidden="true" />
-        Copy link
-      </Menu.Button>
+    <Row className="w-full">
+      <input
+        className="input input-bordered flex-1 rounded-r-none text-gray-500"
+        readOnly
+        type="text"
+        value={displayUrl ?? url}
+      />
 
-      <Transition
-        as={Fragment}
-        enter="transition ease-out duration-100"
-        enterFrom="transform opacity-0 scale-95"
-        enterTo="transform opacity-100 scale-100"
-        leave="transition ease-in duration-75"
-        leaveFrom="transform opacity-100 scale-100"
-        leaveTo="transform opacity-0 scale-95"
+      <Menu
+        as="div"
+        className="relative z-10 flex-shrink-0"
+        onMouseUp={() => {
+          copyToClipboard(url)
+          track(tracking ?? 'copy share link')
+        }}
       >
-        <Menu.Items>
-          <Menu.Item>
-            <ToastClipboard className={toastClassName} />
-          </Menu.Item>
-        </Menu.Items>
-      </Transition>
-    </Menu>
+        <Menu.Button
+          className={clsx(
+            'btn btn-xs border-2 border-green-600 bg-white normal-case text-green-600 hover:border-green-600 hover:bg-white',
+            buttonClassName
+          )}
+        >
+          <LinkIcon className="mr-1.5 h-4 w-4" aria-hidden="true" />
+          Copy link
+        </Menu.Button>
+
+        <Transition
+          as={Fragment}
+          enter="transition ease-out duration-100"
+          enterFrom="transform opacity-0 scale-95"
+          enterTo="transform opacity-100 scale-100"
+          leave="transition ease-in duration-75"
+          leaveFrom="transform opacity-100 scale-100"
+          leaveTo="transform opacity-0 scale-95"
+        >
+          <Menu.Items>
+            <Menu.Item>
+              <ToastClipboard className={toastClassName} />
+            </Menu.Item>
+          </Menu.Items>
+        </Transition>
+      </Menu>
+    </Row>
   )
 }
diff --git a/web/components/share-market.tsx b/web/components/share-market.tsx
index a5da585f..be943a34 100644
--- a/web/components/share-market.tsx
+++ b/web/components/share-market.tsx
@@ -1,5 +1,8 @@
 import clsx from 'clsx'
-import { Contract, contractUrl } from 'web/lib/firebase/contracts'
+
+import { ENV_CONFIG } from 'common/envs/constants'
+
+import { Contract, contractPath, contractUrl } from 'web/lib/firebase/contracts'
 import { CopyLinkButton } from './copy-link-button'
 import { Col } from './layout/col'
 import { Row } from './layout/row'
@@ -7,18 +10,15 @@ import { Row } from './layout/row'
 export function ShareMarket(props: { contract: Contract; className?: string }) {
   const { contract, className } = props
 
+  const url = `https://${ENV_CONFIG.domain}${contractPath(contract)}`
+
   return (
     <Col className={clsx(className, 'gap-3')}>
       <div>Share your market</div>
       <Row className="mb-6 items-center">
-        <input
-          className="input input-bordered flex-1 rounded-r-none text-gray-500"
-          readOnly
-          type="text"
-          value={contractUrl(contract)}
-        />
         <CopyLinkButton
-          contract={contract}
+          url={url}
+          displayUrl={contractUrl(contract)}
           buttonClassName="btn-md rounded-l-none"
           toastClassName={'-left-28 mt-1'}
         />

From d65a60984d4dc08cb95652790890e35dc6530d9b Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Wed, 20 Jul 2022 11:45:53 -0500
Subject: [PATCH 66/71] make group invite link more prominent

---
 web/pages/group/[...slugs]/index.tsx | 36 ++++++++++++++++++----------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/web/pages/group/[...slugs]/index.tsx b/web/pages/group/[...slugs]/index.tsx
index c6485a0e..f95cf399 100644
--- a/web/pages/group/[...slugs]/index.tsx
+++ b/web/pages/group/[...slugs]/index.tsx
@@ -52,6 +52,8 @@ import { useTipTxns } from 'web/hooks/use-tip-txns'
 import { JoinOrLeaveGroupButton } from 'web/components/groups/groups-button'
 import { searchInAny } from 'common/util/parse'
 import { useWindowSize } from 'web/hooks/use-window-size'
+import { CopyLinkButton } from 'web/components/copy-link-button'
+import { ENV_CONFIG } from 'common/envs/constants'
 
 export const getStaticProps = fromPropz(getStaticPropz)
 export async function getStaticPropz(props: { params: { slugs: string[] } }) {
@@ -328,6 +330,11 @@ function GroupOverview(props: {
     })
   }
 
+  const postFix = user ? '?referrer=' + user.username : ''
+  const shareUrl = `https://${ENV_CONFIG.domain}${groupPath(
+    group.slug
+  )}${postFix}`
+
   return (
     <>
       <Col className="gap-2 rounded-b bg-white p-2">
@@ -372,21 +379,26 @@ function GroupOverview(props: {
             </span>
           )}
         </Row>
+
         {anyoneCanJoin && user && (
-          <Row className={'flex-wrap items-center gap-1'}>
-            <span className={'text-gray-500'}>Share</span>
-            <ShareIconButton
-              group={group}
-              username={user.username}
-              buttonClassName={'hover:bg-gray-300 mt-1 !text-gray-700'}
-            >
-              <span className={'mx-2'}>
-                Invite a friend and get M${REFERRAL_AMOUNT} if they sign up!
-              </span>
-            </ShareIconButton>
-          </Row>
+          <Col className="my-4 px-2">
+            <div className="text-lg">Invite</div>
+            <div className={'mb-2 text-gray-500'}>
+              Invite a friend to this group and get M${REFERRAL_AMOUNT} if they
+              sign up!
+            </div>
+
+            <CopyLinkButton
+              url={shareUrl}
+              tracking="copy group share link"
+              buttonClassName="btn-md rounded-l-none"
+              toastClassName={'-left-28 mt-1'}
+            />
+          </Col>
         )}
+
         <Col className={'mt-2'}>
+          <div className="mb-2 text-lg">Members</div>
           <GroupMemberSearch members={members} group={group} />
         </Col>
       </Col>

From 202132868f0054a975c6a6adec7619da6544104e Mon Sep 17 00:00:00 2001
From: Sinclair Chen <abc.sinclair@gmail.com>
Date: Wed, 20 Jul 2022 12:35:04 -0700
Subject: [PATCH 67/71] lint and prettier

---
 web/lib/firebase/groups.ts           | 7 ++++++-
 web/pages/group/[...slugs]/index.tsx | 1 -
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/web/lib/firebase/groups.ts b/web/lib/firebase/groups.ts
index 0122e2ee..fc028642 100644
--- a/web/lib/firebase/groups.ts
+++ b/web/lib/firebase/groups.ts
@@ -22,7 +22,12 @@ export const groups = coll<Group>('groups')
 
 export function groupPath(
   groupSlug: string,
-  subpath?: 'edit' | 'questions' | 'about' | typeof GROUP_CHAT_SLUG | 'leaderboards'
+  subpath?:
+    | 'edit'
+    | 'questions'
+    | 'about'
+    | typeof GROUP_CHAT_SLUG
+    | 'leaderboards'
 ) {
   return `/group/${groupSlug}${subpath ? `/${subpath}` : ''}`
 }
diff --git a/web/pages/group/[...slugs]/index.tsx b/web/pages/group/[...slugs]/index.tsx
index f95cf399..8f1b6593 100644
--- a/web/pages/group/[...slugs]/index.tsx
+++ b/web/pages/group/[...slugs]/index.tsx
@@ -42,7 +42,6 @@ import { getSavedSort } from 'web/hooks/use-sort-and-query-params'
 import { ChoicesToggleGroup } from 'web/components/choices-toggle-group'
 import { toast } from 'react-hot-toast'
 import { useCommentsOnGroup } from 'web/hooks/use-comments'
-import { ShareIconButton } from 'web/components/share-icon-button'
 import { REFERRAL_AMOUNT } from 'common/user'
 import { ContractSearch } from 'web/components/contract-search'
 import clsx from 'clsx'

From 0870397fea13df257903a53ef0de60c885c69cf4 Mon Sep 17 00:00:00 2001
From: Sinclair Chen <abc.sinclair@gmail.com>
Date: Wed, 20 Jul 2022 12:36:23 -0700
Subject: [PATCH 68/71] Show line in menu on mobile

---
 web/components/nav/sidebar.tsx | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/web/components/nav/sidebar.tsx b/web/components/nav/sidebar.tsx
index 77af99e0..ff740540 100644
--- a/web/components/nav/sidebar.tsx
+++ b/web/components/nav/sidebar.tsx
@@ -235,7 +235,10 @@ export default function Sidebar(props: { className?: string }) {
             buttonContent={<MoreButton />}
           />
         )}
-
+        {/* Spacer if there are any groups */}
+        {memberItems.length > 0 && (
+          <hr className="!my-4 mr-2 border-gray-300" />
+        )}
         {privateUser && (
           <GroupsList
             currentPage={router.asPath}
@@ -256,11 +259,7 @@ export default function Sidebar(props: { className?: string }) {
         />
 
         {/* Spacer if there are any groups */}
-        {memberItems.length > 0 && (
-          <div className="py-3">
-            <div className="h-[1px] bg-gray-300" />
-          </div>
-        )}
+        {memberItems.length > 0 && <hr className="!my-4 border-gray-300" />}
         {privateUser && (
           <GroupsList
             currentPage={router.asPath}

From e45d81513c0a592e43906cdecf8eb88f8fa851a5 Mon Sep 17 00:00:00 2001
From: James Grugett <jahooma@gmail.com>
Date: Wed, 20 Jul 2022 14:49:14 -0500
Subject: [PATCH 69/71] Don't filter by personal unless pills enabled

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

diff --git a/web/components/contract-search.tsx b/web/components/contract-search.tsx
index 65c09608..b0fab34b 100644
--- a/web/components/contract-search.tsx
+++ b/web/components/contract-search.tsx
@@ -110,7 +110,10 @@ export function ContractSearch(props: {
   const [filter, setFilter] = useState<filter>(
     querySortOptions?.defaultFilter ?? 'open'
   )
-  const [pillFilter, setPillFilter] = useState<string | undefined>('personal')
+  const pillsEnabled = !additionalFilter
+  const [pillFilter, setPillFilter] = useState<string | undefined>(
+    pillsEnabled ? 'personal' : undefined
+  )
 
   const { filters, numericFilters } = useMemo(() => {
     let filters = [
@@ -210,7 +213,7 @@ export function ContractSearch(props: {
 
       <Spacer h={3} />
 
-      {!additionalFilter && (
+      {pillsEnabled && (
         <Row className="scrollbar-hide items-start gap-2 overflow-x-auto">
           <PillButton
             key={'all'}

From 44afa92b58664faf9cd6dbcc96483aa66552d0c4 Mon Sep 17 00:00:00 2001
From: James Grugett <jahooma@gmail.com>
Date: Wed, 20 Jul 2022 15:05:48 -0500
Subject: [PATCH 70/71] Turn off for you by default

---
 web/components/contract-search.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/web/components/contract-search.tsx b/web/components/contract-search.tsx
index b0fab34b..01a65610 100644
--- a/web/components/contract-search.tsx
+++ b/web/components/contract-search.tsx
@@ -111,9 +111,7 @@ export function ContractSearch(props: {
     querySortOptions?.defaultFilter ?? 'open'
   )
   const pillsEnabled = !additionalFilter
-  const [pillFilter, setPillFilter] = useState<string | undefined>(
-    pillsEnabled ? 'personal' : undefined
-  )
+  const [pillFilter, setPillFilter] = useState<string | undefined>(undefined)
 
   const { filters, numericFilters } = useMemo(() => {
     let filters = [

From c35d0a8bc6aeaa709018719a913f8c7abc25ec53 Mon Sep 17 00:00:00 2001
From: James Grugett <jahooma@gmail.com>
Date: Wed, 20 Jul 2022 15:30:07 -0500
Subject: [PATCH 71/71] Split out "Your bets" from "For you"

---
 web/components/contract-search.tsx | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/web/components/contract-search.tsx b/web/components/contract-search.tsx
index 01a65610..730b113f 100644
--- a/web/components/contract-search.tsx
+++ b/web/components/contract-search.tsx
@@ -125,7 +125,9 @@ export function ContractSearch(props: {
       additionalFilter?.groupSlug
         ? `groupSlugs:${additionalFilter.groupSlug}`
         : '',
-      pillFilter && pillFilter !== 'personal' ? `groupSlugs:${pillFilter}` : '',
+      pillFilter && pillFilter !== 'personal' && pillFilter !== 'your-bets'
+        ? `groupSlugs:${pillFilter}`
+        : '',
       pillFilter === 'personal'
         ? // Show contracts in groups that the user is a member of
           memberGroupSlugs
@@ -135,9 +137,13 @@ export function ContractSearch(props: {
             // Show contracts bet on by users the user follows
             .concat(
               follows?.map((followId) => `uniqueBettorIds:${followId}`) ?? []
-              // Show contracts bet on by the user
             )
-            .concat(user ? `uniqueBettorIds:${user.id}` : [])
+        : '',
+      // Subtract contracts you bet on from For you.
+      pillFilter === 'personal' && user ? `uniqueBettorIds:-${user.id}` : '',
+      pillFilter === 'your-bets' && user
+        ? // Show contracts bet on by the user
+          `uniqueBettorIds:${user.id}`
         : '',
     ].filter((f) => f)
     // Hack to make Algolia work.
@@ -228,6 +234,14 @@ export function ContractSearch(props: {
             For you
           </PillButton>
 
+          <PillButton
+            key={'your-bets'}
+            selected={pillFilter === 'your-bets'}
+            onSelect={() => setPillFilter('your-bets')}
+          >
+            Your bets
+          </PillButton>
+
           {pillGroups.map(({ name, slug }) => {
             return (
               <PillButton