From e969540c72dab78770df9941e3af12adc0941106 Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Wed, 6 Jul 2022 15:06:41 -0600
Subject: [PATCH 01/24] Slight notifications refactor

---
 web/pages/notifications.tsx | 726 ++++++++++++++++++------------------
 1 file changed, 363 insertions(+), 363 deletions(-)

diff --git a/web/pages/notifications.tsx b/web/pages/notifications.tsx
index 54dbdd09..382505e2 100644
--- a/web/pages/notifications.tsx
+++ b/web/pages/notifications.tsx
@@ -166,20 +166,6 @@ export default function Notifications() {
   )
 }
 
-export const setNotificationsAsSeen = (notifications: Notification[]) => {
-  notifications.forEach((notification) => {
-    if (!notification.isSeen)
-      updateDoc(
-        doc(db, `users/${notification.userId}/notifications/`, notification.id),
-        {
-          isSeen: true,
-          viewTime: new Date(),
-        }
-      )
-  })
-  return notifications
-}
-
 function IncomeNotificationGroupItem(props: {
   notificationGroup: NotificationGroup
   className?: string
@@ -556,6 +542,369 @@ function NotificationGroupItem(props: {
   )
 }
 
+function NotificationItem(props: {
+  notification: Notification
+  justSummary?: boolean
+  hideTitle?: boolean
+}) {
+  const { notification, justSummary, hideTitle } = props
+  const {
+    sourceType,
+    sourceId,
+    sourceUserName,
+    sourceUserAvatarUrl,
+    sourceUpdateType,
+    reasonText,
+    reason,
+    sourceUserUsername,
+    createdTime,
+    sourceText,
+    sourceContractCreatorUsername,
+    sourceContractSlug,
+  } = notification
+
+  const [defaultNotificationText, setDefaultNotificationText] =
+    useState<string>('')
+
+  useEffect(() => {
+    if (sourceText) {
+      setDefaultNotificationText(sourceText)
+    } else if (reasonText) {
+      // Handle arbitrary notifications with reason text here.
+      setDefaultNotificationText(reasonText)
+    }
+  }, [reasonText, sourceText])
+
+  const [highlighted] = useState(!notification.isSeen)
+
+  useEffect(() => {
+    setNotificationsAsSeen([notification])
+  }, [notification])
+
+  if (justSummary) {
+    return (
+      <Row className={'items-center text-sm text-gray-500 sm:justify-start'}>
+        <div className={'line-clamp-1 flex-1 overflow-hidden sm:flex'}>
+          <div className={'flex pl-1 sm:pl-0'}>
+            <UserLink
+              name={sourceUserName || ''}
+              username={sourceUserUsername || ''}
+              className={'mr-0 flex-shrink-0'}
+              justFirstName={true}
+            />
+            <div className={'inline-flex overflow-hidden text-ellipsis pl-1'}>
+              <span className={'flex-shrink-0'}>
+                {sourceType &&
+                  reason &&
+                  getReasonForShowingNotification(notification, true, true)}
+              </span>
+              <div className={'ml-1 text-black'}>
+                <NotificationTextLabel
+                  contract={null}
+                  defaultText={defaultNotificationText}
+                  className={'line-clamp-1'}
+                  notification={notification}
+                  justSummary={true}
+                />
+              </div>
+            </div>
+          </div>
+        </div>
+      </Row>
+    )
+  }
+
+  return (
+    <div
+      className={clsx(
+        'bg-white px-2 pt-6 text-sm sm:px-4',
+        highlighted && 'bg-indigo-200 hover:bg-indigo-100'
+      )}
+    >
+      <a href={getSourceUrl(notification)}>
+        <Row className={'items-center text-gray-500 sm:justify-start'}>
+          <Avatar
+            avatarUrl={sourceUserAvatarUrl}
+            size={'sm'}
+            className={'mr-2'}
+            username={sourceUserName}
+          />
+          <div className={'flex-1 overflow-hidden sm:flex'}>
+            <div
+              className={
+                'flex max-w-xl shrink overflow-hidden text-ellipsis pl-1 sm:pl-0'
+              }
+            >
+              {sourceUpdateType != 'closed' && (
+                <UserLink
+                  name={sourceUserName || ''}
+                  username={sourceUserUsername || ''}
+                  className={'mr-0 flex-shrink-0'}
+                  justFirstName={true}
+                />
+              )}
+              {sourceType && reason && (
+                <div className={'inline flex truncate'}>
+                  <span className={'ml-1 flex-shrink-0'}>
+                    {getReasonForShowingNotification(notification, false, true)}
+                  </span>
+                  {!hideTitle && (
+                    <NotificationLink notification={notification} />
+                  )}
+                </div>
+              )}
+              {sourceId &&
+              sourceContractSlug &&
+              sourceContractCreatorUsername ? (
+                <CopyLinkDateTimeComponent
+                  prefix={sourceContractCreatorUsername}
+                  slug={sourceContractSlug}
+                  createdTime={createdTime}
+                  elementId={getSourceIdForLinkComponent(sourceId)}
+                  className={'-mx-1 inline-flex sm:inline-block'}
+                />
+              ) : (
+                <RelativeTimestamp time={createdTime} />
+              )}
+            </div>
+          </div>
+        </Row>
+        <div className={'mt-1 ml-1 md:text-base'}>
+          <NotificationTextLabel
+            contract={null}
+            defaultText={defaultNotificationText}
+            notification={notification}
+          />
+        </div>
+
+        <div className={'mt-6 border-b border-gray-300'} />
+      </a>
+    </div>
+  )
+}
+
+export const setNotificationsAsSeen = (notifications: Notification[]) => {
+  notifications.forEach((notification) => {
+    if (!notification.isSeen)
+      updateDoc(
+        doc(db, `users/${notification.userId}/notifications/`, notification.id),
+        {
+          isSeen: true,
+          viewTime: new Date(),
+        }
+      )
+  })
+  return notifications
+}
+
+function NotificationLink(props: { notification: Notification }) {
+  const { notification } = props
+  const {
+    sourceType,
+    sourceContractTitle,
+    sourceContractCreatorUsername,
+    sourceContractSlug,
+    sourceSlug,
+    sourceTitle,
+  } = notification
+  return (
+    <a
+      href={
+        sourceContractCreatorUsername
+          ? `/${sourceContractCreatorUsername}/${sourceContractSlug}`
+          : sourceType === 'group' && sourceSlug
+          ? `${groupPath(sourceSlug)}`
+          : ''
+      }
+      className={
+        'ml-1 inline max-w-xs truncate font-bold text-gray-500 hover:underline hover:decoration-indigo-400 hover:decoration-2 sm:max-w-sm'
+      }
+    >
+      {sourceContractTitle || sourceTitle}
+    </a>
+  )
+}
+
+function getSourceUrl(notification: Notification) {
+  const {
+    sourceType,
+    sourceId,
+    sourceUserUsername,
+    sourceContractCreatorUsername,
+    sourceContractSlug,
+    sourceSlug,
+  } = notification
+  if (sourceType === 'follow') return `/${sourceUserUsername}`
+  if (sourceType === 'group' && sourceSlug) return `${groupPath(sourceSlug)}`
+  if (
+    sourceContractCreatorUsername &&
+    sourceContractSlug &&
+    sourceType === 'user'
+  )
+    return `/${sourceContractCreatorUsername}/${sourceContractSlug}`
+  if (sourceType === 'tip')
+    return `/${sourceContractCreatorUsername}/${sourceContractSlug}#${sourceSlug}`
+  if (sourceContractCreatorUsername && sourceContractSlug)
+    return `/${sourceContractCreatorUsername}/${sourceContractSlug}#${getSourceIdForLinkComponent(
+      sourceId ?? '',
+      sourceType
+    )}`
+}
+
+function getSourceIdForLinkComponent(
+  sourceId: string,
+  sourceType?: notification_source_types
+) {
+  switch (sourceType) {
+    case 'answer':
+      return `answer-${sourceId}`
+    case 'comment':
+      return sourceId
+    case 'contract':
+      return ''
+    default:
+      return sourceId
+  }
+}
+
+function NotificationTextLabel(props: {
+  defaultText: string
+  contract?: Contract | null
+  notification: Notification
+  className?: string
+  justSummary?: boolean
+}) {
+  const { contract, className, defaultText, notification, justSummary } = props
+  const { sourceUpdateType, sourceType, sourceText, sourceContractTitle } =
+    notification
+  if (sourceType === 'contract') {
+    if (justSummary)
+      return <span>{contract?.question || sourceContractTitle}</span>
+    if (!sourceText) return <div />
+    // Resolved contracts
+    if (sourceType === 'contract' && sourceUpdateType === 'resolved') {
+      {
+        if (sourceText === 'YES' || sourceText == 'NO') {
+          return <BinaryOutcomeLabel outcome={sourceText as any} />
+        }
+        if (sourceText.includes('%'))
+          return (
+            <ProbPercentLabel prob={parseFloat(sourceText.replace('%', ''))} />
+          )
+        if (sourceText === 'CANCEL') return <CancelLabel />
+        if (sourceText === 'MKT' || sourceText === 'PROB') return <MultiLabel />
+      }
+    }
+    // Close date will be a number - it looks better without it
+    if (sourceUpdateType === 'closed') {
+      return <div />
+    }
+    // Updated contracts
+    // Description will be in default text
+    if (parseInt(sourceText) > 0) {
+      return (
+        <span>
+          Updated close time: {new Date(parseInt(sourceText)).toLocaleString()}
+        </span>
+      )
+    }
+  } else if (sourceType === 'user' && sourceText) {
+    return (
+      <span>
+        As a thank you, we sent you{' '}
+        <span className="text-primary">
+          {formatMoney(parseInt(sourceText))}
+        </span>
+        !
+      </span>
+    )
+  } else if (sourceType === 'liquidity' && sourceText) {
+    return (
+      <span className="text-blue-400">{formatMoney(parseInt(sourceText))}</span>
+    )
+  } else if ((sourceType === 'bonus' || sourceType === 'tip') && sourceText) {
+    return (
+      <span className="text-primary">
+        {'+' + formatMoney(parseInt(sourceText))}
+      </span>
+    )
+  }
+  // return default text
+  return (
+    <div className={className ? className : 'line-clamp-4 whitespace-pre-line'}>
+      <Linkify text={defaultText} />
+    </div>
+  )
+}
+
+function getReasonForShowingNotification(
+  notification: Notification,
+  simple?: boolean,
+  replaceOn?: boolean
+) {
+  const { sourceType, sourceUpdateType, reason, sourceSlug } = notification
+  let reasonText: string
+  switch (sourceType) {
+    case 'comment':
+      if (reason === 'reply_to_users_answer')
+        reasonText = !simple ? 'replied to you on' : 'replied'
+      else if (reason === 'tagged_user')
+        reasonText = !simple ? 'tagged you on' : 'tagged you'
+      else if (reason === 'reply_to_users_comment')
+        reasonText = !simple ? 'replied to you on' : 'replied'
+      else if (reason === 'on_users_contract')
+        reasonText = !simple ? `commented on your question` : 'commented'
+      else if (reason === 'on_contract_with_users_comment')
+        reasonText = `commented on`
+      else if (reason === 'on_contract_with_users_answer')
+        reasonText = `commented on`
+      else if (reason === 'on_contract_with_users_shares_in')
+        reasonText = `commented on`
+      else reasonText = `commented on`
+      break
+    case 'contract':
+      if (reason === 'you_follow_user') reasonText = 'asked'
+      else if (sourceUpdateType === 'resolved') reasonText = `resolved`
+      else if (sourceUpdateType === 'closed')
+        reasonText = `Please resolve your question`
+      else reasonText = `updated`
+      break
+    case 'answer':
+      if (reason === 'on_users_contract') reasonText = `answered your question `
+      else if (reason === 'on_contract_with_users_comment')
+        reasonText = `answered`
+      else if (reason === 'on_contract_with_users_answer')
+        reasonText = `answered`
+      else if (reason === 'on_contract_with_users_shares_in')
+        reasonText = `answered`
+      else reasonText = `answered`
+      break
+    case 'follow':
+      reasonText = 'followed you'
+      break
+    case 'liquidity':
+      reasonText = 'added liquidity to your question'
+      break
+    case 'group':
+      reasonText = 'added you to the group'
+      break
+    case 'user':
+      if (sourceSlug && reason === 'user_joined_to_bet_on_your_market')
+        reasonText = 'joined to bet on your market'
+      else if (sourceSlug) reasonText = 'joined because you shared'
+      else reasonText = 'joined because of you'
+      break
+    default:
+      reasonText = ''
+  }
+
+  return (
+    <span className={'flex-shrink-0'}>
+      {replaceOn ? reasonText.replace(' on', '') : reasonText}
+    </span>
+  )
+}
+
 // TODO: where should we put referral bonus notifications?
 function NotificationSettings() {
   const user = useUser()
@@ -751,352 +1100,3 @@ function NotificationSettings() {
     </div>
   )
 }
-
-function NotificationLink(props: { notification: Notification }) {
-  const { notification } = props
-  const {
-    sourceType,
-    sourceContractTitle,
-    sourceContractCreatorUsername,
-    sourceContractSlug,
-    sourceSlug,
-    sourceTitle,
-  } = notification
-  return (
-    <a
-      href={
-        sourceContractCreatorUsername
-          ? `/${sourceContractCreatorUsername}/${sourceContractSlug}`
-          : sourceType === 'group' && sourceSlug
-          ? `${groupPath(sourceSlug)}`
-          : ''
-      }
-      className={
-        'ml-1 inline max-w-xs truncate font-bold text-gray-500 hover:underline hover:decoration-indigo-400 hover:decoration-2 sm:max-w-sm'
-      }
-    >
-      {sourceContractTitle || sourceTitle}
-    </a>
-  )
-}
-
-function getSourceUrl(notification: Notification) {
-  const {
-    sourceType,
-    sourceId,
-    sourceUserUsername,
-    sourceContractCreatorUsername,
-    sourceContractSlug,
-    sourceSlug,
-  } = notification
-  if (sourceType === 'follow') return `/${sourceUserUsername}`
-  if (sourceType === 'group' && sourceSlug) return `${groupPath(sourceSlug)}`
-  if (
-    sourceContractCreatorUsername &&
-    sourceContractSlug &&
-    sourceType === 'user'
-  )
-    return `/${sourceContractCreatorUsername}/${sourceContractSlug}`
-  if (sourceType === 'tip')
-    return `/${sourceContractCreatorUsername}/${sourceContractSlug}#${sourceSlug}`
-  if (sourceContractCreatorUsername && sourceContractSlug)
-    return `/${sourceContractCreatorUsername}/${sourceContractSlug}#${getSourceIdForLinkComponent(
-      sourceId ?? '',
-      sourceType
-    )}`
-}
-
-function getSourceIdForLinkComponent(
-  sourceId: string,
-  sourceType?: notification_source_types
-) {
-  switch (sourceType) {
-    case 'answer':
-      return `answer-${sourceId}`
-    case 'comment':
-      return sourceId
-    case 'contract':
-      return ''
-    default:
-      return sourceId
-  }
-}
-
-function NotificationItem(props: {
-  notification: Notification
-  justSummary?: boolean
-  hideTitle?: boolean
-}) {
-  const { notification, justSummary, hideTitle } = props
-  const {
-    sourceType,
-    sourceId,
-    sourceUserName,
-    sourceUserAvatarUrl,
-    sourceUpdateType,
-    reasonText,
-    reason,
-    sourceUserUsername,
-    createdTime,
-    sourceText,
-    sourceContractCreatorUsername,
-    sourceContractSlug,
-  } = notification
-
-  const [defaultNotificationText, setDefaultNotificationText] =
-    useState<string>('')
-
-  useEffect(() => {
-    if (sourceText) {
-      setDefaultNotificationText(sourceText)
-    } else if (reasonText) {
-      // Handle arbitrary notifications with reason text here.
-      setDefaultNotificationText(reasonText)
-    }
-  }, [reasonText, sourceText])
-
-  const [highlighted] = useState(!notification.isSeen)
-
-  useEffect(() => {
-    setNotificationsAsSeen([notification])
-  }, [notification])
-
-  if (justSummary) {
-    return (
-      <Row className={'items-center text-sm text-gray-500 sm:justify-start'}>
-        <div className={'line-clamp-1 flex-1 overflow-hidden sm:flex'}>
-          <div className={'flex pl-1 sm:pl-0'}>
-            <UserLink
-              name={sourceUserName || ''}
-              username={sourceUserUsername || ''}
-              className={'mr-0 flex-shrink-0'}
-              justFirstName={true}
-            />
-            <div className={'inline-flex overflow-hidden text-ellipsis pl-1'}>
-              <span className={'flex-shrink-0'}>
-                {sourceType &&
-                  reason &&
-                  getReasonForShowingNotification(notification, true, true)}
-              </span>
-              <div className={'ml-1 text-black'}>
-                <NotificationTextLabel
-                  contract={null}
-                  defaultText={defaultNotificationText}
-                  className={'line-clamp-1'}
-                  notification={notification}
-                  justSummary={true}
-                />
-              </div>
-            </div>
-          </div>
-        </div>
-      </Row>
-    )
-  }
-
-  return (
-    <div
-      className={clsx(
-        'bg-white px-2 pt-6 text-sm sm:px-4',
-        highlighted && 'bg-indigo-200 hover:bg-indigo-100'
-      )}
-    >
-      <a href={getSourceUrl(notification)}>
-        <Row className={'items-center text-gray-500 sm:justify-start'}>
-          <Avatar
-            avatarUrl={sourceUserAvatarUrl}
-            size={'sm'}
-            className={'mr-2'}
-            username={sourceUserName}
-          />
-          <div className={'flex-1 overflow-hidden sm:flex'}>
-            <div
-              className={
-                'flex max-w-xl shrink overflow-hidden text-ellipsis pl-1 sm:pl-0'
-              }
-            >
-              {sourceUpdateType != 'closed' && (
-                <UserLink
-                  name={sourceUserName || ''}
-                  username={sourceUserUsername || ''}
-                  className={'mr-0 flex-shrink-0'}
-                  justFirstName={true}
-                />
-              )}
-              {sourceType && reason && (
-                <div className={'inline flex truncate'}>
-                  <span className={'ml-1 flex-shrink-0'}>
-                    {getReasonForShowingNotification(notification, false, true)}
-                  </span>
-                  {!hideTitle && (
-                    <NotificationLink notification={notification} />
-                  )}
-                </div>
-              )}
-              {sourceId &&
-              sourceContractSlug &&
-              sourceContractCreatorUsername ? (
-                <CopyLinkDateTimeComponent
-                  prefix={sourceContractCreatorUsername}
-                  slug={sourceContractSlug}
-                  createdTime={createdTime}
-                  elementId={getSourceIdForLinkComponent(sourceId)}
-                  className={'-mx-1 inline-flex sm:inline-block'}
-                />
-              ) : (
-                <RelativeTimestamp time={createdTime} />
-              )}
-            </div>
-          </div>
-        </Row>
-        <div className={'mt-1 ml-1 md:text-base'}>
-          <NotificationTextLabel
-            contract={null}
-            defaultText={defaultNotificationText}
-            notification={notification}
-          />
-        </div>
-
-        <div className={'mt-6 border-b border-gray-300'} />
-      </a>
-    </div>
-  )
-}
-
-function NotificationTextLabel(props: {
-  defaultText: string
-  contract?: Contract | null
-  notification: Notification
-  className?: string
-  justSummary?: boolean
-}) {
-  const { contract, className, defaultText, notification, justSummary } = props
-  const { sourceUpdateType, sourceType, sourceText, sourceContractTitle } =
-    notification
-  if (sourceType === 'contract') {
-    if (justSummary)
-      return <span>{contract?.question || sourceContractTitle}</span>
-    if (!sourceText) return <div />
-    // Resolved contracts
-    if (sourceType === 'contract' && sourceUpdateType === 'resolved') {
-      {
-        if (sourceText === 'YES' || sourceText == 'NO') {
-          return <BinaryOutcomeLabel outcome={sourceText as any} />
-        }
-        if (sourceText.includes('%'))
-          return (
-            <ProbPercentLabel prob={parseFloat(sourceText.replace('%', ''))} />
-          )
-        if (sourceText === 'CANCEL') return <CancelLabel />
-        if (sourceText === 'MKT' || sourceText === 'PROB') return <MultiLabel />
-      }
-    }
-    // Close date will be a number - it looks better without it
-    if (sourceUpdateType === 'closed') {
-      return <div />
-    }
-    // Updated contracts
-    // Description will be in default text
-    if (parseInt(sourceText) > 0) {
-      return (
-        <span>
-          Updated close time: {new Date(parseInt(sourceText)).toLocaleString()}
-        </span>
-      )
-    }
-  } else if (sourceType === 'user' && sourceText) {
-    return (
-      <span>
-        As a thank you, we sent you{' '}
-        <span className="text-primary">
-          {formatMoney(parseInt(sourceText))}
-        </span>
-        !
-      </span>
-    )
-  } else if (sourceType === 'liquidity' && sourceText) {
-    return (
-      <span className="text-blue-400">{formatMoney(parseInt(sourceText))}</span>
-    )
-  } else if ((sourceType === 'bonus' || sourceType === 'tip') && sourceText) {
-    return (
-      <span className="text-primary">
-        {'+' + formatMoney(parseInt(sourceText))}
-      </span>
-    )
-  }
-  // return default text
-  return (
-    <div className={className ? className : 'line-clamp-4 whitespace-pre-line'}>
-      <Linkify text={defaultText} />
-    </div>
-  )
-}
-
-function getReasonForShowingNotification(
-  notification: Notification,
-  simple?: boolean,
-  replaceOn?: boolean
-) {
-  const { sourceType, sourceUpdateType, reason, sourceSlug } = notification
-  let reasonText: string
-  switch (sourceType) {
-    case 'comment':
-      if (reason === 'reply_to_users_answer')
-        reasonText = !simple ? 'replied to you on' : 'replied'
-      else if (reason === 'tagged_user')
-        reasonText = !simple ? 'tagged you on' : 'tagged you'
-      else if (reason === 'reply_to_users_comment')
-        reasonText = !simple ? 'replied to you on' : 'replied'
-      else if (reason === 'on_users_contract')
-        reasonText = !simple ? `commented on your question` : 'commented'
-      else if (reason === 'on_contract_with_users_comment')
-        reasonText = `commented on`
-      else if (reason === 'on_contract_with_users_answer')
-        reasonText = `commented on`
-      else if (reason === 'on_contract_with_users_shares_in')
-        reasonText = `commented on`
-      else reasonText = `commented on`
-      break
-    case 'contract':
-      if (reason === 'you_follow_user') reasonText = 'asked'
-      else if (sourceUpdateType === 'resolved') reasonText = `resolved`
-      else if (sourceUpdateType === 'closed')
-        reasonText = `Please resolve your question`
-      else reasonText = `updated`
-      break
-    case 'answer':
-      if (reason === 'on_users_contract') reasonText = `answered your question `
-      else if (reason === 'on_contract_with_users_comment')
-        reasonText = `answered`
-      else if (reason === 'on_contract_with_users_answer')
-        reasonText = `answered`
-      else if (reason === 'on_contract_with_users_shares_in')
-        reasonText = `answered`
-      else reasonText = `answered`
-      break
-    case 'follow':
-      reasonText = 'followed you'
-      break
-    case 'liquidity':
-      reasonText = 'added liquidity to your question'
-      break
-    case 'group':
-      reasonText = 'added you to the group'
-      break
-    case 'user':
-      if (sourceSlug && reason === 'user_joined_to_bet_on_your_market')
-        reasonText = 'joined to bet on your market'
-      else if (sourceSlug) reasonText = 'joined because you shared'
-      else reasonText = 'joined because of you'
-      break
-    default:
-      reasonText = ''
-  }
-
-  return (
-    <span className={'flex-shrink-0'}>
-      {replaceOn ? reasonText.replace(' on', '') : reasonText}
-    </span>
-  )
-}

From 2591655269ecc300f1b77779a460b882d4f89d56 Mon Sep 17 00:00:00 2001
From: ahalekelly <ahalekelly@gmail.com>
Date: Wed, 6 Jul 2022 14:41:13 -0700
Subject: [PATCH 02/24] Fix docs edit link (#624)

* Fix docs edit link

* Update github links
---
 docs/docusaurus.config.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/docusaurus.config.js b/docs/docusaurus.config.js
index 85129d87..0cf5a8f2 100644
--- a/docs/docusaurus.config.js
+++ b/docs/docusaurus.config.js
@@ -26,8 +26,7 @@ const config = {
         docs: {
           routeBasePath: '/',
           sidebarPath: require.resolve('./sidebars.js'),
-          // Please change this to your repo.
-          editUrl: 'https://github.com/manifoldmarkets/manifold/tree/main/docs/docs',
+          editUrl: 'https://github.com/manifoldmarkets/manifold/tree/main/docs',
           remarkPlugins: [math],
           rehypePlugins: [katex],
         },
@@ -72,7 +71,7 @@ const config = {
             label: 'Docs',
           },
           {
-            href: 'https://github.com/manifoldmarkets/docs',
+            href: 'https://github.com/manifoldmarkets/manifold/tree/main/docs/docs',
             label: 'GitHub',
             position: 'right',
           },
@@ -116,7 +115,7 @@ const config = {
               },
               {
                 label: 'GitHub',
-                href: 'https://github.com/manifoldmarkets/docs',
+                href: 'https://github.com/manifoldmarkets/manifold/',
               },
             ],
           },

From a23c744c3e1eeda0ada57b779c607555114161aa Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Wed, 6 Jul 2022 17:24:53 -0600
Subject: [PATCH 03/24] Small groups UX changes

---
 web/components/create-question-button.tsx |  14 +-
 web/components/groups/group-chat.tsx      |   3 +-
 web/lib/firebase/groups.ts                |   2 +-
 web/pages/group/[...slugs]/index.tsx      | 154 ++++++++++++++--------
 web/pages/notifications.tsx               |   4 +-
 5 files changed, 113 insertions(+), 64 deletions(-)

diff --git a/web/components/create-question-button.tsx b/web/components/create-question-button.tsx
index 564beb83..a9161ac6 100644
--- a/web/components/create-question-button.tsx
+++ b/web/components/create-question-button.tsx
@@ -3,6 +3,8 @@ import clsx from 'clsx'
 import { firebaseLogin, User } from 'web/lib/firebase/users'
 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
@@ -12,20 +14,20 @@ export const CreateQuestionButton = (props: {
   const gradient =
     'from-indigo-500 to-blue-500 hover:from-indigo-700 hover:to-blue-700'
 
-  const buttonStyle =
-    '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'
-
   const { user, overrideText, className, query } = props
   return (
-    <div className={clsx('aligncenter flex justify-center', className)}>
+    <div className={clsx('flex justify-center', className)}>
       {user ? (
         <Link href={`/create${query ? query : ''}`} passHref>
-          <button className={clsx(gradient, buttonStyle)}>
+          <button className={clsx(gradient, createButtonStyle)}>
             {overrideText ? overrideText : 'Create a question'}
           </button>
         </Link>
       ) : (
-        <button onClick={firebaseLogin} className={clsx(gradient, buttonStyle)}>
+        <button
+          onClick={firebaseLogin}
+          className={clsx(gradient, createButtonStyle)}
+        >
           Sign in
         </button>
       )}
diff --git a/web/components/groups/group-chat.tsx b/web/components/groups/group-chat.tsx
index 114a9003..13028313 100644
--- a/web/components/groups/group-chat.tsx
+++ b/web/components/groups/group-chat.tsx
@@ -36,6 +36,7 @@ export function GroupChat(props: {
   const [inputRef, setInputRef] = useState<HTMLTextAreaElement | null>(null)
   const [groupedMessages, setGroupedMessages] = useState<Comment[]>([])
   const router = useRouter()
+  const isMember = user && group.memberIds.includes(user?.id)
 
   useMemo(() => {
     // Group messages with createdTime within 2 minutes of each other.
@@ -120,7 +121,7 @@ export function GroupChat(props: {
         ))}
         {messages.length === 0 && (
           <div className="p-2 text-gray-500">
-            No messages yet. Why not{' '}
+            No messages yet. Why not{isMember ? ` ` : ' join and '}
             <button
               className={'cursor-pointer font-bold text-gray-700'}
               onClick={() => focusInput()}
diff --git a/web/lib/firebase/groups.ts b/web/lib/firebase/groups.ts
index 04a5bd44..fbb11520 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' | 'chat'
+  subpath?: 'edit' | 'questions' | 'about' | 'chat' | 'rankings'
 ) {
   return `/group/${groupSlug}${subpath ? `/${subpath}` : ''}`
 }
diff --git a/web/pages/group/[...slugs]/index.tsx b/web/pages/group/[...slugs]/index.tsx
index 8a8bc4c1..b6fcfe38 100644
--- a/web/pages/group/[...slugs]/index.tsx
+++ b/web/pages/group/[...slugs]/index.tsx
@@ -21,7 +21,6 @@ import {
   User,
   writeReferralInfo,
 } from 'web/lib/firebase/users'
-import { Spacer } from 'web/components/layout/spacer'
 import { Col } from 'web/components/layout/col'
 import { useUser } from 'web/hooks/use-user'
 import { listMembers, useGroup, useMembers } from 'web/hooks/use-group'
@@ -36,7 +35,10 @@ import { Linkify } from 'web/components/linkify'
 import { fromPropz, usePropz } from 'web/hooks/use-propz'
 import { Tabs } from 'web/components/layout/tabs'
 import { ContractsGrid } from 'web/components/contract/contracts-list'
-import { CreateQuestionButton } from 'web/components/create-question-button'
+import {
+  createButtonStyle,
+  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'
@@ -45,11 +47,13 @@ import { checkAgainstQuery } 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 ShortToggle from 'web/components/widgets/short-toggle'
 import { ShareIconButton } from 'web/components/share-icon-button'
 import { REFERRAL_AMOUNT } from 'common/user'
 import { SiteLink } from 'web/components/site-link'
 import { ContractSearch } from 'web/components/contract-search'
+import clsx from 'clsx'
+import { FollowList } from 'web/components/follow-list'
+import { SearchIcon } from '@heroicons/react/outline'
 
 export const getStaticProps = fromPropz(getStaticPropz)
 export async function getStaticPropz(props: { params: { slugs: string[] } }) {
@@ -104,7 +108,13 @@ async function toTopUsers(userScores: { [userId: string]: number }) {
 export async function getStaticPaths() {
   return { paths: [], fallback: 'blocking' }
 }
-const groupSubpages = [undefined, 'chat', 'questions', 'about'] as const
+const groupSubpages = [
+  undefined,
+  'chat',
+  'questions',
+  'rankings',
+  'about',
+] as const
 
 export default function GroupPage(props: {
   group: Group | null
@@ -178,20 +188,18 @@ export default function GroupPage(props: {
   const rightSidebar = (
     <Col className="mt-6 hidden xl:block">
       <JoinOrCreateButton group={group} user={user} isMember={!!isMember} />
-      <Spacer h={6} />
-      {contracts && (
-        <div className={'mt-2'}>
-          <div className={'my-2 text-gray-500'}>Recent Questions</div>
-          <ContractsGrid
-            contracts={contracts
-              .sort((a, b) => b.createdTime - a.createdTime)
-              .slice(0, 3)}
-            hasMore={false}
-            loadMore={() => {}}
-            overrideGridClassName={'grid w-full grid-cols-1 gap-4'}
-          />
-        </div>
-      )}
+    </Col>
+  )
+  const leaderboard = (
+    <Col>
+      <GroupLeaderboards
+        traderScores={traderScores}
+        creatorScores={creatorScores}
+        topTraders={topTraders}
+        topCreators={topCreators}
+        members={members}
+        user={user}
+      />
     </Col>
   )
 
@@ -203,16 +211,6 @@ export default function GroupPage(props: {
         isCreator={!!isCreator}
         user={user}
       />
-      <Spacer h={8} />
-
-      <GroupLeaderboards
-        traderScores={traderScores}
-        creatorScores={creatorScores}
-        topTraders={topTraders}
-        topCreators={topCreators}
-        members={members}
-        user={user}
-      />
     </Col>
   )
   return (
@@ -243,7 +241,15 @@ export default function GroupPage(props: {
       </Col>
 
       <Tabs
-        defaultIndex={page === 'about' ? 2 : page === 'questions' ? 1 : 0}
+        defaultIndex={
+          page === 'rankings'
+            ? 2
+            : page === 'about'
+            ? 3
+            : page === 'questions'
+            ? 1
+            : 0
+        }
         tabs={[
           {
             title: 'Chat',
@@ -287,11 +293,15 @@ export default function GroupPage(props: {
                 ) : (
                   <LoadingIndicator />
                 )}
-                {isMember && <AddContractButton group={group} user={user} />}
               </div>
             ),
             href: groupPath(group.slug, 'questions'),
           },
+          {
+            title: 'Leaderboards',
+            content: leaderboard,
+            href: groupPath(group.slug, 'rankings'),
+          },
           {
             title: 'About',
             content: aboutTab,
@@ -309,13 +319,16 @@ function JoinOrCreateButton(props: {
   isMember: boolean
 }) {
   const { group, user, isMember } = props
-  return isMember ? (
-    <CreateQuestionButton
-      user={user}
-      overrideText={'Add a new question'}
-      className={'w-48 flex-shrink-0'}
-      query={`?groupId=${group.id}`}
-    />
+  return user && isMember ? (
+    <Row className={'justify-between sm:flex-col sm:justify-center'}>
+      <CreateQuestionButton
+        user={user}
+        overrideText={'Add a new question'}
+        className={'w-48 flex-shrink-0'}
+        query={`?groupId=${group.id}`}
+      />
+      <AddContractButton group={group} user={user} />
+    </Row>
   ) : group.anyoneCanJoin ? (
     <JoinGroupButton group={group} user={user} />
   ) : null
@@ -389,11 +402,51 @@ function GroupOverview(props: {
             </ShareIconButton>
           </Row>
         )}
+        <Col className={'mt-2'}>
+          <GroupMemberSearch group={group} />
+        </Col>
       </Col>
     </Col>
   )
 }
 
+function SearchBar(props: { setQuery: (query: string) => void }) {
+  const { setQuery } = props
+  const debouncedQuery = debounce(setQuery, 50)
+  return (
+    <div className={'relative'}>
+      <SearchIcon className={'absolute left-5 top-3.5 h-5 w-5 text-gray-500'} />
+      <input
+        type="text"
+        onChange={(e) => debouncedQuery(e.target.value)}
+        placeholder="Find a member"
+        className="input input-bordered mb-4 w-full pl-12"
+      />
+    </div>
+  )
+}
+
+function GroupMemberSearch(props: { group: Group }) {
+  const [query, setQuery] = useState('')
+  const members = useMembers(props.group)
+
+  // TODO use find-active-contracts to sort by?
+  const matches = sortBy(members, [(member) => member.name]).filter(
+    (m) =>
+      checkAgainstQuery(query, m.name) || checkAgainstQuery(query, m.username)
+  )
+  return (
+    <div>
+      <SearchBar setQuery={setQuery} />
+      <Col className={'gap-2'}>
+        {matches.length > 0 && (
+          <FollowList userIds={matches.map((m) => m.id)} />
+        )}
+      </Col>
+    </div>
+  )
+}
+
 export function GroupMembersList(props: { group: Group }) {
   const { group } = props
   const members = useMembers(group)
@@ -449,32 +502,24 @@ function GroupLeaderboards(props: {
 }) {
   const { traderScores, creatorScores, members, topTraders, topCreators } =
     props
-  const [includeOutsiders, setIncludeOutsiders] = useState(false)
 
   // Consider hiding M$0
+  // If it's just one member (curator), show all bettors, otherwise just show members
   return (
     <Col>
-      <Row className="items-center justify-end gap-4 text-gray-500">
-        Include all users
-        <ShortToggle
-          enabled={includeOutsiders}
-          setEnabled={setIncludeOutsiders}
-        />
-      </Row>
-
       <div className="mt-4 flex flex-col gap-8 px-4 md:flex-row">
-        {!includeOutsiders ? (
+        {members.length > 1 ? (
           <>
             <SortedLeaderboard
               users={members}
               scoreFunction={(user) => traderScores[user.id] ?? 0}
-              title="🏅 Top bettors"
+              title="🏅 Bettor rankings"
               header="Profit"
             />
             <SortedLeaderboard
               users={members}
               scoreFunction={(user) => creatorScores[user.id] ?? 0}
-              title="🏅 Top creators"
+              title="🏅 Creator rankings"
               header="Market volume"
             />
           </>
@@ -543,16 +588,17 @@ function AddContractButton(props: { group: Group; user: User }) {
           </div>
         </Col>
       </Modal>
-      <Row className={'items-center justify-center'}>
+      <div className={'flex w-48 justify-center'}>
         <button
-          className={
-            'btn btn-md btn-outline cursor-pointer gap-2 whitespace-nowrap text-sm normal-case'
-          }
+          className={clsx(
+            createButtonStyle,
+            'w-48 whitespace-nowrap border border-black text-black hover:bg-black hover:text-white'
+          )}
           onClick={() => setOpen(true)}
         >
           Add an old question
         </button>
-      </Row>
+      </div>
     </>
   )
 }
diff --git a/web/pages/notifications.tsx b/web/pages/notifications.tsx
index 382505e2..08ef9bb8 100644
--- a/web/pages/notifications.tsx
+++ b/web/pages/notifications.tsx
@@ -347,10 +347,10 @@ function IncomeNotificationItem(props: {
     let reasonText = ''
     if (sourceType === 'bonus' && sourceText) {
       reasonText = !simple
-        ? `bonus for ${
+        ? `Bonus for ${
             parseInt(sourceText) / UNIQUE_BETTOR_BONUS_AMOUNT
           } unique bettors`
-        : ' bonus for unique bettors on'
+        : 'bonus on'
     } else if (sourceType === 'tip') {
       reasonText = !simple ? `tipped you` : `in tips on`
     }

From 93b29000152ed4434853252673f4459e36f69ad8 Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Thu, 7 Jul 2022 06:53:14 -0600
Subject: [PATCH 04/24] Groups UX on mobile

---
 web/components/create-question-button.tsx |  2 +
 web/components/groups/group-chat.tsx      |  2 +-
 web/components/layout/tabs.tsx            |  5 ++-
 web/pages/group/[...slugs]/index.tsx      | 51 ++++++++++++++++++-----
 4 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/web/components/create-question-button.tsx b/web/components/create-question-button.tsx
index a9161ac6..b8b5dcf3 100644
--- a/web/components/create-question-button.tsx
+++ b/web/components/create-question-button.tsx
@@ -2,6 +2,8 @@ import Link from 'next/link'
 import clsx from 'clsx'
 import { firebaseLogin, User } from 'web/lib/firebase/users'
 import React from 'react'
+import { PlusIcon } from '@heroicons/react/outline'
+import { Row } from 'web/components/layout/row'
 
 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'
diff --git a/web/components/groups/group-chat.tsx b/web/components/groups/group-chat.tsx
index 13028313..1298065d 100644
--- a/web/components/groups/group-chat.tsx
+++ b/web/components/groups/group-chat.tsx
@@ -97,7 +97,7 @@ export function GroupChat(props: {
   }
 
   return (
-    <Col className={'flex-1'}>
+    <Col className={'mt-2 flex-1'}>
       <Col
         className={
           'max-h-[65vh] w-full space-y-2 overflow-x-hidden overflow-y-scroll'
diff --git a/web/components/layout/tabs.tsx b/web/components/layout/tabs.tsx
index ac1c0fe3..f025951c 100644
--- a/web/components/layout/tabs.tsx
+++ b/web/components/layout/tabs.tsx
@@ -16,14 +16,15 @@ export function Tabs(props: {
   defaultIndex?: number
   labelClassName?: string
   onClick?: (tabTitle: string, index: number) => void
+  className?: string
 }) {
-  const { tabs, defaultIndex, labelClassName, onClick } = props
+  const { tabs, defaultIndex, labelClassName, onClick, className } = props
   const [activeIndex, setActiveIndex] = useState(defaultIndex ?? 0)
   const activeTab = tabs[activeIndex] as Tab | undefined // can be undefined in weird case
 
   return (
     <>
-      <div className="mb-4 border-b border-gray-200">
+      <div className={clsx('mb-4 border-b border-gray-200', className)}>
         <nav className="-mb-px flex space-x-8" aria-label="Tabs">
           {tabs.map((tab, i) => (
             <Link href={tab.href ?? '#'} key={tab.title} shallow={!!tab.href}>
diff --git a/web/pages/group/[...slugs]/index.tsx b/web/pages/group/[...slugs]/index.tsx
index b6fcfe38..2fbd1c5e 100644
--- a/web/pages/group/[...slugs]/index.tsx
+++ b/web/pages/group/[...slugs]/index.tsx
@@ -53,7 +53,7 @@ import { SiteLink } from 'web/components/site-link'
 import { ContractSearch } from 'web/components/contract-search'
 import clsx from 'clsx'
 import { FollowList } from 'web/components/follow-list'
-import { SearchIcon } from '@heroicons/react/outline'
+import { PlusIcon, SearchIcon } from '@heroicons/react/outline'
 
 export const getStaticProps = fromPropz(getStaticPropz)
 export async function getStaticPropz(props: { params: { slugs: string[] } }) {
@@ -223,9 +223,17 @@ export default function GroupPage(props: {
 
       <Col className="px-3 lg:px-1">
         <Row className={'items-center justify-between gap-4'}>
-          <div className={'mb-1'}>
-            <Title className={'line-clamp-2'} text={group.name} />
-            <Linkify text={group.about} />
+          <div className={'sm:mb-1'}>
+            <div
+              className={
+                'line-clamp-1 my-1 text-lg text-indigo-700 sm:my-3 sm:text-2xl'
+              }
+            >
+              {group.name}
+            </div>
+            <div className={'hidden sm:block'}>
+              <Linkify text={group.about} />
+            </div>
           </div>
           <div className="hidden sm:block xl:hidden">
             <JoinOrCreateButton
@@ -241,6 +249,7 @@ export default function GroupPage(props: {
       </Col>
 
       <Tabs
+        className={'mb-0 sm:mb-2'}
         defaultIndex={
           page === 'rankings'
             ? 2
@@ -320,11 +329,19 @@ function JoinOrCreateButton(props: {
 }) {
   const { group, user, isMember } = props
   return user && isMember ? (
-    <Row className={'justify-between sm:flex-col sm:justify-center'}>
+    <Row
+      className={'-mt-2 justify-between sm:mt-0 sm:flex-col sm:justify-center'}
+    >
       <CreateQuestionButton
         user={user}
         overrideText={'Add a new question'}
-        className={'w-48 flex-shrink-0'}
+        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}`}
       />
       <AddContractButton group={group} user={user} />
@@ -357,8 +374,8 @@ function GroupOverview(props: {
   }
 
   return (
-    <Col>
-      <Col className="gap-2 rounded-b bg-white p-4">
+    <>
+      <Col className="gap-2 rounded-b bg-white p-2">
         <Row className={'flex-wrap justify-between'}>
           <div className={'inline-flex items-center'}>
             <div className="mr-1 text-gray-500">Created by</div>
@@ -370,6 +387,9 @@ function GroupOverview(props: {
           </div>
           {isCreator && <EditGroupButton className={'ml-1'} group={group} />}
         </Row>
+        <div className={'block sm:hidden'}>
+          <Linkify text={group.about} />
+        </div>
         <Row className={'items-center gap-1'}>
           <span className={'text-gray-500'}>Membership</span>
           {user && user.id === creator.id ? (
@@ -406,7 +426,7 @@ function GroupOverview(props: {
           <GroupMemberSearch group={group} />
         </Col>
       </Col>
-    </Col>
+    </>
   )
 }
 
@@ -588,16 +608,25 @@ function AddContractButton(props: { group: Group; user: User }) {
           </div>
         </Col>
       </Modal>
-      <div className={'flex w-48 justify-center'}>
+      <div className={'flex justify-center'}>
         <button
           className={clsx(
             createButtonStyle,
-            'w-48 whitespace-nowrap border border-black text-black hover:bg-black hover:text-white'
+            '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 b8748fd49a0b4f2a7c69848fd76dc0576eb7c33e Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Thu, 7 Jul 2022 06:54:00 -0600
Subject: [PATCH 05/24] Leaderboards => Rankings on groups

---
 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 2fbd1c5e..9b155083 100644
--- a/web/pages/group/[...slugs]/index.tsx
+++ b/web/pages/group/[...slugs]/index.tsx
@@ -307,7 +307,7 @@ export default function GroupPage(props: {
             href: groupPath(group.slug, 'questions'),
           },
           {
-            title: 'Leaderboards',
+            title: 'Rankings',
             content: leaderboard,
             href: groupPath(group.slug, 'rankings'),
           },

From 7f8617832f6eaf7be1c345a178c8ed74d8fb671b Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Thu, 7 Jul 2022 07:05:12 -0600
Subject: [PATCH 06/24] Unused vars

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

diff --git a/web/components/create-question-button.tsx b/web/components/create-question-button.tsx
index b8b5dcf3..a9161ac6 100644
--- a/web/components/create-question-button.tsx
+++ b/web/components/create-question-button.tsx
@@ -2,8 +2,6 @@ import Link from 'next/link'
 import clsx from 'clsx'
 import { firebaseLogin, User } from 'web/lib/firebase/users'
 import React from 'react'
-import { PlusIcon } from '@heroicons/react/outline'
-import { Row } from 'web/components/layout/row'
 
 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'
diff --git a/web/pages/group/[...slugs]/index.tsx b/web/pages/group/[...slugs]/index.tsx
index 9b155083..b38750fc 100644
--- a/web/pages/group/[...slugs]/index.tsx
+++ b/web/pages/group/[...slugs]/index.tsx
@@ -2,7 +2,6 @@ import { take, sortBy, debounce } from 'lodash'
 
 import { Group } from 'common/group'
 import { Page } from 'web/components/page'
-import { Title } from 'web/components/title'
 import { listAllBets } from 'web/lib/firebase/bets'
 import { Contract } from 'web/lib/firebase/contracts'
 import {
@@ -53,7 +52,7 @@ import { SiteLink } from 'web/components/site-link'
 import { ContractSearch } from 'web/components/contract-search'
 import clsx from 'clsx'
 import { FollowList } from 'web/components/follow-list'
-import { PlusIcon, SearchIcon } from '@heroicons/react/outline'
+import { SearchIcon } from '@heroicons/react/outline'
 
 export const getStaticProps = fromPropz(getStaticPropz)
 export async function getStaticPropz(props: { params: { slugs: string[] } }) {
@@ -410,7 +409,7 @@ function GroupOverview(props: {
         </Row>
         {anyoneCanJoin && user && (
           <Row className={'flex-wrap items-center gap-1'}>
-            <span className={'text-gray-500'}>Sharing</span>
+            <span className={'text-gray-500'}>Share</span>
             <ShareIconButton
               group={group}
               username={user.username}

From a22b29ad6d495ed965b69a71c6709de6a905c0db Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Thu, 7 Jul 2022 12:36:34 -0400
Subject: [PATCH 07/24] create: remove automatic setting of log scale

---
 web/pages/create.tsx | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/web/pages/create.tsx b/web/pages/create.tsx
index df83fb9f..f26d5687 100644
--- a/web/pages/create.tsx
+++ b/web/pages/create.tsx
@@ -149,14 +149,6 @@ export function NewContract(props: {
     ? parseFloat(initialValueString)
     : undefined
 
-  const adjustIsLog = () => {
-    if (min === undefined || max === undefined) return
-    const lengthDiff = Math.log10(max - min)
-    if (lengthDiff > 2) {
-      setIsLogScale(true)
-    }
-  }
-
   // get days from today until the end of this year:
   const daysLeftInTheYear = dayjs().endOf('year').diff(dayjs(), 'day')
 
@@ -279,7 +271,6 @@ export function NewContract(props: {
                 placeholder="MIN"
                 onClick={(e) => e.stopPropagation()}
                 onChange={(e) => setMinString(e.target.value)}
-                onBlur={adjustIsLog}
                 min={Number.MIN_SAFE_INTEGER}
                 max={Number.MAX_SAFE_INTEGER}
                 disabled={isSubmitting}
@@ -291,7 +282,6 @@ export function NewContract(props: {
                 placeholder="MAX"
                 onClick={(e) => e.stopPropagation()}
                 onChange={(e) => setMaxString(e.target.value)}
-                onBlur={adjustIsLog}
                 min={Number.MIN_SAFE_INTEGER}
                 max={Number.MAX_SAFE_INTEGER}
                 disabled={isSubmitting}

From cfbb78af48a26fa070e47aba121d46ddb03e4744 Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Thu, 7 Jul 2022 14:41:50 -0600
Subject: [PATCH 08/24] Use react-query to cache notifications (#625)

* Use react-query to cache notifications

* Fix imports

* Cleanup

* Limit unseen notifs query

* Catch the bounced query

* Don't use interval

* Unused var

* Avoid flash of page nav

* Give notification question priority & 2 lines

* Right justify timestamps

* Rewording

* Margin

* Simplify error msg

* Be explicit about limit for unseen notifs

* Pass limit > 0
---
 web/components/nav/sidebar.tsx        |  45 ++-
 web/components/notifications-icon.tsx |  56 +--
 web/hooks/use-notifications.ts        |  77 +++--
 web/lib/firebase/notifications.ts     |  27 +-
 web/pages/notifications.tsx           | 475 ++++++++++++--------------
 5 files changed, 358 insertions(+), 322 deletions(-)

diff --git a/web/components/nav/sidebar.tsx b/web/components/nav/sidebar.tsx
index b9449ea0..6ab095ef 100644
--- a/web/components/nav/sidebar.tsx
+++ b/web/components/nav/sidebar.tsx
@@ -12,7 +12,7 @@ import {
 import clsx from 'clsx'
 import Link from 'next/link'
 import { useRouter } from 'next/router'
-import { useUser } from 'web/hooks/use-user'
+import { usePrivateUser, useUser } from 'web/hooks/use-user'
 import { firebaseLogout, User } from 'web/lib/firebase/users'
 import { ManifoldLogo } from './manifold-logo'
 import { MenuButton } from './menu'
@@ -26,8 +26,9 @@ import { groupPath } from 'web/lib/firebase/groups'
 import { trackCallback, withTracking } from 'web/lib/service/analytics'
 import { Group } from 'common/group'
 import { Spacer } from '../layout/spacer'
-import { usePreferredNotifications } from 'web/hooks/use-notifications'
+import { useUnseenPreferredNotifications } from 'web/hooks/use-notifications'
 import { setNotificationsAsSeen } from 'web/pages/notifications'
+import { PrivateUser } from 'common/user'
 
 function getNavigation() {
   return [
@@ -186,6 +187,7 @@ export default function Sidebar(props: { className?: string }) {
   const currentPage = router.pathname
 
   const user = useUser()
+  const privateUser = usePrivateUser(user?.id)
   const navigationOptions = !user ? signedOutNavigation : getNavigation()
   const mobileNavigationOptions = !user
     ? signedOutMobileNavigation
@@ -220,11 +222,13 @@ export default function Sidebar(props: { className?: string }) {
           />
         )}
 
-        <GroupsList
-          currentPage={router.asPath}
-          memberItems={memberItems}
-          user={user}
-        />
+        {privateUser && (
+          <GroupsList
+            currentPage={router.asPath}
+            memberItems={memberItems}
+            privateUser={privateUser}
+          />
+        )}
       </div>
 
       {/* Desktop navigation */}
@@ -243,11 +247,13 @@ export default function Sidebar(props: { className?: string }) {
             <div className="h-[1px] bg-gray-300" />
           </div>
         )}
-        <GroupsList
-          currentPage={router.asPath}
-          memberItems={memberItems}
-          user={user}
-        />
+        {privateUser && (
+          <GroupsList
+            currentPage={router.asPath}
+            memberItems={memberItems}
+            privateUser={privateUser}
+          />
+        )}
       </div>
     </nav>
   )
@@ -256,13 +262,16 @@ export default function Sidebar(props: { className?: string }) {
 function GroupsList(props: {
   currentPage: string
   memberItems: Item[]
-  user: User | null | undefined
+  privateUser: PrivateUser
 }) {
-  const { currentPage, memberItems, user } = props
-  const preferredNotifications = usePreferredNotifications(user?.id, {
-    unseenOnly: true,
-    customHref: '/group/',
-  })
+  const { currentPage, memberItems, privateUser } = props
+  const preferredNotifications = useUnseenPreferredNotifications(
+    privateUser,
+    {
+      customHref: '/group/',
+    },
+    memberItems.length > 0 ? memberItems.length : undefined
+  )
 
   // Set notification as seen if our current page is equal to the isSeenOnHref property
   useEffect(() => {
diff --git a/web/components/notifications-icon.tsx b/web/components/notifications-icon.tsx
index 8f45a054..2938fd17 100644
--- a/web/components/notifications-icon.tsx
+++ b/web/components/notifications-icon.tsx
@@ -4,45 +4,53 @@ import { Row } from 'web/components/layout/row'
 import { useEffect, useState } from 'react'
 import { usePrivateUser, useUser } from 'web/hooks/use-user'
 import { useRouter } from 'next/router'
-import { usePreferredGroupedNotifications } from 'web/hooks/use-notifications'
+import { useUnseenPreferredNotificationGroups } from 'web/hooks/use-notifications'
 import { NOTIFICATIONS_PER_PAGE } from 'web/pages/notifications'
 import { requestBonuses } from 'web/lib/firebase/api-call'
+import { PrivateUser } from 'common/user'
 
 export default function NotificationsIcon(props: { className?: string }) {
   const user = useUser()
   const privateUser = usePrivateUser(user?.id)
-  const notifications = usePreferredGroupedNotifications(privateUser?.id, {
-    unseenOnly: true,
-  })
-  const [seen, setSeen] = useState(false)
 
   useEffect(() => {
-    if (!privateUser) return
-
-    if (Date.now() - (privateUser.lastTimeCheckedBonuses ?? 0) > 65 * 1000)
-      requestBonuses({}).catch((error) => {
-        console.log("couldn't get bonuses:", error.message)
-      })
+    if (
+      privateUser &&
+      privateUser.lastTimeCheckedBonuses &&
+      Date.now() - privateUser.lastTimeCheckedBonuses > 1000 * 70
+    )
+      requestBonuses({}).catch(() => console.log('no bonuses for you (yet)'))
   }, [privateUser])
 
-  const router = useRouter()
-  useEffect(() => {
-    if (router.pathname.endsWith('notifications')) return setSeen(true)
-    else setSeen(false)
-  }, [router.pathname])
-
   return (
     <Row className={clsx('justify-center')}>
       <div className={'relative'}>
-        {!seen && notifications && notifications.length > 0 && (
-          <div className="-mt-0.75 absolute ml-3.5 min-w-[15px] rounded-full bg-indigo-500 p-[2px] text-center text-[10px] leading-3 text-white lg:-mt-1 lg:ml-2">
-            {notifications.length > NOTIFICATIONS_PER_PAGE
-              ? `${NOTIFICATIONS_PER_PAGE}+`
-              : notifications.length}
-          </div>
-        )}
+        {privateUser && <UnseenNotificationsBubble privateUser={privateUser} />}
         <BellIcon className={clsx(props.className)} />
       </div>
     </Row>
   )
 }
+function UnseenNotificationsBubble(props: { privateUser: PrivateUser }) {
+  const router = useRouter()
+  const { privateUser } = props
+  const [seen, setSeen] = useState(false)
+
+  useEffect(() => {
+    if (router.pathname.endsWith('notifications')) return setSeen(true)
+    else setSeen(false)
+  }, [router.pathname])
+
+  const notifications = useUnseenPreferredNotificationGroups(privateUser)
+  if (!notifications || notifications.length === 0 || seen) {
+    return <div />
+  }
+
+  return (
+    <div className="-mt-0.75 absolute ml-3.5 min-w-[15px] rounded-full bg-indigo-500 p-[2px] text-center text-[10px] leading-3 text-white lg:-mt-1 lg:ml-2">
+      {notifications.length > NOTIFICATIONS_PER_PAGE
+        ? `${NOTIFICATIONS_PER_PAGE}+`
+        : notifications.length}
+    </div>
+  )
+}
diff --git a/web/hooks/use-notifications.ts b/web/hooks/use-notifications.ts
index 98b0f2fd..f5502b85 100644
--- a/web/hooks/use-notifications.ts
+++ b/web/hooks/use-notifications.ts
@@ -1,9 +1,13 @@
 import { useEffect, useState } from 'react'
-import { listenForPrivateUser } from 'web/lib/firebase/users'
 import { notification_subscribe_types, PrivateUser } from 'common/user'
 import { Notification } from 'common/notification'
-import { listenForNotifications } from 'web/lib/firebase/notifications'
+import {
+  getNotificationsQuery,
+  listenForNotifications,
+} from 'web/lib/firebase/notifications'
 import { groupBy, map } from 'lodash'
+import { useFirestoreQuery } from '@react-query-firebase/firestore'
+import { NOTIFICATIONS_PER_PAGE } from 'web/pages/notifications'
 
 export type NotificationGroup = {
   notifications: Notification[]
@@ -13,15 +17,30 @@ export type NotificationGroup = {
   type: 'income' | 'normal'
 }
 
-export function usePreferredGroupedNotifications(
-  userId: string | undefined,
-  options: { unseenOnly: boolean }
-) {
+// 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
+    )
+
+    const notificationsToShow = getAppropriateNotifications(
+      notifications,
+      privateUser.notificationPreferences
+    ).filter((n) => !n.isSeenOnHref)
+    setNotifications(notificationsToShow)
+  }, [privateUser.notificationPreferences, result.data, result.isLoading])
 
-  const notifications = usePreferredNotifications(userId, options)
   useEffect(() => {
     if (!notifications) return
 
@@ -32,6 +51,20 @@ export function usePreferredGroupedNotifications(
   return notificationGroups
 }
 
+export function useUnseenPreferredNotificationGroups(privateUser: PrivateUser) {
+  const notifications = useUnseenPreferredNotifications(privateUser, {})
+  const [notificationGroups, setNotificationGroups] = useState<
+    NotificationGroup[] | undefined
+  >(undefined)
+  useEffect(() => {
+    if (!notifications) return
+
+    const groupedNotifications = groupNotifications(notifications)
+    setNotificationGroups(groupedNotifications)
+  }, [notifications])
+  return notificationGroups
+}
+
 export function groupNotifications(notifications: Notification[]) {
   let notificationGroups: NotificationGroup[] = []
   const notificationGroupsByDay = groupBy(notifications, (notification) =>
@@ -85,32 +118,24 @@ export function groupNotifications(notifications: Notification[]) {
   return notificationGroups
 }
 
-export function usePreferredNotifications(
-  userId: string | undefined,
-  options: { unseenOnly: boolean; customHref?: string }
+export function useUnseenPreferredNotifications(
+  privateUser: PrivateUser,
+  options: { customHref?: string },
+  limit: number = NOTIFICATIONS_PER_PAGE
 ) {
-  const { unseenOnly, customHref } = options
-  const [privateUser, setPrivateUser] = useState<PrivateUser | null>(null)
+  const { customHref } = options
   const [notifications, setNotifications] = useState<Notification[]>([])
   const [userAppropriateNotifications, setUserAppropriateNotifications] =
     useState<Notification[]>([])
 
   useEffect(() => {
-    if (userId) listenForPrivateUser(userId, setPrivateUser)
-  }, [userId])
+    return listenForNotifications(privateUser.id, setNotifications, {
+      unseenOnly: true,
+      limit,
+    })
+  }, [limit, privateUser.id])
 
   useEffect(() => {
-    if (privateUser)
-      return listenForNotifications(
-        privateUser.id,
-        setNotifications,
-        unseenOnly
-      )
-  }, [privateUser, unseenOnly])
-
-  useEffect(() => {
-    if (!privateUser) return
-
     const notificationsToShow = getAppropriateNotifications(
       notifications,
       privateUser.notificationPreferences
@@ -118,7 +143,7 @@ export function usePreferredNotifications(
       customHref ? n.isSeenOnHref?.includes(customHref) : !n.isSeenOnHref
     )
     setUserAppropriateNotifications(notificationsToShow)
-  }, [privateUser, notifications, customHref])
+  }, [notifications, customHref, privateUser.notificationPreferences])
 
   return userAppropriateNotifications
 }
diff --git a/web/lib/firebase/notifications.ts b/web/lib/firebase/notifications.ts
index c0dca8be..d2db3665 100644
--- a/web/lib/firebase/notifications.ts
+++ b/web/lib/firebase/notifications.ts
@@ -1,21 +1,36 @@
-import { collection, query, where } from 'firebase/firestore'
+import { collection, limit, orderBy, query, where } from 'firebase/firestore'
 import { Notification } from 'common/notification'
 import { db } from 'web/lib/firebase/init'
 import { listenForValues } from 'web/lib/firebase/utils'
+import { NOTIFICATIONS_PER_PAGE } from 'web/pages/notifications'
 
-function getNotificationsQuery(userId: string, unseenOnly?: boolean) {
+export function getNotificationsQuery(
+  userId: string,
+  unseenOnlyOptions?: { unseenOnly: boolean; limit: number }
+) {
   const notifsCollection = collection(db, `/users/${userId}/notifications`)
-  if (unseenOnly) return query(notifsCollection, where('isSeen', '==', false))
-  return query(notifsCollection)
+  if (unseenOnlyOptions?.unseenOnly)
+    return query(
+      notifsCollection,
+      where('isSeen', '==', false),
+      orderBy('createdTime', 'desc'),
+      limit(unseenOnlyOptions.limit)
+    )
+  return query(
+    notifsCollection,
+    orderBy('createdTime', 'desc'),
+    // Nobody's going through 10 pages of notifications, right?
+    limit(NOTIFICATIONS_PER_PAGE * 10)
+  )
 }
 
 export function listenForNotifications(
   userId: string,
   setNotifications: (notifs: Notification[]) => void,
-  unseenOnly?: boolean
+  unseenOnlyOptions?: { unseenOnly: boolean; limit: number }
 ) {
   return listenForValues<Notification>(
-    getNotificationsQuery(userId, unseenOnly),
+    getNotificationsQuery(userId, unseenOnlyOptions),
     (notifs) => {
       notifs.sort((n1, n2) => n2.createdTime - n1.createdTime)
       setNotifications(notifs)
diff --git a/web/pages/notifications.tsx b/web/pages/notifications.tsx
index 08ef9bb8..3f9b4eed 100644
--- a/web/pages/notifications.tsx
+++ b/web/pages/notifications.tsx
@@ -1,5 +1,5 @@
 import { Tabs } from 'web/components/layout/tabs'
-import { useUser } from 'web/hooks/use-user'
+import { usePrivateUser, useUser } from 'web/hooks/use-user'
 import React, { useEffect, useState } from 'react'
 import { Notification, notification_source_types } from 'common/notification'
 import { Avatar, EmptyAvatar } from 'web/components/avatar'
@@ -8,8 +8,6 @@ import { Page } from 'web/components/page'
 import { Title } from 'web/components/title'
 import { doc, updateDoc } from 'firebase/firestore'
 import { db } from 'web/lib/firebase/init'
-import { CopyLinkDateTimeComponent } from 'web/components/feed/copy-link-date-time'
-import Custom404 from 'web/pages/404'
 import { UserLink } from 'web/components/user-page'
 import { notification_subscribe_types, PrivateUser } from 'common/user'
 import { Contract } from 'common/contract'
@@ -35,137 +33,149 @@ import { formatMoney } from 'common/util/format'
 import { groupPath } from 'web/lib/firebase/groups'
 import { UNIQUE_BETTOR_BONUS_AMOUNT } from 'common/numeric-constants'
 import { groupBy, sum, uniq } from 'lodash'
+import Custom404 from 'web/pages/404'
 
 export const NOTIFICATIONS_PER_PAGE = 30
 const MULTIPLE_USERS_KEY = 'multipleUsers'
 
 export default function Notifications() {
   const user = useUser()
-  const [page, setPage] = useState(1)
-
-  const groupedNotifications = usePreferredGroupedNotifications(user?.id, {
-    unseenOnly: false,
-  })
-  const [paginatedNotificationGroups, setPaginatedNotificationGroups] =
-    useState<NotificationGroup[]>([])
-  useEffect(() => {
-    if (!groupedNotifications) return
-    const start = (page - 1) * NOTIFICATIONS_PER_PAGE
-    const end = start + NOTIFICATIONS_PER_PAGE
-    const maxNotificationsToShow = groupedNotifications.slice(start, end)
-    const remainingNotification = groupedNotifications.slice(end)
-    for (const notification of remainingNotification) {
-      if (notification.isSeen) break
-      else setNotificationsAsSeen(notification.notifications)
-    }
-    setPaginatedNotificationGroups(maxNotificationsToShow)
-  }, [groupedNotifications, page])
-
-  if (user === undefined) {
-    return <LoadingIndicator />
-  }
-  if (user === null) {
-    return <Custom404 />
-  }
+  const privateUser = usePrivateUser(user?.id)
 
+  if (!user) return <Custom404 />
   return (
     <Page>
       <div className={'p-2 sm:p-4'}>
         <Title text={'Notifications'} className={'hidden md:block'} />
-        <Tabs
-          labelClassName={'pb-2 pt-1 '}
-          defaultIndex={0}
-          tabs={[
-            {
-              title: 'Notifications',
-              content: groupedNotifications ? (
-                <div className={''}>
-                  {paginatedNotificationGroups.length === 0 &&
-                    "You don't have any notifications. Try changing your settings to see more."}
-                  {paginatedNotificationGroups.map((notification) =>
-                    notification.type === 'income' ? (
-                      <IncomeNotificationGroupItem
-                        notificationGroup={notification}
-                        key={notification.groupedById + notification.timePeriod}
-                      />
-                    ) : notification.notifications.length === 1 ? (
-                      <NotificationItem
-                        notification={notification.notifications[0]}
-                        key={notification.notifications[0].id}
-                      />
-                    ) : (
-                      <NotificationGroupItem
-                        notificationGroup={notification}
-                        key={notification.groupedById + notification.timePeriod}
-                      />
-                    )
-                  )}
-                  {groupedNotifications.length > NOTIFICATIONS_PER_PAGE && (
-                    <nav
-                      className="flex items-center justify-between border-t border-gray-200 bg-white px-4 py-3 sm:px-6"
-                      aria-label="Pagination"
-                    >
-                      <div className="hidden sm:block">
-                        <p className="text-sm text-gray-700">
-                          Showing{' '}
-                          <span className="font-medium">
-                            {page === 1
-                              ? page
-                              : (page - 1) * NOTIFICATIONS_PER_PAGE}
-                          </span>{' '}
-                          to{' '}
-                          <span className="font-medium">
-                            {page * NOTIFICATIONS_PER_PAGE}
-                          </span>{' '}
-                          of{' '}
-                          <span className="font-medium">
-                            {groupedNotifications.length}
-                          </span>{' '}
-                          results
-                        </p>
-                      </div>
-                      <div className="flex flex-1 justify-between sm:justify-end">
-                        <a
-                          href="#"
-                          className="relative inline-flex 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 > 1 && setPage(page - 1)}
-                        >
-                          Previous
-                        </a>
-                        <a
-                          href="#"
-                          className="relative ml-3 inline-flex 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 <
-                              groupedNotifications?.length /
-                                NOTIFICATIONS_PER_PAGE && setPage(page + 1)
-                          }
-                        >
-                          Next
-                        </a>
-                      </div>
-                    </nav>
-                  )}
-                </div>
-              ) : (
-                <LoadingIndicator />
-              ),
-            },
-            {
-              title: 'Settings',
-              content: (
-                <div className={''}>
-                  <NotificationSettings />
-                </div>
-              ),
-            },
-          ]}
-        />
+        <div>
+          <Tabs
+            labelClassName={'pb-2 pt-1 '}
+            className={'mb-0 sm:mb-2'}
+            defaultIndex={0}
+            tabs={[
+              {
+                title: 'Notifications',
+                content: privateUser ? (
+                  <NotificationsList privateUser={privateUser} />
+                ) : (
+                  <LoadingIndicator />
+                ),
+              },
+              {
+                title: 'Settings',
+                content: (
+                  <div className={''}>
+                    <NotificationSettings />
+                  </div>
+                ),
+              },
+            ]}
+          />
+        </div>
       </div>
     </Page>
   )
 }
 
+function NotificationsList(props: { privateUser: PrivateUser }) {
+  const { privateUser } = props
+  const [page, setPage] = useState(1)
+  const allGroupedNotifications = usePreferredGroupedNotifications(privateUser)
+  const [paginatedGroupedNotifications, setPaginatedGroupedNotifications] =
+    useState<NotificationGroup[] | undefined>(undefined)
+
+  useEffect(() => {
+    if (!allGroupedNotifications) return
+    const start = (page - 1) * 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 />
+
+  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) =>
+        notification.type === 'income' ? (
+          <IncomeNotificationGroupItem
+            notificationGroup={notification}
+            key={notification.groupedById + notification.timePeriod}
+          />
+        ) : notification.notifications.length === 1 ? (
+          <NotificationItem
+            notification={notification.notifications[0]}
+            key={notification.notifications[0].id}
+          />
+        ) : (
+          <NotificationGroupItem
+            notificationGroup={notification}
+            key={notification.groupedById + notification.timePeriod}
+          />
+        )
+      )}
+      {paginatedGroupedNotifications.length > 0 &&
+        allGroupedNotifications.length > NOTIFICATIONS_PER_PAGE && (
+          <nav
+            className="flex items-center justify-between border-t border-gray-200 bg-white px-4 py-3 sm:px-6"
+            aria-label="Pagination"
+          >
+            <div className="hidden sm:block">
+              <p className="text-sm text-gray-700">
+                Showing{' '}
+                <span className="font-medium">
+                  {page === 1 ? page : (page - 1) * NOTIFICATIONS_PER_PAGE}
+                </span>{' '}
+                to{' '}
+                <span className="font-medium">
+                  {page * NOTIFICATIONS_PER_PAGE}
+                </span>{' '}
+                of{' '}
+                <span className="font-medium">
+                  {allGroupedNotifications.length}
+                </span>{' '}
+                results
+              </p>
+            </div>
+            <div className="flex flex-1 justify-between sm:justify-end">
+              <a
+                href="#"
+                className="relative inline-flex 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 > 1 && setPage(page - 1)}
+              >
+                Previous
+              </a>
+              <a
+                href="#"
+                className="relative ml-3 inline-flex 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 <
+                    allGroupedNotifications?.length / NOTIFICATIONS_PER_PAGE &&
+                  setPage(page + 1)
+                }
+              >
+                Next
+              </a>
+            </div>
+          </nav>
+        )}
+    </div>
+  )
+}
+
 function IncomeNotificationGroupItem(props: {
   notificationGroup: NotificationGroup
   className?: string
@@ -261,18 +271,20 @@ function IncomeNotificationGroupItem(props: {
       )}
       <Row className={'items-center text-gray-500 sm:justify-start'}>
         <TrendingUpIcon className={'text-primary h-7 w-7'} />
-        <div className={'flex truncate'}>
-          <div
-            onClick={() => setExpanded(!expanded)}
-            className={'line-clamp-1 cursor-pointer pl-1  sm:pl-0'}
-          >
-            <span>
+        <div
+          className={'flex w-full flex-row flex-wrap pl-1 sm:pl-0'}
+          onClick={() => setExpanded(!expanded)}
+        >
+          <div className={'flex w-full flex-row justify-between'}>
+            <div>
               {'Daily Income Summary: '}
               <span className={'text-primary'}>
                 {'+' + formatMoney(totalIncome)}
               </span>
-            </span>
-            <RelativeTimestamp time={notifications[0].createdTime} />
+            </div>
+            <div className={'inline-block'}>
+              <RelativeTimestamp time={notifications[0].createdTime} />
+            </div>
           </div>
         </div>
       </Row>
@@ -329,13 +341,7 @@ function IncomeNotificationItem(props: {
   justSummary?: boolean
 }) {
   const { notification, justSummary } = props
-  const {
-    sourceType,
-    sourceUserName,
-    reason,
-    sourceUserUsername,
-    createdTime,
-  } = notification
+  const { sourceType, sourceUserName, sourceUserUsername } = notification
   const [highlighted] = useState(!notification.isSeen)
 
   useEffect(() => {
@@ -354,7 +360,7 @@ function IncomeNotificationItem(props: {
     } else if (sourceType === 'tip') {
       reasonText = !simple ? `tipped you` : `in tips on`
     }
-    return <span className={'flex-shrink-0'}>{reasonText}</span>
+    return reasonText
   }
 
   if (justSummary) {
@@ -374,7 +380,7 @@ function IncomeNotificationItem(props: {
               </div>
               <span className={'flex truncate'}>
                 {getReasonForShowingIncomeNotification(true)}
-                <NotificationLink notification={notification} />
+                <NotificationLink notification={notification} noClick={true} />
               </span>
             </div>
           </div>
@@ -392,42 +398,33 @@ function IncomeNotificationItem(props: {
     >
       <a href={getSourceUrl(notification)}>
         <Row className={'items-center text-gray-500 sm:justify-start'}>
-          <div className={'flex max-w-xl shrink '}>
-            {sourceType && reason && (
-              <div className={'inline'}>
-                <span className={'mr-1'}>
-                  <NotificationTextLabel
-                    contract={null}
-                    defaultText={notification.sourceText ?? ''}
-                    notification={notification}
+          <div className={'line-clamp-2 flex max-w-xl shrink '}>
+            <div className={'inline'}>
+              <span className={'mr-1'}>
+                <NotificationTextLabel
+                  contract={null}
+                  defaultText={notification.sourceText ?? ''}
+                  notification={notification}
+                />
+              </span>
+            </div>
+            <span>
+              {sourceType != 'bonus' &&
+                (sourceUserUsername === MULTIPLE_USERS_KEY ? (
+                  <span className={'mr-1 truncate'}>Multiple users</span>
+                ) : (
+                  <UserLink
+                    name={sourceUserName || ''}
+                    username={sourceUserUsername || ''}
+                    className={'mr-1 flex-shrink-0'}
+                    justFirstName={true}
                   />
-                </span>
-
-                {sourceType != 'bonus' &&
-                  (sourceUserUsername === MULTIPLE_USERS_KEY ? (
-                    <span className={'mr-1 truncate'}>Multiple users</span>
-                  ) : (
-                    <UserLink
-                      name={sourceUserName || ''}
-                      username={sourceUserUsername || ''}
-                      className={'mr-1 flex-shrink-0'}
-                      justFirstName={true}
-                    />
-                  ))}
-              </div>
-            )}
-            {getReasonForShowingIncomeNotification(false)}
-            <span className={'ml-1 flex hidden sm:inline-block'}>
-              on
+                ))}
+              {getReasonForShowingIncomeNotification(false)} {' on'}
               <NotificationLink notification={notification} />
             </span>
-            <RelativeTimestamp time={createdTime} />
           </div>
         </Row>
-        <span className={'flex truncate text-gray-500 sm:hidden'}>
-          on
-          <NotificationLink notification={notification} />
-        </span>
         <div className={'mt-4 border-b border-gray-300'} />
       </a>
     </div>
@@ -473,23 +470,25 @@ function NotificationGroupItem(props: {
       )}
       <Row className={'items-center text-gray-500 sm:justify-start'}>
         <EmptyAvatar multi />
-        <div className={'flex truncate pl-2'}>
-          <div
-            onClick={() => setExpanded(!expanded)}
-            className={' flex cursor-pointer truncate pl-1  sm:pl-0'}
-          >
-            {sourceContractTitle ? (
-              <>
-                <span className={'flex-shrink-0'}>{'Activity on '}</span>
-                <span className={'truncate'}>
-                  <NotificationLink notification={notifications[0]} />
-                </span>
-              </>
-            ) : (
-              'Other activity'
-            )}
-          </div>
-          <RelativeTimestamp time={notifications[0].createdTime} />
+        <div
+          className={'line-clamp-2 flex w-full flex-row flex-wrap pl-1 sm:pl-0'}
+        >
+          {sourceContractTitle ? (
+            <div className={'flex w-full flex-row justify-between'}>
+              <div className={'ml-2'}>
+                Activity on
+                <NotificationLink notification={notifications[0]} />
+              </div>
+              <div className={'hidden sm:inline-block'}>
+                <RelativeTimestamp time={notifications[0].createdTime} />
+              </div>
+            </div>
+          ) : (
+            <span>
+              Other activity
+              <RelativeTimestamp time={notifications[0].createdTime} />
+            </span>
+          )}
         </div>
       </Row>
       <div>
@@ -528,7 +527,7 @@ function NotificationGroupItem(props: {
                     notification={notification}
                     key={notification.id}
                     justSummary={false}
-                    hideTitle={true}
+                    isChildOfGroup={true}
                   />
                 ))}
               </>
@@ -545,22 +544,18 @@ function NotificationGroupItem(props: {
 function NotificationItem(props: {
   notification: Notification
   justSummary?: boolean
-  hideTitle?: boolean
+  isChildOfGroup?: boolean
 }) {
-  const { notification, justSummary, hideTitle } = props
+  const { notification, justSummary, isChildOfGroup } = props
   const {
     sourceType,
-    sourceId,
     sourceUserName,
     sourceUserAvatarUrl,
     sourceUpdateType,
     reasonText,
     reason,
     sourceUserUsername,
-    createdTime,
     sourceText,
-    sourceContractCreatorUsername,
-    sourceContractSlug,
   } = notification
 
   const [defaultNotificationText, setDefaultNotificationText] =
@@ -629,44 +624,38 @@ function NotificationItem(props: {
             className={'mr-2'}
             username={sourceUserName}
           />
-          <div className={'flex-1 overflow-hidden sm:flex'}>
+          <div className={'flex w-full flex-row pl-1 sm:pl-0'}>
             <div
               className={
-                'flex max-w-xl shrink overflow-hidden text-ellipsis pl-1 sm:pl-0'
+                'line-clamp-2 sm:line-clamp-none flex w-full flex-row justify-between'
               }
             >
-              {sourceUpdateType != 'closed' && (
-                <UserLink
-                  name={sourceUserName || ''}
-                  username={sourceUserUsername || ''}
-                  className={'mr-0 flex-shrink-0'}
-                  justFirstName={true}
-                />
-              )}
-              {sourceType && reason && (
-                <div className={'inline flex truncate'}>
-                  <span className={'ml-1 flex-shrink-0'}>
-                    {getReasonForShowingNotification(notification, false, true)}
-                  </span>
-                  {!hideTitle && (
-                    <NotificationLink notification={notification} />
-                  )}
-                </div>
-              )}
-              {sourceId &&
-              sourceContractSlug &&
-              sourceContractCreatorUsername ? (
-                <CopyLinkDateTimeComponent
-                  prefix={sourceContractCreatorUsername}
-                  slug={sourceContractSlug}
-                  createdTime={createdTime}
-                  elementId={getSourceIdForLinkComponent(sourceId)}
-                  className={'-mx-1 inline-flex sm:inline-block'}
-                />
-              ) : (
-                <RelativeTimestamp time={createdTime} />
-              )}
+              <div>
+                {sourceUpdateType != 'closed' && (
+                  <UserLink
+                    name={sourceUserName || ''}
+                    username={sourceUserUsername || ''}
+                    className={'mr-1 flex-shrink-0'}
+                    justFirstName={true}
+                  />
+                )}
+                {getReasonForShowingNotification(
+                  notification,
+                  false,
+                  isChildOfGroup
+                )}
+                {isChildOfGroup ? (
+                  <RelativeTimestamp time={notification.createdTime} />
+                ) : (
+                  <NotificationLink notification={notification} />
+                )}
+              </div>
             </div>
+            {!isChildOfGroup && (
+              <div className={'hidden sm:inline-block'}>
+                <RelativeTimestamp time={notification.createdTime} />
+              </div>
+            )}
           </div>
         </Row>
         <div className={'mt-1 ml-1 md:text-base'}>
@@ -697,8 +686,11 @@ export const setNotificationsAsSeen = (notifications: Notification[]) => {
   return notifications
 }
 
-function NotificationLink(props: { notification: Notification }) {
-  const { notification } = props
+function NotificationLink(props: {
+  notification: Notification
+  noClick?: boolean
+}) {
+  const { notification, noClick } = props
   const {
     sourceType,
     sourceContractTitle,
@@ -707,8 +699,17 @@ function NotificationLink(props: { notification: Notification }) {
     sourceSlug,
     sourceTitle,
   } = notification
+  if (noClick)
+    return (
+      <span className={'ml-1 font-bold '}>
+        {sourceContractTitle || sourceTitle}
+      </span>
+    )
   return (
     <a
+      className={
+        'ml-1 font-bold hover:underline hover:decoration-indigo-400 hover:decoration-2 '
+      }
       href={
         sourceContractCreatorUsername
           ? `/${sourceContractCreatorUsername}/${sourceContractSlug}`
@@ -716,9 +717,6 @@ function NotificationLink(props: { notification: Notification }) {
           ? `${groupPath(sourceSlug)}`
           : ''
       }
-      className={
-        'ml-1 inline max-w-xs truncate font-bold text-gray-500 hover:underline hover:decoration-indigo-400 hover:decoration-2 sm:max-w-sm'
-      }
     >
       {sourceContractTitle || sourceTitle}
     </a>
@@ -852,14 +850,6 @@ function getReasonForShowingNotification(
         reasonText = !simple ? 'tagged you on' : 'tagged you'
       else if (reason === 'reply_to_users_comment')
         reasonText = !simple ? 'replied to you on' : 'replied'
-      else if (reason === 'on_users_contract')
-        reasonText = !simple ? `commented on your question` : 'commented'
-      else if (reason === 'on_contract_with_users_comment')
-        reasonText = `commented on`
-      else if (reason === 'on_contract_with_users_answer')
-        reasonText = `commented on`
-      else if (reason === 'on_contract_with_users_shares_in')
-        reasonText = `commented on`
       else reasonText = `commented on`
       break
     case 'contract':
@@ -871,12 +861,6 @@ function getReasonForShowingNotification(
       break
     case 'answer':
       if (reason === 'on_users_contract') reasonText = `answered your question `
-      else if (reason === 'on_contract_with_users_comment')
-        reasonText = `answered`
-      else if (reason === 'on_contract_with_users_answer')
-        reasonText = `answered`
-      else if (reason === 'on_contract_with_users_shares_in')
-        reasonText = `answered`
       else reasonText = `answered`
       break
     case 'follow':
@@ -897,12 +881,7 @@ function getReasonForShowingNotification(
     default:
       reasonText = ''
   }
-
-  return (
-    <span className={'flex-shrink-0'}>
-      {replaceOn ? reasonText.replace(' on', '') : reasonText}
-    </span>
-  )
+  return replaceOn ? reasonText.replace(' on', '') : reasonText
 }
 
 // TODO: where should we put referral bonus notifications?

From d6e808e1a39e20193c97f713b1710ed687f7a5a4 Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Thu, 7 Jul 2022 14:45:26 -0600
Subject: [PATCH 09/24] Remove category filters

---
 web/components/contract-search.tsx | 123 ++---------------------------
 1 file changed, 8 insertions(+), 115 deletions(-)

diff --git a/web/components/contract-search.tsx b/web/components/contract-search.tsx
index 2c7f5b62..220a95ab 100644
--- a/web/components/contract-search.tsx
+++ b/web/components/contract-search.tsx
@@ -20,13 +20,6 @@ import { Row } from './layout/row'
 import { useEffect, useMemo, useRef, useState } from 'react'
 import { Spacer } from './layout/spacer'
 import { ENV, IS_PRIVATE_MANIFOLD } from 'common/envs/constants'
-import { useUser } from 'web/hooks/use-user'
-import { useFollows } from 'web/hooks/use-follows'
-import { EditCategoriesButton } from './feed/category-selector'
-import { CATEGORIES, category } from 'common/categories'
-import { Tabs } from './layout/tabs'
-import { EditFollowingButton } from './following-button'
-import { track } from '@amplitude/analytics-browser'
 import { trackCallback } from 'web/lib/service/analytics'
 import ContractSearchFirestore from 'web/pages/contract-search-firestore'
 
@@ -60,7 +53,6 @@ export function ContractSearch(props: {
     tag?: string
     excludeContractIds?: string[]
   }
-  showCategorySelector: boolean
   onContractClick?: (contract: Contract) => void
   showPlaceHolder?: boolean
   hideOrderSelector?: boolean
@@ -70,7 +62,6 @@ export function ContractSearch(props: {
   const {
     querySortOptions,
     additionalFilter,
-    showCategorySelector,
     onContractClick,
     overrideGridClassName,
     hideOrderSelector,
@@ -78,10 +69,6 @@ export function ContractSearch(props: {
     hideQuickBet,
   } = props
 
-  const user = useUser()
-  const followedCategories = user?.followedCategories
-  const follows = useFollows(user?.id)
-
   const { initialSort } = useInitialQueryAndSort(querySortOptions)
 
   const sort = sortIndexes
@@ -94,18 +81,11 @@ export function ContractSearch(props: {
     querySortOptions?.defaultFilter ?? 'open'
   )
 
-  const [mode, setMode] = useState<'categories' | 'following'>('categories')
-
   const { filters, numericFilters } = useMemo(() => {
     let filters = [
       filter === 'open' ? 'isResolved:false' : '',
       filter === 'closed' ? 'isResolved:false' : '',
       filter === 'resolved' ? 'isResolved:true' : '',
-      showCategorySelector
-        ? mode === 'categories'
-          ? followedCategories?.map((cat) => `lowercaseTags:${cat}`) ?? ''
-          : follows?.map((creatorId) => `creatorId:${creatorId}`) ?? ''
-        : '',
       additionalFilter?.creatorId
         ? `creatorId:${additionalFilter.creatorId}`
         : '',
@@ -120,14 +100,7 @@ export function ContractSearch(props: {
     ].filter((f) => f)
 
     return { filters, numericFilters }
-  }, [
-    filter,
-    showCategorySelector,
-    mode,
-    Object.values(additionalFilter ?? {}).join(','),
-    (followedCategories ?? []).join(','),
-    (follows ?? []).join(','),
-  ])
+  }, [filter, Object.values(additionalFilter ?? {}).join(',')])
 
   const indexName = `${indexPrefix}contracts-${sort}`
 
@@ -182,28 +155,13 @@ export function ContractSearch(props: {
 
       <Spacer h={3} />
 
-      {showCategorySelector && (
-        <CategoryFollowSelector
-          mode={mode}
-          setMode={setMode}
-          followedCategories={followedCategories ?? []}
-          follows={follows ?? []}
-        />
-      )}
-
-      <Spacer h={4} />
-
-      {mode === 'following' && (follows ?? []).length === 0 ? (
-        <>You're not following anyone yet.</>
-      ) : (
-        <ContractSearchInner
-          querySortOptions={querySortOptions}
-          onContractClick={onContractClick}
-          overrideGridClassName={overrideGridClassName}
-          hideQuickBet={hideQuickBet}
-          excludeContractIds={additionalFilter?.excludeContractIds}
-        />
-      )}
+      <ContractSearchInner
+        querySortOptions={querySortOptions}
+        onContractClick={onContractClick}
+        overrideGridClassName={overrideGridClassName}
+        hideQuickBet={hideQuickBet}
+        excludeContractIds={additionalFilter?.excludeContractIds}
+      />
     </InstantSearch>
   )
 }
@@ -288,68 +246,3 @@ export function ContractSearchInner(props: {
     />
   )
 }
-
-function CategoryFollowSelector(props: {
-  mode: 'categories' | 'following'
-  setMode: (mode: 'categories' | 'following') => void
-  followedCategories: string[]
-  follows: string[]
-}) {
-  const { mode, setMode, followedCategories, follows } = props
-
-  const user = useUser()
-
-  const categoriesTitle = `${
-    followedCategories?.length ? followedCategories.length : 'All'
-  } Categories`
-  let categoriesDescription = `Showing all categories`
-
-  const followingTitle = `${follows?.length ? follows.length : 'All'} Following`
-
-  if (followedCategories.length) {
-    const categoriesLabel = followedCategories
-      .slice(0, 3)
-      .map((cat) => CATEGORIES[cat as category])
-      .join(', ')
-    const andMoreLabel =
-      followedCategories.length > 3
-        ? `, and ${followedCategories.length - 3} more`
-        : ''
-    categoriesDescription = `Showing ${categoriesLabel}${andMoreLabel}`
-  }
-
-  return (
-    <Tabs
-      defaultIndex={mode === 'categories' ? 0 : 1}
-      tabs={[
-        {
-          title: categoriesTitle,
-          content: user && (
-            <Row className="items-center gap-1 text-gray-500">
-              <div>{categoriesDescription}</div>
-              <EditCategoriesButton className="self-start" user={user} />
-            </Row>
-          ),
-        },
-        ...(user
-          ? [
-              {
-                title: followingTitle,
-                content: (
-                  <Row className="items-center gap-2 text-gray-500">
-                    <div>Showing markets by users you are following.</div>
-                    <EditFollowingButton className="self-start" user={user} />
-                  </Row>
-                ),
-              },
-            ]
-          : []),
-      ]}
-      onClick={(_, index) => {
-        const mode = index === 0 ? 'categories' : 'following'
-        setMode(mode)
-        track(`click ${mode} tab`)
-      }}
-    />
-  )
-}

From 3ff8b263122f0d8e030d1e8cfac10b28b217caae Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Thu, 7 Jul 2022 14:55:28 -0600
Subject: [PATCH 10/24] Remove category selector references

---
 web/components/contract/contracts-list.tsx | 1 -
 web/pages/group/[...slugs]/index.tsx       | 1 -
 web/pages/home.tsx                         | 1 -
 web/pages/markets.tsx                      | 2 +-
 web/pages/tag/[tag].tsx                    | 1 -
 5 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/web/components/contract/contracts-list.tsx b/web/components/contract/contracts-list.tsx
index e24090d9..20a85ef4 100644
--- a/web/components/contract/contracts-list.tsx
+++ b/web/components/contract/contracts-list.tsx
@@ -87,7 +87,6 @@ export function CreatorContractsList(props: { creator: User }) {
       additionalFilter={{
         creatorId: creator.id,
       }}
-      showCategorySelector={false}
     />
   )
 }
diff --git a/web/pages/group/[...slugs]/index.tsx b/web/pages/group/[...slugs]/index.tsx
index b38750fc..db8d38be 100644
--- a/web/pages/group/[...slugs]/index.tsx
+++ b/web/pages/group/[...slugs]/index.tsx
@@ -598,7 +598,6 @@ function AddContractButton(props: { group: Group; user: User }) {
             <ContractSearch
               hideOrderSelector={true}
               onContractClick={addContractToCurrentGroup}
-              showCategorySelector={false}
               overrideGridClassName={'flex grid-cols-1 flex-col gap-3 p-1'}
               showPlaceHolder={true}
               hideQuickBet={true}
diff --git a/web/pages/home.tsx b/web/pages/home.tsx
index 75eae351..12bd46a2 100644
--- a/web/pages/home.tsx
+++ b/web/pages/home.tsx
@@ -34,7 +34,6 @@ const Home = () => {
               shouldLoadFromStorage: true,
               defaultSort: getSavedSort() ?? '24-hour-vol',
             }}
-            showCategorySelector
             onContractClick={(c) => {
               // Show contract without navigating to contract page.
               setContract(c)
diff --git a/web/pages/markets.tsx b/web/pages/markets.tsx
index ab8e064d..a3e851fc 100644
--- a/web/pages/markets.tsx
+++ b/web/pages/markets.tsx
@@ -11,7 +11,7 @@ export default function Markets() {
         description="Discover what's new, trending, or soon-to-close. Or search among our hundreds of markets."
         url="/markets"
       />
-      <ContractSearch showCategorySelector />
+      <ContractSearch />
     </Page>
   )
 }
diff --git a/web/pages/tag/[tag].tsx b/web/pages/tag/[tag].tsx
index c6b7d31d..476afecf 100644
--- a/web/pages/tag/[tag].tsx
+++ b/web/pages/tag/[tag].tsx
@@ -18,7 +18,6 @@ export default function TagPage() {
           shouldLoadFromStorage: true,
         }}
         additionalFilter={{ tag }}
-        showCategorySelector={false}
       />
     </Page>
   )

From 3eee4a41030008f701e120792b22fc44fbd62a6a Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Thu, 7 Jul 2022 15:06:29 -0600
Subject: [PATCH 11/24] Track notification clicks

---
 web/pages/notifications.tsx | 50 ++++++++++++++++++++++++++++++-------
 1 file changed, 41 insertions(+), 9 deletions(-)

diff --git a/web/pages/notifications.tsx b/web/pages/notifications.tsx
index 3f9b4eed..aa2cdc51 100644
--- a/web/pages/notifications.tsx
+++ b/web/pages/notifications.tsx
@@ -34,6 +34,7 @@ import { groupPath } from 'web/lib/firebase/groups'
 import { UNIQUE_BETTOR_BONUS_AMOUNT } from 'common/numeric-constants'
 import { groupBy, sum, uniq } from 'lodash'
 import Custom404 from 'web/pages/404'
+import { track } from '@amplitude/analytics-browser'
 
 export const NOTIFICATIONS_PER_PAGE = 30
 const MULTIPLE_USERS_KEY = 'multipleUsers'
@@ -380,7 +381,7 @@ function IncomeNotificationItem(props: {
               </div>
               <span className={'flex truncate'}>
                 {getReasonForShowingIncomeNotification(true)}
-                <NotificationLink notification={notification} noClick={true} />
+                <QuestionLink notification={notification} ignoreClick={true} />
               </span>
             </div>
           </div>
@@ -421,7 +422,7 @@ function IncomeNotificationItem(props: {
                   />
                 ))}
               {getReasonForShowingIncomeNotification(false)} {' on'}
-              <NotificationLink notification={notification} />
+              <QuestionLink notification={notification} />
             </span>
           </div>
         </Row>
@@ -477,7 +478,7 @@ function NotificationGroupItem(props: {
             <div className={'flex w-full flex-row justify-between'}>
               <div className={'ml-2'}>
                 Activity on
-                <NotificationLink notification={notifications[0]} />
+                <QuestionLink notification={notifications[0]} />
               </div>
               <div className={'hidden sm:inline-block'}>
                 <RelativeTimestamp time={notifications[0].createdTime} />
@@ -616,7 +617,22 @@ function NotificationItem(props: {
         highlighted && 'bg-indigo-200 hover:bg-indigo-100'
       )}
     >
-      <a href={getSourceUrl(notification)}>
+      <a
+        href={getSourceUrl(notification)}
+        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={sourceUserAvatarUrl}
@@ -647,7 +663,7 @@ function NotificationItem(props: {
                 {isChildOfGroup ? (
                   <RelativeTimestamp time={notification.createdTime} />
                 ) : (
-                  <NotificationLink notification={notification} />
+                  <QuestionLink notification={notification} />
                 )}
               </div>
             </div>
@@ -686,11 +702,11 @@ export const setNotificationsAsSeen = (notifications: Notification[]) => {
   return notifications
 }
 
-function NotificationLink(props: {
+function QuestionLink(props: {
   notification: Notification
-  noClick?: boolean
+  ignoreClick?: boolean
 }) {
-  const { notification, noClick } = props
+  const { notification, ignoreClick } = props
   const {
     sourceType,
     sourceContractTitle,
@@ -699,7 +715,8 @@ function NotificationLink(props: {
     sourceSlug,
     sourceTitle,
   } = notification
-  if (noClick)
+
+  if (ignoreClick)
     return (
       <span className={'ml-1 font-bold '}>
         {sourceContractTitle || sourceTitle}
@@ -717,6 +734,17 @@ function NotificationLink(props: {
           ? `${groupPath(sourceSlug)}`
           : ''
       }
+      onClick={() =>
+        track('Notification Clicked', {
+          type: 'question title',
+          sourceType,
+          sourceContractTitle,
+          sourceContractCreatorUsername,
+          sourceContractSlug,
+          sourceSlug,
+          sourceTitle,
+        })
+      }
     >
       {sourceContractTitle || sourceTitle}
     </a>
@@ -969,6 +997,10 @@ function NotificationSettings() {
     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,

From e456b9a85562c8eabad9767213537bf5ec266504 Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Thu, 7 Jul 2022 15:24:13 -0600
Subject: [PATCH 12/24] Analyze tab usage

---
 web/components/contract/contract-tabs.tsx |  1 +
 web/components/layout/tabs.tsx            | 16 +++++++++++++++-
 web/components/user-page.tsx              |  1 +
 web/pages/group/[...slugs]/index.tsx      |  1 +
 web/pages/groups.tsx                      |  1 +
 web/pages/leaderboards.tsx                |  1 +
 web/pages/notifications.tsx               |  1 +
 web/pages/stats.tsx                       |  1 +
 8 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/web/components/contract/contract-tabs.tsx b/web/components/contract/contract-tabs.tsx
index e68e59b9..c7759fb8 100644
--- a/web/components/contract/contract-tabs.tsx
+++ b/web/components/contract/contract-tabs.tsx
@@ -87,6 +87,7 @@ export function ContractTabs(props: {
 
   return (
     <Tabs
+      currentPageForAnalytics={'contract'}
       tabs={[
         { title: 'Comments', content: commentActivity },
         { title: 'Bets', content: betActivity },
diff --git a/web/components/layout/tabs.tsx b/web/components/layout/tabs.tsx
index f025951c..8aec39b1 100644
--- a/web/components/layout/tabs.tsx
+++ b/web/components/layout/tabs.tsx
@@ -2,6 +2,7 @@ import clsx from 'clsx'
 import Link from 'next/link'
 import { ReactNode, useState } from 'react'
 import { Row } from './row'
+import { track } from '@amplitude/analytics-browser'
 
 type Tab = {
   title: string
@@ -17,8 +18,16 @@ export function Tabs(props: {
   labelClassName?: string
   onClick?: (tabTitle: string, index: number) => void
   className?: string
+  currentPageForAnalytics?: string
 }) {
-  const { tabs, defaultIndex, labelClassName, onClick, className } = props
+  const {
+    tabs,
+    defaultIndex,
+    labelClassName,
+    onClick,
+    className,
+    currentPageForAnalytics,
+  } = props
   const [activeIndex, setActiveIndex] = useState(defaultIndex ?? 0)
   const activeTab = tabs[activeIndex] as Tab | undefined // can be undefined in weird case
 
@@ -32,6 +41,11 @@ export function Tabs(props: {
                 id={`tab-${i}`}
                 key={tab.title}
                 onClick={(e) => {
+                  track('Clicked Tab', {
+                    title: tab.title,
+                    href: tab.href,
+                    currentPage: currentPageForAnalytics,
+                  })
                   if (!tab.href) {
                     e.preventDefault()
                   }
diff --git a/web/components/user-page.tsx b/web/components/user-page.tsx
index c33476aa..af03eb46 100644
--- a/web/components/user-page.tsx
+++ b/web/components/user-page.tsx
@@ -262,6 +262,7 @@ export function UserPage(props: {
 
         {usersContracts !== 'loading' && commentsByContract != 'loading' ? (
           <Tabs
+            currentPageForAnalytics={'profile'}
             labelClassName={'pb-2 pt-1 '}
             defaultIndex={
               defaultTabTitle ? TAB_IDS.indexOf(defaultTabTitle) : 0
diff --git a/web/pages/group/[...slugs]/index.tsx b/web/pages/group/[...slugs]/index.tsx
index db8d38be..73d7819a 100644
--- a/web/pages/group/[...slugs]/index.tsx
+++ b/web/pages/group/[...slugs]/index.tsx
@@ -248,6 +248,7 @@ export default function GroupPage(props: {
       </Col>
 
       <Tabs
+        currentPageForAnalytics={groupPath(group.slug)}
         className={'mb-0 sm:mb-2'}
         defaultIndex={
           page === 'rankings'
diff --git a/web/pages/groups.tsx b/web/pages/groups.tsx
index 22fe7661..ae64cc76 100644
--- a/web/pages/groups.tsx
+++ b/web/pages/groups.tsx
@@ -106,6 +106,7 @@ export default function Groups(props: {
             </div>
 
             <Tabs
+              currentPageForAnalytics={'groups'}
               tabs={[
                 ...(user && memberGroupIds.length > 0
                   ? [
diff --git a/web/pages/leaderboards.tsx b/web/pages/leaderboards.tsx
index f306493b..061f3a19 100644
--- a/web/pages/leaderboards.tsx
+++ b/web/pages/leaderboards.tsx
@@ -126,6 +126,7 @@ export default function Leaderboards(props: {
     <Page>
       <Title text={'Leaderboards'} className={'hidden md:block'} />
       <Tabs
+        currentPageForAnalytics={'leaderboards'}
         defaultIndex={0}
         onClick={(title, index) => {
           const period = ['allTime', 'monthly', 'weekly', 'daily'][index]
diff --git a/web/pages/notifications.tsx b/web/pages/notifications.tsx
index aa2cdc51..bb495ecd 100644
--- a/web/pages/notifications.tsx
+++ b/web/pages/notifications.tsx
@@ -50,6 +50,7 @@ export default function Notifications() {
         <Title text={'Notifications'} className={'hidden md:block'} />
         <div>
           <Tabs
+            currentPageForAnalytics={'notifications'}
             labelClassName={'pb-2 pt-1 '}
             className={'mb-0 sm:mb-2'}
             defaultIndex={0}
diff --git a/web/pages/stats.tsx b/web/pages/stats.tsx
index c81bc3ff..57c47843 100644
--- a/web/pages/stats.tsx
+++ b/web/pages/stats.tsx
@@ -25,6 +25,7 @@ export default function Analytics() {
   return (
     <Page>
       <Tabs
+        currentPageForAnalytics={'stats'}
         tabs={[
           {
             title: 'Activity',

From 999c1cd8e3d929ff3c445e4dde3a0d32769f4809 Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Thu, 7 Jul 2022 15:52:28 -0600
Subject: [PATCH 13/24] Bold more on new group chats

---
 web/components/nav/nav-bar.tsx | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/web/components/nav/nav-bar.tsx b/web/components/nav/nav-bar.tsx
index 9f0f8ddd..2b065f1c 100644
--- a/web/components/nav/nav-bar.tsx
+++ b/web/components/nav/nav-bar.tsx
@@ -9,7 +9,7 @@ import {
 import { Transition, Dialog } from '@headlessui/react'
 import { useState, Fragment } from 'react'
 import Sidebar, { Item } from './sidebar'
-import { useUser } from 'web/hooks/use-user'
+import { usePrivateUser, useUser } from 'web/hooks/use-user'
 import { formatMoney } from 'common/util/format'
 import { Avatar } from '../avatar'
 import clsx from 'clsx'
@@ -17,6 +17,8 @@ import { useRouter } from 'next/router'
 import NotificationsIcon from 'web/components/notifications-icon'
 import { useIsIframe } from 'web/hooks/use-is-iframe'
 import { trackCallback } from 'web/lib/service/analytics'
+import { useUnseenPreferredNotifications } from 'web/hooks/use-notifications'
+import { PrivateUser } from 'common/user'
 
 function getNavigation() {
   return [
@@ -42,6 +44,7 @@ export function BottomNavBar() {
   const currentPage = router.pathname
 
   const user = useUser()
+  const privateUser = usePrivateUser(user?.id)
 
   const isIframe = useIsIframe()
   if (isIframe) {
@@ -81,8 +84,12 @@ export function BottomNavBar() {
         className="w-full select-none py-1 px-3 text-center hover:cursor-pointer hover:bg-indigo-200 hover:text-indigo-700"
         onClick={() => setSidebarOpen(true)}
       >
-        <MenuAlt3Icon className="my-1 mx-auto h-6 w-6" aria-hidden="true" />
-        More
+        <MenuAlt3Icon className=" my-1 mx-auto h-6 w-6" aria-hidden="true" />
+        {privateUser ? (
+          <MoreMenuWithGroupNotifications privateUser={privateUser} />
+        ) : (
+          'More'
+        )}
       </div>
 
       <MobileSidebar
@@ -93,6 +100,22 @@ export function BottomNavBar() {
   )
 }
 
+function MoreMenuWithGroupNotifications(props: { privateUser: PrivateUser }) {
+  const { privateUser } = props
+  const preferredNotifications = useUnseenPreferredNotifications(privateUser, {
+    customHref: '/group/',
+  })
+  return (
+    <span
+      className={
+        preferredNotifications.length > 0 ? 'font-bold' : 'font-normal'
+      }
+    >
+      More
+    </span>
+  )
+}
+
 function NavBarItem(props: { item: Item; currentPage: string }) {
   const { item, currentPage } = props
   const track = trackCallback(`navbar: ${item.trackingEventName ?? item.name}`)

From c3bc25a4b92c7ff6b285d937eca678dc0ecb6e4f Mon Sep 17 00:00:00 2001
From: Ben Congdon <ben@congdon.dev>
Date: Thu, 7 Jul 2022 15:36:02 -0700
Subject: [PATCH 14/24] Add API route for listing a bets by user (#567)

* Add API route for getting a user's bets

* Refactor bets API to use /bets

* Update /markets to use zod validation

* Update docs
---
 docs/docs/api.md                              | 58 ++++++++++++++++
 firestore.indexes.json                        | 22 +++++++
 web/lib/firebase/bets.ts                      | 44 +++++++++++++
 web/pages/api/v0/_types.ts                    | 12 ++++
 web/pages/api/v0/_validate.ts                 | 17 +++++
 web/pages/api/v0/bets.ts                      | 66 +++++++++++++++++++
 web/pages/api/v0/markets.ts                   | 48 +++++++-------
 .../api/v0/user/[username]/bets/index.ts      | 25 +++++++
 8 files changed, 269 insertions(+), 23 deletions(-)
 create mode 100644 web/pages/api/v0/_validate.ts
 create mode 100644 web/pages/api/v0/bets.ts
 create mode 100644 web/pages/api/v0/user/[username]/bets/index.ts

diff --git a/docs/docs/api.md b/docs/docs/api.md
index a8ac18fe..1cea6027 100644
--- a/docs/docs/api.md
+++ b/docs/docs/api.md
@@ -567,6 +567,64 @@ $ curl https://manifold.markets/api/v0/market/{marketId}/resolve -X POST \
                  ]}'
 ```
 
+### `GET /v0/bets`
+
+Gets a list of bets, ordered by creation date descending.
+
+Parameters:
+
+- `username`: Optional. If set, the response will include only bets created by this user.
+- `market`: Optional. The slug of a market. If set, the response will only include bets on this market.
+- `limit`: Optional. How many bets to return. The maximum and the default is 1000.
+- `before`: Optional. The ID of the bet before which the list will start. For
+  example, if you ask for the most recent 10 bets, and then perform a second
+  query for 10 more bets with `before=[the id of the 10th bet]`, you will
+  get bets 11 through 20.
+
+Requires no authorization.
+
+- Example request
+  ```
+  https://manifold.markets/api/v0/bets?username=ManifoldMarkets&market=will-california-abolish-daylight-sa
+  ```
+- Response type: A `Bet[]`.
+
+- <details><summary>Example response</summary><p>
+
+  ```json
+  [
+    {
+      "probAfter": 0.44418877319153904,
+      "shares": -645.8346334931828,
+      "outcome": "YES",
+      "contractId": "tgB1XmvFXZNhjr3xMNLp",
+      "sale": {
+        "betId": "RcOtarI3d1DUUTjiE0rx",
+        "amount": 474.9999999999998
+      },
+      "createdTime": 1644602886293,
+      "userId": "94YYTk1AFWfbWMpfYcvnnwI1veP2",
+      "probBefore": 0.7229189477449224,
+      "id": "x9eNmCaqQeXW8AgJ8Zmp",
+      "amount": -499.9999999999998
+    },
+    {
+      "probAfter": 0.9901970375647697,
+      "contractId": "zdeaYVAfHlo9jKzWh57J",
+      "outcome": "YES",
+      "amount": 1,
+      "id": "8PqxKYwXCcLYoXy2m2Nm",
+      "shares": 1.0049875638533763,
+      "userId": "94YYTk1AFWfbWMpfYcvnnwI1veP2",
+      "probBefore": 0.9900000000000001,
+      "createdTime": 1644705818872
+    }
+  ]
+  ```
+
+  </p>
+  </details>
+
 ## Changelog
 
 - 2022-06-08: Add paging to markets endpoint
diff --git a/firestore.indexes.json b/firestore.indexes.json
index e0cee632..0a8b14bd 100644
--- a/firestore.indexes.json
+++ b/firestore.indexes.json
@@ -559,6 +559,28 @@
           "queryScope": "COLLECTION_GROUP"
         }
       ]
+    },
+    {
+      "collectionGroup": "bets",
+      "fieldPath": "id",
+      "indexes": [
+        {
+          "order": "ASCENDING",
+          "queryScope": "COLLECTION"
+        },
+        {
+          "order": "DESCENDING",
+          "queryScope": "COLLECTION"
+        },
+        {
+          "arrayConfig": "CONTAINS",
+          "queryScope": "COLLECTION"
+        },
+        {
+          "order": "ASCENDING",
+          "queryScope": "COLLECTION_GROUP"
+        }
+      ]
     }
   ]
 }
diff --git a/web/lib/firebase/bets.ts b/web/lib/firebase/bets.ts
index c442ff73..6fc29d24 100644
--- a/web/lib/firebase/bets.ts
+++ b/web/lib/firebase/bets.ts
@@ -4,6 +4,13 @@ import {
   query,
   where,
   orderBy,
+  QueryConstraint,
+  limit,
+  startAfter,
+  doc,
+  getDocs,
+  getDoc,
+  DocumentSnapshot,
 } from 'firebase/firestore'
 import { uniq } from 'lodash'
 
@@ -78,6 +85,43 @@ export async function getUserBets(
     .catch((reason) => reason)
 }
 
+export async function getBets(options: {
+  userId?: string
+  contractId?: string
+  before?: string
+  limit: number
+}) {
+  const { userId, contractId, before } = options
+
+  const queryParts: QueryConstraint[] = [
+    orderBy('createdTime', 'desc'),
+    limit(options.limit),
+  ]
+  if (userId) {
+    queryParts.push(where('userId', '==', userId))
+  }
+  if (before) {
+    let beforeSnap: DocumentSnapshot
+    if (contractId) {
+      beforeSnap = await getDoc(
+        doc(db, 'contracts', contractId, 'bets', before)
+      )
+    } else {
+      beforeSnap = (
+        await getDocs(
+          query(collectionGroup(db, 'bets'), where('id', '==', before))
+        )
+      ).docs[0]
+    }
+    queryParts.push(startAfter(beforeSnap))
+  }
+
+  const querySource = contractId
+    ? collection(db, 'contracts', contractId, 'bets')
+    : collectionGroup(db, 'bets')
+  return await getValues<Bet>(query(querySource, ...queryParts))
+}
+
 export async function getContractsOfUserBets(userId: string) {
   const bets: Bet[] = await getUserBets(userId, { includeRedemptions: false })
   const contractIds = uniq(bets.map((bet) => bet.contractId))
diff --git a/web/pages/api/v0/_types.ts b/web/pages/api/v0/_types.ts
index e0012c2b..7f52077d 100644
--- a/web/pages/api/v0/_types.ts
+++ b/web/pages/api/v0/_types.ts
@@ -55,6 +55,18 @@ export type ApiError = {
   error: string
 }
 
+type ValidationErrorDetail = {
+  field: string | null
+  error: string
+}
+export class ValidationError {
+  details: ValidationErrorDetail[]
+
+  constructor(details: ValidationErrorDetail[]) {
+    this.details = details
+  }
+}
+
 export function toLiteMarket(contract: Contract): LiteMarket {
   const {
     id,
diff --git a/web/pages/api/v0/_validate.ts b/web/pages/api/v0/_validate.ts
new file mode 100644
index 00000000..25f5af4e
--- /dev/null
+++ b/web/pages/api/v0/_validate.ts
@@ -0,0 +1,17 @@
+import { z } from 'zod'
+import { ValidationError } from './_types'
+
+export const validate = <T extends z.ZodTypeAny>(schema: T, val: unknown) => {
+  const result = schema.safeParse(val)
+  if (!result.success) {
+    const issues = result.error.issues.map((i) => {
+      return {
+        field: i.path.join('.') || null,
+        error: i.message,
+      }
+    })
+    throw new ValidationError(issues)
+  } else {
+    return result.data as z.infer<T>
+  }
+}
diff --git a/web/pages/api/v0/bets.ts b/web/pages/api/v0/bets.ts
new file mode 100644
index 00000000..c3de3e97
--- /dev/null
+++ b/web/pages/api/v0/bets.ts
@@ -0,0 +1,66 @@
+import { NextApiRequest, NextApiResponse } from 'next'
+import { applyCorsHeaders, CORS_UNRESTRICTED } from 'web/lib/api/cors'
+import { Bet, getBets } from 'web/lib/firebase/bets'
+import { getContractFromSlug } from 'web/lib/firebase/contracts'
+import { getUserByUsername } from 'web/lib/firebase/users'
+import { ApiError, ValidationError } from './_types'
+import { z } from 'zod'
+import { validate } from './_validate'
+
+const queryParams = z
+  .object({
+    username: z.string().optional(),
+    market: z.string().optional(),
+    limit: z
+      .number()
+      .default(1000)
+      .or(z.string().regex(/\d+/).transform(Number))
+      .refine((n) => n >= 0 && n <= 1000, 'Limit must be between 0 and 1000'),
+    before: z.string().optional(),
+  })
+  .strict()
+
+export default async function handler(
+  req: NextApiRequest,
+  res: NextApiResponse<Bet[] | ValidationError | ApiError>
+) {
+  await applyCorsHeaders(req, res, CORS_UNRESTRICTED)
+
+  let params: z.infer<typeof queryParams>
+  try {
+    params = validate(queryParams, req.query)
+  } catch (e) {
+    if (e instanceof ValidationError) {
+      return res.status(400).json(e)
+    }
+    console.error(`Unknown error during validation: ${e}`)
+    return res.status(500).json({ error: 'Unknown error during validation' })
+  }
+
+  const { username, market, limit, before } = params
+
+  let userId: string | undefined
+  if (username) {
+    const user = await getUserByUsername(username)
+    if (!user) {
+      res.status(404).json({ error: 'User not found' })
+      return
+    }
+    userId = user.id
+  }
+
+  let contractId: string | undefined
+  if (market) {
+    const contract = await getContractFromSlug(market)
+    if (!contract) {
+      res.status(404).json({ error: 'Contract not found' })
+      return
+    }
+    contractId = contract.id
+  }
+
+  const bets = await getBets({ userId, contractId, limit, before })
+
+  res.setHeader('Cache-Control', 'max-age=0')
+  return res.status(200).json(bets)
+}
diff --git a/web/pages/api/v0/markets.ts b/web/pages/api/v0/markets.ts
index fec3cc30..56ecc594 100644
--- a/web/pages/api/v0/markets.ts
+++ b/web/pages/api/v0/markets.ts
@@ -2,38 +2,40 @@
 import type { NextApiRequest, NextApiResponse } from 'next'
 import { listAllContracts } from 'web/lib/firebase/contracts'
 import { applyCorsHeaders, CORS_UNRESTRICTED } from 'web/lib/api/cors'
-import { toLiteMarket } from './_types'
+import { toLiteMarket, ValidationError } from './_types'
+import { z } from 'zod'
+import { validate } from './_validate'
+
+const queryParams = z
+  .object({
+    limit: z
+      .number()
+      .default(1000)
+      .or(z.string().regex(/\d+/).transform(Number))
+      .refine((n) => n >= 0 && n <= 1000, 'Limit must be between 0 and 1000'),
+    before: z.string().optional(),
+  })
+  .strict()
 
 export default async function handler(
   req: NextApiRequest,
   res: NextApiResponse
 ) {
   await applyCorsHeaders(req, res, CORS_UNRESTRICTED)
-  let before: string | undefined
-  let limit: number | undefined
-  if (req.query.before != null) {
-    if (typeof req.query.before !== 'string') {
-      res.status(400).json({ error: 'before must be null or a market ID.' })
-      return
+
+  let params: z.infer<typeof queryParams>
+  try {
+    params = validate(queryParams, req.query)
+  } catch (e) {
+    if (e instanceof ValidationError) {
+      return res.status(400).json(e)
     }
-    before = req.query.before
-  }
-  if (req.query.limit != null) {
-    if (typeof req.query.limit !== 'string') {
-      res
-        .status(400)
-        .json({ error: 'limit must be null or a number of markets to return.' })
-      return
-    }
-    limit = parseInt(req.query.limit)
-  } else {
-    limit = 1000
-  }
-  if (limit < 1 || limit > 1000) {
-    res.status(400).json({ error: 'limit must be between 1 and 1000.' })
-    return
+    console.error(`Unknown error during validation: ${e}`)
+    return res.status(500).json({ error: 'Unknown error during validation' })
   }
 
+  const { limit, before } = params
+
   try {
     const contracts = await listAllContracts(limit, before)
     // Serve from Vercel cache, then update. see https://vercel.com/docs/concepts/functions/edge-caching
diff --git a/web/pages/api/v0/user/[username]/bets/index.ts b/web/pages/api/v0/user/[username]/bets/index.ts
new file mode 100644
index 00000000..464af52c
--- /dev/null
+++ b/web/pages/api/v0/user/[username]/bets/index.ts
@@ -0,0 +1,25 @@
+import { NextApiRequest, NextApiResponse } from 'next'
+import { applyCorsHeaders, CORS_UNRESTRICTED } from 'web/lib/api/cors'
+import { Bet, getUserBets } from 'web/lib/firebase/bets'
+import { getUserByUsername } from 'web/lib/firebase/users'
+import { ApiError } from '../../../_types'
+
+export default async function handler(
+  req: NextApiRequest,
+  res: NextApiResponse<Bet[] | ApiError>
+) {
+  await applyCorsHeaders(req, res, CORS_UNRESTRICTED)
+  const { username } = req.query
+
+  const user = await getUserByUsername(username as string)
+
+  if (!user) {
+    res.status(404).json({ error: 'User not found' })
+    return
+  }
+
+  const bets = await getUserBets(user.id, { includeRedemptions: false })
+
+  res.setHeader('Cache-Control', 'max-age=0')
+  return res.status(200).json(bets)
+}

From 53ddb1243be61121485dac57cefde4fa13a334b2 Mon Sep 17 00:00:00 2001
From: Austin Chen <akrolsmir@gmail.com>
Date: Thu, 7 Jul 2022 15:41:44 -0700
Subject: [PATCH 15/24] Clone missing indexes from firestore

---
 firestore.indexes.json | 108 ++++++++++++++++++++++++++---------------
 1 file changed, 68 insertions(+), 40 deletions(-)

diff --git a/firestore.indexes.json b/firestore.indexes.json
index 0a8b14bd..12e88033 100644
--- a/firestore.indexes.json
+++ b/firestore.indexes.json
@@ -306,24 +306,6 @@
         }
       ]
     },
-    {
-      "collectionGroup": "txns",
-      "queryScope": "COLLECTION",
-      "fields": [
-        {
-          "fieldPath": "toId",
-          "order": "ASCENDING"
-        },
-        {
-          "fieldPath": "toType",
-          "order": "ASCENDING"
-        },
-        {
-          "fieldPath": "createdTime",
-          "order": "DESCENDING"
-        }
-      ]
-    },
     {
       "collectionGroup": "manalinks",
       "queryScope": "COLLECTION",
@@ -338,6 +320,34 @@
         }
       ]
     },
+    {
+      "collectionGroup": "notifications",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "isSeen",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "createdTime",
+          "order": "DESCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "portfolioHistory",
+      "queryScope": "COLLECTION_GROUP",
+      "fields": [
+        {
+          "fieldPath": "userId",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "timestamp",
+          "order": "ASCENDING"
+        }
+      ]
+    },
     {
       "collectionGroup": "portfolioHistory",
       "queryScope": "COLLECTION",
@@ -351,6 +361,24 @@
           "order": "ASCENDING"
         }
       ]
+    },
+    {
+      "collectionGroup": "txns",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "toId",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "toType",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "createdTime",
+          "order": "DESCENDING"
+        }
+      ]
     }
   ],
   "fieldOverrides": [
@@ -424,6 +452,28 @@
         }
       ]
     },
+    {
+      "collectionGroup": "bets",
+      "fieldPath": "id",
+      "indexes": [
+        {
+          "order": "ASCENDING",
+          "queryScope": "COLLECTION"
+        },
+        {
+          "order": "DESCENDING",
+          "queryScope": "COLLECTION"
+        },
+        {
+          "arrayConfig": "CONTAINS",
+          "queryScope": "COLLECTION"
+        },
+        {
+          "order": "ASCENDING",
+          "queryScope": "COLLECTION_GROUP"
+        }
+      ]
+    },
     {
       "collectionGroup": "bets",
       "fieldPath": "userId",
@@ -559,28 +609,6 @@
           "queryScope": "COLLECTION_GROUP"
         }
       ]
-    },
-    {
-      "collectionGroup": "bets",
-      "fieldPath": "id",
-      "indexes": [
-        {
-          "order": "ASCENDING",
-          "queryScope": "COLLECTION"
-        },
-        {
-          "order": "DESCENDING",
-          "queryScope": "COLLECTION"
-        },
-        {
-          "arrayConfig": "CONTAINS",
-          "queryScope": "COLLECTION"
-        },
-        {
-          "order": "ASCENDING",
-          "queryScope": "COLLECTION_GROUP"
-        }
-      ]
     }
   ]
 }

From d6136a993763714d3f990543a964834ee6527173 Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Thu, 7 Jul 2022 17:17:10 -0600
Subject: [PATCH 16/24] Minor notif spacing adjustments

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

diff --git a/web/pages/notifications.tsx b/web/pages/notifications.tsx
index bb495ecd..0924fbdd 100644
--- a/web/pages/notifications.tsx
+++ b/web/pages/notifications.tsx
@@ -272,9 +272,11 @@ function IncomeNotificationGroupItem(props: {
         />
       )}
       <Row className={'items-center text-gray-500 sm:justify-start'}>
-        <TrendingUpIcon className={'text-primary h-7 w-7'} />
+        <TrendingUpIcon
+          className={'text-primary ml-1 h-7 w-7 flex-shrink-0 sm:ml-2'}
+        />
         <div
-          className={'flex w-full flex-row flex-wrap pl-1 sm:pl-0'}
+          className={'ml-2 flex w-full flex-row flex-wrap truncate'}
           onClick={() => setExpanded(!expanded)}
         >
           <div className={'flex w-full flex-row justify-between'}>

From b1b016f9e0732f87c68b084e8b0763f1c0e35c0f Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Thu, 7 Jul 2022 17:23:13 -0600
Subject: [PATCH 17/24] Enable tipping on group chats w/ notif (#629)

---
 common/txn.ts                           |  3 +-
 functions/src/create-notification.ts    | 49 ++++++++++++++-----
 functions/src/on-create-txn.ts          | 65 +++++++++++++++----------
 functions/src/utils.ts                  |  5 ++
 web/components/groups/group-chat.tsx    | 39 ++++++++++-----
 web/components/tipper.tsx               |  2 +
 web/hooks/use-tip-txns.ts               | 16 ++++--
 web/lib/firebase/txns.ts                | 17 ++++++-
 web/pages/[username]/[contractSlug].tsx |  2 +-
 web/pages/group/[...slugs]/index.tsx    |  9 +++-
 web/pages/notifications.tsx             | 18 ++++---
 11 files changed, 160 insertions(+), 65 deletions(-)

diff --git a/common/txn.ts b/common/txn.ts
index 53b08501..701b67fe 100644
--- a/common/txn.ts
+++ b/common/txn.ts
@@ -36,8 +36,9 @@ type Tip = {
   toType: 'USER'
   category: 'TIP'
   data: {
-    contractId: string
     commentId: string
+    contractId?: string
+    groupId?: string
   }
 }
 
diff --git a/functions/src/create-notification.ts b/functions/src/create-notification.ts
index 49bff5f7..519720fd 100644
--- a/functions/src/create-notification.ts
+++ b/functions/src/create-notification.ts
@@ -14,6 +14,8 @@ import { Bet } from '../../common/bet'
 import { Answer } from '../../common/answer'
 import { getContractBetMetrics } from '../../common/calculate'
 import { removeUndefinedProps } from '../../common/util/object'
+import { TipTxn } from '../../common/txn'
+import { Group } from '../../common/group'
 const firestore = admin.firestore()
 
 type user_to_reason_texts = {
@@ -285,15 +287,6 @@ export const createNotification = async (
         isSeeOnHref: sourceSlug,
       }
   }
-  const notifyTippedUserOfNewTip = async (
-    userToReasonTexts: user_to_reason_texts,
-    userId: string
-  ) => {
-    if (shouldGetNotification(userId, userToReasonTexts))
-      userToReasonTexts[userId] = {
-        reason: 'tip_received',
-      }
-  }
 
   const getUsersToNotify = async () => {
     const userToReasonTexts: user_to_reason_texts = {}
@@ -346,8 +339,6 @@ export const createNotification = async (
         userToReasonTexts,
         sourceContract.creatorId
       )
-    } else if (sourceType === 'tip' && relatedUserId) {
-      await notifyTippedUserOfNewTip(userToReasonTexts, relatedUserId)
     }
     return userToReasonTexts
   }
@@ -355,3 +346,39 @@ export const createNotification = async (
   const userToReasonTexts = await getUsersToNotify()
   await createUsersNotifications(userToReasonTexts)
 }
+
+export const createTipNotification = async (
+  fromUser: User,
+  toUser: User,
+  tip: TipTxn,
+  idempotencyKey: string,
+  commentId: string,
+  contract?: Contract,
+  group?: Group
+) => {
+  const slug = group ? group.slug + `#${commentId}` : commentId
+
+  const notificationRef = firestore
+    .collection(`/users/${toUser.id}/notifications`)
+    .doc(idempotencyKey)
+  const notification: Notification = {
+    id: idempotencyKey,
+    userId: toUser.id,
+    reason: 'tip_received',
+    createdTime: Date.now(),
+    isSeen: false,
+    sourceId: tip.id,
+    sourceType: 'tip',
+    sourceUpdateType: 'created',
+    sourceUserName: fromUser.name,
+    sourceUserUsername: fromUser.username,
+    sourceUserAvatarUrl: fromUser.avatarUrl,
+    sourceText: tip.amount.toString(),
+    sourceContractCreatorUsername: contract?.creatorUsername,
+    sourceContractTitle: contract?.question,
+    sourceContractSlug: contract?.slug,
+    sourceSlug: slug,
+    sourceTitle: group?.name,
+  }
+  return await notificationRef.set(removeUndefinedProps(notification))
+}
diff --git a/functions/src/on-create-txn.ts b/functions/src/on-create-txn.ts
index d877ecac..b915cfa1 100644
--- a/functions/src/on-create-txn.ts
+++ b/functions/src/on-create-txn.ts
@@ -1,7 +1,7 @@
 import * as functions from 'firebase-functions'
-import { Txn } from 'common/txn'
-import { getContract, getUser, log } from './utils'
-import { createNotification } from './create-notification'
+import { TipTxn, Txn } from 'common/txn'
+import { getContract, getGroup, getUser, log } from './utils'
+import { createTipNotification } from './create-notification'
 import * as admin from 'firebase-admin'
 import { Comment } from 'common/comment'
 
@@ -18,7 +18,7 @@ export const onCreateTxn = functions.firestore
     }
   })
 
-async function handleTipTxn(txn: Txn, eventId: string) {
+async function handleTipTxn(txn: TipTxn, eventId: string) {
   // get user sending and receiving tip
   const [sender, receiver] = await Promise.all([
     getUser(txn.fromId),
@@ -29,40 +29,53 @@ async function handleTipTxn(txn: Txn, eventId: string) {
     return
   }
 
-  if (!txn.data?.contractId || !txn.data?.commentId) {
-    log('No contractId or comment id in tip txn.data')
+  if (!txn.data?.commentId) {
+    log('No comment id in tip txn.data')
     return
   }
+  let contract = undefined
+  let group = undefined
+  let commentSnapshot = undefined
 
-  const contract = await getContract(txn.data.contractId)
-  if (!contract) {
-    log('Could not find contract')
-    return
+  if (txn.data.contractId) {
+    contract = await getContract(txn.data.contractId)
+    if (!contract) {
+      log('Could not find contract')
+      return
+    }
+    commentSnapshot = await firestore
+      .collection('contracts')
+      .doc(contract.id)
+      .collection('comments')
+      .doc(txn.data.commentId)
+      .get()
+  } else if (txn.data.groupId) {
+    group = await getGroup(txn.data.groupId)
+    if (!group) {
+      log('Could not find group')
+      return
+    }
+    commentSnapshot = await firestore
+      .collection('groups')
+      .doc(group.id)
+      .collection('comments')
+      .doc(txn.data.commentId)
+      .get()
   }
 
-  const commentSnapshot = await firestore
-    .collection('contracts')
-    .doc(contract.id)
-    .collection('comments')
-    .doc(txn.data.commentId)
-    .get()
-  if (!commentSnapshot.exists) {
+  if (!commentSnapshot || !commentSnapshot.exists) {
     log('Could not find comment')
     return
   }
   const comment = commentSnapshot.data() as Comment
 
-  await createNotification(
-    txn.id,
-    'tip',
-    'created',
+  await createTipNotification(
     sender,
+    receiver,
+    txn,
     eventId,
-    txn.amount.toString(),
+    comment.id,
     contract,
-    'comment',
-    receiver.id,
-    txn.data?.commentId,
-    comment.text
+    group
   )
 }
diff --git a/functions/src/utils.ts b/functions/src/utils.ts
index 29f0db00..0414b01e 100644
--- a/functions/src/utils.ts
+++ b/functions/src/utils.ts
@@ -3,6 +3,7 @@ import * as admin from 'firebase-admin'
 import { chunk } from 'lodash'
 import { Contract } from '../../common/contract'
 import { PrivateUser, User } from '../../common/user'
+import { Group } from '../../common/group'
 
 export const log = (...args: unknown[]) => {
   console.log(`[${new Date().toISOString()}]`, ...args)
@@ -66,6 +67,10 @@ export const getContract = (contractId: string) => {
   return getDoc<Contract>('contracts', contractId)
 }
 
+export const getGroup = (groupId: string) => {
+  return getDoc<Group>('groups', groupId)
+}
+
 export const getUser = (userId: string) => {
   return getDoc<User>('users', userId)
 }
diff --git a/web/components/groups/group-chat.tsx b/web/components/groups/group-chat.tsx
index 1298065d..6e82b05c 100644
--- a/web/components/groups/group-chat.tsx
+++ b/web/components/groups/group-chat.tsx
@@ -18,13 +18,18 @@ import { UserLink } from 'web/components/user-page'
 
 import { groupPath } from 'web/lib/firebase/groups'
 import { CopyLinkDateTimeComponent } from 'web/components/feed/copy-link-date-time'
+import { CommentTipMap, CommentTips } from 'web/hooks/use-tip-txns'
+import { Tipper } from 'web/components/tipper'
+import { sum } from 'lodash'
+import { formatMoney } from 'common/util/format'
 
 export function GroupChat(props: {
   messages: Comment[]
   user: User | null | undefined
   group: Group
+  tips: CommentTipMap
 }) {
-  const { messages, user, group } = props
+  const { messages, user, group, tips } = props
   const [messageText, setMessageText] = useState('')
   const [isSubmitting, setIsSubmitting] = useState(false)
   const [scrollToBottomRef, setScrollToBottomRef] =
@@ -117,6 +122,7 @@ export function GroupChat(props: {
                 ? setScrollToMessageRef
                 : undefined
             }
+            tips={tips[message.id] ?? {}}
           />
         ))}
         {messages.length === 0 && (
@@ -166,8 +172,9 @@ const GroupMessage = memo(function GroupMessage_(props: {
   onReplyClick?: (comment: Comment) => void
   setRef?: (ref: HTMLDivElement) => void
   highlight?: boolean
+  tips: CommentTips
 }) {
-  const { comment, onReplyClick, group, setRef, highlight, user } = props
+  const { comment, onReplyClick, group, setRef, highlight, user, tips } = props
   const { text, userUsername, userName, userAvatarUrl, createdTime } = comment
   const isCreatorsComment = user && comment.userId === user.id
   return (
@@ -209,16 +216,24 @@ const GroupMessage = memo(function GroupMessage_(props: {
           shouldTruncate={false}
         />
       </Row>
-      {!isCreatorsComment && onReplyClick && (
-        <button
-          className={
-            'self-start py-1 text-xs font-bold text-gray-500 hover:underline'
-          }
-          onClick={() => onReplyClick(comment)}
-        >
-          Reply
-        </button>
-      )}
+      <Row>
+        {!isCreatorsComment && onReplyClick && (
+          <button
+            className={
+              'self-start py-1 text-xs font-bold text-gray-500 hover:underline'
+            }
+            onClick={() => onReplyClick(comment)}
+          >
+            Reply
+          </button>
+        )}
+        {isCreatorsComment && sum(Object.values(tips)) > 0 && (
+          <span className={'text-primary'}>
+            {formatMoney(sum(Object.values(tips)))}
+          </span>
+        )}
+        {!isCreatorsComment && <Tipper comment={comment} tips={tips} />}
+      </Row>
     </Col>
   )
 })
diff --git a/web/components/tipper.tsx b/web/components/tipper.tsx
index 64bad4eb..6f7dfbcb 100644
--- a/web/components/tipper.tsx
+++ b/web/components/tipper.tsx
@@ -53,6 +53,7 @@ export function Tipper(prop: { comment: Comment; tips: CommentTips }) {
         data: {
           contractId: comment.contractId,
           commentId: comment.id,
+          groupId: comment.groupId,
         },
         description: `${user.name} tipped M$ ${change} to ${comment.userName} for a comment`,
       })
@@ -60,6 +61,7 @@ export function Tipper(prop: { comment: Comment; tips: CommentTips }) {
       track('send comment tip', {
         contractId: comment.contractId,
         commentId: comment.id,
+        groupId: comment.groupId,
         amount: change,
         fromId: user.id,
         toId: comment.userId,
diff --git a/web/hooks/use-tip-txns.ts b/web/hooks/use-tip-txns.ts
index 13ef3d34..50542402 100644
--- a/web/hooks/use-tip-txns.ts
+++ b/web/hooks/use-tip-txns.ts
@@ -1,17 +1,25 @@
 import { TipTxn } from 'common/txn'
 import { groupBy, mapValues, sumBy } from 'lodash'
 import { useEffect, useMemo, useState } from 'react'
-import { listenForTipTxns } from 'web/lib/firebase/txns'
+import {
+  listenForTipTxns,
+  listenForTipTxnsOnGroup,
+} from 'web/lib/firebase/txns'
 
 export type CommentTips = { [userId: string]: number }
 export type CommentTipMap = { [commentId: string]: CommentTips }
 
-export function useTipTxns(contractId: string): CommentTipMap {
+export function useTipTxns(on: {
+  contractId?: string
+  groupId?: string
+}): CommentTipMap {
   const [txns, setTxns] = useState<TipTxn[]>([])
+  const { contractId, groupId } = on
 
   useEffect(() => {
-    return listenForTipTxns(contractId, setTxns)
-  }, [contractId, setTxns])
+    if (contractId) return listenForTipTxns(contractId, setTxns)
+    if (groupId) return listenForTipTxnsOnGroup(groupId, setTxns)
+  }, [contractId, groupId, setTxns])
 
   return useMemo(() => {
     const byComment = groupBy(txns, 'data.commentId')
diff --git a/web/lib/firebase/txns.ts b/web/lib/firebase/txns.ts
index 17e9a09b..88ab1352 100644
--- a/web/lib/firebase/txns.ts
+++ b/web/lib/firebase/txns.ts
@@ -27,18 +27,31 @@ export function getAllCharityTxns() {
   return getValues<DonationTxn>(charitiesQuery)
 }
 
-const getTipsQuery = (contractId: string) =>
+const getTipsOnContractQuery = (contractId: string) =>
   query(
     txns,
     where('category', '==', 'TIP'),
     where('data.contractId', '==', contractId)
   )
 
+const getTipsOnGroupQuery = (groupId: string) =>
+  query(
+    txns,
+    where('category', '==', 'TIP'),
+    where('data.groupId', '==', groupId)
+  )
+
 export function listenForTipTxns(
   contractId: string,
   setTxns: (txns: TipTxn[]) => void
 ) {
-  return listenForValues<TipTxn>(getTipsQuery(contractId), setTxns)
+  return listenForValues<TipTxn>(getTipsOnContractQuery(contractId), setTxns)
+}
+export function listenForTipTxnsOnGroup(
+  groupId: string,
+  setTxns: (txns: TipTxn[]) => void
+) {
+  return listenForValues<TipTxn>(getTipsOnGroupQuery(groupId), setTxns)
 }
 
 // Find all manalink Txns that are from or to this user
diff --git a/web/pages/[username]/[contractSlug].tsx b/web/pages/[username]/[contractSlug].tsx
index 2576c2e3..e33c116e 100644
--- a/web/pages/[username]/[contractSlug].tsx
+++ b/web/pages/[username]/[contractSlug].tsx
@@ -124,7 +124,7 @@ export function ContractPageContent(
   // Sort for now to see if bug is fixed.
   comments.sort((c1, c2) => c1.createdTime - c2.createdTime)
 
-  const tips = useTipTxns(contract.id)
+  const tips = useTipTxns({ contractId: contract.id })
 
   const user = useUser()
   const { width, height } = useWindowSize()
diff --git a/web/pages/group/[...slugs]/index.tsx b/web/pages/group/[...slugs]/index.tsx
index 73d7819a..dec25ab1 100644
--- a/web/pages/group/[...slugs]/index.tsx
+++ b/web/pages/group/[...slugs]/index.tsx
@@ -53,6 +53,7 @@ import { ContractSearch } from 'web/components/contract-search'
 import clsx from 'clsx'
 import { FollowList } from 'web/components/follow-list'
 import { SearchIcon } from '@heroicons/react/outline'
+import { useTipTxns } from 'web/hooks/use-tip-txns'
 
 export const getStaticProps = fromPropz(getStaticPropz)
 export async function getStaticPropz(props: { params: { slugs: string[] } }) {
@@ -149,6 +150,7 @@ export default function GroupPage(props: {
   const group = useGroup(props.group?.id) ?? props.group
   const [contracts, setContracts] = useState<Contract[] | undefined>(undefined)
   const [query, setQuery] = useState('')
+  const tips = useTipTxns({ groupId: group?.id })
 
   const messages = useCommentsOnGroup(group?.id)
   const debouncedQuery = debounce(setQuery, 50)
@@ -263,7 +265,12 @@ export default function GroupPage(props: {
           {
             title: 'Chat',
             content: messages ? (
-              <GroupChat messages={messages} user={user} group={group} />
+              <GroupChat
+                messages={messages}
+                user={user}
+                group={group}
+                tips={tips}
+              />
             ) : (
               <LoadingIndicator />
             ),
diff --git a/web/pages/notifications.tsx b/web/pages/notifications.tsx
index 0924fbdd..3a8e4bc0 100644
--- a/web/pages/notifications.tsx
+++ b/web/pages/notifications.tsx
@@ -384,7 +384,10 @@ function IncomeNotificationItem(props: {
               </div>
               <span className={'flex truncate'}>
                 {getReasonForShowingIncomeNotification(true)}
-                <QuestionLink notification={notification} ignoreClick={true} />
+                <QuestionOrGroupLink
+                  notification={notification}
+                  ignoreClick={true}
+                />
               </span>
             </div>
           </div>
@@ -425,7 +428,7 @@ function IncomeNotificationItem(props: {
                   />
                 ))}
               {getReasonForShowingIncomeNotification(false)} {' on'}
-              <QuestionLink notification={notification} />
+              <QuestionOrGroupLink notification={notification} />
             </span>
           </div>
         </Row>
@@ -481,7 +484,7 @@ function NotificationGroupItem(props: {
             <div className={'flex w-full flex-row justify-between'}>
               <div className={'ml-2'}>
                 Activity on
-                <QuestionLink notification={notifications[0]} />
+                <QuestionOrGroupLink notification={notifications[0]} />
               </div>
               <div className={'hidden sm:inline-block'}>
                 <RelativeTimestamp time={notifications[0].createdTime} />
@@ -666,7 +669,7 @@ function NotificationItem(props: {
                 {isChildOfGroup ? (
                   <RelativeTimestamp time={notification.createdTime} />
                 ) : (
-                  <QuestionLink notification={notification} />
+                  <QuestionOrGroupLink notification={notification} />
                 )}
               </div>
             </div>
@@ -705,7 +708,7 @@ export const setNotificationsAsSeen = (notifications: Notification[]) => {
   return notifications
 }
 
-function QuestionLink(props: {
+function QuestionOrGroupLink(props: {
   notification: Notification
   ignoreClick?: boolean
 }) {
@@ -733,7 +736,7 @@ function QuestionLink(props: {
       href={
         sourceContractCreatorUsername
           ? `/${sourceContractCreatorUsername}/${sourceContractSlug}`
-          : sourceType === 'group' && sourceSlug
+          : (sourceType === 'group' || sourceType === 'tip') && sourceSlug
           ? `${groupPath(sourceSlug)}`
           : ''
       }
@@ -771,8 +774,9 @@ function getSourceUrl(notification: Notification) {
     sourceType === 'user'
   )
     return `/${sourceContractCreatorUsername}/${sourceContractSlug}`
-  if (sourceType === 'tip')
+  if (sourceType === 'tip' && sourceContractSlug)
     return `/${sourceContractCreatorUsername}/${sourceContractSlug}#${sourceSlug}`
+  if (sourceType === 'tip' && sourceSlug) return `${groupPath(sourceSlug)}`
   if (sourceContractCreatorUsername && sourceContractSlug)
     return `/${sourceContractCreatorUsername}/${sourceContractSlug}#${getSourceIdForLinkComponent(
       sourceId ?? '',

From 50c5f8b6ebed75ddb20895a66a5434ef4cc9945a Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Fri, 8 Jul 2022 12:34:16 -0400
Subject: [PATCH 18/24] reenable fees on share sales; rename getCpmmFees()

---
 common/calculate-cpmm.ts     | 24 ++++++++++--------------
 web/components/bet-panel.tsx |  4 ++--
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/common/calculate-cpmm.ts b/common/calculate-cpmm.ts
index e7d56ba3..92d95251 100644
--- a/common/calculate-cpmm.ts
+++ b/common/calculate-cpmm.ts
@@ -1,7 +1,7 @@
 import { sum, groupBy, mapValues, sumBy, partition } from 'lodash'
 
 import { CPMMContract } from './contract'
-import { CREATOR_FEE, Fees, LIQUIDITY_FEE, noFees, PLATFORM_FEE } from './fees'
+import { CREATOR_FEE, Fees, LIQUIDITY_FEE, PLATFORM_FEE } from './fees'
 import { LiquidityProvision } from './liquidity-provision'
 import { addObjects } from './util/object'
 
@@ -58,7 +58,7 @@ function calculateCpmmShares(
     : n + bet - (k * (bet + y) ** -p) ** (1 / (1 - p))
 }
 
-export function getCpmmLiquidityFee(
+export function getCpmmFees(
   contract: CPMMContract,
   bet: number,
   outcome: string
@@ -83,7 +83,7 @@ export function calculateCpmmSharesAfterFee(
   outcome: string
 ) {
   const { pool, p } = contract
-  const { remainingBet } = getCpmmLiquidityFee(contract, bet, outcome)
+  const { remainingBet } = getCpmmFees(contract, bet, outcome)
 
   return calculateCpmmShares(pool, p, remainingBet, outcome)
 }
@@ -94,9 +94,7 @@ export function calculateCpmmPurchase(
   outcome: string
 ) {
   const { pool, p } = contract
-  const { remainingBet, fees } = getCpmmLiquidityFee(contract, bet, outcome)
-  // const remainingBet = bet
-  // const fees = noFees
+  const { remainingBet, fees } = getCpmmFees(contract, bet, outcome)
 
   const shares = calculateCpmmShares(pool, p, remainingBet, outcome)
   const { YES: y, NO: n } = pool
@@ -176,19 +174,17 @@ export function calculateCpmmSale(
     throw new Error('Cannot sell non-positive shares')
   }
 
-  const saleValue = calculateCpmmShareValue(
+  const rawSaleValue = calculateCpmmShareValue(
     contract,
     shares,
     outcome as 'YES' | 'NO'
   )
 
-  const fees = noFees
-
-  // const { fees, remainingBet: saleValue } = getCpmmLiquidityFee(
-  //   contract,
-  //   rawSaleValue,
-  //   outcome === 'YES' ? 'NO' : 'YES'
-  // )
+  const { fees, remainingBet: saleValue } = getCpmmFees(
+    contract,
+    rawSaleValue,
+    outcome === 'YES' ? 'NO' : 'YES'
+  )
 
   const { pool } = contract
   const { YES: y, NO: n } = pool
diff --git a/web/components/bet-panel.tsx b/web/components/bet-panel.tsx
index f76117b9..a43f6f12 100644
--- a/web/components/bet-panel.tsx
+++ b/web/components/bet-panel.tsx
@@ -37,7 +37,7 @@ import { useUserContractBets } from 'web/hooks/use-user-bets'
 import {
   calculateCpmmSale,
   getCpmmProbability,
-  getCpmmLiquidityFee,
+  getCpmmFees,
 } from 'common/calculate-cpmm'
 import { getFormattedMappedValue } from 'common/pseudo-numeric'
 import { SellRow } from './sell-row'
@@ -302,7 +302,7 @@ function BuyPanel(props: {
 
   const cpmmFees =
     contract.mechanism === 'cpmm-1' &&
-    getCpmmLiquidityFee(contract, betAmount ?? 0, betChoice ?? 'YES').totalFees
+    getCpmmFees(contract, betAmount ?? 0, betChoice ?? 'YES').totalFees
 
   const dpmTooltip =
     contract.mechanism === 'dpm-2'

From 93b293ca0e2f984aa1dec93ec1dd6566c0113d5f Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Fri, 8 Jul 2022 12:50:46 -0400
Subject: [PATCH 19/24] remove quick betting for FR markets

---
 web/components/contract/quick-bet.tsx | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/web/components/contract/quick-bet.tsx b/web/components/contract/quick-bet.tsx
index adbcc456..76ee7536 100644
--- a/web/components/contract/quick-bet.tsx
+++ b/web/components/contract/quick-bet.tsx
@@ -131,6 +131,13 @@ export function QuickBet(props: { contract: Contract; user: User }) {
     })
   }
 
+  if (outcomeType === 'FREE_RESPONSE')
+    return (
+      <Col className="relative -my-4 -mr-5 min-w-[5.5rem] justify-center gap-2 pr-5 pl-1 align-middle">
+        <QuickOutcomeView contract={contract} previewProb={previewProb} />
+      </Col>
+    )
+
   return (
     <Col
       className={clsx(

From ed0544212d133bb6af7447f9739beac6a2a72899 Mon Sep 17 00:00:00 2001
From: Marshall Polaris <marshall@pol.rs>
Date: Fri, 8 Jul 2022 15:00:03 -0700
Subject: [PATCH 20/24] Migrate changeUserInfo function to v2 (#626)

---
 functions/src/change-user-info.ts | 61 ++++++++++---------------------
 functions/src/index.ts            |  3 +-
 web/lib/firebase/api-call.ts      |  4 ++
 web/lib/firebase/fn-call.ts       | 10 -----
 web/pages/profile.tsx             | 19 ++++------
 5 files changed, 32 insertions(+), 65 deletions(-)

diff --git a/functions/src/change-user-info.ts b/functions/src/change-user-info.ts
index 118d5c67..aa041856 100644
--- a/functions/src/change-user-info.ts
+++ b/functions/src/change-user-info.ts
@@ -1,5 +1,5 @@
-import * as functions from 'firebase-functions'
 import * as admin from 'firebase-admin'
+import { z } from 'zod'
 
 import { getUser } from './utils'
 import { Contract } from '../../common/contract'
@@ -11,37 +11,23 @@ import {
 } from '../../common/util/clean-username'
 import { removeUndefinedProps } from '../../common/util/object'
 import { Answer } from '../../common/answer'
+import { APIError, newEndpoint, validate } from './api'
 
-export const changeUserInfo = functions
-  .runWith({ minInstances: 1 })
-  .https.onCall(
-    async (
-      data: {
-        username?: string
-        name?: string
-        avatarUrl?: string
-      },
-      context
-    ) => {
-      const userId = context?.auth?.uid
-      if (!userId) return { status: 'error', message: 'Not authorized' }
+const bodySchema = z.object({
+  username: z.string().optional(),
+  name: z.string().optional(),
+  avatarUrl: z.string().optional(),
+})
 
-      const user = await getUser(userId)
-      if (!user) return { status: 'error', message: 'User not found' }
+export const changeuserinfo = newEndpoint({}, async (req, auth) => {
+  const { username, name, avatarUrl } = validate(bodySchema, req.body)
 
-      const { username, name, avatarUrl } = data
+  const user = await getUser(auth.uid)
+  if (!user) throw new APIError(400, 'User not found')
 
-      return await changeUser(user, { username, name, avatarUrl })
-        .then(() => {
-          console.log('succesfully changed', user.username, 'to', data)
-          return { status: 'success' }
-        })
-        .catch((e) => {
-          console.log('Error', e.message)
-          return { status: 'error', message: e.message }
-        })
-    }
-  )
+  await changeUser(user, { username, name, avatarUrl })
+  return { message: 'Successfully changed user info.' }
+})
 
 export const changeUser = async (
   user: User,
@@ -55,14 +41,14 @@ export const changeUser = async (
     if (update.username) {
       update.username = cleanUsername(update.username)
       if (!update.username) {
-        throw new Error('Invalid username')
+        throw new APIError(400, 'Invalid username')
       }
 
       const sameNameUser = await transaction.get(
         firestore.collection('users').where('username', '==', update.username)
       )
       if (!sameNameUser.empty) {
-        throw new Error('Username already exists')
+        throw new APIError(400, 'Username already exists')
       }
     }
 
@@ -104,17 +90,10 @@ export const changeUser = async (
     )
     const answerUpdate: Partial<Answer> = removeUndefinedProps(update)
 
-    await transaction.update(userRef, userUpdate)
-
-    await Promise.all(
-      commentSnap.docs.map((d) => transaction.update(d.ref, commentUpdate))
-    )
-
-    await Promise.all(
-      answerSnap.docs.map((d) => transaction.update(d.ref, answerUpdate))
-    )
-
-    await contracts.docs.map((d) => transaction.update(d.ref, contractUpdate))
+    transaction.update(userRef, userUpdate)
+    commentSnap.docs.forEach((d) => transaction.update(d.ref, commentUpdate))
+    answerSnap.docs.forEach((d) => transaction.update(d.ref, answerUpdate))
+    contracts.docs.forEach((d) => transaction.update(d.ref, contractUpdate))
   })
 }
 
diff --git a/functions/src/index.ts b/functions/src/index.ts
index 8d1756f2..08639c7c 100644
--- a/functions/src/index.ts
+++ b/functions/src/index.ts
@@ -3,7 +3,6 @@ import * as admin from 'firebase-admin'
 admin.initializeApp()
 
 // v1
-// export * from './keep-awake'
 export * from './claim-manalink'
 export * from './transact'
 export * from './stripe'
@@ -16,7 +15,6 @@ export * from './unsubscribe'
 export * from './update-metrics'
 export * from './update-stats'
 export * from './backup-db'
-export * from './change-user-info'
 export * from './market-close-notifications'
 export * from './add-liquidity'
 export * from './on-create-answer'
@@ -33,6 +31,7 @@ export * from './on-create-txn'
 
 // v2
 export * from './health'
+export * from './change-user-info'
 export * from './place-bet'
 export * from './sell-bet'
 export * from './sell-shares'
diff --git a/web/lib/firebase/api-call.ts b/web/lib/firebase/api-call.ts
index db41e592..341e92b0 100644
--- a/web/lib/firebase/api-call.ts
+++ b/web/lib/firebase/api-call.ts
@@ -50,6 +50,10 @@ export function getFunctionUrl(name: string) {
   }
 }
 
+export function changeUserInfo(params: any) {
+  return call(getFunctionUrl('changeuserinfo'), 'POST', params)
+}
+
 export function createMarket(params: any) {
   return call(getFunctionUrl('createmarket'), 'POST', params)
 }
diff --git a/web/lib/firebase/fn-call.ts b/web/lib/firebase/fn-call.ts
index ce78ac3a..b9b771b5 100644
--- a/web/lib/firebase/fn-call.ts
+++ b/web/lib/firebase/fn-call.ts
@@ -42,16 +42,6 @@ export const createUser: () => Promise<User | null> = () => {
     .catch(() => null)
 }
 
-export const changeUserInfo = (data: {
-  username?: string
-  name?: string
-  avatarUrl?: string
-}) => {
-  return cloudFunction('changeUserInfo')(data)
-    .then((r) => r.data as { status: string; message?: string })
-    .catch((e) => ({ status: 'error', message: e.message }))
-}
-
 export const addLiquidity = (data: { amount: number; contractId: string }) => {
   return cloudFunction('addLiquidity')(data)
     .then((r) => r.data as { status: string })
diff --git a/web/pages/profile.tsx b/web/pages/profile.tsx
index ac06eaf2..62177825 100644
--- a/web/pages/profile.tsx
+++ b/web/pages/profile.tsx
@@ -9,7 +9,7 @@ import { Title } from 'web/components/title'
 import { usePrivateUser, useUser } from 'web/hooks/use-user'
 import { formatMoney } from 'common/util/format'
 import { cleanDisplayName, cleanUsername } from 'common/util/clean-username'
-import { changeUserInfo } from 'web/lib/firebase/fn-call'
+import { changeUserInfo } from 'web/lib/firebase/api-call'
 import { uploadImage } from 'web/lib/firebase/storage'
 import { Col } from 'web/components/layout/col'
 import { Row } from 'web/components/layout/row'
@@ -85,12 +85,9 @@ export default function ProfilePage() {
 
     if (newName) {
       setName(newName)
-
-      await changeUserInfo({ name: newName })
-        .catch(() => ({ status: 'error' }))
-        .then((r) => {
-          if (r.status === 'error') setName(user?.name || '')
-        })
+      await changeUserInfo({ name: newName }).catch((_) =>
+        setName(user?.name || '')
+      )
     } else {
       setName(user?.name || '')
     }
@@ -101,11 +98,9 @@ export default function ProfilePage() {
 
     if (newUsername) {
       setUsername(newUsername)
-      await changeUserInfo({ username: newUsername })
-        .catch(() => ({ status: 'error' }))
-        .then((r) => {
-          if (r.status === 'error') setUsername(user?.username || '')
-        })
+      await changeUserInfo({ username: newUsername }).catch((_) =>
+        setUsername(user?.username || '')
+      )
     } else {
       setUsername(user?.username || '')
     }

From d9f42caa6a87acc643769475ff1e5a21b0cddc60 Mon Sep 17 00:00:00 2001
From: Marshall Polaris <marshall@pol.rs>
Date: Fri, 8 Jul 2022 15:08:17 -0700
Subject: [PATCH 21/24] Migrate addLiquidity and withdrawLiquidity functions to
 v2 (#627)

---
 functions/src/add-liquidity.ts      | 149 +++++++++++-----------
 functions/src/index.ts              |   2 +-
 functions/src/withdraw-liquidity.ts | 188 ++++++++++++----------------
 web/components/liquidity-panel.tsx  |  14 +--
 web/lib/firebase/api-call.ts        |   8 ++
 web/lib/firebase/fn-call.ts         |  11 --
 6 files changed, 167 insertions(+), 205 deletions(-)

diff --git a/functions/src/add-liquidity.ts b/functions/src/add-liquidity.ts
index eca0a056..3ef453c2 100644
--- a/functions/src/add-liquidity.ts
+++ b/functions/src/add-liquidity.ts
@@ -1,105 +1,96 @@
-import * as functions from 'firebase-functions'
 import * as admin from 'firebase-admin'
+import { z } from 'zod'
 
 import { Contract } from '../../common/contract'
 import { User } from '../../common/user'
 import { removeUndefinedProps } from '../../common/util/object'
 import { redeemShares } from './redeem-shares'
 import { getNewLiquidityProvision } from '../../common/add-liquidity'
+import { APIError, newEndpoint, validate } from './api'
 
-export const addLiquidity = functions.runWith({ minInstances: 1 }).https.onCall(
-  async (
-    data: {
-      amount: number
-      contractId: string
-    },
-    context
-  ) => {
-    const userId = context?.auth?.uid
-    if (!userId) return { status: 'error', message: 'Not authorized' }
+const bodySchema = z.object({
+  contractId: z.string(),
+  amount: z.number().gt(0),
+})
 
-    const { amount, contractId } = data
+export const addliquidity = newEndpoint({}, async (req, auth) => {
+  const { amount, contractId } = validate(bodySchema, req.body)
 
-    if (amount <= 0 || isNaN(amount) || !isFinite(amount))
-      return { status: 'error', message: 'Invalid amount' }
+  if (!isFinite(amount)) throw new APIError(400, 'Invalid amount')
 
-    // run as transaction to prevent race conditions
-    return await firestore
-      .runTransaction(async (transaction) => {
-        const userDoc = firestore.doc(`users/${userId}`)
-        const userSnap = await transaction.get(userDoc)
-        if (!userSnap.exists)
-          return { status: 'error', message: 'User not found' }
-        const user = userSnap.data() as User
+  // run as transaction to prevent race conditions
+  return await firestore
+    .runTransaction(async (transaction) => {
+      const userDoc = firestore.doc(`users/${auth.uid}`)
+      const userSnap = await transaction.get(userDoc)
+      if (!userSnap.exists) throw new APIError(400, 'User not found')
+      const user = userSnap.data() as User
 
-        const contractDoc = firestore.doc(`contracts/${contractId}`)
-        const contractSnap = await transaction.get(contractDoc)
-        if (!contractSnap.exists)
-          return { status: 'error', message: 'Invalid contract' }
-        const contract = contractSnap.data() as Contract
-        if (
-          contract.mechanism !== 'cpmm-1' ||
-          (contract.outcomeType !== 'BINARY' &&
-            contract.outcomeType !== 'PSEUDO_NUMERIC')
-        )
-          return { status: 'error', message: 'Invalid contract' }
+      const contractDoc = firestore.doc(`contracts/${contractId}`)
+      const contractSnap = await transaction.get(contractDoc)
+      if (!contractSnap.exists) throw new APIError(400, 'Invalid contract')
+      const contract = contractSnap.data() as Contract
+      if (
+        contract.mechanism !== 'cpmm-1' ||
+        (contract.outcomeType !== 'BINARY' &&
+          contract.outcomeType !== 'PSEUDO_NUMERIC')
+      )
+        throw new APIError(400, 'Invalid contract')
 
-        const { closeTime } = contract
-        if (closeTime && Date.now() > closeTime)
-          return { status: 'error', message: 'Trading is closed' }
+      const { closeTime } = contract
+      if (closeTime && Date.now() > closeTime)
+        throw new APIError(400, 'Trading is closed')
 
-        if (user.balance < amount)
-          return { status: 'error', message: 'Insufficient balance' }
+      if (user.balance < amount) throw new APIError(400, 'Insufficient balance')
 
-        const newLiquidityProvisionDoc = firestore
-          .collection(`contracts/${contractId}/liquidity`)
-          .doc()
+      const newLiquidityProvisionDoc = firestore
+        .collection(`contracts/${contractId}/liquidity`)
+        .doc()
 
-        const { newLiquidityProvision, newPool, newP, newTotalLiquidity } =
-          getNewLiquidityProvision(
-            user,
-            amount,
-            contract,
-            newLiquidityProvisionDoc.id
-          )
-
-        if (newP !== undefined && !isFinite(newP)) {
-          return {
-            status: 'error',
-            message: 'Liquidity injection rejected due to overflow error.',
-          }
-        }
-
-        transaction.update(
-          contractDoc,
-          removeUndefinedProps({
-            pool: newPool,
-            p: newP,
-            totalLiquidity: newTotalLiquidity,
-          })
+      const { newLiquidityProvision, newPool, newP, newTotalLiquidity } =
+        getNewLiquidityProvision(
+          user,
+          amount,
+          contract,
+          newLiquidityProvisionDoc.id
         )
 
-        const newBalance = user.balance - amount
-        const newTotalDeposits = user.totalDeposits - amount
-
-        if (!isFinite(newBalance)) {
-          throw new Error('Invalid user balance for ' + user.username)
+      if (newP !== undefined && !isFinite(newP)) {
+        return {
+          status: 'error',
+          message: 'Liquidity injection rejected due to overflow error.',
         }
+      }
 
-        transaction.update(userDoc, {
-          balance: newBalance,
-          totalDeposits: newTotalDeposits,
+      transaction.update(
+        contractDoc,
+        removeUndefinedProps({
+          pool: newPool,
+          p: newP,
+          totalLiquidity: newTotalLiquidity,
         })
+      )
 
-        transaction.create(newLiquidityProvisionDoc, newLiquidityProvision)
+      const newBalance = user.balance - amount
+      const newTotalDeposits = user.totalDeposits - amount
 
-        return { status: 'success', newLiquidityProvision }
+      if (!isFinite(newBalance)) {
+        throw new APIError(500, 'Invalid user balance for ' + user.username)
+      }
+
+      transaction.update(userDoc, {
+        balance: newBalance,
+        totalDeposits: newTotalDeposits,
       })
-      .then(async (result) => {
-        await redeemShares(userId, contractId)
-        return result
-      })
-  }
-)
+
+      transaction.create(newLiquidityProvisionDoc, newLiquidityProvision)
+
+      return newLiquidityProvision
+    })
+    .then(async (result) => {
+      await redeemShares(auth.uid, contractId)
+      return result
+    })
+})
 
 const firestore = admin.firestore()
diff --git a/functions/src/index.ts b/functions/src/index.ts
index 08639c7c..2800bb7d 100644
--- a/functions/src/index.ts
+++ b/functions/src/index.ts
@@ -16,7 +16,6 @@ export * from './update-metrics'
 export * from './update-stats'
 export * from './backup-db'
 export * from './market-close-notifications'
-export * from './add-liquidity'
 export * from './on-create-answer'
 export * from './on-update-contract'
 export * from './on-create-contract'
@@ -36,6 +35,7 @@ export * from './place-bet'
 export * from './sell-bet'
 export * from './sell-shares'
 export * from './create-contract'
+export * from './add-liquidity'
 export * from './withdraw-liquidity'
 export * from './create-group'
 export * from './resolve-market'
diff --git a/functions/src/withdraw-liquidity.ts b/functions/src/withdraw-liquidity.ts
index cc8c84cf..1bdb19de 100644
--- a/functions/src/withdraw-liquidity.ts
+++ b/functions/src/withdraw-liquidity.ts
@@ -1,5 +1,5 @@
-import * as functions from 'firebase-functions'
 import * as admin from 'firebase-admin'
+import { z } from 'zod'
 
 import { CPMMContract } from '../../common/contract'
 import { User } from '../../common/user'
@@ -10,129 +10,107 @@ import { Bet } from '../../common/bet'
 import { getProbability } from '../../common/calculate'
 import { noFees } from '../../common/fees'
 
-import { APIError } from './api'
+import { APIError, newEndpoint, validate } from './api'
 import { redeemShares } from './redeem-shares'
 
-export const withdrawLiquidity = functions
-  .runWith({ minInstances: 1 })
-  .https.onCall(
-    async (
-      data: {
-        contractId: string
-      },
-      context
-    ) => {
-      const userId = context?.auth?.uid
-      if (!userId) return { status: 'error', message: 'Not authorized' }
+const bodySchema = z.object({
+  contractId: z.string(),
+})
 
-      const { contractId } = data
-      if (!contractId)
-        return { status: 'error', message: 'Missing contract id' }
+export const withdrawliquidity = newEndpoint({}, async (req, auth) => {
+  const { contractId } = validate(bodySchema, req.body)
 
-      return await firestore
-        .runTransaction(async (trans) => {
-          const lpDoc = firestore.doc(`users/${userId}`)
-          const lpSnap = await trans.get(lpDoc)
-          if (!lpSnap.exists) throw new APIError(400, 'User not found.')
-          const lp = lpSnap.data() as User
+  return await firestore
+    .runTransaction(async (trans) => {
+      const lpDoc = firestore.doc(`users/${auth.uid}`)
+      const lpSnap = await trans.get(lpDoc)
+      if (!lpSnap.exists) throw new APIError(400, 'User not found.')
+      const lp = lpSnap.data() as User
 
-          const contractDoc = firestore.doc(`contracts/${contractId}`)
-          const contractSnap = await trans.get(contractDoc)
-          if (!contractSnap.exists)
-            throw new APIError(400, 'Contract not found.')
-          const contract = contractSnap.data() as CPMMContract
+      const contractDoc = firestore.doc(`contracts/${contractId}`)
+      const contractSnap = await trans.get(contractDoc)
+      if (!contractSnap.exists) throw new APIError(400, 'Contract not found.')
+      const contract = contractSnap.data() as CPMMContract
 
-          const liquidityCollection = firestore.collection(
-            `contracts/${contractId}/liquidity`
-          )
+      const liquidityCollection = firestore.collection(
+        `contracts/${contractId}/liquidity`
+      )
 
-          const liquiditiesSnap = await trans.get(liquidityCollection)
+      const liquiditiesSnap = await trans.get(liquidityCollection)
 
-          const liquidities = liquiditiesSnap.docs.map(
-            (doc) => doc.data() as LiquidityProvision
-          )
+      const liquidities = liquiditiesSnap.docs.map(
+        (doc) => doc.data() as LiquidityProvision
+      )
 
-          const userShares = getUserLiquidityShares(
-            userId,
-            contract,
-            liquidities
-          )
+      const userShares = getUserLiquidityShares(auth.uid, contract, liquidities)
 
-          // zero all added amounts for now
-          // can add support for partial withdrawals in the future
-          liquiditiesSnap.docs
-            .filter(
-              (_, i) =>
-                !liquidities[i].isAnte && liquidities[i].userId === userId
-            )
-            .forEach((doc) => trans.update(doc.ref, { amount: 0 }))
+      // zero all added amounts for now
+      // can add support for partial withdrawals in the future
+      liquiditiesSnap.docs
+        .filter(
+          (_, i) => !liquidities[i].isAnte && liquidities[i].userId === auth.uid
+        )
+        .forEach((doc) => trans.update(doc.ref, { amount: 0 }))
 
-          const payout = Math.min(...Object.values(userShares))
-          if (payout <= 0) return {}
+      const payout = Math.min(...Object.values(userShares))
+      if (payout <= 0) return {}
 
-          const newBalance = lp.balance + payout
-          const newTotalDeposits = lp.totalDeposits + payout
-          trans.update(lpDoc, {
-            balance: newBalance,
-            totalDeposits: newTotalDeposits,
-          } as Partial<User>)
+      const newBalance = lp.balance + payout
+      const newTotalDeposits = lp.totalDeposits + payout
+      trans.update(lpDoc, {
+        balance: newBalance,
+        totalDeposits: newTotalDeposits,
+      } as Partial<User>)
 
-          const newPool = subtractObjects(contract.pool, userShares)
+      const newPool = subtractObjects(contract.pool, userShares)
 
-          const minPoolShares = Math.min(...Object.values(newPool))
-          const adjustedTotal = contract.totalLiquidity - payout
+      const minPoolShares = Math.min(...Object.values(newPool))
+      const adjustedTotal = contract.totalLiquidity - payout
 
-          // total liquidity is a bogus number; use minPoolShares to prevent from going negative
-          const newTotalLiquidity = Math.max(adjustedTotal, minPoolShares)
+      // total liquidity is a bogus number; use minPoolShares to prevent from going negative
+      const newTotalLiquidity = Math.max(adjustedTotal, minPoolShares)
 
-          trans.update(contractDoc, {
-            pool: newPool,
-            totalLiquidity: newTotalLiquidity,
-          })
+      trans.update(contractDoc, {
+        pool: newPool,
+        totalLiquidity: newTotalLiquidity,
+      })
 
-          const prob = getProbability(contract)
+      const prob = getProbability(contract)
 
-          // surplus shares become user's bets
-          const bets = Object.entries(userShares)
-            .map(([outcome, shares]) =>
-              shares - payout < 1 // don't create bet if less than 1 share
-                ? undefined
-                : ({
-                    userId: userId,
-                    contractId: contract.id,
-                    amount:
-                      (outcome === 'YES' ? prob : 1 - prob) * (shares - payout),
-                    shares: shares - payout,
-                    outcome,
-                    probBefore: prob,
-                    probAfter: prob,
-                    createdTime: Date.now(),
-                    isLiquidityProvision: true,
-                    fees: noFees,
-                  } as Omit<Bet, 'id'>)
-            )
-            .filter((x) => x !== undefined)
+      // surplus shares become user's bets
+      const bets = Object.entries(userShares)
+        .map(([outcome, shares]) =>
+          shares - payout < 1 // don't create bet if less than 1 share
+            ? undefined
+            : ({
+                userId: auth.uid,
+                contractId: contract.id,
+                amount:
+                  (outcome === 'YES' ? prob : 1 - prob) * (shares - payout),
+                shares: shares - payout,
+                outcome,
+                probBefore: prob,
+                probAfter: prob,
+                createdTime: Date.now(),
+                isLiquidityProvision: true,
+                fees: noFees,
+              } as Omit<Bet, 'id'>)
+        )
+        .filter((x) => x !== undefined)
 
-          for (const bet of bets) {
-            const doc = firestore
-              .collection(`contracts/${contract.id}/bets`)
-              .doc()
-            trans.create(doc, { id: doc.id, ...bet })
-          }
+      for (const bet of bets) {
+        const doc = firestore.collection(`contracts/${contract.id}/bets`).doc()
+        trans.create(doc, { id: doc.id, ...bet })
+      }
 
-          return userShares
-        })
-        .then(async (result) => {
-          // redeem surplus bet with pre-existing bets
-          await redeemShares(userId, contractId)
-
-          console.log('userid', userId, 'withdraws', result)
-          return { status: 'success', userShares: result }
-        })
-        .catch((e) => {
-          return { status: 'error', message: e.message }
-        })
-    }
-  )
+      return userShares
+    })
+    .then(async (result) => {
+      // redeem surplus bet with pre-existing bets
+      await redeemShares(auth.uid, contractId)
+      console.log('userid', auth.uid, 'withdraws', result)
+      return result
+    })
+})
 
 const firestore = admin.firestore()
diff --git a/web/components/liquidity-panel.tsx b/web/components/liquidity-panel.tsx
index 33efb335..d1e066be 100644
--- a/web/components/liquidity-panel.tsx
+++ b/web/components/liquidity-panel.tsx
@@ -4,7 +4,7 @@ import { useEffect, useState } from 'react'
 import { CPMMContract } from 'common/contract'
 import { formatMoney } from 'common/util/format'
 import { useUser } from 'web/hooks/use-user'
-import { addLiquidity, withdrawLiquidity } from 'web/lib/firebase/fn-call'
+import { addLiquidity, withdrawLiquidity } from 'web/lib/firebase/api-call'
 import { AmountInput } from './amount-input'
 import { Row } from './layout/row'
 import { useUserLiquidity } from 'web/hooks/use-liquidity'
@@ -90,14 +90,10 @@ function AddLiquidityPanel(props: { contract: CPMMContract }) {
     setIsSuccess(false)
 
     addLiquidity({ amount, contractId })
-      .then((r) => {
-        if (r.status === 'success') {
-          setIsSuccess(true)
-          setError(undefined)
-          setIsLoading(false)
-        } else {
-          setError('Server error')
-        }
+      .then((_) => {
+        setIsSuccess(true)
+        setError(undefined)
+        setIsLoading(false)
       })
       .catch((_) => setError('Server error'))
 
diff --git a/web/lib/firebase/api-call.ts b/web/lib/firebase/api-call.ts
index 341e92b0..d169ea72 100644
--- a/web/lib/firebase/api-call.ts
+++ b/web/lib/firebase/api-call.ts
@@ -54,6 +54,14 @@ export function changeUserInfo(params: any) {
   return call(getFunctionUrl('changeuserinfo'), 'POST', params)
 }
 
+export function addLiquidity(params: any) {
+  return call(getFunctionUrl('addliquidity'), 'POST', params)
+}
+
+export function withdrawLiquidity(params: any) {
+  return call(getFunctionUrl('withdrawliquidity'), 'POST', params)
+}
+
 export function createMarket(params: any) {
   return call(getFunctionUrl('createmarket'), 'POST', params)
 }
diff --git a/web/lib/firebase/fn-call.ts b/web/lib/firebase/fn-call.ts
index b9b771b5..3b16af70 100644
--- a/web/lib/firebase/fn-call.ts
+++ b/web/lib/firebase/fn-call.ts
@@ -9,11 +9,6 @@ import { safeLocalStorage } from '../util/local'
 export const cloudFunction = <RequestData, ResponseData>(name: string) =>
   httpsCallable<RequestData, ResponseData>(functions, name)
 
-export const withdrawLiquidity = cloudFunction<
-  { contractId: string },
-  { status: 'error' | 'success'; userShares: { [outcome: string]: number } }
->('withdrawLiquidity')
-
 export const transact = cloudFunction<
   Omit<Txn, 'id' | 'createdTime'>,
   { status: 'error' | 'success'; message?: string; txn?: Txn }
@@ -42,12 +37,6 @@ export const createUser: () => Promise<User | null> = () => {
     .catch(() => null)
 }
 
-export const addLiquidity = (data: { amount: number; contractId: string }) => {
-  return cloudFunction('addLiquidity')(data)
-    .then((r) => r.data as { status: string })
-    .catch((e) => ({ status: 'error', message: e.message }))
-}
-
 export const claimManalink = cloudFunction<
   string,
   { status: 'error' | 'success'; message?: string }

From fdde73710ee18400e22626b8fa99f3b55838ba18 Mon Sep 17 00:00:00 2001
From: Marshall Polaris <marshall@pol.rs>
Date: Fri, 8 Jul 2022 15:28:04 -0700
Subject: [PATCH 22/24]  Migrate claimManalink function to v2 (#628)

* Implement helpful `toString` on client `APIError`

* Migrate claimManalink function to v2
---
 functions/src/claim-manalink.ts | 166 ++++++++++++++++----------------
 functions/src/index.ts          |   2 +-
 web/lib/firebase/api-call.ts    |   7 ++
 web/lib/firebase/fn-call.ts     |   5 -
 web/pages/link/[slug].tsx       |   7 +-
 5 files changed, 94 insertions(+), 93 deletions(-)

diff --git a/functions/src/claim-manalink.ts b/functions/src/claim-manalink.ts
index 4bcd8b16..3822bbf7 100644
--- a/functions/src/claim-manalink.ts
+++ b/functions/src/claim-manalink.ts
@@ -1,102 +1,104 @@
-import * as functions from 'firebase-functions'
 import * as admin from 'firebase-admin'
+import { z } from 'zod'
 
 import { User } from 'common/user'
 import { Manalink } from 'common/manalink'
 import { runTxn, TxnData } from './transact'
+import { APIError, newEndpoint, validate } from './api'
 
-export const claimManalink = functions
-  .runWith({ minInstances: 1 })
-  .https.onCall(async (slug: string, context) => {
-    const userId = context?.auth?.uid
-    if (!userId) return { status: 'error', message: 'Not authorized' }
+const bodySchema = z.object({
+  slug: z.string(),
+})
 
-    // Run as transaction to prevent race conditions.
-    return await firestore.runTransaction(async (transaction) => {
-      // Look up the manalink
-      const manalinkDoc = firestore.doc(`manalinks/${slug}`)
-      const manalinkSnap = await transaction.get(manalinkDoc)
-      if (!manalinkSnap.exists) {
-        return { status: 'error', message: 'Manalink not found' }
-      }
-      const manalink = manalinkSnap.data() as Manalink
+export const claimmanalink = newEndpoint({}, async (req, auth) => {
+  const { slug } = validate(bodySchema, req.body)
 
-      const { amount, fromId, claimedUserIds } = manalink
+  // Run as transaction to prevent race conditions.
+  return await firestore.runTransaction(async (transaction) => {
+    // Look up the manalink
+    const manalinkDoc = firestore.doc(`manalinks/${slug}`)
+    const manalinkSnap = await transaction.get(manalinkDoc)
+    if (!manalinkSnap.exists) {
+      throw new APIError(400, 'Manalink not found')
+    }
+    const manalink = manalinkSnap.data() as Manalink
 
-      if (amount <= 0 || isNaN(amount) || !isFinite(amount))
-        return { status: 'error', message: 'Invalid amount' }
+    const { amount, fromId, claimedUserIds } = manalink
 
-      const fromDoc = firestore.doc(`users/${fromId}`)
-      const fromSnap = await transaction.get(fromDoc)
-      if (!fromSnap.exists) {
-        return { status: 'error', message: `User ${fromId} not found` }
-      }
-      const fromUser = fromSnap.data() as User
+    if (amount <= 0 || isNaN(amount) || !isFinite(amount))
+      throw new APIError(500, 'Invalid amount')
 
-      // Only permit one redemption per user per link
-      if (claimedUserIds.includes(userId)) {
-        return {
-          status: 'error',
-          message: `${fromUser.name} already redeemed manalink ${slug}`,
-        }
-      }
+    const fromDoc = firestore.doc(`users/${fromId}`)
+    const fromSnap = await transaction.get(fromDoc)
+    if (!fromSnap.exists) {
+      throw new APIError(500, `User ${fromId} not found`)
+    }
+    const fromUser = fromSnap.data() as User
 
-      // Disallow expired or maxed out links
-      if (manalink.expiresTime != null && manalink.expiresTime < Date.now()) {
-        return {
-          status: 'error',
-          message: `Manalink ${slug} expired on ${new Date(
-            manalink.expiresTime
-          ).toLocaleString()}`,
-        }
-      }
-      if (
-        manalink.maxUses != null &&
-        manalink.maxUses <= manalink.claims.length
-      ) {
-        return {
-          status: 'error',
-          message: `Manalink ${slug} has reached its max uses of ${manalink.maxUses}`,
-        }
-      }
+    // Only permit one redemption per user per link
+    if (claimedUserIds.includes(auth.uid)) {
+      throw new APIError(400, `You already redeemed manalink ${slug}`)
+    }
 
-      if (fromUser.balance < amount) {
-        return {
-          status: 'error',
-          message: `Insufficient balance: ${fromUser.name} needed ${amount} for this manalink but only had ${fromUser.balance} `,
-        }
-      }
+    // Disallow expired or maxed out links
+    if (manalink.expiresTime != null && manalink.expiresTime < Date.now()) {
+      throw new APIError(
+        400,
+        `Manalink ${slug} expired on ${new Date(
+          manalink.expiresTime
+        ).toLocaleString()}`
+      )
+    }
+    if (
+      manalink.maxUses != null &&
+      manalink.maxUses <= manalink.claims.length
+    ) {
+      throw new APIError(
+        400,
+        `Manalink ${slug} has reached its max uses of ${manalink.maxUses}`
+      )
+    }
 
-      // Actually execute the txn
-      const data: TxnData = {
-        fromId,
-        fromType: 'USER',
-        toId: userId,
-        toType: 'USER',
-        amount,
-        token: 'M$',
-        category: 'MANALINK',
-        description: `Manalink ${slug} claimed: ${amount} from ${fromUser.username} to ${userId}`,
-      }
-      const result = await runTxn(transaction, data)
-      const txnId = result.txn?.id
-      if (!txnId) {
-        return { status: 'error', message: result.message }
-      }
+    if (fromUser.balance < amount) {
+      throw new APIError(
+        400,
+        `Insufficient balance: ${fromUser.name} needed ${amount} for this manalink but only had ${fromUser.balance} `
+      )
+    }
 
-      // Update the manalink object with this info
-      const claim = {
-        toId: userId,
-        txnId,
-        claimedTime: Date.now(),
-      }
-      transaction.update(manalinkDoc, {
-        claimedUserIds: [...claimedUserIds, userId],
-        claims: [...manalink.claims, claim],
-      })
+    // Actually execute the txn
+    const data: TxnData = {
+      fromId,
+      fromType: 'USER',
+      toId: auth.uid,
+      toType: 'USER',
+      amount,
+      token: 'M$',
+      category: 'MANALINK',
+      description: `Manalink ${slug} claimed: ${amount} from ${fromUser.username} to ${auth.uid}`,
+    }
+    const result = await runTxn(transaction, data)
+    const txnId = result.txn?.id
+    if (!txnId) {
+      throw new APIError(
+        500,
+        result.message ?? 'An error occurred posting the transaction.'
+      )
+    }
 
-      return { status: 'success', message: 'Manalink claimed' }
+    // Update the manalink object with this info
+    const claim = {
+      toId: auth.uid,
+      txnId,
+      claimedTime: Date.now(),
+    }
+    transaction.update(manalinkDoc, {
+      claimedUserIds: [...claimedUserIds, auth.uid],
+      claims: [...manalink.claims, claim],
     })
+
+    return { message: 'Manalink claimed' }
   })
+})
 
 const firestore = admin.firestore()
diff --git a/functions/src/index.ts b/functions/src/index.ts
index 2800bb7d..7c839396 100644
--- a/functions/src/index.ts
+++ b/functions/src/index.ts
@@ -3,7 +3,6 @@ import * as admin from 'firebase-admin'
 admin.initializeApp()
 
 // v1
-export * from './claim-manalink'
 export * from './transact'
 export * from './stripe'
 export * from './create-user'
@@ -34,6 +33,7 @@ export * from './change-user-info'
 export * from './place-bet'
 export * from './sell-bet'
 export * from './sell-shares'
+export * from './claim-manalink'
 export * from './create-contract'
 export * from './add-liquidity'
 export * from './withdraw-liquidity'
diff --git a/web/lib/firebase/api-call.ts b/web/lib/firebase/api-call.ts
index d169ea72..04c6b7ce 100644
--- a/web/lib/firebase/api-call.ts
+++ b/web/lib/firebase/api-call.ts
@@ -10,6 +10,9 @@ export class APIError extends Error {
     this.name = 'APIError'
     this.details = details
   }
+  toString() {
+    return this.name
+  }
 }
 
 export async function call(url: string, method: string, params: any) {
@@ -82,6 +85,10 @@ export function sellBet(params: any) {
   return call(getFunctionUrl('sellbet'), 'POST', params)
 }
 
+export function claimManalink(params: any) {
+  return call(getFunctionUrl('claimmanalink'), 'POST', params)
+}
+
 export function createGroup(params: any) {
   return call(getFunctionUrl('creategroup'), 'POST', params)
 }
diff --git a/web/lib/firebase/fn-call.ts b/web/lib/firebase/fn-call.ts
index 3b16af70..6867b5bb 100644
--- a/web/lib/firebase/fn-call.ts
+++ b/web/lib/firebase/fn-call.ts
@@ -36,8 +36,3 @@ export const createUser: () => Promise<User | null> = () => {
     .then((r) => (r.data as any)?.user || null)
     .catch(() => null)
 }
-
-export const claimManalink = cloudFunction<
-  string,
-  { status: 'error' | 'success'; message?: string }
->('claimManalink')
diff --git a/web/pages/link/[slug].tsx b/web/pages/link/[slug].tsx
index eed68e1a..b36a9057 100644
--- a/web/pages/link/[slug].tsx
+++ b/web/pages/link/[slug].tsx
@@ -2,7 +2,7 @@ import { useRouter } from 'next/router'
 import { useState } from 'react'
 import { SEO } from 'web/components/SEO'
 import { Title } from 'web/components/title'
-import { claimManalink } from 'web/lib/firebase/fn-call'
+import { claimManalink } from 'web/lib/firebase/api-call'
 import { useManalink } from 'web/lib/firebase/manalinks'
 import { ManalinkCard } from 'web/components/manalink-card'
 import { useUser } from 'web/hooks/use-user'
@@ -42,10 +42,7 @@ export default function ClaimPage() {
               if (user == null) {
                 await firebaseLogin()
               }
-              const result = await claimManalink(manalink.slug)
-              if (result.data.status == 'error') {
-                throw new Error(result.data.message)
-              }
+              await claimManalink({ slug: manalink.slug })
               user && router.push(`/${user.username}?claimed-mana=yes`)
             } catch (e) {
               console.log(e)

From c1ca1471a1705ca2501af746d6a9df4a44604360 Mon Sep 17 00:00:00 2001
From: Marshall Polaris <marshall@pol.rs>
Date: Sat, 9 Jul 2022 00:26:56 -0700
Subject: [PATCH 23/24] Migrate createAnswer function to v2 (#634)

* Migrate createAnswer function to v2

* Remove unhelpful toString on APIError
---
 functions/src/create-answer.ts                | 185 ++++++++----------
 functions/src/index.ts                        |   2 +-
 .../answers/create-answer-panel.tsx           |  25 +--
 web/lib/firebase/api-call.ts                  |   6 +-
 web/lib/firebase/fn-call.ts                   |  10 -
 5 files changed, 101 insertions(+), 127 deletions(-)

diff --git a/functions/src/create-answer.ts b/functions/src/create-answer.ts
index cf3867b0..2abaf44d 100644
--- a/functions/src/create-answer.ts
+++ b/functions/src/create-answer.ts
@@ -1,5 +1,5 @@
-import * as functions from 'firebase-functions'
 import * as admin from 'firebase-admin'
+import { z } from 'zod'
 
 import { Contract } from '../../common/contract'
 import { User } from '../../common/user'
@@ -7,122 +7,103 @@ import { getNewMultiBetInfo } from '../../common/new-bet'
 import { Answer, MAX_ANSWER_LENGTH } from '../../common/answer'
 import { getContract, getValues } from './utils'
 import { sendNewAnswerEmail } from './emails'
+import { APIError, newEndpoint, validate } from './api'
 
-export const createAnswer = functions
-  .runWith({ minInstances: 1, secrets: ['MAILGUN_KEY'] })
-  .https.onCall(
-    async (
-      data: {
-        contractId: string
-        amount: number
-        text: string
-      },
-      context
-    ) => {
-      const userId = context?.auth?.uid
-      if (!userId) return { status: 'error', message: 'Not authorized' }
+const bodySchema = z.object({
+  contractId: z.string().max(MAX_ANSWER_LENGTH),
+  amount: z.number().gt(0),
+  text: z.string(),
+})
 
-      const { contractId, amount, text } = data
+const opts = { secrets: ['MAILGUN_KEY'] }
 
-      if (amount <= 0 || isNaN(amount) || !isFinite(amount))
-        return { status: 'error', message: 'Invalid amount' }
+export const createanswer = newEndpoint(opts, async (req, auth) => {
+  const { contractId, amount, text } = validate(bodySchema, req.body)
 
-      if (!text || typeof text !== 'string' || text.length > MAX_ANSWER_LENGTH)
-        return { status: 'error', message: 'Invalid text' }
+  if (!isFinite(amount)) throw new APIError(400, 'Invalid amount')
 
-      // Run as transaction to prevent race conditions.
-      const result = await firestore.runTransaction(async (transaction) => {
-        const userDoc = firestore.doc(`users/${userId}`)
-        const userSnap = await transaction.get(userDoc)
-        if (!userSnap.exists)
-          return { status: 'error', message: 'User not found' }
-        const user = userSnap.data() as User
+  // Run as transaction to prevent race conditions.
+  const answer = await firestore.runTransaction(async (transaction) => {
+    const userDoc = firestore.doc(`users/${auth.uid}`)
+    const userSnap = await transaction.get(userDoc)
+    if (!userSnap.exists) throw new APIError(400, 'User not found')
+    const user = userSnap.data() as User
 
-        if (user.balance < amount)
-          return { status: 'error', message: 'Insufficient balance' }
+    if (user.balance < amount) throw new APIError(400, 'Insufficient balance')
 
-        const contractDoc = firestore.doc(`contracts/${contractId}`)
-        const contractSnap = await transaction.get(contractDoc)
-        if (!contractSnap.exists)
-          return { status: 'error', message: 'Invalid contract' }
-        const contract = contractSnap.data() as Contract
+    const contractDoc = firestore.doc(`contracts/${contractId}`)
+    const contractSnap = await transaction.get(contractDoc)
+    if (!contractSnap.exists) throw new APIError(400, 'Invalid contract')
+    const contract = contractSnap.data() as Contract
 
-        if (contract.outcomeType !== 'FREE_RESPONSE')
-          return {
-            status: 'error',
-            message: 'Requires a free response contract',
-          }
+    if (contract.outcomeType !== 'FREE_RESPONSE')
+      throw new APIError(400, 'Requires a free response contract')
 
-        const { closeTime, volume } = contract
-        if (closeTime && Date.now() > closeTime)
-          return { status: 'error', message: 'Trading is closed' }
+    const { closeTime, volume } = contract
+    if (closeTime && Date.now() > closeTime)
+      throw new APIError(400, 'Trading is closed')
 
-        const [lastAnswer] = await getValues<Answer>(
-          firestore
-            .collection(`contracts/${contractId}/answers`)
-            .orderBy('number', 'desc')
-            .limit(1)
-        )
+    const [lastAnswer] = await getValues<Answer>(
+      firestore
+        .collection(`contracts/${contractId}/answers`)
+        .orderBy('number', 'desc')
+        .limit(1)
+    )
 
-        if (!lastAnswer)
-          return { status: 'error', message: 'Could not fetch last answer' }
+    if (!lastAnswer) throw new APIError(500, 'Could not fetch last answer')
 
-        const number = lastAnswer.number + 1
-        const id = `${number}`
+    const number = lastAnswer.number + 1
+    const id = `${number}`
 
-        const newAnswerDoc = firestore
-          .collection(`contracts/${contractId}/answers`)
-          .doc(id)
+    const newAnswerDoc = firestore
+      .collection(`contracts/${contractId}/answers`)
+      .doc(id)
 
-        const answerId = newAnswerDoc.id
-        const { username, name, avatarUrl } = user
+    const answerId = newAnswerDoc.id
+    const { username, name, avatarUrl } = user
 
-        const answer: Answer = {
-          id,
-          number,
-          contractId,
-          createdTime: Date.now(),
-          userId: user.id,
-          username,
-          name,
-          avatarUrl,
-          text,
-        }
-        transaction.create(newAnswerDoc, answer)
-
-        const loanAmount = 0
-
-        const { newBet, newPool, newTotalShares, newTotalBets } =
-          getNewMultiBetInfo(answerId, amount, contract, loanAmount)
-
-        const newBalance = user.balance - amount
-        const betDoc = firestore
-          .collection(`contracts/${contractId}/bets`)
-          .doc()
-        transaction.create(betDoc, {
-          id: betDoc.id,
-          userId: user.id,
-          ...newBet,
-        })
-        transaction.update(userDoc, { balance: newBalance })
-        transaction.update(contractDoc, {
-          pool: newPool,
-          totalShares: newTotalShares,
-          totalBets: newTotalBets,
-          answers: [...(contract.answers ?? []), answer],
-          volume: volume + amount,
-        })
-
-        return { status: 'success', answerId, betId: betDoc.id, answer }
-      })
-
-      const { answer } = result
-      const contract = await getContract(contractId)
-
-      if (answer && contract) await sendNewAnswerEmail(answer, contract)
-
-      return result
+    const answer: Answer = {
+      id,
+      number,
+      contractId,
+      createdTime: Date.now(),
+      userId: user.id,
+      username,
+      name,
+      avatarUrl,
+      text,
     }
-  )
+    transaction.create(newAnswerDoc, answer)
+
+    const loanAmount = 0
+
+    const { newBet, newPool, newTotalShares, newTotalBets } =
+      getNewMultiBetInfo(answerId, amount, contract, loanAmount)
+
+    const newBalance = user.balance - amount
+    const betDoc = firestore.collection(`contracts/${contractId}/bets`).doc()
+    transaction.create(betDoc, {
+      id: betDoc.id,
+      userId: user.id,
+      ...newBet,
+    })
+    transaction.update(userDoc, { balance: newBalance })
+    transaction.update(contractDoc, {
+      pool: newPool,
+      totalShares: newTotalShares,
+      totalBets: newTotalBets,
+      answers: [...(contract.answers ?? []), answer],
+      volume: volume + amount,
+    })
+
+    return answer
+  })
+
+  const contract = await getContract(contractId)
+
+  if (answer && contract) await sendNewAnswerEmail(answer, contract)
+
+  return answer
+})
 
 const firestore = admin.firestore()
diff --git a/functions/src/index.ts b/functions/src/index.ts
index 7c839396..34fceaa7 100644
--- a/functions/src/index.ts
+++ b/functions/src/index.ts
@@ -6,7 +6,6 @@ admin.initializeApp()
 export * from './transact'
 export * from './stripe'
 export * from './create-user'
-export * from './create-answer'
 export * from './on-create-bet'
 export * from './on-create-comment-on-contract'
 export * from './on-view'
@@ -30,6 +29,7 @@ export * from './on-create-txn'
 // v2
 export * from './health'
 export * from './change-user-info'
+export * from './create-answer'
 export * from './place-bet'
 export * from './sell-bet'
 export * from './sell-shares'
diff --git a/web/components/answers/create-answer-panel.tsx b/web/components/answers/create-answer-panel.tsx
index ed9012c9..41745b09 100644
--- a/web/components/answers/create-answer-panel.tsx
+++ b/web/components/answers/create-answer-panel.tsx
@@ -6,7 +6,7 @@ import { findBestMatch } from 'string-similarity'
 import { FreeResponseContract } from 'common/contract'
 import { BuyAmountInput } from '../amount-input'
 import { Col } from '../layout/col'
-import { createAnswer } from 'web/lib/firebase/fn-call'
+import { APIError, createAnswer } from 'web/lib/firebase/api-call'
 import { Row } from '../layout/row'
 import {
   formatMoney,
@@ -46,20 +46,23 @@ export function CreateAnswerPanel(props: { contract: FreeResponseContract }) {
     if (canSubmit) {
       setIsSubmitting(true)
 
-      const result = await createAnswer({
-        contractId: contract.id,
-        text,
-        amount: betAmount,
-      }).then((r) => r.data)
-
-      setIsSubmitting(false)
-
-      if (result.status === 'success') {
+      try {
+        await createAnswer({
+          contractId: contract.id,
+          text,
+          amount: betAmount,
+        })
         setText('')
         setBetAmount(10)
         setAmountError(undefined)
         setPossibleDuplicateAnswer(undefined)
-      } else setAmountError(result.message)
+      } catch (e) {
+        if (e instanceof APIError) {
+          setAmountError(e.toString())
+        }
+      }
+
+      setIsSubmitting(false)
     }
   }
 
diff --git a/web/lib/firebase/api-call.ts b/web/lib/firebase/api-call.ts
index 04c6b7ce..ef0cad1e 100644
--- a/web/lib/firebase/api-call.ts
+++ b/web/lib/firebase/api-call.ts
@@ -10,9 +10,6 @@ export class APIError extends Error {
     this.name = 'APIError'
     this.details = details
   }
-  toString() {
-    return this.name
-  }
 }
 
 export async function call(url: string, method: string, params: any) {
@@ -53,6 +50,9 @@ export function getFunctionUrl(name: string) {
   }
 }
 
+export function createAnswer(params: any) {
+  return call(getFunctionUrl('createanswer'), 'POST', params)
+}
 export function changeUserInfo(params: any) {
   return call(getFunctionUrl('changeuserinfo'), 'POST', params)
 }
diff --git a/web/lib/firebase/fn-call.ts b/web/lib/firebase/fn-call.ts
index 6867b5bb..27a5e8f3 100644
--- a/web/lib/firebase/fn-call.ts
+++ b/web/lib/firebase/fn-call.ts
@@ -14,16 +14,6 @@ export const transact = cloudFunction<
   { status: 'error' | 'success'; message?: string; txn?: Txn }
 >('transact')
 
-export const createAnswer = cloudFunction<
-  { contractId: string; text: string; amount: number },
-  {
-    status: 'error' | 'success'
-    message?: string
-    answerId?: string
-    betId?: string
-  }
->('createAnswer')
-
 export const createUser: () => Promise<User | null> = () => {
   const local = safeLocalStorage()
   let deviceToken = local?.getItem('device-token')

From e7e686d5799190682b2ea6af802937f43724a079 Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Sat, 9 Jul 2022 13:53:50 -0400
Subject: [PATCH 24/24] return creator liquidity after resolution

---
 common/calculate-cpmm.ts            | 27 +++++++++++++++++----------
 common/payouts-fixed.ts             |  4 ++--
 functions/src/withdraw-liquidity.ts |  7 ++++++-
 web/hooks/use-liquidity.ts          |  7 ++++++-
 4 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/common/calculate-cpmm.ts b/common/calculate-cpmm.ts
index 92d95251..8a609970 100644
--- a/common/calculate-cpmm.ts
+++ b/common/calculate-cpmm.ts
@@ -1,4 +1,4 @@
-import { sum, groupBy, mapValues, sumBy, partition } from 'lodash'
+import { sum, groupBy, mapValues, sumBy } from 'lodash'
 
 import { CPMMContract } from './contract'
 import { CREATOR_FEE, Fees, LIQUIDITY_FEE, PLATFORM_FEE } from './fees'
@@ -268,18 +268,20 @@ const calculateLiquidityDelta = (p: number) => (l: LiquidityProvision) => {
 
 export function getCpmmLiquidityPoolWeights(
   contract: CPMMContract,
-  liquidities: LiquidityProvision[]
+  liquidities: LiquidityProvision[],
+  excludeAntes: boolean
 ) {
-  const [antes, nonAntes] = partition(liquidities, (l) => !!l.isAnte)
-
   const calcLiqudity = calculateLiquidityDelta(contract.p)
-  const liquidityShares = nonAntes.map(calcLiqudity)
+  const liquidityShares = liquidities.map(calcLiqudity)
+  const shareSum = sum(liquidityShares)
 
-  const shareSum = sum(liquidityShares) + sum(antes.map(calcLiqudity))
+  const includedLiquidities = excludeAntes
+    ? liquidityShares.filter((_, i) => !liquidities[i].isAnte)
+    : liquidityShares
 
-  const weights = liquidityShares.map((s, i) => ({
+  const weights = includedLiquidities.map((s, i) => ({
     weight: s / shareSum,
-    providerId: nonAntes[i].userId,
+    providerId: liquidities[i].userId,
   }))
 
   const userWeights = groupBy(weights, (w) => w.providerId)
@@ -292,9 +294,14 @@ export function getCpmmLiquidityPoolWeights(
 export function getUserLiquidityShares(
   userId: string,
   contract: CPMMContract,
-  liquidities: LiquidityProvision[]
+  liquidities: LiquidityProvision[],
+  excludeAntes: boolean
 ) {
-  const weights = getCpmmLiquidityPoolWeights(contract, liquidities)
+  const weights = getCpmmLiquidityPoolWeights(
+    contract,
+    liquidities,
+    excludeAntes
+  )
   const userWeight = weights[userId] ?? 0
 
   return mapValues(contract.pool, (shares) => userWeight * shares)
diff --git a/common/payouts-fixed.ts b/common/payouts-fixed.ts
index 4e06042b..4b8de85a 100644
--- a/common/payouts-fixed.ts
+++ b/common/payouts-fixed.ts
@@ -72,7 +72,7 @@ export const getLiquidityPoolPayouts = (
   const { pool } = contract
   const finalPool = pool[outcome]
 
-  const weights = getCpmmLiquidityPoolWeights(contract, liquidities)
+  const weights = getCpmmLiquidityPoolWeights(contract, liquidities, false)
 
   return Object.entries(weights).map(([providerId, weight]) => ({
     userId: providerId,
@@ -123,7 +123,7 @@ export const getLiquidityPoolProbPayouts = (
   const { pool } = contract
   const finalPool = p * pool.YES + (1 - p) * pool.NO
 
-  const weights = getCpmmLiquidityPoolWeights(contract, liquidities)
+  const weights = getCpmmLiquidityPoolWeights(contract, liquidities, false)
 
   return Object.entries(weights).map(([providerId, weight]) => ({
     userId: providerId,
diff --git a/functions/src/withdraw-liquidity.ts b/functions/src/withdraw-liquidity.ts
index 1bdb19de..53974f7d 100644
--- a/functions/src/withdraw-liquidity.ts
+++ b/functions/src/withdraw-liquidity.ts
@@ -42,7 +42,12 @@ export const withdrawliquidity = newEndpoint({}, async (req, auth) => {
         (doc) => doc.data() as LiquidityProvision
       )
 
-      const userShares = getUserLiquidityShares(auth.uid, contract, liquidities)
+      const userShares = getUserLiquidityShares(
+        auth.uid,
+        contract,
+        liquidities,
+        true
+      )
 
       // zero all added amounts for now
       // can add support for partial withdrawals in the future
diff --git a/web/hooks/use-liquidity.ts b/web/hooks/use-liquidity.ts
index 9c610f3b..9c7c2b6f 100644
--- a/web/hooks/use-liquidity.ts
+++ b/web/hooks/use-liquidity.ts
@@ -21,6 +21,11 @@ export const useLiquidity = (contractId: string) => {
 export const useUserLiquidity = (contract: CPMMContract, userId: string) => {
   const liquidities = useLiquidity(contract.id)
 
-  const userShares = getUserLiquidityShares(userId, contract, liquidities ?? [])
+  const userShares = getUserLiquidityShares(
+    userId,
+    contract,
+    liquidities ?? [],
+    true
+  )
   return userShares
 }