From 8da36298e5f6ee2b095351a8e19ac2e291009ede Mon Sep 17 00:00:00 2001
From: Boa <iansphilips@gmail.com>
Date: Tue, 3 May 2022 07:51:25 -0600
Subject: [PATCH 01/34] condense comment logic in one component (#119)

---
 web/components/feed/feed-items.tsx | 151 +++++++++++++----------------
 1 file changed, 68 insertions(+), 83 deletions(-)

diff --git a/web/components/feed/feed-items.tsx b/web/components/feed/feed-items.tsx
index e21db3e5..a3b650c0 100644
--- a/web/components/feed/feed-items.tsx
+++ b/web/components/feed/feed-items.tsx
@@ -227,35 +227,27 @@ export function CommentInput(props: {
   const user = useUser()
   const [comment, setComment] = useState('')
 
-  async function submitComment() {
-    if (!comment) return
-    if (!user) {
-      return await firebaseLogin()
-    }
-    await createComment(contract.id, comment, user)
-    setComment('')
-  }
-
   // Should this be oldest bet or most recent bet?
   const mostRecentCommentableBet = betsByCurrentUser
     .filter(
       (bet) =>
-        canCommentOnBet(bet.userId, bet.createdTime, user) &&
+        canCommentOnBet(bet, bet.createdTime, user) &&
         !comments.some((comment) => comment.betId == bet.id)
     )
     .sort((b1, b2) => b1.createdTime - b2.createdTime)
     .pop()
 
-  if (mostRecentCommentableBet) {
-    return (
-      <FeedBet
-        contract={contract}
-        bet={mostRecentCommentableBet}
-        hideOutcome={false}
-        smallAvatar={false}
-      />
-    )
+  const { id } = mostRecentCommentableBet || { id: undefined }
+
+  async function submitComment(id: string | undefined) {
+    if (!comment) return
+    if (!user) {
+      return await firebaseLogin()
+    }
+    await createComment(contract.id, comment, user, id)
+    setComment('')
   }
+
   const { userPosition, userPositionMoney, yesFloorShares, noFloorShares } =
     getBettorsPosition(contract, Date.now(), betsByCurrentUser)
 
@@ -267,7 +259,14 @@ export function CommentInput(props: {
         </div>
         <div className={'min-w-0 flex-1 py-1.5'}>
           <div className="text-sm text-gray-500">
-            {user && userPosition > 0 && (
+            {mostRecentCommentableBet && (
+              <BetStatusText
+                contract={contract}
+                bet={mostRecentCommentableBet}
+                isSelf={true}
+              />
+            )}
+            {!mostRecentCommentableBet && user && userPosition > 0 && (
               <>
                 {'You have ' + userPositionMoney + ' '}
                 <>
@@ -290,7 +289,7 @@ export function CommentInput(props: {
                 maxLength={MAX_COMMENT_LENGTH}
                 onKeyDown={(e) => {
                   if (e.key === 'Enter' && (e.ctrlKey || e.metaKey)) {
-                    submitComment()
+                    submitComment(id)
                   }
                 }}
               />
@@ -298,7 +297,7 @@ export function CommentInput(props: {
                 className={
                   'btn btn-outline btn-sm text-transform: mt-1 capitalize'
                 }
-                onClick={submitComment}
+                onClick={() => submitComment(id)}
               >
                 {user ? 'Comment' : 'Sign in to comment'}
               </button>
@@ -372,24 +371,12 @@ export function FeedBet(props: {
   bet: Bet
   hideOutcome: boolean
   smallAvatar: boolean
-  hideComment?: boolean
   bettor?: User // If set: reveal bettor identity
 }) {
-  const { contract, bet, hideOutcome, smallAvatar, bettor, hideComment } = props
-  const { id, amount, outcome, createdTime, userId } = bet
+  const { contract, bet, hideOutcome, smallAvatar, bettor } = props
+  const { userId } = bet
   const user = useUser()
   const isSelf = user?.id === userId
-  const canComment = canCommentOnBet(userId, createdTime, user) && !hideComment
-
-  const [comment, setComment] = useState('')
-  async function submitComment() {
-    if (!user || !comment || !canComment) return
-    await createComment(contract.id, comment, user, id)
-    setComment('')
-  }
-
-  const bought = amount >= 0 ? 'bought' : 'sold'
-  const money = formatMoney(Math.abs(amount))
 
   return (
     <>
@@ -421,52 +408,52 @@ export function FeedBet(props: {
           )}
         </div>
         <div className={'min-w-0 flex-1 py-1.5'}>
-          <div className="text-sm text-gray-500">
-            <span>{isSelf ? 'You' : bettor ? bettor.name : 'A trader'}</span>{' '}
-            {bought} {money}
-            {!hideOutcome && (
-              <>
-                {' '}
-                of{' '}
-                <OutcomeLabel
-                  outcome={outcome}
-                  contract={contract}
-                  truncate="short"
-                />
-              </>
-            )}
-            <RelativeTimestamp time={createdTime} />
-            {(canComment || comment) && (
-              <div className="mt-2">
-                <Textarea
-                  value={comment}
-                  onChange={(e) => setComment(e.target.value)}
-                  className="textarea textarea-bordered w-full resize-none"
-                  placeholder="Add a comment..."
-                  rows={3}
-                  maxLength={MAX_COMMENT_LENGTH}
-                  onKeyDown={(e) => {
-                    if (e.key === 'Enter' && (e.ctrlKey || e.metaKey)) {
-                      submitComment()
-                    }
-                  }}
-                />
-                <button
-                  className="btn btn-outline btn-sm text-transform: mt-1 capitalize"
-                  onClick={submitComment}
-                  disabled={!canComment}
-                >
-                  Comment
-                </button>
-              </div>
-            )}
-          </div>
+          <BetStatusText
+            bet={bet}
+            contract={contract}
+            isSelf={isSelf}
+            hideOutcome={hideOutcome}
+            bettor={bettor}
+          />
         </div>
       </Row>
     </>
   )
 }
 
+function BetStatusText(props: {
+  contract: Contract
+  bet: Bet
+  isSelf: boolean
+  hideOutcome?: boolean
+  bettor?: User
+}) {
+  const { bet, contract, hideOutcome, bettor, isSelf } = props
+  const { amount, outcome, createdTime } = bet
+
+  const bought = amount >= 0 ? 'bought' : 'sold'
+  const money = formatMoney(Math.abs(amount))
+
+  return (
+    <div className="text-sm text-gray-500">
+      <span>{isSelf ? 'You' : bettor ? bettor.name : 'A trader'}</span> {bought}{' '}
+      {money}
+      {!hideOutcome && (
+        <>
+          {' '}
+          of{' '}
+          <OutcomeLabel
+            outcome={outcome}
+            contract={contract}
+            truncate="short"
+          />
+        </>
+      )}
+      <RelativeTimestamp time={createdTime} />
+    </div>
+  )
+}
+
 function TruncatedComment(props: {
   comment: string
   moreHref: string
@@ -573,14 +560,12 @@ export function FeedQuestion(props: {
   )
 }
 
-function canCommentOnBet(
-  userId: string,
-  createdTime: number,
-  user?: User | null
-) {
-  const isSelf = user?.id === userId
+function canCommentOnBet(bet: Bet, createdTime: number, user?: User | null) {
+  const isSelf = user?.id === bet.userId
   // You can comment if your bet was posted in the last hour
-  return isSelf && Date.now() - createdTime < 60 * 60 * 1000
+  return (
+    !bet.isRedemption && isSelf && Date.now() - createdTime < 60 * 60 * 1000
+  )
 }
 
 function FeedDescription(props: { contract: Contract }) {

From 3434b3de3f20ae5337102343f7906b2734c7c262 Mon Sep 17 00:00:00 2001
From: Sinclair Chen <abc.sinclair@gmail.com>
Date: Tue, 3 May 2022 07:00:33 -0700
Subject: [PATCH 02/34] Move all charity images to imgur + Next (#120)

---
 common/charity.ts                       | 87 +++++++++----------------
 web/components/charity/charity-card.tsx |  5 +-
 web/next.config.js                      |  2 +-
 web/pages/charity/[charitySlug].tsx     |  9 ++-
 4 files changed, 39 insertions(+), 64 deletions(-)

diff --git a/common/charity.ts b/common/charity.ts
index ab769655..72f96983 100644
--- a/common/charity.ts
+++ b/common/charity.ts
@@ -19,8 +19,7 @@ export const charities: Charity[] = [
     website: 'https://www.1daysooner.org/',
     preview:
       'Accelerating the development of each vaccine by even a couple of days via COVID-19 human challenge trials could save thousands of lives.',
-    photo:
-      'https://images.squarespace-cdn.com/content/v1/5f5f8496d1d7713486b6075a/666cbb5a-5335-4323-b9ea-b764edc826e1/OFFICIAL+1Day+Sooner+Logo.png',
+    photo: 'https://i.imgur.com/bUDdzUE.png',
     description: `1Day Sooner is a non-profit that advocates on behalf of COVID-19 challenge trial volunteers.
       
     After a vaccine candidate is created in a lab, it is developed through a combination of pre-clinical evaluation and three phases of clinical trials that test its safety and efficacy. In traditional Phase III trials, participants receive the vaccine candidate or a placebo/active comparator, and efficacy is judged by comparing the prevalence of infection in the vaccine group and the placebo/comparator group, to test the hypothesis that significantly fewer participants in the vaccine group get infected. In these traditional trials, after receiving the treatment, participants return to their homes and their normal daily lives so as to test the treatment under real world conditions. Since only a small proportion of these participants may encounter the disease, it may take a large number of participants and a good deal of time for these trials to reveal differences between the vaccine and placebo groups.
@@ -35,8 +34,7 @@ export const charities: Charity[] = [
     website: 'https://quantifieduncertainty.org/',
     preview:
       'The Quantified Uncertainty Research Institute advances forecasting and epistemics to improve the long-term future of humanity.',
-    photo:
-      'https://quantifieduncertainty.org/_next/image?url=https%3A%2F%2Fsuper-static-assets.s3.amazonaws.com%2F09bb1362-5e3f-4724-8ffd-f3235f67356f%2Fimages%2F6151ac3e-aed7-44c7-9827-399fe6e9222b.png&w=1920&q=80',
+    photo: 'https://i.imgur.com/ZsSXPjH.png',
     description: `QURI researches systematic practices to specify and estimate the most important parameters for the most important or scalable decisions. Research areas include forecasting, epistemics, evaluations, ontology, and estimation.
     
     We emphasize technological solutions that can heavily scale in the next 5 to 30 years.
@@ -47,7 +45,7 @@ export const charities: Charity[] = [
   {
     name: 'Long-Term Future Fund',
     website: 'https://funds.effectivealtruism.org/funds/far-future',
-    photo: 'https://app.effectivealtruism.org/logo-funds.svg',
+    photo: 'https://i.imgur.com/C2qka9g.png',
     preview:
       'Positively influence the long-term trajectory of civilization by making grants that address global catastrophic risks.',
     description: `The Fund has a broad remit to make grants that promote, implement and advocate for longtermist ideas. Many of our grants aim to address potential risks from advanced artificial intelligence and to build infrastructure and advocate for longtermist projects. However, we welcome applications related to long-term institutional reform or other global catastrophic risks (e.g., pandemics or nuclear conflict).
@@ -61,7 +59,7 @@ export const charities: Charity[] = [
   {
     name: 'GiveWell Maximum Impact Fund',
     website: 'https://www.givewell.org/maximum-impact-fund',
-    photo: 'https://www.givewell.org/sites/all/themes/gw_basic/logo.png',
+    photo: 'https://i.imgur.com/xikuDMZ.png',
     preview:
       'We search for the charities that save or improve lives the most per dollar.',
     description: `
@@ -98,8 +96,7 @@ Future plans: We expect to focus on similar theoretical problems in alignment un
     name: 'Give Directly',
     website: 'https://www.givedirectly.org/',
     ein: '27-1661997',
-    photo:
-      'https://www.givewell.org/sites/default/files/charity_logos/GiveDirectly.jpg',
+    photo: 'https://i.imgur.com/lrdxSyd.jpg',
     preview: 'Send money directly to people living in poverty.',
     description:
       'GiveDirectly is a nonprofit that lets donors like you send money directly to the world’s poorest households. We believe people living in poverty deserve the dignity to choose for themselves how best to improve their lives — cash enables that choice. Since 2009, we’ve delivered $500M+ in cash directly into the hands of over 1 million families living in poverty. We currently have operations in Kenya, Rwanda, Liberia, Malawi, Morocco, Mozambique, DRC, Uganda, and the United States.',
@@ -108,8 +105,7 @@ Future plans: We expect to focus on similar theoretical problems in alignment un
     name: 'Hellen Keller International',
     website: 'https://www.hki.org/',
     ein: '13-5562162',
-    photo:
-      'https://www.ntd-ngonetwork.org/sites/nnn/files/content/organisation/logos/2020-01-28/v2_HKLogo_Primary_RGB.jpg',
+    photo: 'https://i.imgur.com/Dl97Abk.jpg',
     preview:
       'We envision a world where no one is deprived of the opportunity to live a healthy life – and reach their true potential.',
     description:
@@ -119,8 +115,7 @@ Future plans: We expect to focus on similar theoretical problems in alignment un
     name: 'Against Malaria Foundation',
     website: 'https://www.againstmalaria.com/',
     ein: '20-3069841',
-    photo:
-      'https://media-exp1.licdn.com/dms/image/C4D0BAQFvdcum9KBNfg/company-logo_200_200/0?e=2159024400&v=beta&t=hxjJCKQkMp2irTOcuJEceW7x4l3c4PD7gYCQ6ulgYlg',
+    photo: 'https://i.imgur.com/F3JoZi9.png',
     preview: 'We help protect people from malaria.',
     description:
       'AMF (againstmalaria.com) provides funding for long-lasting insecticide-treated net (LLIN) distributions (for protection against malaria) in developing countries. There is strong evidence that distributing LLINs reduces child mortality and malaria cases. AMF conducts post-distribution surveys of completed distributions to determine whether LLINs have reached their intended destinations and how long they remain in good condition.',
@@ -128,8 +123,7 @@ Future plans: We expect to focus on similar theoretical problems in alignment un
   {
     name: 'Rethink Charity',
     website: 'https://rethink.charity/',
-    photo:
-      'https://process.filestackapi.com/resize=width:600,height:315,fit:max/quality=value:90/jvYvq1JFQkOqo3J8hVcJ',
+    photo: 'https://i.imgur.com/Go7N7As.png',
     preview:
       'Providing vital support to high-impact charities and charitable projects.',
     description: `At Rethink Charity, we’re excited about improving the world by providing vital support to high-impact charities and charitable projects. We equip them with tools to boost their impact, through our projects that empower their donors with tax-efficient giving options and strategically coordinated matching opportunities.
@@ -143,8 +137,7 @@ Future plans: We expect to focus on similar theoretical problems in alignment un
     name: 'Malaria Consortium',
     website: 'https://www.malariaconsortium.org/',
     ein: '98-0627052',
-    photo:
-      'https://www.malariaconsortium.org/website-2013/images_template/malaria_consortium_logo.png',
+    photo: 'https://i.imgur.com/LGwy9d8.png ',
     preview:
       'We specialise in the prevention, control and treatment of malaria and other communicable diseases.',
     description:
@@ -153,7 +146,7 @@ Future plans: We expect to focus on similar theoretical problems in alignment un
   {
     name: 'The Center for the Study of Partisanship and Ideology',
     website: 'https://cspicenter.org/',
-    photo: 'https://cspicenter.org/wp-content/uploads/2020/02/CSPI.png',
+    photo: 'https://i.imgur.com/O88tkOW.png',
     preview:
       'Support and fund research on how ideology and government policy contribute to scientific, technological, and social progress.',
     description: `Over the last few decades, scientific and technological progress have stagnated. Scientists conduct more research than ever before, but groundbreaking innovation is scarce. At the same time, identity politics and political polarization have reached new extremes, and social trends such as family stability and crime are worse than in previous decades and in some cases moving in the wrong direction. What explains these trends, and how can we reverse them?
@@ -170,8 +163,7 @@ Future plans: We expect to focus on similar theoretical problems in alignment un
     name: 'Faunalytics',
     website: 'https://faunalytics.org/',
     ein: '01-0686889',
-    photo:
-      'https://animalcharityevaluators.org/wp-content/uploads/2016/08/logo-faunalytics2400x2400-200x200@2x.jpg',
+    photo: 'https://i.imgur.com/3JXhuXl.jpg',
     preview:
       'Faunalytics conducts research and shares knowledge to help advocates help animals effectively.',
     description:
@@ -181,8 +173,7 @@ Future plans: We expect to focus on similar theoretical problems in alignment un
     name: 'The Humane League',
     website: 'https://thehumaneleague.org/',
     ein: '04-3817491',
-    photo:
-      'https://animalcharityevaluators.org/wp-content/uploads/2019/03/thl-mended-heart-logo@2x-200x200@2x.jpg',
+    photo: 'https://i.imgur.com/za9Rwon.jpg',
     preview:
       'We exist to end the abuse of animals raised for food by influencing the policies of the world’s biggest companies, demanding legislation, and empowering others to take action and leave animals off their plates',
     description:
@@ -192,8 +183,7 @@ Future plans: We expect to focus on similar theoretical problems in alignment un
     name: 'Wild Animal Initiative',
     website: 'https://www.wildanimalinitiative.org/',
     ein: '82-2281466',
-    photo:
-      'https://animalcharityevaluators.org/wp-content/uploads/2020/11/WAI-logo_square-gray-on-teal-1-630x630.png',
+    photo: 'https://i.imgur.com/bOVUnDm.png',
     preview: 'We want to make life better for wild animals.',
     description:
       'Wild Animal Initiative (WAI) currently operates in the U.S., where they work to strengthen the animal advocacy movement through creating an academic field dedicated to wild animal welfare. They compile literature reviews, write theoretical and opinion articles, and publish research results on their website and/or in peer-reviewed journals. WAI focuses on identifying and sharing possible research avenues and connecting with more established fields. They also work with researchers from various academic and non-academic institutions to identify potential collaborators, and they recently launched a grant assistance program.',
@@ -202,8 +192,7 @@ Future plans: We expect to focus on similar theoretical problems in alignment un
     name: 'New Incentives',
     website: 'https://www.newincentives.org/',
     ein: '45-2368993',
-    photo:
-      'https://uploads-ssl.webflow.com/5f7c51bf9fac9b5ed62aa37b/5f7c51bf9fac9b85c42aa3df_Group%20344%20(1).svg',
+    photo: 'https://i.imgur.com/bYl4tk3.png',
     preview: 'Cash incentives to boost vaccination rates and save lives.',
     description:
       'New Incentives (newincentives.org) runs a conditional cash transfer (CCT) program in North West Nigeria which seeks to increase uptake of routine immunizations through cash transfers, raising public awareness of the benefits of vaccination and reducing the frequency of vaccine stockouts.',
@@ -212,8 +201,7 @@ Future plans: We expect to focus on similar theoretical problems in alignment un
     name: 'SCI foundation',
     website: 'https://schistosomiasiscontrolinitiative.org/',
     ein: '',
-    photo:
-      'https://images.easyfundraising.org.uk/cause/cropped/cause-logo-e99e0632a8a9572150fdcf3abf08ad45.png',
+    photo: 'https://i.imgur.com/sWD8zM5.png',
     preview:
       'SCI works with governments in sub-Saharan Africa to create or scale up programs that treat schistosomiasis and soil-transmitted helminthiasis ("deworming").',
     description:
@@ -223,8 +211,7 @@ Future plans: We expect to focus on similar theoretical problems in alignment un
     name: 'Wikimedia Foundation',
     website: 'https://wikimediafoundation.org/',
     ein: '20-0049703',
-    photo:
-      'https://2.bp.blogspot.com/-jVseU39DW0s/VjmXVMOEEEI/AAAAAAAACK8/dwUP6sLqy-Q/s1600/wikimedia.png',
+    photo: 'https://i.imgur.com/klEzUbR.png',
     preview: 'We help everyone share in the sum of all knowledge.',
     description:
       'We are the people who keep knowledge free. There is an amazing community of people around the world that makes great projects like Wikipedia. We help them do that work. We take care of the technical infrastructure, the legal challenges, and the growing pains.',
@@ -233,8 +220,7 @@ Future plans: We expect to focus on similar theoretical problems in alignment un
     name: 'Rainforest Trust',
     website: 'https://www.rainforesttrust.org/',
     ein: '13-3500609',
-    photo:
-      'https://ww1.prweb.com/prfiles/2019/05/29/16344590/Rrainforest%20Trust%20new%20logo%20tall-1%20copy.png',
+    photo: 'https://i.imgur.com/6MzS530.png',
     preview:
       'Rainforest Trust saves endangered wildlife and protects our planet by creating rainforest reserves through partnerships, community engagement and donor support.',
     description:
@@ -244,8 +230,7 @@ Future plans: We expect to focus on similar theoretical problems in alignment un
     name: 'The Nature Conservancy',
     website: 'https://www.nature.org/en-us/',
     ein: '53-0242652',
-    photo:
-      'https://mma.prnewswire.com/media/1140905/The_Nature_Conservancy_Logo.jpg?p=facebook',
+    photo: 'https://i.imgur.com/vjxkoGo.jpg',
     preview: 'A Future Where People and Nature Thrive',
     description:
       'The Nature Conservancy is a global environmental nonprofit working to create a world where people and nature can thrive. Founded in the U.S. through grassroots action in 1951, The Nature Conservancy has grown to become one of the most effective and wide-reaching environmental organizations in the world. Thanks to more than a million members and the dedicated efforts of our diverse staff and over 400 scientists, we impact conservation in 76 countries and territories: 37 by direct conservation impact and 39 through partners.',
@@ -254,7 +239,7 @@ Future plans: We expect to focus on similar theoretical problems in alignment un
     name: 'Doctors Without Borders',
     website: 'https://www.doctorswithoutborders.org/',
     ein: '13-3433452',
-    photo: 'https://www.doctorswithoutborders.org/themes/custom/msf/logo.svg',
+    photo: 'https://i.imgur.com/xqhH9FE.png',
     preview:
       'We provide independent, impartial medical humanitarian assistance to the people who need it most.',
     description:
@@ -264,8 +249,7 @@ Future plans: We expect to focus on similar theoretical problems in alignment un
     name: 'World Wildlife Fund',
     website: 'https://www.worldwildlife.org/',
     ein: '52-1693387',
-    photo:
-      'https://www.worldwildlife.org/assets/structure/unique/logo-c562409bb6158bf64e5f8b1be066dbd5983d75f5ce7c9935a5afffbcc03f8e5d.png',
+    photo: 'https://i.imgur.com/hDADuqW.png',
     preview:
       'WWF works to sustain the natural world for the benefit of people and wildlife, collaborating with partners from local to global levels in nearly 100 countries.',
     description:
@@ -274,7 +258,7 @@ Future plans: We expect to focus on similar theoretical problems in alignment un
   {
     name: 'UNICEF USA',
     website: 'https://www.unicefusa.org/',
-    photo: 'https://www.unicefusa.org/sites/default/files/UNICEFUSA_DIG_C.svg',
+    photo: 'https://i.imgur.com/9cxuvZi.png',
     ein: '13-1760110',
     preview:
       "UNICEF USA helps save and protect the world's most vulnerable children.",
@@ -285,8 +269,7 @@ Future plans: We expect to focus on similar theoretical problems in alignment un
     name: 'Vitamin Angels',
     website: 'https://www.vitaminangels.org/',
     ein: '77-0485881',
-    photo:
-      'https://www.newhope.com/sites/newhope360.com/files/styles/article_featured_retina/public/vitamin-angels-logo.jpg?itok=pfNCPLE0',
+    photo: 'https://i.imgur.com/Mf35IOu.jpg',
     preview:
       'By improving access to vital nutrition, everyone gets an equal chance to grow, thrive, and prosper.',
     description:
@@ -296,7 +279,7 @@ Future plans: We expect to focus on similar theoretical problems in alignment un
     name: 'Free Software Foundation',
     website: 'https://www.fsf.org/',
     ein: '04-2888848',
-    photo: 'https://www.gnu.org/graphics/logo-fsf.org.png',
+    photo: 'https://i.imgur.com/z87sFDE.png',
     preview:
       'The Free Software Foundation (FSF) is a nonprofit with a worldwide mission to promote computer user freedom.',
     description:
@@ -306,8 +289,7 @@ Future plans: We expect to focus on similar theoretical problems in alignment un
     name: 'Direct Relief',
     website: 'https://www.directrelief.org/',
     ein: '95-1831116',
-    photo:
-      'https://www.ngoadvisor.net/wp-content/uploads/2016/02/DirectRelief_Logo_RGB-2-1920x576.png',
+    photo: 'https://i.imgur.com/QS7kHAU.png',
     preview:
       'Direct Relief is a humanitarian aid organization, active in all 50 states and more than 80 countries, with a mission to improve the health and lives of people affected by poverty or emergencies – without regard to politics, religion, or ability to pay.',
     description:
@@ -317,8 +299,7 @@ Future plans: We expect to focus on similar theoretical problems in alignment un
     name: 'World Resources Institute',
     website: 'https://www.wri.org/',
     ein: '52-1257057',
-    photo:
-      'https://www.americansecurityproject.org/wp-content/uploads/2016/11/WRI_logo_4c.png',
+    photo: 'https://i.imgur.com/Bi6MgYI.png',
     preview:
       'WRI is a global nonprofit organization that works with leaders in government, business and civil society to research, design, and carry out practical solutions that simultaneously improve people’s lives and ensure nature can thrive.',
     description:
@@ -328,8 +309,7 @@ Future plans: We expect to focus on similar theoretical problems in alignment un
     name: 'ProPublica',
     website: 'https://www.propublica.org/',
     ein: '14-2007220',
-    photo:
-      'https://seekvectorlogo.com/wp-content/uploads/2018/09/propublica-vector-logo.png',
+    photo: 'https://i.imgur.com/R5Vt3Pb.png',
     preview:
       'The mission: to expose abuses of power and betrayals of the public trust by government, business, and other institutions, using the moral force of investigative journalism to spur reform through the sustained spotlighting of wrongdoing.',
     description:
@@ -339,8 +319,7 @@ Future plans: We expect to focus on similar theoretical problems in alignment un
     name: 'Dana-Farber Cancer Institute',
     website: 'https://www.dana-farber.org/',
     ein: '04-2263040',
-    photo:
-      'https://www.danafarbermasterclass.com/assets/images/DFCI-logo-lens-stacked.png',
+    photo: 'https://i.imgur.com/SQNn97p.png',
     preview:
       "For over 70 years, we've led the world by making life-changing breakthroughs in cancer research and patient care, providing the most advanced treatments available.",
     description:
@@ -350,8 +329,7 @@ Future plans: We expect to focus on similar theoretical problems in alignment un
     name: 'Save The Children',
     website: 'https://www.savethechildren.org/',
     ein: '06-0726487',
-    photo:
-      'https://www.thisisclapham.co.uk/wp-content/uploads/2016/08/savethechildren.png',
+    photo: 'https://i.imgur.com/GngYPBI.png',
     preview:
       'Through the decades, Save the Children has continued to work to save children’s lives, and that’s still what we do today.',
     description:
@@ -361,8 +339,7 @@ Future plans: We expect to focus on similar theoretical problems in alignment un
     name: 'World Central Kitchen Incorporated',
     website: 'https://wck.org/',
     ein: '27-3521132',
-    photo:
-      'https://res.cloudinary.com/dktp1ybbx/image/upload/f_auto,fl_lossy,q_auto/v1560203222/organization/prod/924457/M0oxO9vaxO.png',
+    photo: 'https://i.imgur.com/te93MaY.png',
     preview:
       'WCK is first to the frontlines, providing meals in response to humanitarian, climate, and community crises. We build resilient food systems with locally led solutions.',
     description:
@@ -372,8 +349,7 @@ Future plans: We expect to focus on similar theoretical problems in alignment un
     name: 'The Johns Hopkins Center for Health Security',
     website: 'https://www.centerforhealthsecurity.org/',
     ein: '',
-    photo:
-      'https://www.centerforhealthsecurity.org/sebin/d/d/CHS.logo.horizontal.blue.png',
+    photo: 'https://i.imgur.com/gKZE2Xs.png',
     preview:
       'Our mission: to protect people’s health from epidemics and disasters and ensure that communities are resilient to major challenges.',
     description:
@@ -382,8 +358,7 @@ Future plans: We expect to focus on similar theoretical problems in alignment un
   {
     name: 'ALLFED',
     website: 'https://allfed.info/',
-    photo:
-      'https://images1.the-dots.com/1860424/allfed-logo-1.png?p=projectImageFullJpg',
+    photo: 'https://i.imgur.com/p235vwF.jpg',
     ein: '27-6601178',
     preview: 'Feeding everyone no matter what.',
     description:
diff --git a/web/components/charity/charity-card.tsx b/web/components/charity/charity-card.tsx
index bd95db73..1deae59f 100644
--- a/web/components/charity/charity-card.tsx
+++ b/web/components/charity/charity-card.tsx
@@ -1,6 +1,7 @@
 import { StarIcon } from '@heroicons/react/solid'
 import _ from 'lodash'
 import Link from 'next/link'
+import Image from 'next/image'
 import { Charity } from '../../../common/charity'
 import { useCharityTxns } from '../../hooks/use-charity-txns'
 import { manaToUSD } from '../../pages/charity/[charitySlug]'
@@ -19,9 +20,9 @@ export function CharityCard(props: { charity: Charity }) {
           {tags?.includes('Featured') && <FeaturedBadge />}
         </Row>
 
-        <figure className="h-32 px-4 pt-4">
+        <figure className="relative h-32 p-4">
           {photo ? (
-            <img className="h-full w-full object-contain" src={photo} alt="" />
+            <Image src={photo} alt="" layout="fill" objectFit="contain" />
           ) : (
             <div className="h-full w-full bg-gradient-to-r from-slate-300 to-indigo-200" />
           )}
diff --git a/web/next.config.js b/web/next.config.js
index a40c9e32..a03f4b93 100644
--- a/web/next.config.js
+++ b/web/next.config.js
@@ -8,7 +8,7 @@ module.exports = {
     optimizeCss: true,
   },
   images: {
-    domains: ['lh3.googleusercontent.com'],
+    domains: ['lh3.googleusercontent.com', 'i.imgur.com'],
   },
   async redirects() {
     return [
diff --git a/web/pages/charity/[charitySlug].tsx b/web/pages/charity/[charitySlug].tsx
index 8295c156..c53cbb7e 100644
--- a/web/pages/charity/[charitySlug].tsx
+++ b/web/pages/charity/[charitySlug].tsx
@@ -18,6 +18,7 @@ import { useCharityTxns } from '../../hooks/use-charity-txns'
 import { useWindowSize } from '../../hooks/use-window-size'
 import Confetti from 'react-confetti'
 import { Donation } from '../../components/charity/feed-items'
+import Image from 'next/image'
 
 export const manaToUSD = (mana: number) =>
   (mana / 100).toLocaleString('en-US', { style: 'currency', currency: 'USD' })
@@ -78,11 +79,9 @@ function CharityPage(props: { charity: Charity }) {
           {/* TODO: donations over time chart */}
           <Row className="justify-between">
             {photo && (
-              <img
-                src={photo}
-                alt=""
-                className="w-40 rounded-2xl object-contain"
-              />
+              <div className="relative w-40 rounded-2xl">
+                <Image src={photo} alt="" layout="fill" objectFit="contain" />
+              </div>
             )}
             <Details
               charity={charity}

From 2da5423f361c64d3de14dfcc8a3f21bf4a2dbfcf Mon Sep 17 00:00:00 2001
From: Sinclair Chen <abc.sinclair@gmail.com>
Date: Tue, 3 May 2022 08:12:42 -0700
Subject: [PATCH 03/34] Add padding too charity images (#123)

---
 web/components/charity/charity-card.tsx | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/web/components/charity/charity-card.tsx b/web/components/charity/charity-card.tsx
index 1deae59f..2bf8f879 100644
--- a/web/components/charity/charity-card.tsx
+++ b/web/components/charity/charity-card.tsx
@@ -19,14 +19,15 @@ export function CharityCard(props: { charity: Charity }) {
         <Row className="mt-6">
           {tags?.includes('Featured') && <FeaturedBadge />}
         </Row>
-
-        <figure className="relative h-32 p-4">
-          {photo ? (
-            <Image src={photo} alt="" layout="fill" objectFit="contain" />
-          ) : (
-            <div className="h-full w-full bg-gradient-to-r from-slate-300 to-indigo-200" />
-          )}
-        </figure>
+        <div className="px-8">
+          <figure className="relative h-32">
+            {photo ? (
+              <Image src={photo} alt="" layout="fill" objectFit="contain" />
+            ) : (
+              <div className="h-full w-full bg-gradient-to-r from-slate-300 to-indigo-200" />
+            )}
+          </figure>
+        </div>
         <div className="card-body">
           {/* <h3 className="card-title line-clamp-3">{name}</h3> */}
           <div className="line-clamp-4 text-sm">{preview}</div>

From 14544d064af3385fd0ac75d1ece93b2c3c7b3503 Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Tue, 3 May 2022 11:26:02 -0400
Subject: [PATCH 04/34] charity page: remove centering

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

diff --git a/web/pages/charity/index.tsx b/web/pages/charity/index.tsx
index ff1925a6..77b75425 100644
--- a/web/pages/charity/index.tsx
+++ b/web/pages/charity/index.tsx
@@ -36,7 +36,7 @@ export default function Charity() {
 
   return (
     <Page>
-      <Col className="w-full items-center rounded px-4 py-6 sm:px-8 xl:w-[125%]">
+      <Col className="w-full rounded px-4 py-6 sm:px-8 xl:w-[125%]">
         <Col className="max-w-xl gap-2">
           <Title className="!mt-0" text="Manifold for Good" />
           <div className="mb-6 text-gray-500">

From a982b86cfe62b25d242be8043d062d90d2c3b6f5 Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Tue, 3 May 2022 12:18:37 -0400
Subject: [PATCH 05/34] $300 ante for free daily markets

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

diff --git a/functions/src/create-contract.ts b/functions/src/create-contract.ts
index ae7b0ad8..e531e1b3 100644
--- a/functions/src/create-contract.ts
+++ b/functions/src/create-contract.ts
@@ -72,7 +72,6 @@ export const createContract = functions
       )
         return { status: 'error', message: 'Invalid initial probability' }
 
-      const ante = FIXED_ANTE // data.ante
       // uses utc time on server:
       const today = new Date().setHours(0, 0, 0, 0)
       const userContractsCreatedTodaySnapshot = await firestore
@@ -82,6 +81,8 @@ export const createContract = functions
         .get()
       const isFree = userContractsCreatedTodaySnapshot.size === 0
 
+      const ante = isFree ? 300 : FIXED_ANTE // data.ante
+
       if (
         ante === undefined ||
         ante < MINIMUM_ANTE ||

From abf23a1462d9b1725f3f5aca6097be69df29c9f0 Mon Sep 17 00:00:00 2001
From: Sinclair Chen <abc.sinclair@gmail.com>
Date: Tue, 3 May 2022 10:25:14 -0700
Subject: [PATCH 06/34] Pre-load charity order to prevent "jump" (#122)

---
 web/hooks/use-charity-txns.ts | 15 +--------------
 web/lib/firebase/txns.ts      |  6 +++---
 web/pages/charity/index.tsx   | 32 ++++++++++++++++++++++----------
 3 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/web/hooks/use-charity-txns.ts b/web/hooks/use-charity-txns.ts
index c89e0b91..5636e720 100644
--- a/web/hooks/use-charity-txns.ts
+++ b/web/hooks/use-charity-txns.ts
@@ -1,9 +1,6 @@
 import { useEffect, useState } from 'react'
 import { Txn } from '../../common/txn'
-import {
-  listenForAllCharityTxns,
-  listenForCharityTxns,
-} from '../lib/firebase/txns'
+import { listenForCharityTxns } from '../lib/firebase/txns'
 
 export const useCharityTxns = (charityId: string) => {
   const [txns, setTxns] = useState<Txn[]>([])
@@ -14,13 +11,3 @@ export const useCharityTxns = (charityId: string) => {
 
   return txns
 }
-
-export const useAllCharityTxns = () => {
-  const [txns, setTxns] = useState<Txn[]>([])
-
-  useEffect(() => {
-    return listenForAllCharityTxns(setTxns)
-  }, [])
-
-  return txns
-}
diff --git a/web/lib/firebase/txns.ts b/web/lib/firebase/txns.ts
index 9f2b1f3b..efb98b45 100644
--- a/web/lib/firebase/txns.ts
+++ b/web/lib/firebase/txns.ts
@@ -3,7 +3,7 @@ import _ from 'lodash'
 import { Txn } from '../../../common/txn'
 
 import { db } from './init'
-import { listenForValues } from './utils'
+import { getValues, listenForValues } from './utils'
 
 const txnCollection = collection(db, 'txns')
 
@@ -24,6 +24,6 @@ export function listenForCharityTxns(
 
 const charitiesQuery = query(txnCollection, where('toType', '==', 'CHARITY'))
 
-export function listenForAllCharityTxns(setTxns: (txns: Txn[]) => void) {
-  return listenForValues<Txn>(charitiesQuery, setTxns)
+export function getAllCharityTxns() {
+  return getValues<Txn>(charitiesQuery)
 }
diff --git a/web/pages/charity/index.tsx b/web/pages/charity/index.tsx
index 77b75425..39e96792 100644
--- a/web/pages/charity/index.tsx
+++ b/web/pages/charity/index.tsx
@@ -1,37 +1,49 @@
 import _ from 'lodash'
 import { useState, useMemo } from 'react'
-import { charities } from '../../../common/charity'
+import { charities, Charity as CharityType } from '../../../common/charity'
 import { CharityCard } from '../../components/charity/charity-card'
 import { Col } from '../../components/layout/col'
 import { Spacer } from '../../components/layout/spacer'
 import { Page } from '../../components/page'
 import { SiteLink } from '../../components/site-link'
 import { Title } from '../../components/title'
-import { useAllCharityTxns } from '../../hooks/use-charity-txns'
+import { getAllCharityTxns } from '../../lib/firebase/txns'
 
-export default function Charity() {
-  const allCharityTxn = useAllCharityTxns()
-  const totals = _.mapValues(_.groupBy(allCharityTxn, 'toId'), (txns) =>
+export async function getStaticProps() {
+  const txns = await getAllCharityTxns()
+  const totals = _.mapValues(_.groupBy(txns, 'toId'), (txns) =>
     _.sumBy(txns, (txn) => txn.amount)
   )
   const totalRaised = _.sum(Object.values(totals))
-
-  // TODO: show loading state while totals are calculating
-
   const sortedCharities = _.sortBy(charities, [
     (charity) => (charity.tags?.includes('Featured') ? 0 : 1),
     (charity) => -totals[charity.id],
   ])
 
+  return {
+    props: {
+      totalRaised,
+      charities: sortedCharities,
+    },
+    revalidate: 60,
+  }
+}
+
+export default function Charity(props: {
+  totalRaised: number
+  charities: CharityType[]
+}) {
+  const { totalRaised, charities } = props
+
   const [query, setQuery] = useState('')
   const debouncedQuery = _.debounce(setQuery, 50)
 
   const filterCharities = useMemo(
     () =>
-      sortedCharities.filter((charity) =>
+      charities.filter((charity) =>
         charity.name.toLowerCase().includes(query.toLowerCase())
       ),
-    [query, sortedCharities]
+    [query]
   )
 
   return (

From f2217d1d8b9febf1b9e252a41f70ebf9aa5bc6ce Mon Sep 17 00:00:00 2001
From: Sinclair Chen <abc.sinclair@gmail.com>
Date: Tue, 3 May 2022 13:36:00 -0700
Subject: [PATCH 07/34] Improve donate box UI in mid-size window (#126)

---
 web/components/page.tsx             | 2 +-
 web/pages/charity/[charitySlug].tsx | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/components/page.tsx b/web/components/page.tsx
index 6ee84875..90aa41df 100644
--- a/web/components/page.tsx
+++ b/web/components/page.tsx
@@ -32,7 +32,7 @@ export function Page(props: {
           {children}
 
           {/* If right sidebar is hidden, place its content at the bottom of the page. */}
-          <div className="block xl:hidden">{rightSidebar}</div>
+          <div className="mt-4 block xl:hidden">{rightSidebar}</div>
         </main>
         <aside className="hidden xl:col-span-3 xl:block">
           <div className="sticky top-4 space-y-4">{rightSidebar}</div>
diff --git a/web/pages/charity/[charitySlug].tsx b/web/pages/charity/[charitySlug].tsx
index c53cbb7e..6869ede8 100644
--- a/web/pages/charity/[charitySlug].tsx
+++ b/web/pages/charity/[charitySlug].tsx
@@ -215,8 +215,8 @@ function DonationBox(props: {
         />
 
         <Col className="mt-3 w-full gap-3">
-          <Row className="items-center justify-between text-sm">
-            <span className="text-gray-500">{charity.name} receives</span>
+          <Row className="items-center text-sm xl:justify-between">
+            <span className="mr-1 text-gray-500">{charity.name} receives</span>
             <span>{manaToUSD(amount || 0)}</span>
           </Row>
           {/* TODO: matching pool */}

From 100821e34c6bcb16eaab9855e46600c5ed49cba1 Mon Sep 17 00:00:00 2001
From: Sinclair Chen <abc.sinclair@gmail.com>
Date: Tue, 3 May 2022 13:36:54 -0700
Subject: [PATCH 08/34] Ask user to buy more mana when insufficient funds
 (#124)

---
 web/components/amount-input.tsx | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/web/components/amount-input.tsx b/web/components/amount-input.tsx
index 783d8f19..d4724c2a 100644
--- a/web/components/amount-input.tsx
+++ b/web/components/amount-input.tsx
@@ -8,6 +8,7 @@ import { Bet } from '../../common/bet'
 import { Spacer } from './layout/spacer'
 import { calculateCpmmSale } from '../../common/calculate-cpmm'
 import { Binary, CPMM, FullContract } from '../../common/contract'
+import { SiteLink } from './site-link'
 
 export function AmountInput(props: {
   amount: number | undefined
@@ -65,7 +66,16 @@ export function AmountInput(props: {
 
       {error && (
         <div className="mb-2 mr-auto self-center whitespace-nowrap text-xs font-medium tracking-wide text-red-500">
-          {error}
+          {error === 'Insufficient balance' ? (
+            <>
+              Not enough funds.
+              <span className="ml-1 text-indigo-500">
+                <SiteLink href="/add-funds">Buy more?</SiteLink>
+              </span>
+            </>
+          ) : (
+            error
+          )}
         </div>
       )}
 

From 3a33efa8dbaa68499f5613ce6f1a3f877bd563a0 Mon Sep 17 00:00:00 2001
From: Boa <iansphilips@gmail.com>
Date: Tue, 3 May 2022 14:38:40 -0600
Subject: [PATCH 09/34] Threaded free response comments & general comments
 sections (#121)

* Allow comments to reference answers

* Add comment inputs for free response answers

* condense comment logic in one component

* Add General Comments section to FR answers

* Prompt signin even if no comment

* Remove unused & refactor

* Simplify general comments logic, toggle comment boxes

* Clarify rendering logic
---
 common/comment.ts                         |   1 +
 og-image/api/_lib/template.ts             |   3 +-
 web/components/contract/contract-tabs.tsx |  37 +++++--
 web/components/feed/activity-items.ts     |  97 +++++++++++++++--
 web/components/feed/contract-activity.tsx |  12 ++-
 web/components/feed/feed-items.tsx        | 125 +++++++++++++++-------
 web/lib/firebase/comments.ts              |   6 +-
 7 files changed, 224 insertions(+), 57 deletions(-)

diff --git a/common/comment.ts b/common/comment.ts
index 5daeb37e..15cfbcb5 100644
--- a/common/comment.ts
+++ b/common/comment.ts
@@ -4,6 +4,7 @@ export type Comment = {
   id: string
   contractId: string
   betId?: string
+  answerOutcome?: string
   userId: string
 
   text: string
diff --git a/og-image/api/_lib/template.ts b/og-image/api/_lib/template.ts
index 00d47394..a6b0336c 100644
--- a/og-image/api/_lib/template.ts
+++ b/og-image/api/_lib/template.ts
@@ -93,7 +93,8 @@ export function getHtml(parsedReq: ParsedRequest) {
     creatorAvatarUrl,
   } = parsedReq
   const MAX_QUESTION_CHARS = 100
-  const truncatedQuestion = question.length > MAX_QUESTION_CHARS
+  const truncatedQuestion =
+    question.length > MAX_QUESTION_CHARS
       ? question.slice(0, MAX_QUESTION_CHARS) + '...'
       : question
   const hideAvatar = creatorAvatarUrl ? '' : 'hidden'
diff --git a/web/components/contract/contract-tabs.tsx b/web/components/contract/contract-tabs.tsx
index 2ba6cde8..ae1203cf 100644
--- a/web/components/contract/contract-tabs.tsx
+++ b/web/components/contract/contract-tabs.tsx
@@ -7,6 +7,7 @@ import { ContractActivity } from '../feed/contract-activity'
 import { ContractBetsTable, MyBetsSummary } from '../bets-list'
 import { Spacer } from '../layout/spacer'
 import { Tabs } from '../layout/tabs'
+import { Col } from '../layout/col'
 
 export function ContractTabs(props: {
   contract: Contract
@@ -33,14 +34,34 @@ export function ContractTabs(props: {
   )
 
   const commentActivity = (
-    <ContractActivity
-      contract={contract}
-      bets={bets}
-      comments={comments}
-      user={user}
-      mode="comments"
-      betRowClassName="!mt-0 xl:hidden"
-    />
+    <>
+      <ContractActivity
+        contract={contract}
+        bets={bets}
+        comments={comments}
+        user={user}
+        mode={
+          contract.outcomeType === 'FREE_RESPONSE'
+            ? 'free-response-comment-answer-groups'
+            : 'comments'
+        }
+        betRowClassName="!mt-0 xl:hidden"
+      />
+      {contract.outcomeType === 'FREE_RESPONSE' && (
+        <Col className={'mt-8 flex w-full '}>
+          <div className={'text-md mt-8 mb-2 text-left'}>General Comments</div>
+          <div className={'mb-4 w-full border-b border-gray-200'} />
+          <ContractActivity
+            contract={contract}
+            bets={bets}
+            comments={comments}
+            user={user}
+            mode={'comments'}
+            betRowClassName="!mt-0 xl:hidden"
+          />
+        </Col>
+      )}
+    </>
   )
 
   const yourTrades = (
diff --git a/web/components/feed/activity-items.ts b/web/components/feed/activity-items.ts
index 40dd2338..71d42621 100644
--- a/web/components/feed/activity-items.ts
+++ b/web/components/feed/activity-items.ts
@@ -33,6 +33,7 @@ export type CommentInputItem = BaseActivityItem & {
   type: 'commentInput'
   betsByCurrentUser: Bet[]
   comments: Comment[]
+  answerOutcome?: string
 }
 
 export type DescriptionItem = BaseActivityItem & {
@@ -82,6 +83,7 @@ export type ResolveItem = BaseActivityItem & {
   type: 'resolve'
 }
 
+export const GENERAL_COMMENTS_OUTCOME_ID = 'General Comments'
 const DAY_IN_MS = 24 * 60 * 60 * 1000
 const ABBREVIATED_NUM_COMMENTS_OR_BETS_TO_SHOW = 3
 
@@ -263,6 +265,68 @@ function getAnswerGroups(
   return answerGroups
 }
 
+function getAnswerAndCommentInputGroups(
+  contract: FullContract<DPM, FreeResponse>,
+  bets: Bet[],
+  comments: Comment[],
+  user: User | undefined | null
+) {
+  let outcomes = _.uniq(bets.map((bet) => bet.outcome)).filter(
+    (outcome) => getOutcomeProbability(contract, outcome) > 0.0001
+  )
+  outcomes = _.sortBy(outcomes, (outcome) =>
+    getOutcomeProbability(contract, outcome)
+  )
+
+  function collateCommentsSectionForOutcome(outcome: string) {
+    const answerBets = bets.filter((bet) => bet.outcome === outcome)
+    const answerComments = comments.filter(
+      (comment) =>
+        comment.answerOutcome === outcome ||
+        answerBets.some((bet) => bet.id === comment.betId)
+    )
+    let items = []
+    items.push({
+      type: 'commentInput' as const,
+      id: 'commentInputFor' + outcome,
+      contract,
+      betsByCurrentUser: user
+        ? bets.filter((bet) => bet.userId === user.id)
+        : [],
+      comments: comments,
+      answerOutcome: outcome,
+    })
+    items.push(
+      ...getCommentsWithPositions(
+        answerBets,
+        answerComments,
+        contract
+      ).reverse()
+    )
+    return items
+  }
+
+  const answerGroups = outcomes
+    .map((outcome) => {
+      const answer = contract.answers?.find(
+        (answer) => answer.id === outcome
+      ) as Answer
+
+      const items = collateCommentsSectionForOutcome(outcome)
+
+      return {
+        id: outcome,
+        type: 'answergroup' as const,
+        contract,
+        answer,
+        items,
+        user,
+      }
+    })
+    .filter((group) => group.answer) as ActivityItem[]
+  return answerGroups
+}
+
 function groupBetsAndComments(
   bets: Bet[],
   comments: Comment[],
@@ -382,7 +446,7 @@ export function getAllContractActivityItems(
       )
     )
     items.push({
-      type: 'commentInput',
+      type: 'commentInput' as const,
       id: 'commentInput',
       contract,
       betsByCurrentUser: [],
@@ -408,7 +472,7 @@ export function getAllContractActivityItems(
 
   if (outcomeType === 'BINARY') {
     items.push({
-      type: 'commentInput',
+      type: 'commentInput' as const,
       id: 'commentInput',
       contract,
       betsByCurrentUser: [],
@@ -479,7 +543,7 @@ export function getSpecificContractActivityItems(
   comments: Comment[],
   user: User | null | undefined,
   options: {
-    mode: 'comments' | 'bets'
+    mode: 'comments' | 'bets' | 'free-response-comment-answer-groups'
   }
 ) {
   const { mode } = options
@@ -501,18 +565,39 @@ export function getSpecificContractActivityItems(
       break
 
     case 'comments':
-      items.push(...getCommentsWithPositions(bets, comments, contract))
+      const nonFreeResponseComments = comments.filter(
+        (comment) => comment.answerOutcome === undefined
+      )
+      const nonFreeResponseBets =
+        contract.outcomeType === 'FREE_RESPONSE' ? [] : bets
+      items.push(
+        ...getCommentsWithPositions(
+          nonFreeResponseBets,
+          nonFreeResponseComments,
+          contract
+        )
+      )
 
       items.push({
         type: 'commentInput',
         id: 'commentInput',
         contract,
         betsByCurrentUser: user
-          ? bets.filter((bet) => bet.userId === user.id)
+          ? nonFreeResponseBets.filter((bet) => bet.userId === user.id)
           : [],
-        comments: comments,
+        comments: nonFreeResponseComments,
       })
       break
+    case 'free-response-comment-answer-groups':
+      items.push(
+        ...getAnswerAndCommentInputGroups(
+          contract as FullContract<DPM, FreeResponse>,
+          bets,
+          comments,
+          user
+        )
+      )
+      break
   }
 
   return items.reverse()
diff --git a/web/components/feed/contract-activity.tsx b/web/components/feed/contract-activity.tsx
index f65c6716..a0e40916 100644
--- a/web/components/feed/contract-activity.tsx
+++ b/web/components/feed/contract-activity.tsx
@@ -16,7 +16,13 @@ export function ContractActivity(props: {
   bets: Bet[]
   comments: Comment[]
   user: User | null | undefined
-  mode: 'only-recent' | 'abbreviated' | 'all' | 'comments' | 'bets'
+  mode:
+    | 'only-recent'
+    | 'abbreviated'
+    | 'all'
+    | 'comments'
+    | 'bets'
+    | 'free-response-comment-answer-groups'
   contractPath?: string
   className?: string
   betRowClassName?: string
@@ -38,7 +44,9 @@ export function ContractActivity(props: {
       ? getRecentContractActivityItems(contract, bets, comments, user, {
           contractPath,
         })
-      : mode === 'comments' || mode === 'bets'
+      : mode === 'comments' ||
+        mode === 'bets' ||
+        mode === 'free-response-comment-answer-groups'
       ? getSpecificContractActivityItems(contract, bets, comments, user, {
           mode,
         })
diff --git a/web/components/feed/feed-items.tsx b/web/components/feed/feed-items.tsx
index a3b650c0..3627a6b4 100644
--- a/web/components/feed/feed-items.tsx
+++ b/web/components/feed/feed-items.tsx
@@ -37,7 +37,7 @@ import { fromNow } from '../../lib/util/time'
 import BetRow from '../bet-row'
 import { Avatar } from '../avatar'
 import { Answer } from '../../../common/answer'
-import { ActivityItem } from './activity-items'
+import { ActivityItem, GENERAL_COMMENTS_OUTCOME_ID } from './activity-items'
 import {
   Binary,
   CPMM,
@@ -222,29 +222,42 @@ export function CommentInput(props: {
   contract: Contract
   betsByCurrentUser: Bet[]
   comments: Comment[]
+  // Only for free response comment inputs
+  answerOutcome?: string
 }) {
-  const { contract, betsByCurrentUser, comments } = props
+  const { contract, betsByCurrentUser, comments, answerOutcome } = props
   const user = useUser()
   const [comment, setComment] = useState('')
+  const [focused, setFocused] = useState(false)
 
   // Should this be oldest bet or most recent bet?
   const mostRecentCommentableBet = betsByCurrentUser
-    .filter(
-      (bet) =>
-        canCommentOnBet(bet, bet.createdTime, user) &&
+    .filter((bet) => {
+      if (
+        canCommentOnBet(bet, user) &&
+        // The bet doesn't already have a comment
         !comments.some((comment) => comment.betId == bet.id)
-    )
+      ) {
+        if (!answerOutcome) return true
+        // If we're in free response, don't allow commenting on ante bet
+        return (
+          bet.outcome !== GENERAL_COMMENTS_OUTCOME_ID &&
+          answerOutcome === bet.outcome
+        )
+      }
+      return false
+    })
     .sort((b1, b2) => b1.createdTime - b2.createdTime)
     .pop()
 
   const { id } = mostRecentCommentableBet || { id: undefined }
 
-  async function submitComment(id: string | undefined) {
-    if (!comment) return
+  async function submitComment(betId: string | undefined) {
     if (!user) {
       return await firebaseLogin()
     }
-    await createComment(contract.id, comment, user, id)
+    if (!comment) return
+    await createComment(contract.id, comment, user, betId, answerOutcome)
     setComment('')
   }
 
@@ -253,11 +266,11 @@ export function CommentInput(props: {
 
   return (
     <>
-      <Row className={'flex w-full gap-2 pt-3'}>
+      <Row className={'flex w-full gap-2'}>
         <div>
           <Avatar avatarUrl={user?.avatarUrl} username={user?.username} />
         </div>
-        <div className={'min-w-0 flex-1 py-1.5'}>
+        <div className={'min-w-0 flex-1'}>
           <div className="text-sm text-gray-500">
             {mostRecentCommentableBet && (
               <BetStatusText
@@ -279,30 +292,65 @@ export function CommentInput(props: {
                 </>
               </>
             )}
-            <div className="mt-2">
-              <Textarea
-                value={comment}
-                onChange={(e) => setComment(e.target.value)}
-                className="textarea textarea-bordered w-full resize-none"
-                placeholder="Add a comment..."
-                rows={3}
-                maxLength={MAX_COMMENT_LENGTH}
-                onKeyDown={(e) => {
-                  if (e.key === 'Enter' && (e.ctrlKey || e.metaKey)) {
-                    submitComment(id)
-                  }
-                }}
-              />
-              <button
-                className={
-                  'btn btn-outline btn-sm text-transform: mt-1 capitalize'
-                }
-                onClick={() => submitComment(id)}
-              >
-                {user ? 'Comment' : 'Sign in to comment'}
-              </button>
-            </div>
+            {(answerOutcome === undefined || focused) && (
+              <div className="mt-2">
+                <Textarea
+                  value={comment}
+                  onChange={(e) => setComment(e.target.value)}
+                  className="textarea textarea-bordered w-full resize-none"
+                  placeholder="Add a comment..."
+                  autoFocus={true}
+                  rows={answerOutcome == undefined || focused ? 3 : 1}
+                  onFocus={() => setFocused(true)}
+                  onBlur={() => !comment && setFocused(false)}
+                  maxLength={MAX_COMMENT_LENGTH}
+                  onKeyDown={(e) => {
+                    if (e.key === 'Enter' && (e.ctrlKey || e.metaKey)) {
+                      submitComment(id)
+                    }
+                  }}
+                />
+              </div>
+            )}
           </div>
+          {!user && (
+            <button
+              className={
+                'btn btn-outline btn-sm text-transform: mt-1 capitalize'
+              }
+              onClick={() => submitComment(id)}
+            >
+              Sign in to Comment
+            </button>
+          )}
+          {user && answerOutcome === undefined && (
+            <button
+              className={
+                'btn btn-outline btn-sm text-transform: mt-1 capitalize'
+              }
+              onClick={() => submitComment(id)}
+            >
+              Comment
+            </button>
+          )}
+          {user && answerOutcome !== undefined && (
+            <button
+              className={
+                focused
+                  ? 'btn btn-outline btn-sm text-transform: mt-1 capitalize'
+                  : 'btn btn-ghost btn-sm text-transform: mt-1 capitalize'
+              }
+              onClick={() => {
+                if (!focused) setFocused(true)
+                else {
+                  submitComment(id)
+                  setFocused(false)
+                }
+              }}
+            >
+              {!focused ? 'Add Comment' : 'Comment'}
+            </button>
+          )}
         </div>
       </Row>
     </>
@@ -560,12 +608,11 @@ export function FeedQuestion(props: {
   )
 }
 
-function canCommentOnBet(bet: Bet, createdTime: number, user?: User | null) {
-  const isSelf = user?.id === bet.userId
+function canCommentOnBet(bet: Bet, user?: User | null) {
+  const { userId, createdTime, isRedemption } = bet
+  const isSelf = user?.id === userId
   // You can comment if your bet was posted in the last hour
-  return (
-    !bet.isRedemption && isSelf && Date.now() - createdTime < 60 * 60 * 1000
-  )
+  return !isRedemption && isSelf && Date.now() - createdTime < 60 * 60 * 1000
 }
 
 function FeedDescription(props: { contract: Contract }) {
diff --git a/web/lib/firebase/comments.ts b/web/lib/firebase/comments.ts
index 65c86621..381269d2 100644
--- a/web/lib/firebase/comments.ts
+++ b/web/lib/firebase/comments.ts
@@ -21,7 +21,8 @@ export async function createComment(
   contractId: string,
   text: string,
   commenter: User,
-  betId?: string
+  betId?: string,
+  answerOutcome?: string
 ) {
   const ref = betId
     ? doc(getCommentsCollection(contractId), betId)
@@ -39,6 +40,9 @@ export async function createComment(
   if (betId) {
     comment.betId = betId
   }
+  if (answerOutcome) {
+    comment.answerOutcome = answerOutcome
+  }
   return await setDoc(ref, comment)
 }
 

From 0d63e471bede6ae7f7ae1eb70d08ffa0cae3b9b1 Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Tue, 3 May 2022 16:45:21 -0400
Subject: [PATCH 10/34] Only show cursor if focused

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

diff --git a/web/components/feed/feed-items.tsx b/web/components/feed/feed-items.tsx
index 3627a6b4..472f6649 100644
--- a/web/components/feed/feed-items.tsx
+++ b/web/components/feed/feed-items.tsx
@@ -299,7 +299,7 @@ export function CommentInput(props: {
                   onChange={(e) => setComment(e.target.value)}
                   className="textarea textarea-bordered w-full resize-none"
                   placeholder="Add a comment..."
-                  autoFocus={true}
+                  autoFocus={focused}
                   rows={answerOutcome == undefined || focused ? 3 : 1}
                   onFocus={() => setFocused(true)}
                   onBlur={() => !comment && setFocused(false)}

From 278bcb97241be24ff379c17ae7952694ff489ae4 Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Tue, 3 May 2022 16:57:39 -0400
Subject: [PATCH 11/34] Show resolved FR answers

---
 web/pages/[username]/[contractSlug].tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/pages/[username]/[contractSlug].tsx b/web/pages/[username]/[contractSlug].tsx
index 6fa84a7f..84231e5a 100644
--- a/web/pages/[username]/[contractSlug].tsx
+++ b/web/pages/[username]/[contractSlug].tsx
@@ -169,7 +169,7 @@ export function ContractPageContent(props: FirstArgument<typeof ContractPage>) {
         />
 
         {outcomeType === 'FREE_RESPONSE' &&
-          (!isResolved || resolution === 'MKT') && (
+          (isResolved || resolution === 'MKT') && (
             <>
               <Spacer h={4} />
               <AnswersPanel
@@ -179,7 +179,7 @@ export function ContractPageContent(props: FirstArgument<typeof ContractPage>) {
             </>
           )}
 
-        {contract.isResolved && (
+        {isResolved && (
           <>
             <div className="grid grid-cols-1 sm:grid-cols-2">
               <ContractLeaderboard contract={contract} bets={bets} />

From a004d3a4bf5c1feb7e0c0b45d7c617669dc88756 Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Tue, 3 May 2022 17:54:00 -0400
Subject: [PATCH 12/34] Always show answer panel

---
 web/pages/[username]/[contractSlug].tsx | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/web/pages/[username]/[contractSlug].tsx b/web/pages/[username]/[contractSlug].tsx
index 84231e5a..34ed776a 100644
--- a/web/pages/[username]/[contractSlug].tsx
+++ b/web/pages/[username]/[contractSlug].tsx
@@ -168,16 +168,15 @@ export function ContractPageContent(props: FirstArgument<typeof ContractPage>) {
           comments={comments ?? []}
         />
 
-        {outcomeType === 'FREE_RESPONSE' &&
-          (isResolved || resolution === 'MKT') && (
-            <>
-              <Spacer h={4} />
-              <AnswersPanel
-                contract={contract as FullContract<DPM, FreeResponse>}
-              />
-              <Spacer h={4} />
-            </>
-          )}
+        {outcomeType === 'FREE_RESPONSE' && (
+          <>
+            <Spacer h={4} />
+            <AnswersPanel
+              contract={contract as FullContract<DPM, FreeResponse>}
+            />
+            <Spacer h={4} />
+          </>
+        )}
 
         {isResolved && (
           <>

From 5c18820d9636d94b9d781ce45b6fa0a6beb9265b Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Wed, 4 May 2022 11:11:06 -0400
Subject: [PATCH 13/34] go back to $100 fixed ante

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

diff --git a/functions/src/create-contract.ts b/functions/src/create-contract.ts
index e531e1b3..dfc8128d 100644
--- a/functions/src/create-contract.ts
+++ b/functions/src/create-contract.ts
@@ -81,7 +81,7 @@ export const createContract = functions
         .get()
       const isFree = userContractsCreatedTodaySnapshot.size === 0
 
-      const ante = isFree ? 300 : FIXED_ANTE // data.ante
+      const ante = FIXED_ANTE // data.ante
 
       if (
         ante === undefined ||

From 95b67c05e2f306ddd05f1b2c35ecef913149e249 Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Wed, 4 May 2022 11:47:45 -0400
Subject: [PATCH 14/34] another sell shares rounding bug

---
 web/components/amount-input.tsx | 5 +++--
 web/components/bet-panel.tsx    | 8 +++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/web/components/amount-input.tsx b/web/components/amount-input.tsx
index d4724c2a..76111b6f 100644
--- a/web/components/amount-input.tsx
+++ b/web/components/amount-input.tsx
@@ -178,9 +178,10 @@ export function SellAmountInput(props: {
   ]
 
   const sellOutcome = yesShares ? 'YES' : noShares ? 'NO' : undefined
-  const shares = yesShares || noShares
+  const shares = Math.round(yesShares) || Math.round(noShares)
+
+  const sharesSold = Math.min(amount ?? 0, shares)
 
-  const sharesSold = Math.min(amount ?? 0, yesShares || noShares)
   const { saleValue } = calculateCpmmSale(
     contract,
     sharesSold,
diff --git a/web/components/bet-panel.tsx b/web/components/bet-panel.tsx
index 677e0197..cff37929 100644
--- a/web/components/bet-panel.tsx
+++ b/web/components/bet-panel.tsx
@@ -432,7 +432,13 @@ export function SellPanel(props: {
       <SellAmountInput
         inputClassName="w-full"
         contract={contract}
-        amount={amount ? Math.floor(amount) : undefined}
+        amount={
+          amount
+            ? Math.round(amount) === 0
+              ? 0
+              : Math.floor(amount)
+            : undefined
+        }
         onChange={setAmount}
         userBets={userBets}
         error={error}

From 899c6ab0e05442f02c60140bb17f355a4ee6d575 Mon Sep 17 00:00:00 2001
From: Marshall Polaris <marshall@pol.rs>
Date: Wed, 4 May 2022 11:07:00 -0700
Subject: [PATCH 15/34] Add script to denormalize avatars into other docs
 (#127)

* Add script to denormalize avatars into contracts/comments

* Also handle denormalizing answer avatar URLs

* Small fixups
---
 .../src/scripts/denormalize-avatar-urls.ts    | 125 ++++++++++++++++++
 functions/src/scripts/denormalize.ts          |  48 +++++++
 2 files changed, 173 insertions(+)
 create mode 100644 functions/src/scripts/denormalize-avatar-urls.ts
 create mode 100644 functions/src/scripts/denormalize.ts

diff --git a/functions/src/scripts/denormalize-avatar-urls.ts b/functions/src/scripts/denormalize-avatar-urls.ts
new file mode 100644
index 00000000..23b7dfc9
--- /dev/null
+++ b/functions/src/scripts/denormalize-avatar-urls.ts
@@ -0,0 +1,125 @@
+// Script for lining up users and contracts/comments to make sure the denormalized avatar URLs in the contracts and
+// comments match the user avatar URLs.
+
+import * as admin from 'firebase-admin'
+import { initAdmin } from './script-init'
+import {
+  DocumentCorrespondence,
+  findDiffs,
+  describeDiff,
+  applyDiff,
+} from './denormalize'
+import { DocumentSnapshot, Transaction } from 'firebase-admin/firestore'
+
+initAdmin()
+const firestore = admin.firestore()
+
+async function getUsersById(transaction: Transaction) {
+  const results = new Map<string, DocumentSnapshot>()
+  const users = await transaction.get(firestore.collection('users'))
+  users.forEach((doc) => {
+    results.set(doc.get('id'), doc)
+  })
+  console.log(`Found ${results.size} unique users.`)
+  return results
+}
+
+async function getContractsByUserId(transaction: Transaction) {
+  let n = 0
+  const results = new Map<string, DocumentSnapshot[]>()
+  const contracts = await transaction.get(firestore.collection('contracts'))
+  contracts.forEach((doc) => {
+    const creatorId = doc.get('creatorId')
+    const creatorContracts = results.get(creatorId) || []
+    creatorContracts.push(doc)
+    results.set(creatorId, creatorContracts)
+    n++
+  })
+  console.log(`Found ${n} contracts from ${results.size} unique users.`)
+  return results
+}
+
+async function getCommentsByUserId(transaction: Transaction) {
+  let n = 0
+  const results = new Map<string, DocumentSnapshot[]>()
+  const comments = await transaction.get(firestore.collectionGroup('comments'))
+  comments.forEach((doc) => {
+    const userId = doc.get('userId')
+    const userComments = results.get(userId) || []
+    userComments.push(doc)
+    results.set(userId, userComments)
+    n++
+  })
+  console.log(`Found ${n} comments from ${results.size} unique users.`)
+  return results
+}
+
+async function getAnswersByUserId(transaction: Transaction) {
+  let n = 0
+  const results = new Map<string, DocumentSnapshot[]>()
+  const answers = await transaction.get(firestore.collectionGroup('answers'))
+  answers.forEach((doc) => {
+    const userId = doc.get('userId')
+    const userAnswers = results.get(userId) || []
+    userAnswers.push(doc)
+    results.set(userId, userAnswers)
+    n++
+  })
+  console.log(`Found ${n} answers from ${results.size} unique users.`)
+  return results
+}
+
+if (require.main === module) {
+  admin.firestore().runTransaction(async (transaction) => {
+    const [usersById, contractsByUserId, commentsByUserId, answersByUserId] =
+      await Promise.all([
+        getUsersById(transaction),
+        getContractsByUserId(transaction),
+        getCommentsByUserId(transaction),
+        getAnswersByUserId(transaction),
+      ])
+
+    const usersContracts = Array.from(
+      usersById.entries(),
+      ([id, doc]): DocumentCorrespondence => {
+        return [doc, contractsByUserId.get(id) || []]
+      }
+    )
+    const contractDiffs = findDiffs(
+      usersContracts,
+      'avatarUrl',
+      'creatorAvatarUrl'
+    )
+    console.log(`Found ${contractDiffs.length} contracts with mismatches.`)
+    contractDiffs.forEach((d) => {
+      console.log(describeDiff(d))
+      applyDiff(transaction, d)
+    })
+
+    const usersComments = Array.from(
+      usersById.entries(),
+      ([id, doc]): DocumentCorrespondence => {
+        return [doc, commentsByUserId.get(id) || []]
+      }
+    )
+    const commentDiffs = findDiffs(usersComments, 'avatarUrl', 'userAvatarUrl')
+    console.log(`Found ${commentDiffs.length} comments with mismatches.`)
+    commentDiffs.forEach((d) => {
+      console.log(describeDiff(d))
+      applyDiff(transaction, d)
+    })
+
+    const usersAnswers = Array.from(
+      usersById.entries(),
+      ([id, doc]): DocumentCorrespondence => {
+        return [doc, answersByUserId.get(id) || []]
+      }
+    )
+    const answerDiffs = findDiffs(usersAnswers, 'avatarUrl', 'avatarUrl')
+    console.log(`Found ${answerDiffs.length} answers with mismatches.`)
+    answerDiffs.forEach((d) => {
+      console.log(describeDiff(d))
+      applyDiff(transaction, d)
+    })
+  })
+}
diff --git a/functions/src/scripts/denormalize.ts b/functions/src/scripts/denormalize.ts
new file mode 100644
index 00000000..ca4111b0
--- /dev/null
+++ b/functions/src/scripts/denormalize.ts
@@ -0,0 +1,48 @@
+// Helper functions for maintaining the relationship between fields in one set of documents and denormalized copies in
+// another set of documents.
+
+import { DocumentSnapshot, Transaction } from 'firebase-admin/firestore'
+
+export type DocumentValue = {
+  doc: DocumentSnapshot
+  field: string
+  val: any
+}
+export type DocumentCorrespondence = [DocumentSnapshot, DocumentSnapshot[]]
+export type DocumentDiff = {
+  src: DocumentValue
+  dest: DocumentValue
+}
+
+export function findDiffs(
+  docs: DocumentCorrespondence[],
+  srcPath: string,
+  destPath: string
+) {
+  const diffs: DocumentDiff[] = []
+  for (let [srcDoc, destDocs] of docs) {
+    const srcVal = srcDoc.get(srcPath)
+    for (let destDoc of destDocs) {
+      const destVal = destDoc.get(destPath)
+      if (destVal !== srcVal) {
+        diffs.push({
+          src: { doc: srcDoc, field: srcPath, val: srcVal },
+          dest: { doc: destDoc, field: destPath, val: destVal },
+        })
+      }
+    }
+  }
+  return diffs
+}
+
+export function describeDiff(diff: DocumentDiff) {
+  function describeDocVal(x: DocumentValue): string {
+    return `${x.doc.ref.path}.${x.field}: ${x.val}`
+  }
+  return `${describeDocVal(diff.src)} -> ${describeDocVal(diff.dest)}`
+}
+
+export function applyDiff(transaction: Transaction, diff: DocumentDiff) {
+  const { src, dest } = diff
+  transaction.update(dest.doc.ref, dest.field, src.val)
+}

From bf8e09b6c1f2c5d1d9dcf672f210bba6d7a0a2e4 Mon Sep 17 00:00:00 2001
From: Marshall Polaris <marshall@pol.rs>
Date: Wed, 4 May 2022 11:07:22 -0700
Subject: [PATCH 16/34] Represent DB avatar URLs as non-null (#128)

---
 common/answer.ts           | 2 +-
 common/comment.ts          | 2 +-
 common/contract.ts         | 2 +-
 common/user.ts             | 2 +-
 web/components/SEO.tsx     | 9 ++-------
 web/pages/api/v0/_types.ts | 2 +-
 6 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/common/answer.ts b/common/answer.ts
index 9dcc3828..87e7d05f 100644
--- a/common/answer.ts
+++ b/common/answer.ts
@@ -9,7 +9,7 @@ export type Answer = {
   userId: string
   username: string
   name: string
-  avatarUrl?: string
+  avatarUrl: string
 
   text: string
 }
diff --git a/common/comment.ts b/common/comment.ts
index 15cfbcb5..95c2ec4a 100644
--- a/common/comment.ts
+++ b/common/comment.ts
@@ -13,5 +13,5 @@ export type Comment = {
   // Denormalized, for rendering comments
   userName: string
   userUsername: string
-  userAvatarUrl?: string
+  userAvatarUrl: string
 }
diff --git a/common/contract.ts b/common/contract.ts
index 82a330b5..ee3034de 100644
--- a/common/contract.ts
+++ b/common/contract.ts
@@ -11,7 +11,7 @@ export type FullContract<
   creatorId: string
   creatorName: string
   creatorUsername: string
-  creatorAvatarUrl?: string // Start requiring after 2022-03-01
+  creatorAvatarUrl: string
 
   question: string
   description: string // More info about what the contract is about
diff --git a/common/user.ts b/common/user.ts
index 8f8e6d0d..ce586774 100644
--- a/common/user.ts
+++ b/common/user.ts
@@ -4,7 +4,7 @@ export type User = {
 
   name: string
   username: string
-  avatarUrl?: string
+  avatarUrl: string
 
   // For their user page
   bio?: string
diff --git a/web/components/SEO.tsx b/web/components/SEO.tsx
index 8987d671..8420b199 100644
--- a/web/components/SEO.tsx
+++ b/web/components/SEO.tsx
@@ -6,7 +6,7 @@ export type OgCardProps = {
   metadata: string
   creatorName: string
   creatorUsername: string
-  creatorAvatarUrl?: string
+  creatorAvatarUrl: string
 }
 
 function buildCardUrl(props: OgCardProps) {
@@ -14,11 +14,6 @@ function buildCardUrl(props: OgCardProps) {
     props.probability === undefined
       ? ''
       : `&probability=${encodeURIComponent(props.probability ?? '')}`
-  const creatorAvatarUrlParam =
-    props.creatorAvatarUrl === undefined
-      ? ''
-      : `&creatorAvatarUrl=${encodeURIComponent(props.creatorAvatarUrl ?? '')}`
-
   // URL encode each of the props, then add them as query params
   return (
     `https://manifold-og-image.vercel.app/m.png` +
@@ -26,7 +21,7 @@ function buildCardUrl(props: OgCardProps) {
     probabilityParam +
     `&metadata=${encodeURIComponent(props.metadata)}` +
     `&creatorName=${encodeURIComponent(props.creatorName)}` +
-    creatorAvatarUrlParam +
+    `&creatorAvatarUrl=${encodeURIComponent(props.creatorAvatarUrl)}` +
     `&creatorUsername=${encodeURIComponent(props.creatorUsername)}`
   )
 }
diff --git a/web/pages/api/v0/_types.ts b/web/pages/api/v0/_types.ts
index 8f2976fa..4569576c 100644
--- a/web/pages/api/v0/_types.ts
+++ b/web/pages/api/v0/_types.ts
@@ -12,7 +12,7 @@ export type LiteMarket = {
   creatorUsername: string
   creatorName: string
   createdTime: number
-  creatorAvatarUrl?: string
+  creatorAvatarUrl: string
 
   // Market attributes. All times are in milliseconds since epoch
   closeTime?: number

From 9480f9f34c19d82d02e5c9003475e9a029c44847 Mon Sep 17 00:00:00 2001
From: Boa <iansphilips@gmail.com>
Date: Wed, 4 May 2022 16:03:06 -0600
Subject: [PATCH 17/34] Improve free response answer ux (#131)

* Remove number from chosen FR answer

* Distinguish wining and losing FR answers

* Show no answers text

* Simplify get answer items logic

* Show answer number

* Show answer # when resolving
---
 web/components/answers/answer-item.tsx   |  2 +-
 web/components/answers/answers-panel.tsx | 29 ++++++++++++------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/web/components/answers/answer-item.tsx b/web/components/answers/answer-item.tsx
index fdeafea0..96746b62 100644
--- a/web/components/answers/answer-item.tsx
+++ b/web/components/answers/answer-item.tsx
@@ -68,7 +68,7 @@ export function AnswerItem(props: {
             </Row>
           </SiteLink>
           {/* TODO: Show total pool? */}
-          <div className="text-base">#{number}</div>
+          <div className="text-base">{showChoice && '#' + number}</div>
         </Row>
       </Col>
 
diff --git a/web/components/answers/answers-panel.tsx b/web/components/answers/answers-panel.tsx
index 3af2c286..f315b514 100644
--- a/web/components/answers/answers-panel.tsx
+++ b/web/components/answers/answers-panel.tsx
@@ -24,7 +24,7 @@ export function AnswersPanel(props: {
   const { creatorId, resolution, resolutions, totalBets } = contract
 
   const answers = useAnswers(contract.id) ?? contract.answers
-  const [winningAnswers, otherAnswers] = _.partition(
+  const [winningAnswers, losingAnswers] = _.partition(
     answers.filter(
       (answer) => answer.id !== '0' && totalBets[answer.id] > 0.000000001
     ),
@@ -36,7 +36,7 @@ export function AnswersPanel(props: {
       resolutions ? -1 * resolutions[answer.id] : 0
     ),
     ..._.sortBy(
-      resolution ? [] : otherAnswers,
+      resolution ? [] : losingAnswers,
       (answer) => -1 * getDpmOutcomeProbability(contract.totalShares, answer.id)
     ),
   ]
@@ -52,7 +52,11 @@ export function AnswersPanel(props: {
 
   const chosenTotal = _.sum(Object.values(chosenAnswers))
 
-  const answerItems = getAnswers(contract, user)
+  const answerItems = getAnswerItems(
+    contract,
+    losingAnswers.length > 0 ? losingAnswers : sortedAnswers,
+    user
+  )
 
   const onChoose = (answerId: string, prob: number) => {
     if (resolveOption === 'CHOOSE') {
@@ -89,9 +93,7 @@ export function AnswersPanel(props: {
 
   return (
     <Col className="gap-3">
-      {(resolveOption === 'CHOOSE' ||
-        resolveOption === 'CHOOSE_MULTIPLE' ||
-        resolution === 'MKT') &&
+      {(resolveOption || resolution) &&
         sortedAnswers.map((answer) => (
           <AnswerItem
             key={answer.id}
@@ -105,11 +107,7 @@ export function AnswersPanel(props: {
           />
         ))}
 
-      {sortedAnswers.length === 0 && (
-        <div className="pb-4 text-gray-500">No answers yet...</div>
-      )}
-
-      {!resolveOption && sortedAnswers.length > 0 && (
+      {!resolveOption && (
         <FeedItems
           contract={contract}
           items={answerItems}
@@ -118,6 +116,10 @@ export function AnswersPanel(props: {
         />
       )}
 
+      {answers.length <= 1 && (
+        <div className="pb-4 text-gray-500">No answers yet...</div>
+      )}
+
       {tradingAllowed(contract) &&
         (!resolveOption || resolveOption === 'CANCEL') && (
           <CreateAnswerPanel contract={contract} />
@@ -138,12 +140,11 @@ export function AnswersPanel(props: {
   )
 }
 
-function getAnswers(
+function getAnswerItems(
   contract: FullContract<DPM, FreeResponse>,
+  answers: Answer[],
   user: User | undefined | null
 ) {
-  const { answers } = contract
-
   let outcomes = _.uniq(
     answers.map((answer) => answer.number.toString())
   ).filter((outcome) => getOutcomeProbability(contract, outcome) > 0.0001)

From b42e77858f640858a454f8b6cc7b3fd59031e8b0 Mon Sep 17 00:00:00 2001
From: Austin Chen <akrolsmir@gmail.com>
Date: Thu, 5 May 2022 10:12:16 -0400
Subject: [PATCH 18/34] Search through charity preview, description, and tags
 too

---
 web/pages/charity/index.tsx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/web/pages/charity/index.tsx b/web/pages/charity/index.tsx
index 39e96792..32e64420 100644
--- a/web/pages/charity/index.tsx
+++ b/web/pages/charity/index.tsx
@@ -40,8 +40,12 @@ export default function Charity(props: {
 
   const filterCharities = useMemo(
     () =>
-      charities.filter((charity) =>
-        charity.name.toLowerCase().includes(query.toLowerCase())
+      charities.filter(
+        (charity) =>
+          charity.name.toLowerCase().includes(query.toLowerCase()) ||
+          charity.preview.toLowerCase().includes(query.toLowerCase()) ||
+          charity.description.toLowerCase().includes(query.toLowerCase()) ||
+          (charity.tags as string[])?.includes(query.toLowerCase())
       ),
     [query]
   )

From 1caed4455295ef28baf4b99356cb3189692c41b9 Mon Sep 17 00:00:00 2001
From: Austin Chen <akrolsmir@gmail.com>
Date: Thu, 5 May 2022 10:15:12 -0400
Subject: [PATCH 19/34] Show /charity in signed-out sidebar

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

diff --git a/web/components/nav/sidebar.tsx b/web/components/nav/sidebar.tsx
index e3145498..2d5ae49b 100644
--- a/web/components/nav/sidebar.tsx
+++ b/web/components/nav/sidebar.tsx
@@ -32,6 +32,7 @@ const navigation = [
 const signedOutNavigation = [
   { name: 'Home', href: '/home', icon: HomeIcon },
   { name: 'Explore', href: '/markets', icon: SearchIcon },
+  { name: 'Charity', href: '/charity', icon: HeartIcon },
   { name: 'About', href: 'https://docs.manifold.markets', icon: BookOpenIcon },
 ]
 

From adefd3259c9d4880cac8cc1161c988c9c0554852 Mon Sep 17 00:00:00 2001
From: Marshall Polaris <marshall@pol.rs>
Date: Thu, 5 May 2022 09:50:58 -0700
Subject: [PATCH 20/34] Cleanup avatar component rendering (#130)

* Remove unnecessary classes on avatar img

I don't believe these have any visible effect.

* Don't apply Tailwind 'avatar' class in menu

We don't use this class elsewhere when displaying avatars (instead our
avatar has manual styles that do the stuff Tailwind is trying to do)
and it just assigns a weird size that we don't want.

If we want to use the Tailwind avatar styles we should refactor further.

* Remove unnecessary avatar wrapper div

* Remove old prop from avatar
---
 web/components/avatar.tsx           | 48 +++++++++++++----------------
 web/components/nav/nav-bar.tsx      |  2 +-
 web/components/nav/profile-menu.tsx |  2 +-
 3 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/web/components/avatar.tsx b/web/components/avatar.tsx
index 318c5498..706b61f3 100644
--- a/web/components/avatar.tsx
+++ b/web/components/avatar.tsx
@@ -8,10 +8,8 @@ export function Avatar(props: {
   noLink?: boolean
   size?: number | 'xs' | 'sm'
   className?: string
-  containerClassName?: string
 }) {
-  const { username, avatarUrl, noLink, size, className, containerClassName } =
-    props
+  const { username, avatarUrl, noLink, size, className } = props
   const s = size == 'xs' ? 6 : size === 'sm' ? 8 : size || 10
 
   const onClick =
@@ -21,32 +19,28 @@ export function Avatar(props: {
           e.stopPropagation()
           Router.push(`/${username}`)
         }
-  return (
-    <div
+
+  // there can be no avatar URL or username in the feed, we show a "submit comment"
+  // item with a fake grey user circle guy even if you aren't signed in
+  return avatarUrl ? (
+    <img
       className={clsx(
-        `flex-shrink-0 rounded-full bg-white w-${s} h-${s}`,
-        containerClassName
+        'flex-shrink-0 rounded-full rounded-full bg-white object-cover',
+        `w-${s} h-${s}`,
+        !noLink && 'cursor-pointer',
+        className
       )}
-    >
-      {avatarUrl ? (
-        <img
-          className={clsx(
-            'flex items-center justify-center rounded-full object-cover',
-            `w-${s} h-${s}`,
-            !noLink && 'cursor-pointer',
-            className
-          )}
-          src={avatarUrl}
-          onClick={onClick}
-          alt={username}
-        />
-      ) : (
-        // TODO: After 2022-03-01, can just assume that all contracts have an avatarUrl
-        <UserCircleIcon
-          className={`w-${s} h-${s} text-gray-500`}
-          aria-hidden="true"
-        />
+      src={avatarUrl}
+      onClick={onClick}
+      alt={username}
+    />
+  ) : (
+    <UserCircleIcon
+      className={clsx(
+        `flex-shrink-0 rounded-full bg-white w-${s} h-${s} text-gray-500`,
+        className
       )}
-    </div>
+      aria-hidden="true"
+    />
   )
 }
diff --git a/web/components/nav/nav-bar.tsx b/web/components/nav/nav-bar.tsx
index a9cb49f0..0aded804 100644
--- a/web/components/nav/nav-bar.tsx
+++ b/web/components/nav/nav-bar.tsx
@@ -60,7 +60,7 @@ export function BottomNavBar() {
         ) : user ? (
           <>
             <Avatar
-              containerClassName="mx-auto my-1"
+              className="mx-auto my-1"
               size="xs"
               username={user.username}
               avatarUrl={user.avatarUrl}
diff --git a/web/components/nav/profile-menu.tsx b/web/components/nav/profile-menu.tsx
index c88e67b9..71c9fc47 100644
--- a/web/components/nav/profile-menu.tsx
+++ b/web/components/nav/profile-menu.tsx
@@ -28,7 +28,7 @@ export function getNavigationOptions(user?: User | null) {
 export function ProfileSummary(props: { user: User | undefined }) {
   const { user } = props
   return (
-    <Row className="group avatar items-center gap-4 rounded-md py-3 text-gray-500 group-hover:bg-gray-100 group-hover:text-gray-700">
+    <Row className="group items-center gap-4 rounded-md py-3 text-gray-500 group-hover:bg-gray-100 group-hover:text-gray-700">
       <Avatar avatarUrl={user?.avatarUrl} username={user?.username} noLink />
 
       <div className="truncate text-left">

From 2e214cab7ae79c237a84bb5c423c92d777a3eefb Mon Sep 17 00:00:00 2001
From: Marshall Polaris <marshall@pol.rs>
Date: Thu, 5 May 2022 09:51:09 -0700
Subject: [PATCH 21/34] Kill warmup spam (#133)

* Only warm up sell bet function once

* Only warm up create user function once
---
 web/components/bets-list.tsx | 5 +++--
 web/lib/firebase/users.ts    | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/web/components/bets-list.tsx b/web/components/bets-list.tsx
index 5d595cf7..9bad3627 100644
--- a/web/components/bets-list.tsx
+++ b/web/components/bets-list.tsx
@@ -553,10 +553,11 @@ function BetRow(props: { bet: Bet; contract: Contract; saleBet?: Bet }) {
   )
 }
 
+const warmUpSellBet = _.throttle(() => sellBet({}).catch(), 5000 /* ms */)
+
 function SellButton(props: { contract: Contract; bet: Bet }) {
   useEffect(() => {
-    // warm up cloud function
-    sellBet({}).catch()
+    warmUpSellBet()
   }, [])
 
   const { contract, bet } = props
diff --git a/web/lib/firebase/users.ts b/web/lib/firebase/users.ts
index e07d138c..8b8523c6 100644
--- a/web/lib/firebase/users.ts
+++ b/web/lib/firebase/users.ts
@@ -77,11 +77,13 @@ const CACHED_USER_KEY = 'CACHED_USER_KEY'
 // used to avoid weird race condition
 let createUserPromise: Promise<User | null> | undefined = undefined
 
+const warmUpCreateUser = _.throttle(createUser, 5000 /* ms */)
+
 export function listenForLogin(onUser: (user: User | null) => void) {
   const cachedUser = localStorage.getItem(CACHED_USER_KEY)
   onUser(cachedUser ? JSON.parse(cachedUser) : null)
 
-  if (!cachedUser) createUser() // warm up cloud function
+  if (!cachedUser) warmUpCreateUser()
 
   return onAuthStateChanged(auth, async (fbUser) => {
     if (fbUser) {

From bbf419953ed80ffe324a06c2cdfd234aa85f6191 Mon Sep 17 00:00:00 2001
From: Boa <iansphilips@gmail.com>
Date: Thu, 5 May 2022 16:30:30 -0600
Subject: [PATCH 22/34] Show comments on profile (#137)

* WIP - got comments on the user page

* Remove number from chosen FR answer

* Distinguish wining and losing FR answers

* Show no answers text

* Simplify get answer items logic

* Show answer number

* Show answer # when resolving

* Fix import path

* Add user's collated comments onto profile

* Allow linking to comments/markets in profile

* Allow preload of users contracts in profile

* Remove unused check

* Small code improvements
---
 web/components/charity/feed-items.tsx      |   2 +-
 web/components/comments-list.tsx           |  65 +++++++++++++
 web/components/contract/contracts-list.tsx |  15 +--
 web/components/feed/feed-items.tsx         |  12 +--
 web/components/layout/tabs.tsx             |  22 +++--
 web/components/relative-timestamp.tsx      |  14 +++
 web/components/user-page.tsx               | 105 ++++++++++++++++++++-
 web/lib/firebase/comments.ts               |  19 +++-
 web/pages/[username]/index.tsx             |   8 +-
 9 files changed, 220 insertions(+), 42 deletions(-)
 create mode 100644 web/components/comments-list.tsx
 create mode 100644 web/components/relative-timestamp.tsx

diff --git a/web/components/charity/feed-items.tsx b/web/components/charity/feed-items.tsx
index 9216e776..43d03c7b 100644
--- a/web/components/charity/feed-items.tsx
+++ b/web/components/charity/feed-items.tsx
@@ -3,7 +3,7 @@ import { Avatar } from '../avatar'
 import { useUserById } from '../../hooks/use-users'
 import { UserLink } from '../user-page'
 import { manaToUSD } from '../../pages/charity/[charitySlug]'
-import { RelativeTimestamp } from '../feed/feed-items'
+import { RelativeTimestamp } from '../relative-timestamp'
 
 export function Donation(props: { txn: Txn }) {
   const { txn } = props
diff --git a/web/components/comments-list.tsx b/web/components/comments-list.tsx
new file mode 100644
index 00000000..7461c6f1
--- /dev/null
+++ b/web/components/comments-list.tsx
@@ -0,0 +1,65 @@
+import { Comment } from '../../common/comment'
+import { Contract } from '../../common/contract'
+import { contractPath } from '../lib/firebase/contracts'
+import { SiteLink } from './site-link'
+import { Row } from './layout/row'
+import { Avatar } from './avatar'
+import { RelativeTimestamp } from './relative-timestamp'
+import { UserLink } from './user-page'
+import { User } from '../../common/user'
+import { Col } from './layout/col'
+import { Linkify } from './linkify'
+
+export function UserCommentsList(props: {
+  user: User
+  commentsByUniqueContracts: Map<Contract, Comment[]>
+}) {
+  const { commentsByUniqueContracts } = props
+
+  return (
+    <Col className={'bg-white'}>
+      {Array.from(commentsByUniqueContracts).map(([contract, comments]) => (
+        <div key={contract.id} className={'border-width-1 border-b p-5'}>
+          <div className={'mb-2 text-sm text-indigo-700'}>
+            <SiteLink href={contractPath(contract)}>
+              {contract.question}
+            </SiteLink>
+          </div>
+          {comments.map((comment) => (
+            <div key={comment.id} className={'relative pb-6'}>
+              <div className="relative flex items-start space-x-3">
+                <ProfileComment comment={comment} />
+              </div>
+            </div>
+          ))}
+        </div>
+      ))}
+    </Col>
+  )
+}
+
+function ProfileComment(props: { comment: Comment }) {
+  const { comment } = props
+  const { text, userUsername, userName, userAvatarUrl, createdTime } = comment
+  // TODO: find and attach relevant bets by comment betId at some point
+  return (
+    <div>
+      <Row className={'gap-4'}>
+        <Avatar username={userUsername} avatarUrl={userAvatarUrl} />
+        <div className="min-w-0 flex-1">
+          <div>
+            <p className="mt-0.5 text-sm text-gray-500">
+              <UserLink
+                className="text-gray-500"
+                username={userUsername}
+                name={userName}
+              />{' '}
+              <RelativeTimestamp time={createdTime} />
+            </p>
+          </div>
+          <Linkify text={text} />
+        </div>
+      </Row>
+    </div>
+  )
+}
diff --git a/web/components/contract/contracts-list.tsx b/web/components/contract/contracts-list.tsx
index dab8613d..e84af1ea 100644
--- a/web/components/contract/contracts-list.tsx
+++ b/web/components/contract/contracts-list.tsx
@@ -341,19 +341,8 @@ export function SearchableGrid(props: {
   )
 }
 
-export function CreatorContractsList(props: { creator: User }) {
-  const { creator } = props
-  const [contracts, setContracts] = useState<Contract[] | 'loading'>('loading')
-
-  useEffect(() => {
-    if (creator?.id) {
-      // TODO: stream changes from firestore
-      listContracts(creator.id).then(setContracts)
-    }
-  }, [creator])
-
-  if (contracts === 'loading') return <></>
-
+export function CreatorContractsList(props: { contracts: Contract[] }) {
+  const { contracts } = props
   return (
     <SearchableGrid
       contracts={contracts}
diff --git a/web/components/feed/feed-items.tsx b/web/components/feed/feed-items.tsx
index 472f6649..dbf3ece3 100644
--- a/web/components/feed/feed-items.tsx
+++ b/web/components/feed/feed-items.tsx
@@ -55,6 +55,7 @@ import { trackClick } from '../../lib/firebase/tracking'
 import { firebaseLogin } from '../../lib/firebase/users'
 import { DAY_MS } from '../../../common/util/time'
 import NewContractBadge from '../new-contract-badge'
+import { RelativeTimestamp } from '../relative-timestamp'
 import { calculateCpmmSale } from '../../../common/calculate-cpmm'
 
 export function FeedItems(props: {
@@ -357,17 +358,6 @@ export function CommentInput(props: {
   )
 }
 
-export function RelativeTimestamp(props: { time: number }) {
-  const { time } = props
-  return (
-    <DateTimeTooltip time={time}>
-      <span className="ml-1 whitespace-nowrap text-gray-400">
-        {fromNow(time)}
-      </span>
-    </DateTimeTooltip>
-  )
-}
-
 function getBettorsPosition(
   contract: Contract,
   createdTime: number,
diff --git a/web/components/layout/tabs.tsx b/web/components/layout/tabs.tsx
index 45b6a7d7..fc9dd775 100644
--- a/web/components/layout/tabs.tsx
+++ b/web/components/layout/tabs.tsx
@@ -1,6 +1,7 @@
 import clsx from 'clsx'
 import Link from 'next/link'
 import { useState } from 'react'
+import { Row } from './row'
 
 type Tab = {
   title: string
@@ -10,8 +11,13 @@ type Tab = {
   href?: string
 }
 
-export function Tabs(props: { tabs: Tab[]; defaultIndex?: number }) {
-  const { tabs, defaultIndex } = props
+export function Tabs(props: {
+  tabs: Tab[]
+  defaultIndex?: number
+  className?: string
+  onClick?: (tabName: string) => void
+}) {
+  const { tabs, defaultIndex, className, onClick } = props
   const [activeIndex, setActiveIndex] = useState(defaultIndex ?? 0)
   const activeTab = tabs[activeIndex]
 
@@ -28,19 +34,21 @@ export function Tabs(props: { tabs: Tab[]; defaultIndex?: number }) {
                     e.preventDefault()
                   }
                   setActiveIndex(i)
+                  onClick?.(tab.title)
                 }}
                 className={clsx(
                   activeIndex === i
                     ? 'border-indigo-500 text-indigo-600'
                     : 'border-transparent text-gray-500 hover:border-gray-300 hover:text-gray-700',
-                  'cursor-pointer whitespace-nowrap border-b-2 py-4 px-1 text-sm font-medium'
+                  'cursor-pointer whitespace-nowrap border-b-2 py-3 px-1 text-sm font-medium',
+                  className
                 )}
                 aria-current={activeIndex === i ? 'page' : undefined}
               >
-                {tab.tabIcon ? (
-                  <span className="mr-2">{tab.tabIcon}</span>
-                ) : null}
-                {tab.title}
+                <Row className={'items-center justify-center gap-1'}>
+                  {tab.tabIcon && <span> {tab.tabIcon}</span>}
+                  {tab.title}
+                </Row>
               </a>
             </Link>
           ))}
diff --git a/web/components/relative-timestamp.tsx b/web/components/relative-timestamp.tsx
new file mode 100644
index 00000000..cd5ca713
--- /dev/null
+++ b/web/components/relative-timestamp.tsx
@@ -0,0 +1,14 @@
+import { DateTimeTooltip } from './datetime-tooltip'
+import { fromNow } from '../lib/util/time'
+import React from 'react'
+
+export function RelativeTimestamp(props: { time: number }) {
+  const { time } = props
+  return (
+    <DateTimeTooltip time={time}>
+      <span className="ml-1 whitespace-nowrap text-gray-400">
+        {fromNow(time)}
+      </span>
+    </DateTimeTooltip>
+  )
+}
diff --git a/web/components/user-page.tsx b/web/components/user-page.tsx
index b73cffc4..0f033ce3 100644
--- a/web/components/user-page.tsx
+++ b/web/components/user-page.tsx
@@ -12,6 +12,15 @@ import { Row } from './layout/row'
 import { LinkIcon } from '@heroicons/react/solid'
 import { genHash } from '../../common/util/random'
 import { PencilIcon } from '@heroicons/react/outline'
+import { Tabs } from './layout/tabs'
+import { UserCommentsList } from './comments-list'
+import { useEffect, useState } from 'react'
+import { Comment, getUsersComments } from '../lib/firebase/comments'
+import { Contract } from '../../common/contract'
+import { getContractFromId, listContracts } from '../lib/firebase/contracts'
+import { LoadingIndicator } from './loading-indicator'
+import { useRouter } from 'next/router'
+import _ from 'lodash'
 
 export function UserLink(props: {
   name: string
@@ -29,10 +38,47 @@ export function UserLink(props: {
   )
 }
 
-export function UserPage(props: { user: User; currentUser?: User }) {
-  const { user, currentUser } = props
+export function UserPage(props: {
+  user: User
+  currentUser?: User
+  defaultTabTitle?: string
+}) {
+  const router = useRouter()
+  const { user, currentUser, defaultTabTitle } = props
   const isCurrentUser = user.id === currentUser?.id
   const bannerUrl = user.bannerUrl ?? defaultBannerUrl(user.id)
+  const [usersComments, setUsersComments] = useState<Comment[]>([] as Comment[])
+  const [usersContracts, setUsersContracts] = useState<Contract[] | 'loading'>(
+    'loading'
+  )
+  const [commentsByContract, setCommentsByContract] = useState<
+    Map<Contract, Comment[]> | 'loading'
+  >('loading')
+
+  useEffect(() => {
+    if (!user) return
+    getUsersComments(user.id).then(setUsersComments)
+    listContracts(user.id).then(setUsersContracts)
+  }, [user])
+
+  useEffect(() => {
+    const uniqueContractIds = _.uniq(
+      usersComments.map((comment) => comment.contractId)
+    )
+    Promise.all(
+      uniqueContractIds.map((contractId) => getContractFromId(contractId))
+    ).then((contracts) => {
+      const commentsByContract = new Map<Contract, Comment[]>()
+      contracts.forEach((contract) => {
+        if (!contract) return
+        commentsByContract.set(
+          contract,
+          usersComments.filter((comment) => comment.contractId === contract.id)
+        )
+      })
+      setCommentsByContract(commentsByContract)
+    })
+  }, [usersComments])
 
   return (
     <Page>
@@ -138,8 +184,59 @@ export function UserPage(props: { user: User; currentUser?: User }) {
         </Col>
 
         <Spacer h={10} />
-
-        <CreatorContractsList creator={user} />
+        {usersContracts !== 'loading' && commentsByContract != 'loading' ? (
+          <Tabs
+            className={'pb-2 pt-1 '}
+            defaultIndex={defaultTabTitle === 'Comments' ? 1 : 0}
+            onClick={(tabName) =>
+              router.push(
+                {
+                  pathname: `/${user.username}`,
+                  query: { tab: tabName },
+                },
+                undefined,
+                { shallow: true }
+              )
+            }
+            tabs={[
+              {
+                title: 'Markets',
+                content: <CreatorContractsList contracts={usersContracts} />,
+                tabIcon: (
+                  <div
+                    className={clsx(
+                      usersContracts.length > 9 ? 'px-1' : 'px-1.5',
+                      'items-center rounded-full border-2 border-current py-0.5 text-xs'
+                    )}
+                  >
+                    {usersContracts.length}
+                  </div>
+                ),
+              },
+              {
+                title: 'Comments',
+                content: (
+                  <UserCommentsList
+                    user={user}
+                    commentsByUniqueContracts={commentsByContract}
+                  />
+                ),
+                tabIcon: (
+                  <div
+                    className={clsx(
+                      usersComments.length > 9 ? 'px-1' : 'px-1.5',
+                      'items-center rounded-full border-2 border-current py-0.5 text-xs'
+                    )}
+                  >
+                    {usersComments.length}
+                  </div>
+                ),
+              },
+            ]}
+          />
+        ) : (
+          <LoadingIndicator />
+        )}
       </Col>
     </Page>
   )
diff --git a/web/lib/firebase/comments.ts b/web/lib/firebase/comments.ts
index 381269d2..e97e6f99 100644
--- a/web/lib/firebase/comments.ts
+++ b/web/lib/firebase/comments.ts
@@ -1,11 +1,11 @@
 import {
-  doc,
   collection,
-  setDoc,
-  query,
   collectionGroup,
-  where,
+  doc,
   orderBy,
+  query,
+  setDoc,
+  where,
 } from 'firebase/firestore'
 import _ from 'lodash'
 
@@ -13,6 +13,7 @@ import { getValues, listenForValues } from './utils'
 import { db } from './init'
 import { User } from '../../../common/user'
 import { Comment } from '../../../common/comment'
+
 export type { Comment }
 
 export const MAX_COMMENT_LENGTH = 10000
@@ -125,3 +126,13 @@ export async function getDailyComments(
 
   return commentsByDay
 }
+
+const getUsersCommentsQuery = (userId: string) =>
+  query(
+    collectionGroup(db, 'comments'),
+    where('userId', '==', userId),
+    orderBy('createdTime', 'desc')
+  )
+export async function getUsersComments(userId: string) {
+  return await getValues<Comment>(getUsersCommentsQuery(userId))
+}
diff --git a/web/pages/[username]/index.tsx b/web/pages/[username]/index.tsx
index de88d52a..e1e63260 100644
--- a/web/pages/[username]/index.tsx
+++ b/web/pages/[username]/index.tsx
@@ -9,7 +9,7 @@ import Custom404 from '../404'
 export default function UserProfile() {
   const router = useRouter()
   const [user, setUser] = useState<User | null | 'loading'>('loading')
-  const { username } = router.query as { username: string }
+  const { username, tab } = router.query as { username: string; tab: string }
   useEffect(() => {
     if (username) {
       getUserByUsername(username).then(setUser)
@@ -21,7 +21,11 @@ export default function UserProfile() {
   if (user === 'loading') return <></>
 
   return user ? (
-    <UserPage user={user} currentUser={currentUser || undefined} />
+    <UserPage
+      user={user}
+      currentUser={currentUser || undefined}
+      defaultTabTitle={tab}
+    />
   ) : (
     <Custom404 />
   )

From e41f646b425aab0bfb7ad3a906a0b274267f4e1c Mon Sep 17 00:00:00 2001
From: SirSaltyy <104849031+SirSaltyy@users.noreply.github.com>
Date: Thu, 5 May 2022 22:19:47 -0400
Subject: [PATCH 23/34] Remove all spaces between M$ and the associated number
 (#134)

* Remove all spaces between M$ and the associated number

* Update index.tsx
---
 common/util/format.ts          | 2 +-
 web/components/feed-create.tsx | 2 +-
 web/pages/charity/index.tsx    | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/common/util/format.ts b/common/util/format.ts
index e4ac0bd7..765c34d9 100644
--- a/common/util/format.ts
+++ b/common/util/format.ts
@@ -10,7 +10,7 @@ const formatter = new Intl.NumberFormat('en-US', {
 export function formatMoney(amount: number) {
   const newAmount = Math.round(amount) === 0 ? 0 : Math.floor(amount) // handle -0 case
   return (
-    ENV_CONFIG.moneyMoniker + ' ' + formatter.format(newAmount).replace('$', '')
+    ENV_CONFIG.moneyMoniker + formatter.format(newAmount).replace('$', '')
   )
 }
 
diff --git a/web/components/feed-create.tsx b/web/components/feed-create.tsx
index 0a0c6902..ac3fd562 100644
--- a/web/components/feed-create.tsx
+++ b/web/components/feed-create.tsx
@@ -37,7 +37,7 @@ export function FeedPromo(props: { hotContracts: Contract[] }) {
         <div className="mb-4 text-gray-500">
           Find markets on any topic imaginable. Or create your own!
           <br />
-          Sign up to get M$ 1,000 and start trading.
+          Sign up to get M$1,000 and start trading.
           <br />
         </div>
         <Spacer h={6} />
diff --git a/web/pages/charity/index.tsx b/web/pages/charity/index.tsx
index 32e64420..daa4e784 100644
--- a/web/pages/charity/index.tsx
+++ b/web/pages/charity/index.tsx
@@ -56,8 +56,7 @@ export default function Charity(props: {
         <Col className="max-w-xl gap-2">
           <Title className="!mt-0" text="Manifold for Good" />
           <div className="mb-6 text-gray-500">
-            Donate your winnings to charity! Through the month of May, every M$
-            100 you contribute turns into $1 USD sent to your chosen charity.
+            Donate your winnings to charity! Through the month of May, every M$100 you contribute turns into $1 USD sent to your chosen charity.
             <Spacer h={5} />
             Together we've donated over ${Math.floor(totalRaised / 100)} USD so
             far!

From 87b43e6bdbca233803f9136d0dfa8d617b4ee915 Mon Sep 17 00:00:00 2001
From: SirSaltyy <104849031+SirSaltyy@users.noreply.github.com>
Date: Thu, 5 May 2022 22:20:18 -0400
Subject: [PATCH 24/34] Add link to twitter with svg icon to the sidebar and
 profile menu.  Remove Discord hero icon and replace it with discord svg.
 (#135)

---
 web/components/nav/profile-menu.tsx |  2 ++
 web/components/nav/sidebar.tsx      | 10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/web/components/nav/profile-menu.tsx b/web/components/nav/profile-menu.tsx
index 71c9fc47..994f8bc1 100644
--- a/web/components/nav/profile-menu.tsx
+++ b/web/components/nav/profile-menu.tsx
@@ -13,6 +13,7 @@ export function getNavigationOptions(user?: User | null) {
     return [
       { name: 'Leaderboards', href: '/leaderboards' },
       { name: 'Discord', href: 'https://discord.gg/eHQBNBqXuh' },
+      { name: 'Twitter', href: 'https://twitter.com/ManifoldMarkets' },
     ]
   }
 
@@ -20,6 +21,7 @@ export function getNavigationOptions(user?: User | null) {
     { name: 'Add funds', href: '/add-funds' },
     { name: 'Leaderboards', href: '/leaderboards' },
     { name: 'Discord', href: 'https://discord.gg/eHQBNBqXuh' },
+    { name: 'Twitter', href: 'https://twitter.com/ManifoldMarkets' },
     { name: 'About', href: 'https://docs.manifold.markets' },
     { name: 'Sign out', href: '#', onClick: () => firebaseLogout() },
   ]
diff --git a/web/components/nav/sidebar.tsx b/web/components/nav/sidebar.tsx
index 2d5ae49b..4fef69f4 100644
--- a/web/components/nav/sidebar.tsx
+++ b/web/components/nav/sidebar.tsx
@@ -22,6 +22,13 @@ import { MenuButton } from './menu'
 import { getNavigationOptions, ProfileSummary } from './profile-menu'
 import { useHasCreatedContractToday } from '../../hooks/use-has-created-contract-today'
 
+// Create an icon from the url of an image
+function IconFromUrl(url: string): React.ComponentType<{ className?: string }> {
+  return function Icon(props) {
+    return <img src={url} className={clsx(props.className, 'h-6 w-6')} />
+  }
+}
+
 const navigation = [
   { name: 'Home', href: '/home', icon: HomeIcon },
   { name: 'Explore', href: '/markets', icon: SearchIcon },
@@ -39,7 +46,8 @@ const signedOutNavigation = [
 const signedOutMobileNavigation = [
   { name: 'Charity', href: '/charity', icon: HeartIcon },
   { name: 'Leaderboards', href: '/leaderboards', icon: CakeIcon },
-  { name: 'Discord', href: 'https://discord.gg/eHQBNBqXuh', icon: ChatIcon },
+  { name: 'Discord', href: 'https://discord.gg/eHQBNBqXuh', icon: IconFromUrl("/discord-logo.svg") },
+  { name: 'Twitter', href: 'https://twitter.com/ManifoldMarkets', icon: IconFromUrl("/twitter-logo.svg") },
   { name: 'About', href: 'https://docs.manifold.markets', icon: BookOpenIcon },
 ]
 

From 4de0fcd198b01354af1c7ec318c9729fdfbbe953 Mon Sep 17 00:00:00 2001
From: James Grugett <jahooma@gmail.com>
Date: Fri, 6 May 2022 14:29:15 -0400
Subject: [PATCH 25/34] Revert "Represent DB avatar URLs as non-null (#128)"

This reverts commit bf8e09b6c1f2c5d1d9dcf672f210bba6d7a0a2e4.
---
 common/answer.ts           | 2 +-
 common/comment.ts          | 2 +-
 common/contract.ts         | 2 +-
 common/user.ts             | 2 +-
 web/components/SEO.tsx     | 9 +++++++--
 web/pages/api/v0/_types.ts | 2 +-
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/common/answer.ts b/common/answer.ts
index 87e7d05f..9dcc3828 100644
--- a/common/answer.ts
+++ b/common/answer.ts
@@ -9,7 +9,7 @@ export type Answer = {
   userId: string
   username: string
   name: string
-  avatarUrl: string
+  avatarUrl?: string
 
   text: string
 }
diff --git a/common/comment.ts b/common/comment.ts
index 95c2ec4a..15cfbcb5 100644
--- a/common/comment.ts
+++ b/common/comment.ts
@@ -13,5 +13,5 @@ export type Comment = {
   // Denormalized, for rendering comments
   userName: string
   userUsername: string
-  userAvatarUrl: string
+  userAvatarUrl?: string
 }
diff --git a/common/contract.ts b/common/contract.ts
index ee3034de..82a330b5 100644
--- a/common/contract.ts
+++ b/common/contract.ts
@@ -11,7 +11,7 @@ export type FullContract<
   creatorId: string
   creatorName: string
   creatorUsername: string
-  creatorAvatarUrl: string
+  creatorAvatarUrl?: string // Start requiring after 2022-03-01
 
   question: string
   description: string // More info about what the contract is about
diff --git a/common/user.ts b/common/user.ts
index ce586774..8f8e6d0d 100644
--- a/common/user.ts
+++ b/common/user.ts
@@ -4,7 +4,7 @@ export type User = {
 
   name: string
   username: string
-  avatarUrl: string
+  avatarUrl?: string
 
   // For their user page
   bio?: string
diff --git a/web/components/SEO.tsx b/web/components/SEO.tsx
index 8420b199..8987d671 100644
--- a/web/components/SEO.tsx
+++ b/web/components/SEO.tsx
@@ -6,7 +6,7 @@ export type OgCardProps = {
   metadata: string
   creatorName: string
   creatorUsername: string
-  creatorAvatarUrl: string
+  creatorAvatarUrl?: string
 }
 
 function buildCardUrl(props: OgCardProps) {
@@ -14,6 +14,11 @@ function buildCardUrl(props: OgCardProps) {
     props.probability === undefined
       ? ''
       : `&probability=${encodeURIComponent(props.probability ?? '')}`
+  const creatorAvatarUrlParam =
+    props.creatorAvatarUrl === undefined
+      ? ''
+      : `&creatorAvatarUrl=${encodeURIComponent(props.creatorAvatarUrl ?? '')}`
+
   // URL encode each of the props, then add them as query params
   return (
     `https://manifold-og-image.vercel.app/m.png` +
@@ -21,7 +26,7 @@ function buildCardUrl(props: OgCardProps) {
     probabilityParam +
     `&metadata=${encodeURIComponent(props.metadata)}` +
     `&creatorName=${encodeURIComponent(props.creatorName)}` +
-    `&creatorAvatarUrl=${encodeURIComponent(props.creatorAvatarUrl)}` +
+    creatorAvatarUrlParam +
     `&creatorUsername=${encodeURIComponent(props.creatorUsername)}`
   )
 }
diff --git a/web/pages/api/v0/_types.ts b/web/pages/api/v0/_types.ts
index 4569576c..8f2976fa 100644
--- a/web/pages/api/v0/_types.ts
+++ b/web/pages/api/v0/_types.ts
@@ -12,7 +12,7 @@ export type LiteMarket = {
   creatorUsername: string
   creatorName: string
   createdTime: number
-  creatorAvatarUrl: string
+  creatorAvatarUrl?: string
 
   // Market attributes. All times are in milliseconds since epoch
   closeTime?: number

From 22a9901148f362ea66aec2e82a743417b0e7d962 Mon Sep 17 00:00:00 2001
From: Austin Chen <akrolsmir@gmail.com>
Date: Sat, 7 May 2022 08:15:40 -0400
Subject: [PATCH 26/34] Feature Nonlinear as a charity

---
 common/charity.ts                       | 29 +++++++++++++++++++++++++
 web/components/charity/charity-card.tsx |  2 +-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/common/charity.ts b/common/charity.ts
index 72f96983..ecc9f89b 100644
--- a/common/charity.ts
+++ b/common/charity.ts
@@ -56,6 +56,35 @@ export const charities: Charity[] = [
     - Promoting long-term thinking`,
     tags: ['Featured'] as CharityTag[],
   },
+  {
+    name: 'Nonlinear',
+    website: 'https://www.nonlinear.org/',
+    photo: 'https://i.imgur.com/Muifc1l.png',
+    preview:
+      'Incubate longtermist nonprofits by connecting founders with ideas, funding, and mentorship.',
+    description: `Problem: There are tens of thousands of people working full time to make AI powerful, but around one hundred working to make AI safe. This needs to change.
+
+    Longtermism is held back by two bottlenecks:
+    1. Lots of funding, but few charities to deploy it.
+    2. Lots of talent, but few charities creating jobs.
+    
+    Solution: Longtermism needs more charities to deploy funding and create jobs. Our goal is to 10x the number of talented people working on longtermism by launching dozens of high impact charities.
+    
+    This helps solve the bottlenecks because entrepreneurs “unlock” latent EA talent - if one person starts an organization that employs 100 people who weren’t previously working on AI safety, that doubles the number of people working on the problem.
+    
+    Our process:
+    1. Research the highest leverage ideas
+    2. Find the right founders
+    3. Connect them with mentors and funding
+    
+    We will be announcing more details about our incubation program soon. 
+    
+    A few of the ideas we’ve incubated so far:
+    - The Nonlinear Library: Listen to top EA content on your podcast player. We use text-to-speech software to create an automatically updating repository of audio content from the EA Forum, Alignment Forum, and LessWrong. You can find it on all major podcast players here. 
+    - EA Hiring Agency: Helping EA orgs scalably hire talent.
+    - EA Houses: EA's Airbnb - Connecting EAs who have extra space with EAs who need space here.`,
+    tags: ['Featured'] as CharityTag[],
+  },
   {
     name: 'GiveWell Maximum Impact Fund',
     website: 'https://www.givewell.org/maximum-impact-fund',
diff --git a/web/components/charity/charity-card.tsx b/web/components/charity/charity-card.tsx
index 2bf8f879..13a871b1 100644
--- a/web/components/charity/charity-card.tsx
+++ b/web/components/charity/charity-card.tsx
@@ -16,7 +16,7 @@ export function CharityCard(props: { charity: Charity }) {
   return (
     <Link href={`/charity/${slug}`} passHref>
       <div className="card card-compact transition:shadow flex-1 cursor-pointer border-2 bg-white hover:shadow-md">
-        <Row className="mt-6">
+        <Row className="mt-6 mb-2">
           {tags?.includes('Featured') && <FeaturedBadge />}
         </Row>
         <div className="px-8">

From cea942280226f71f7091dd421adf6612a5de5640 Mon Sep 17 00:00:00 2001
From: Austin Chen <akrolsmir@gmail.com>
Date: Sat, 7 May 2022 10:10:25 -0400
Subject: [PATCH 27/34] Update site copy

---
 web/components/answers/answer-bet-panel.tsx |  2 +-
 web/components/bet-panel.tsx                |  4 +--
 web/components/feed-create.tsx              | 33 +++++++++------------
 web/lib/firebase/contracts.ts               |  2 +-
 web/pages/charity/index.tsx                 |  7 +++--
 5 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/web/components/answers/answer-bet-panel.tsx b/web/components/answers/answer-bet-panel.tsx
index 9d84b2f2..18fd949d 100644
--- a/web/components/answers/answer-bet-panel.tsx
+++ b/web/components/answers/answer-bet-panel.tsx
@@ -174,7 +174,7 @@ export function AnswerBetPanel(props: {
           className="btn self-stretch whitespace-nowrap border-none bg-gradient-to-r from-teal-500 to-green-500 px-10 text-lg font-medium normal-case hover:from-teal-600 hover:to-green-600"
           onClick={firebaseLogin}
         >
-          Sign up to trade!
+          Sign up to bet!
         </button>
       )}
     </Col>
diff --git a/web/components/bet-panel.tsx b/web/components/bet-panel.tsx
index cff37929..c4f5c506 100644
--- a/web/components/bet-panel.tsx
+++ b/web/components/bet-panel.tsx
@@ -72,7 +72,7 @@ export function BetPanel(props: {
             className="btn flex-1 whitespace-nowrap border-none bg-gradient-to-r from-teal-500 to-green-500 px-10 text-lg font-medium normal-case hover:from-teal-600 hover:to-green-600"
             onClick={firebaseLogin}
           >
-            Sign up to trade!
+            Sign up to bet!
           </button>
         )}
       </Col>
@@ -187,7 +187,7 @@ export function BetPanelSwitcher(props: {
             className="btn flex-1 whitespace-nowrap border-none bg-gradient-to-r from-teal-500 to-green-500 px-10 text-lg font-medium normal-case hover:from-teal-600 hover:to-green-600"
             onClick={firebaseLogin}
           >
-            Sign up to trade!
+            Sign up to bet!
           </button>
         )}
       </Col>
diff --git a/web/components/feed-create.tsx b/web/components/feed-create.tsx
index ac3fd562..1035b91c 100644
--- a/web/components/feed-create.tsx
+++ b/web/components/feed-create.tsx
@@ -11,41 +11,36 @@ import clsx from 'clsx'
 import { Row } from './layout/row'
 import { ENV_CONFIG } from '../../common/envs/constants'
 import _ from 'lodash'
+import { SiteLink } from './site-link'
 
 export function FeedPromo(props: { hotContracts: Contract[] }) {
   const { hotContracts } = props
 
   return (
     <>
-      <Col className="my-6 rounded-xl bg-white py-12 text-center sm:m-12">
+      <Col className="my-6 rounded-xl text-center sm:m-12">
         <h1 className="text-4xl sm:text-6xl xl:text-6xl">
-          <div className="font-semibold sm:mb-2">
-            A{' '}
-            <span className="bg-gradient-to-r from-teal-400 to-green-400 bg-clip-text font-bold text-transparent">
-              market{' '}
-            </span>
-            for
-          </div>
-          <div className="font-semibold">
-            every{' '}
-            <span className="bg-gradient-to-r from-teal-400 to-green-400 bg-clip-text font-bold text-transparent">
-              question
-            </span>
-          </div>
+          <div className="font-semibold sm:mb-2">A market for</div>
+          <span className="bg-gradient-to-r from-teal-400 to-green-400 bg-clip-text font-bold text-transparent">
+            every question
+          </span>
         </h1>
         <Spacer h={6} />
-        <div className="mb-4 text-gray-500">
-          Find markets on any topic imaginable. Or create your own!
+        <div className="mb-4 px-2 text-gray-500">
+          Bet on any topic imaginable. Or create your own market!
           <br />
-          Sign up to get M$1,000 and start trading.
+          Sign up and get M$1,000 - worth $10 to your{' '}
+          <SiteLink className="font-semibold" href="/charity">
+            favorite charity.
+          </SiteLink>
           <br />
         </div>
         <Spacer h={6} />
         <button
-          className="btn btn-lg self-center border-none bg-gradient-to-r from-teal-500 to-green-500  normal-case hover:from-teal-600 hover:to-green-600"
+          className="self-center rounded-md border-none bg-gradient-to-r from-teal-500 to-green-500 py-4 px-6 text-lg font-semibold normal-case text-white hover:from-teal-600 hover:to-green-600"
           onClick={firebaseLogin}
         >
-          Sign up for free
+          Start betting now
         </button>{' '}
       </Col>
 
diff --git a/web/lib/firebase/contracts.ts b/web/lib/firebase/contracts.ts
index d415788c..7061d4c4 100644
--- a/web/lib/firebase/contracts.ts
+++ b/web/lib/firebase/contracts.ts
@@ -50,7 +50,7 @@ export function contractMetrics(contract: Contract) {
     ? dayjs(resolutionTime).format('MMM D')
     : undefined
 
-  const volumeLabel = `${formatMoney(contract.volume)} volume`
+  const volumeLabel = `${formatMoney(contract.volume)} bet`
 
   return { volumeLabel, createdDate, resolvedDate }
 }
diff --git a/web/pages/charity/index.tsx b/web/pages/charity/index.tsx
index daa4e784..bd729571 100644
--- a/web/pages/charity/index.tsx
+++ b/web/pages/charity/index.tsx
@@ -56,7 +56,8 @@ export default function Charity(props: {
         <Col className="max-w-xl gap-2">
           <Title className="!mt-0" text="Manifold for Good" />
           <div className="mb-6 text-gray-500">
-            Donate your winnings to charity! Through the month of May, every M$100 you contribute turns into $1 USD sent to your chosen charity.
+            Donate your winnings to charity! Through the month of May, every
+            M$100 you contribute turns into $1 USD sent to your chosen charity.
             <Spacer h={5} />
             Together we've donated over ${Math.floor(totalRaised / 100)} USD so
             far!
@@ -100,8 +101,8 @@ export default function Charity(props: {
           <br />
           <br />
           <span className="italic">
-            Note: Manifold is not affiliated with any of these charities (other
-            than being fans of their work!)
+            Note: Manifold is not affiliated with non-Featured charities; we're
+            just fans of their work!
             <br />
             As Manifold is a for-profit entity, your contributions will not be
             tax deductible.

From 2eed1c432aa4d2fb2a54195f0faeb857c2cf2ed1 Mon Sep 17 00:00:00 2001
From: Austin Chen <akrolsmir@gmail.com>
Date: Sat, 7 May 2022 19:44:01 -0400
Subject: [PATCH 28/34] Hardcode in 8 frontpage markets

---
 web/components/feed-create.tsx |  2 +-
 web/lib/firebase/contracts.ts  |  7 +++++++
 web/pages/index.tsx            | 13 +++++++++++--
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/web/components/feed-create.tsx b/web/components/feed-create.tsx
index 1035b91c..7ce1deb5 100644
--- a/web/components/feed-create.tsx
+++ b/web/components/feed-create.tsx
@@ -46,7 +46,7 @@ export function FeedPromo(props: { hotContracts: Contract[] }) {
 
       <Row className="m-4 mb-6 items-center gap-1 text-xl font-semibold text-gray-800">
         <SparklesIcon className="inline h-5 w-5" aria-hidden="true" />
-        Trending today
+        Trending markets
       </Row>
       <ContractsGrid
         contracts={hotContracts?.slice(0, 10) || []}
diff --git a/web/lib/firebase/contracts.ts b/web/lib/firebase/contracts.ts
index 7061d4c4..ab408215 100644
--- a/web/lib/firebase/contracts.ts
+++ b/web/lib/firebase/contracts.ts
@@ -239,6 +239,13 @@ export async function getHotContracts() {
   )
 }
 
+export async function getContractsBySlugs(slugs: string[]) {
+  const q = query(contractCollection, where('slug', 'in', slugs))
+  const snapshot = await getDocs(q)
+  const contracts = snapshot.docs.map((doc) => doc.data() as Contract)
+  return _.sortBy(contracts, (contract) => -1 * contract.volume24Hours)
+}
+
 const topWeeklyQuery = query(
   contractCollection,
   where('isResolved', '==', false),
diff --git a/web/pages/index.tsx b/web/pages/index.tsx
index 57c72a8d..eb954f3c 100644
--- a/web/pages/index.tsx
+++ b/web/pages/index.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import Router from 'next/router'
 
-import { Contract, getHotContracts } from '../lib/firebase/contracts'
+import { Contract, getContractsBySlugs } from '../lib/firebase/contracts'
 import { Page } from '../components/page'
 import { FeedPromo } from '../components/feed-create'
 import { Col } from '../components/layout/col'
@@ -9,7 +9,16 @@ import { useUser } from '../hooks/use-user'
 import { ManifoldLogo } from '../components/nav/manifold-logo'
 
 export async function getStaticProps() {
-  const hotContracts = (await getHotContracts().catch(() => [])) ?? []
+  const hotContracts = await getContractsBySlugs([
+    'if-boris-johnson-is-leader-of-the-c',
+    'will-ethereum-merge-to-proofofstake',
+    'will-russia-control-the-majority-of',
+    'will-elon-musk-buy-twitter-this-yea',
+    'will-an-ai-get-gold-on-any-internat',
+    'how-many-us-supreme-court-justices',
+    'who-will-win-the-nba-finals-champio',
+    'what-database-will-manifold-be-prim',
+  ])
 
   return {
     props: { hotContracts },

From 5efcf612897f23af8ceead4e95db21d841f8f282 Mon Sep 17 00:00:00 2001
From: Marshall Polaris <marshall@pol.rs>
Date: Sun, 8 May 2022 13:33:58 -0700
Subject: [PATCH 29/34] Configure compiler to allow absolute imports from root
 (#147)

---
 web/pages/api/v0/_types.ts      | 10 +++++-----
 web/pages/api/v0/market/[id].ts |  8 ++++----
 web/pages/api/v0/markets.ts     |  4 ++--
 web/pages/api/v0/slug/[slug].ts |  8 ++++----
 web/tsconfig.json               |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/web/pages/api/v0/_types.ts b/web/pages/api/v0/_types.ts
index 8f2976fa..355b1973 100644
--- a/web/pages/api/v0/_types.ts
+++ b/web/pages/api/v0/_types.ts
@@ -1,8 +1,8 @@
-import { Bet } from '../../../../common/bet'
-import { getProbability } from '../../../../common/calculate'
-import { Comment } from '../../../../common/comment'
-import { Contract } from '../../../../common/contract'
-import { removeUndefinedProps } from '../../../../common/util/object'
+import { Bet } from 'common/bet'
+import { getProbability } from 'common/calculate'
+import { Comment } from 'common/comment'
+import { Contract } from 'common/contract'
+import { removeUndefinedProps } from 'common/util/object'
 
 export type LiteMarket = {
   // Unique identifer for this market
diff --git a/web/pages/api/v0/market/[id].ts b/web/pages/api/v0/market/[id].ts
index 2faa9c57..723a6440 100644
--- a/web/pages/api/v0/market/[id].ts
+++ b/web/pages/api/v0/market/[id].ts
@@ -1,9 +1,9 @@
 import { NextApiRequest, NextApiResponse } from 'next'
-import { Bet, listAllBets } from '../../../../lib/firebase/bets'
-import { listAllComments } from '../../../../lib/firebase/comments'
-import { getContractFromId } from '../../../../lib/firebase/contracts'
+import { Bet, listAllBets } from 'web/lib/firebase/bets'
+import { listAllComments } from 'web/lib/firebase/comments'
+import { getContractFromId } from 'web/lib/firebase/contracts'
+import { applyCorsHeaders, CORS_UNRESTRICTED } from 'web/lib/api/cors'
 import { FullMarket, ApiError, toLiteMarket } from '../_types'
-import { applyCorsHeaders, CORS_UNRESTRICTED } from '../../../../lib/api/cors'
 
 export default async function handler(
   req: NextApiRequest,
diff --git a/web/pages/api/v0/markets.ts b/web/pages/api/v0/markets.ts
index a27fd27a..1319147a 100644
--- a/web/pages/api/v0/markets.ts
+++ b/web/pages/api/v0/markets.ts
@@ -1,8 +1,8 @@
 // Next.js API route support: https://vercel.com/docs/concepts/functions/serverless-functions
 import type { NextApiRequest, NextApiResponse } from 'next'
-import { listAllContracts } from '../../../lib/firebase/contracts'
+import { listAllContracts } from 'web/lib/firebase/contracts'
+import { applyCorsHeaders, CORS_UNRESTRICTED } from 'web/lib/api/cors'
 import { toLiteMarket } from './_types'
-import { applyCorsHeaders, CORS_UNRESTRICTED } from '../../../lib/api/cors'
 
 type Data = any[]
 
diff --git a/web/pages/api/v0/slug/[slug].ts b/web/pages/api/v0/slug/[slug].ts
index c4bba82a..fba785fb 100644
--- a/web/pages/api/v0/slug/[slug].ts
+++ b/web/pages/api/v0/slug/[slug].ts
@@ -1,9 +1,9 @@
 import { NextApiRequest, NextApiResponse } from 'next'
-import { Bet, listAllBets } from '../../../../lib/firebase/bets'
-import { listAllComments } from '../../../../lib/firebase/comments'
-import { getContractFromSlug } from '../../../../lib/firebase/contracts'
+import { applyCorsHeaders, CORS_UNRESTRICTED } from 'web/lib/api/cors'
+import { Bet, listAllBets } from 'web/lib/firebase/bets'
+import { listAllComments } from 'web/lib/firebase/comments'
+import { getContractFromSlug } from 'web/lib/firebase/contracts'
 import { FullMarket, ApiError, toLiteMarket } from '../_types'
-import { applyCorsHeaders, CORS_UNRESTRICTED } from '../../../../lib/api/cors'
 
 export default async function handler(
   req: NextApiRequest,
diff --git a/web/tsconfig.json b/web/tsconfig.json
index f2426297..3d8768eb 100644
--- a/web/tsconfig.json
+++ b/web/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "baseUrl": "../",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,

From b47e4364ad89ebdc11eecd7b256e2cbd99ce9903 Mon Sep 17 00:00:00 2001
From: Austin Chen <akrolsmir@gmail.com>
Date: Sun, 8 May 2022 22:53:02 -0400
Subject: [PATCH 30/34] Remove circle around markets/comments count

---
 web/components/user-page.tsx | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/web/components/user-page.tsx b/web/components/user-page.tsx
index 0f033ce3..24d58081 100644
--- a/web/components/user-page.tsx
+++ b/web/components/user-page.tsx
@@ -203,12 +203,7 @@ export function UserPage(props: {
                 title: 'Markets',
                 content: <CreatorContractsList contracts={usersContracts} />,
                 tabIcon: (
-                  <div
-                    className={clsx(
-                      usersContracts.length > 9 ? 'px-1' : 'px-1.5',
-                      'items-center rounded-full border-2 border-current py-0.5 text-xs'
-                    )}
-                  >
+                  <div className="px-0.5 font-bold">
                     {usersContracts.length}
                   </div>
                 ),
@@ -222,14 +217,7 @@ export function UserPage(props: {
                   />
                 ),
                 tabIcon: (
-                  <div
-                    className={clsx(
-                      usersComments.length > 9 ? 'px-1' : 'px-1.5',
-                      'items-center rounded-full border-2 border-current py-0.5 text-xs'
-                    )}
-                  >
-                    {usersComments.length}
-                  </div>
+                  <div className="px-0.5 font-bold">{usersComments.length}</div>
                 ),
               },
             ]}

From dd2366458d3bba420afadf89120a95e062ca5807 Mon Sep 17 00:00:00 2001
From: Marshall Polaris <marshall@pol.rs>
Date: Sun, 8 May 2022 23:57:29 -0700
Subject: [PATCH 31/34] Fix up target in web tsconfig (#155)

---
 web/tsconfig.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/tsconfig.json b/web/tsconfig.json
index 3d8768eb..96cf1311 100644
--- a/web/tsconfig.json
+++ b/web/tsconfig.json
@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "target": "es5",
     "baseUrl": "../",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,

From acc9c84e2e9cf33fdb75d158dbeca2d9bd634db6 Mon Sep 17 00:00:00 2001
From: Marshall Polaris <marshall@pol.rs>
Date: Mon, 9 May 2022 06:04:36 -0700
Subject: [PATCH 32/34] More absolute imports (#156)

* Configure functions module to allow absolute imports

* Convert common imports in functions to be absolute

* Convert common imports in web to be absolute

* Convert lib imports in web to be absolute

* Convert hooks imports in web to be absolute

* Convert components imports in web to be absolute
---
 functions/src/add-liquidity.ts                |  8 +--
 functions/src/change-user-info.ts             | 12 ++--
 functions/src/create-answer.ts                | 15 ++---
 functions/src/create-contract.ts              | 12 ++--
 functions/src/create-fold.ts                  |  8 +--
 functions/src/create-user.ts                  | 11 ++--
 functions/src/emails.ts                       | 18 +++---
 functions/src/market-close-emails.ts          |  2 +-
 functions/src/on-create-bet.ts                |  2 +-
 functions/src/on-create-comment.ts            |  6 +-
 functions/src/on-view.ts                      |  2 +-
 functions/src/place-bet.ts                    | 12 ++--
 functions/src/redeem-shares.ts                | 10 ++--
 functions/src/resolve-market.ts               | 12 ++--
 functions/src/scripts/cache-views.ts          |  6 +-
 .../src/scripts/correct-bet-probability.ts    |  6 +-
 functions/src/scripts/create-private-users.ts |  2 +-
 functions/src/scripts/get-json-dump.ts        |  6 +-
 functions/src/scripts/lowercase-fold-tags.ts  |  2 +-
 .../src/scripts/make-contracts-public.ts      |  2 +-
 functions/src/scripts/migrate-contract.ts     |  4 +-
 functions/src/scripts/migrate-to-cfmm.ts      | 23 +++-----
 functions/src/scripts/migrate-to-dpm-2.ts     | 13 ++---
 .../src/scripts/pay-out-contract-again.ts     |  8 +--
 .../scripts/recalculate-contract-totals.ts    |  4 +-
 functions/src/scripts/remove-answer-ante.ts   |  4 +-
 .../src/scripts/rename-user-contracts.ts      |  2 +-
 functions/src/scripts/update-contract-tags.ts |  4 +-
 functions/src/scripts/update-feed.ts          |  6 +-
 .../src/scripts/update-last-comment-time.ts   |  4 +-
 functions/src/sell-bet.ts                     | 12 ++--
 functions/src/sell-shares.ts                  | 10 ++--
 functions/src/transact.ts                     |  6 +-
 functions/src/unsubscribe.ts                  |  2 +-
 functions/src/update-contract-metrics.ts      |  6 +-
 functions/src/update-feed.ts                  | 16 ++---
 functions/src/update-recommendations.ts       | 12 ++--
 functions/src/update-user-metrics.ts          | 10 ++--
 functions/src/utils.ts                        |  4 +-
 functions/tsconfig.json                       |  1 +
 web/components/add-funds-button.tsx           |  4 +-
 web/components/add-liquidity-panel.tsx        |  8 +--
 web/components/amount-input.tsx               | 10 ++--
 web/components/analytics/charts.tsx           |  2 +-
 web/components/answers/answer-bet-panel.tsx   | 16 ++---
 web/components/answers/answer-item.tsx        | 10 ++--
 .../answers/answer-resolve-panel.tsx          |  6 +-
 web/components/answers/answers-graph.tsx      | 10 ++--
 web/components/answers/answers-panel.tsx      | 16 ++---
 .../answers/create-answer-panel.tsx           | 16 ++---
 web/components/bet-panel.tsx                  | 23 ++++----
 web/components/bet-row.tsx                    |  6 +-
 web/components/bets-list.tsx                  | 20 +++----
 web/components/charity/charity-card.tsx       |  4 +-
 web/components/charity/feed-items.tsx         |  4 +-
 web/components/comments-list.tsx              |  8 +--
 web/components/contract/contract-card.tsx     |  8 +--
 .../contract/contract-description.tsx         |  8 +--
 web/components/contract/contract-details.tsx  |  8 +--
 .../contract/contract-info-dialog.tsx         | 11 ++--
 web/components/contract/contract-overview.tsx | 10 ++--
 .../contract/contract-prob-graph.tsx          | 10 ++--
 web/components/contract/contract-tabs.tsx     | 10 ++--
 web/components/contract/contracts-list.tsx    |  8 +--
 web/components/copy-link-button.tsx           |  8 +--
 web/components/feed-create.tsx                |  6 +-
 web/components/feed/activity-feed.tsx         |  8 +--
 web/components/feed/activity-items.ts         | 19 +++---
 web/components/feed/contract-activity.tsx     | 12 ++--
 web/components/feed/feed-items.tsx            | 38 +++++-------
 web/components/feed/find-active-contracts.ts  |  6 +-
 web/components/folds/create-fold-button.tsx   |  8 +--
 web/components/folds/edit-fold-button.tsx     |  8 +--
 web/components/folds/fast-fold-following.tsx  |  4 +-
 web/components/folds/fold-tag.tsx             |  2 +-
 web/components/folds/follow-fold-button.tsx   |  8 +--
 web/components/leaderboard.tsx                |  2 +-
 web/components/nav/manifold-logo.tsx          |  4 +-
 web/components/nav/nav-bar.tsx                |  4 +-
 web/components/nav/profile-menu.tsx           |  6 +-
 web/components/nav/sidebar.tsx                | 20 +++++--
 web/components/outcome-label.tsx              |  8 +--
 web/components/relative-timestamp.tsx         |  2 +-
 web/components/resolution-panel.tsx           | 12 ++--
 web/components/sell-button.tsx                |  6 +-
 web/components/sell-modal.tsx                 |  8 +--
 web/components/sell-row.tsx                   |  8 +--
 web/components/share-embed-button.tsx         |  8 +--
 web/components/share-market.tsx               |  2 +-
 web/components/tags-input.tsx                 |  4 +-
 web/components/use-save-shares.ts             |  4 +-
 web/components/user-page.tsx                  | 10 ++--
 web/components/yes-no-selector.tsx            |  2 +-
 web/hooks/use-admin.ts                        |  2 +-
 web/hooks/use-algo-feed.ts                    | 14 ++---
 web/hooks/use-answers.ts                      |  4 +-
 web/hooks/use-bets.ts                         |  4 +-
 web/hooks/use-charity-txns.ts                 |  4 +-
 web/hooks/use-comments.ts                     |  2 +-
 web/hooks/use-contract.ts                     |  2 +-
 web/hooks/use-contracts.ts                    |  4 +-
 web/hooks/use-fold.ts                         |  6 +-
 web/hooks/use-has-created-contract-today.ts   |  4 +-
 web/hooks/use-propz.ts                        |  2 +-
 web/hooks/use-seen-contracts.ts               |  4 +-
 web/hooks/use-user-bets.ts                    |  2 +-
 web/hooks/use-user.ts                         |  4 +-
 web/hooks/use-users.ts                        |  4 +-
 web/lib/firebase/answers.ts                   |  2 +-
 web/lib/firebase/api-call.ts                  |  8 +--
 web/lib/firebase/bets.ts                      |  4 +-
 web/lib/firebase/comments.ts                  |  4 +-
 web/lib/firebase/contracts.ts                 | 20 +++----
 web/lib/firebase/folds.ts                     |  2 +-
 web/lib/firebase/init.ts                      |  2 +-
 web/lib/firebase/tracking.ts                  |  2 +-
 web/lib/firebase/txns.ts                      |  2 +-
 web/lib/firebase/users.ts                     |  4 +-
 web/lib/service/stripe.ts                     |  2 +-
 web/pages/404.tsx                             |  6 +-
 web/pages/[username]/[contractSlug].tsx       | 52 ++++++++---------
 web/pages/[username]/index.tsx                |  6 +-
 web/pages/_app.tsx                            |  2 +-
 web/pages/_document.tsx                       |  2 +-
 web/pages/about.tsx                           |  6 +-
 web/pages/account.tsx                         |  8 +--
 web/pages/add-funds.tsx                       | 14 ++---
 web/pages/admin.tsx                           | 10 ++--
 web/pages/analytics.tsx                       | 24 ++++----
 web/pages/charity/[charitySlug].tsx           | 28 ++++-----
 web/pages/charity/index.tsx                   | 16 ++---
 web/pages/create.tsx                          | 30 +++++-----
 web/pages/embed/[username]/[contractSlug].tsx | 44 ++++++--------
 web/pages/embed/analytics.tsx                 | 10 ++--
 web/pages/fold/[...slugs]/index.tsx           | 58 +++++++++----------
 web/pages/folds.tsx                           | 26 ++++-----
 web/pages/home.tsx                            | 16 ++---
 web/pages/index.tsx                           | 12 ++--
 web/pages/landing-page.tsx                    |  8 +--
 web/pages/leaderboards.tsx                    | 12 ++--
 web/pages/make-predictions.tsx                | 28 ++++-----
 web/pages/markets.tsx                         | 12 ++--
 web/pages/portfolio.tsx                       | 10 ++--
 web/pages/profile.tsx                         | 33 +++++------
 web/pages/server-sitemap.xml.tsx              |  2 +-
 web/pages/simulator.tsx                       |  4 +-
 web/pages/tag/[tag].tsx                       |  8 +--
 web/pages/trades.tsx                          |  2 +-
 148 files changed, 671 insertions(+), 710 deletions(-)

diff --git a/functions/src/add-liquidity.ts b/functions/src/add-liquidity.ts
index e37804d3..2f6d2446 100644
--- a/functions/src/add-liquidity.ts
+++ b/functions/src/add-liquidity.ts
@@ -1,11 +1,11 @@
 import * as functions from 'firebase-functions'
 import * as admin from 'firebase-admin'
 
-import { Contract } from '../../common/contract'
-import { User } from '../../common/user'
-import { removeUndefinedProps } from '../../common/util/object'
+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 { getNewLiquidityProvision } from 'common/add-liquidity'
 
 export const addLiquidity = functions.runWith({ minInstances: 1 }).https.onCall(
   async (
diff --git a/functions/src/change-user-info.ts b/functions/src/change-user-info.ts
index ab15eb70..f85d45b3 100644
--- a/functions/src/change-user-info.ts
+++ b/functions/src/change-user-info.ts
@@ -2,12 +2,12 @@ import * as functions from 'firebase-functions'
 import * as admin from 'firebase-admin'
 
 import { getUser } from './utils'
-import { Contract } from '../../common/contract'
-import { Comment } from '../../common/comment'
-import { User } from '../../common/user'
-import { cleanUsername } from '../../common/util/clean-username'
-import { removeUndefinedProps } from '../../common/util/object'
-import { Answer } from '../../common/answer'
+import { Contract } from 'common/contract'
+import { Comment } from 'common/comment'
+import { User } from 'common/user'
+import { cleanUsername } from 'common/util/clean-username'
+import { removeUndefinedProps } from 'common/util/object'
+import { Answer } from 'common/answer'
 
 export const changeUserInfo = functions
   .runWith({ minInstances: 1 })
diff --git a/functions/src/create-answer.ts b/functions/src/create-answer.ts
index 1da8f350..55211585 100644
--- a/functions/src/create-answer.ts
+++ b/functions/src/create-answer.ts
@@ -1,18 +1,13 @@
 import * as functions from 'firebase-functions'
 import * as admin from 'firebase-admin'
 
-import {
-  Contract,
-  DPM,
-  FreeResponse,
-  FullContract,
-} from '../../common/contract'
-import { User } from '../../common/user'
-import { getLoanAmount, getNewMultiBetInfo } from '../../common/new-bet'
-import { Answer, MAX_ANSWER_LENGTH } from '../../common/answer'
+import { Contract, DPM, FreeResponse, FullContract } from 'common/contract'
+import { User } from 'common/user'
+import { getLoanAmount, getNewMultiBetInfo } from 'common/new-bet'
+import { Answer, MAX_ANSWER_LENGTH } from 'common/answer'
 import { getContract, getValues } from './utils'
 import { sendNewAnswerEmail } from './emails'
-import { Bet } from '../../common/bet'
+import { Bet } from 'common/bet'
 
 export const createAnswer = functions.runWith({ minInstances: 1 }).https.onCall(
   async (
diff --git a/functions/src/create-contract.ts b/functions/src/create-contract.ts
index dfc8128d..5345469e 100644
--- a/functions/src/create-contract.ts
+++ b/functions/src/create-contract.ts
@@ -13,10 +13,10 @@ import {
   MAX_QUESTION_LENGTH,
   MAX_TAG_LENGTH,
   outcomeType,
-} from '../../common/contract'
-import { slugify } from '../../common/util/slugify'
-import { randomString } from '../../common/util/random'
-import { getNewContract } from '../../common/new-contract'
+} from 'common/contract'
+import { slugify } from 'common/util/slugify'
+import { randomString } from 'common/util/random'
+import { getNewContract } from 'common/new-contract'
 import {
   FIXED_ANTE,
   getAnteBets,
@@ -24,8 +24,8 @@ import {
   getFreeAnswerAnte,
   HOUSE_LIQUIDITY_PROVIDER_ID,
   MINIMUM_ANTE,
-} from '../../common/antes'
-import { getNoneAnswer } from '../../common/answer'
+} from 'common/antes'
+import { getNoneAnswer } from 'common/answer'
 
 export const createContract = functions
   .runWith({ minInstances: 1 })
diff --git a/functions/src/create-fold.ts b/functions/src/create-fold.ts
index 36d1d269..5cf40b22 100644
--- a/functions/src/create-fold.ts
+++ b/functions/src/create-fold.ts
@@ -3,10 +3,10 @@ import * as admin from 'firebase-admin'
 import * as _ from 'lodash'
 
 import { getUser } from './utils'
-import { Contract } from '../../common/contract'
-import { slugify } from '../../common/util/slugify'
-import { randomString } from '../../common/util/random'
-import { Fold } from '../../common/fold'
+import { Contract } from 'common/contract'
+import { slugify } from 'common/util/slugify'
+import { randomString } from 'common/util/random'
+import { Fold } from 'common/fold'
 
 export const createFold = functions.runWith({ minInstances: 1 }).https.onCall(
   async (
diff --git a/functions/src/create-user.ts b/functions/src/create-user.ts
index f73b868b..dd2b5275 100644
--- a/functions/src/create-user.ts
+++ b/functions/src/create-user.ts
@@ -6,15 +6,12 @@ import {
   STARTING_BALANCE,
   SUS_STARTING_BALANCE,
   User,
-} from '../../common/user'
+} from 'common/user'
 import { getUser, getUserByUsername } from './utils'
-import { randomString } from '../../common/util/random'
-import {
-  cleanDisplayName,
-  cleanUsername,
-} from '../../common/util/clean-username'
+import { randomString } from 'common/util/random'
+import { cleanDisplayName, cleanUsername } from 'common/util/clean-username'
 import { sendWelcomeEmail } from './emails'
-import { isWhitelisted } from '../../common/envs/constants'
+import { isWhitelisted } from 'common/envs/constants'
 
 export const createUser = functions
   .runWith({ minInstances: 1 })
diff --git a/functions/src/emails.ts b/functions/src/emails.ts
index c3b70734..4c434bcf 100644
--- a/functions/src/emails.ts
+++ b/functions/src/emails.ts
@@ -1,14 +1,14 @@
 import * as _ from 'lodash'
 
-import { DOMAIN, PROJECT_ID } from '../../common/envs/constants'
-import { Answer } from '../../common/answer'
-import { Bet } from '../../common/bet'
-import { getProbability } from '../../common/calculate'
-import { Comment } from '../../common/comment'
-import { Contract, FreeResponseContract } from '../../common/contract'
-import { CREATOR_FEE } from '../../common/fees'
-import { PrivateUser, User } from '../../common/user'
-import { formatMoney, formatPercent } from '../../common/util/format'
+import { DOMAIN, PROJECT_ID } from 'common/envs/constants'
+import { Answer } from 'common/answer'
+import { Bet } from 'common/bet'
+import { getProbability } from 'common/calculate'
+import { Comment } from 'common/comment'
+import { Contract, FreeResponseContract } from 'common/contract'
+import { CREATOR_FEE } from 'common/fees'
+import { PrivateUser, User } from 'common/user'
+import { formatMoney, formatPercent } from 'common/util/format'
 import { sendTemplateEmail, sendTextEmail } from './send-email'
 import { getPrivateUser, getUser } from './utils'
 
diff --git a/functions/src/market-close-emails.ts b/functions/src/market-close-emails.ts
index bb144600..3adc5b6d 100644
--- a/functions/src/market-close-emails.ts
+++ b/functions/src/market-close-emails.ts
@@ -1,7 +1,7 @@
 import * as functions from 'firebase-functions'
 import * as admin from 'firebase-admin'
 
-import { Contract } from '../../common/contract'
+import { Contract } from 'common/contract'
 import { getPrivateUser, getUserByUsername } from './utils'
 import { sendMarketCloseEmail } from './emails'
 
diff --git a/functions/src/on-create-bet.ts b/functions/src/on-create-bet.ts
index deaa4c4a..e3cf0ece 100644
--- a/functions/src/on-create-bet.ts
+++ b/functions/src/on-create-bet.ts
@@ -3,7 +3,7 @@ import * as admin from 'firebase-admin'
 import * as _ from 'lodash'
 
 import { getContract } from './utils'
-import { Bet } from '../../common/bet'
+import { Bet } from 'common/bet'
 
 const firestore = admin.firestore()
 
diff --git a/functions/src/on-create-comment.ts b/functions/src/on-create-comment.ts
index 18fc6757..654f9055 100644
--- a/functions/src/on-create-comment.ts
+++ b/functions/src/on-create-comment.ts
@@ -3,10 +3,10 @@ import * as admin from 'firebase-admin'
 import * as _ from 'lodash'
 
 import { getContract, getUser, getValues } from './utils'
-import { Comment } from '../../common/comment'
+import { Comment } from 'common/comment'
 import { sendNewCommentEmail } from './emails'
-import { Bet } from '../../common/bet'
-import { Answer } from '../../common/answer'
+import { Bet } from 'common/bet'
+import { Answer } from 'common/answer'
 
 const firestore = admin.firestore()
 
diff --git a/functions/src/on-view.ts b/functions/src/on-view.ts
index d2f746d5..6e08ae76 100644
--- a/functions/src/on-view.ts
+++ b/functions/src/on-view.ts
@@ -1,6 +1,6 @@
 import * as functions from 'firebase-functions'
 import * as admin from 'firebase-admin'
-import { View } from '../../common/tracking'
+import { View } from 'common/tracking'
 
 const firestore = admin.firestore()
 
diff --git a/functions/src/place-bet.ts b/functions/src/place-bet.ts
index 74487126..083c8bc2 100644
--- a/functions/src/place-bet.ts
+++ b/functions/src/place-bet.ts
@@ -1,18 +1,18 @@
 import * as functions from 'firebase-functions'
 import * as admin from 'firebase-admin'
 
-import { Contract } from '../../common/contract'
-import { User } from '../../common/user'
+import { Contract } from 'common/contract'
+import { User } from 'common/user'
 import {
   getNewBinaryCpmmBetInfo,
   getNewBinaryDpmBetInfo,
   getNewMultiBetInfo,
   getLoanAmount,
-} from '../../common/new-bet'
-import { addObjects, removeUndefinedProps } from '../../common/util/object'
-import { Bet } from '../../common/bet'
+} from 'common/new-bet'
+import { addObjects, removeUndefinedProps } from 'common/util/object'
+import { Bet } from 'common/bet'
 import { redeemShares } from './redeem-shares'
-import { Fees } from '../../common/fees'
+import { Fees } from 'common/fees'
 
 export const placeBet = functions.runWith({ minInstances: 1 }).https.onCall(
   async (
diff --git a/functions/src/redeem-shares.ts b/functions/src/redeem-shares.ts
index 08d87a8b..a43aa509 100644
--- a/functions/src/redeem-shares.ts
+++ b/functions/src/redeem-shares.ts
@@ -1,12 +1,12 @@
 import * as admin from 'firebase-admin'
 import * as _ from 'lodash'
 
-import { Bet } from '../../common/bet'
-import { getProbability } from '../../common/calculate'
+import { Bet } from 'common/bet'
+import { getProbability } from 'common/calculate'
 
-import { Binary, CPMM, FullContract } from '../../common/contract'
-import { noFees } from '../../common/fees'
-import { User } from '../../common/user'
+import { Binary, CPMM, FullContract } from 'common/contract'
+import { noFees } from 'common/fees'
+import { User } from 'common/user'
 
 export const redeemShares = async (userId: string, contractId: string) => {
   return await firestore.runTransaction(async (transaction) => {
diff --git a/functions/src/resolve-market.ts b/functions/src/resolve-market.ts
index 5a2edec2..5ee82ff5 100644
--- a/functions/src/resolve-market.ts
+++ b/functions/src/resolve-market.ts
@@ -2,14 +2,14 @@ import * as functions from 'firebase-functions'
 import * as admin from 'firebase-admin'
 import * as _ from 'lodash'
 
-import { Contract } from '../../common/contract'
-import { User } from '../../common/user'
-import { Bet } from '../../common/bet'
+import { Contract } from 'common/contract'
+import { User } from 'common/user'
+import { Bet } from 'common/bet'
 import { getUser, isProd, payUser } from './utils'
 import { sendMarketResolutionEmail } from './emails'
-import { getLoanPayouts, getPayouts } from '../../common/payouts'
-import { removeUndefinedProps } from '../../common/util/object'
-import { LiquidityProvision } from '../../common/liquidity-provision'
+import { getLoanPayouts, getPayouts } from 'common/payouts'
+import { removeUndefinedProps } from 'common/util/object'
+import { LiquidityProvision } from 'common/liquidity-provision'
 
 export const resolveMarket = functions
   .runWith({ minInstances: 1 })
diff --git a/functions/src/scripts/cache-views.ts b/functions/src/scripts/cache-views.ts
index c7145a1e..c7ed661f 100644
--- a/functions/src/scripts/cache-views.ts
+++ b/functions/src/scripts/cache-views.ts
@@ -5,9 +5,9 @@ import { initAdmin } from './script-init'
 initAdmin()
 
 import { getValues } from '../utils'
-import { View } from '../../../common/tracking'
-import { User } from '../../../common/user'
-import { batchedWaitAll } from '../../../common/util/promise'
+import { View } from 'common/tracking'
+import { User } from 'common/user'
+import { batchedWaitAll } from 'common/util/promise'
 
 const firestore = admin.firestore()
 
diff --git a/functions/src/scripts/correct-bet-probability.ts b/functions/src/scripts/correct-bet-probability.ts
index 3b57dbeb..e65b4ddf 100644
--- a/functions/src/scripts/correct-bet-probability.ts
+++ b/functions/src/scripts/correct-bet-probability.ts
@@ -4,9 +4,9 @@ import * as _ from 'lodash'
 import { initAdmin } from './script-init'
 initAdmin()
 
-import { Bet } from '../../../common/bet'
-import { getDpmProbability } from '../../../common/calculate-dpm'
-import { Binary, Contract, DPM, FullContract } from '../../../common/contract'
+import { Bet } from 'common/bet'
+import { getDpmProbability } from 'common/calculate-dpm'
+import { Binary, Contract, DPM, FullContract } from 'common/contract'
 
 type DocRef = admin.firestore.DocumentReference
 const firestore = admin.firestore()
diff --git a/functions/src/scripts/create-private-users.ts b/functions/src/scripts/create-private-users.ts
index 8051a447..a83bb53e 100644
--- a/functions/src/scripts/create-private-users.ts
+++ b/functions/src/scripts/create-private-users.ts
@@ -4,7 +4,7 @@ import * as _ from 'lodash'
 import { initAdmin } from './script-init'
 initAdmin()
 
-import { PrivateUser, STARTING_BALANCE, User } from '../../../common/user'
+import { PrivateUser, STARTING_BALANCE, User } from 'common/user'
 
 const firestore = admin.firestore()
 
diff --git a/functions/src/scripts/get-json-dump.ts b/functions/src/scripts/get-json-dump.ts
index b9909132..3027ce45 100644
--- a/functions/src/scripts/get-json-dump.ts
+++ b/functions/src/scripts/get-json-dump.ts
@@ -5,10 +5,10 @@ import * as fs from 'fs'
 import { initAdmin } from './script-init'
 initAdmin()
 
-import { Bet } from '../../../common/bet'
-import { Contract } from '../../../common/contract'
+import { Bet } from 'common/bet'
+import { Contract } from 'common/contract'
 import { getValues } from '../utils'
-import { Comment } from '../../../common/comment'
+import { Comment } from 'common/comment'
 
 const firestore = admin.firestore()
 
diff --git a/functions/src/scripts/lowercase-fold-tags.ts b/functions/src/scripts/lowercase-fold-tags.ts
index 80b79a33..f5d01bfe 100644
--- a/functions/src/scripts/lowercase-fold-tags.ts
+++ b/functions/src/scripts/lowercase-fold-tags.ts
@@ -5,7 +5,7 @@ import { initAdmin } from './script-init'
 initAdmin()
 
 import { getValues } from '../utils'
-import { Fold } from '../../../common/fold'
+import { Fold } from 'common/fold'
 
 async function lowercaseFoldTags() {
   const firestore = admin.firestore()
diff --git a/functions/src/scripts/make-contracts-public.ts b/functions/src/scripts/make-contracts-public.ts
index 19d2e196..5d958f13 100644
--- a/functions/src/scripts/make-contracts-public.ts
+++ b/functions/src/scripts/make-contracts-public.ts
@@ -4,7 +4,7 @@ import * as _ from 'lodash'
 import { initAdmin } from './script-init'
 initAdmin()
 
-import { Contract } from '../../../common/contract'
+import { Contract } from 'common/contract'
 
 const firestore = admin.firestore()
 
diff --git a/functions/src/scripts/migrate-contract.ts b/functions/src/scripts/migrate-contract.ts
index 718cf62e..7127f371 100644
--- a/functions/src/scripts/migrate-contract.ts
+++ b/functions/src/scripts/migrate-contract.ts
@@ -4,8 +4,8 @@ import * as _ from 'lodash'
 import { initAdmin } from './script-init'
 initAdmin()
 
-import { Bet } from '../../../common/bet'
-import { Contract } from '../../../common/contract'
+import { Bet } from 'common/bet'
+import { Contract } from 'common/contract'
 
 type DocRef = admin.firestore.DocumentReference
 
diff --git a/functions/src/scripts/migrate-to-cfmm.ts b/functions/src/scripts/migrate-to-cfmm.ts
index 874011ca..9dd8c63e 100644
--- a/functions/src/scripts/migrate-to-cfmm.ts
+++ b/functions/src/scripts/migrate-to-cfmm.ts
@@ -4,22 +4,13 @@ import * as _ from 'lodash'
 import { initAdmin } from './script-init'
 initAdmin()
 
-import {
-  Binary,
-  Contract,
-  CPMM,
-  DPM,
-  FullContract,
-} from '../../../common/contract'
-import { Bet } from '../../../common/bet'
-import {
-  calculateDpmPayout,
-  getDpmProbability,
-} from '../../../common/calculate-dpm'
-import { User } from '../../../common/user'
-import { getCpmmInitialLiquidity } from '../../../common/antes'
-import { noFees } from '../../../common/fees'
-import { addObjects } from '../../../common/util/object'
+import { Binary, Contract, CPMM, DPM, FullContract } from 'common/contract'
+import { Bet } from 'common/bet'
+import { calculateDpmPayout, getDpmProbability } from 'common/calculate-dpm'
+import { User } from 'common/user'
+import { getCpmmInitialLiquidity } from 'common/antes'
+import { noFees } from 'common/fees'
+import { addObjects } from 'common/util/object'
 
 type DocRef = admin.firestore.DocumentReference
 
diff --git a/functions/src/scripts/migrate-to-dpm-2.ts b/functions/src/scripts/migrate-to-dpm-2.ts
index 2c6f066f..81e99d98 100644
--- a/functions/src/scripts/migrate-to-dpm-2.ts
+++ b/functions/src/scripts/migrate-to-dpm-2.ts
@@ -4,14 +4,11 @@ import * as _ from 'lodash'
 import { initAdmin } from './script-init'
 initAdmin()
 
-import { Binary, Contract, DPM, FullContract } from '../../../common/contract'
-import { Bet } from '../../../common/bet'
-import {
-  calculateDpmShares,
-  getDpmProbability,
-} from '../../../common/calculate-dpm'
-import { getSellBetInfo } from '../../../common/sell-bet'
-import { User } from '../../../common/user'
+import { Binary, Contract, DPM, FullContract } from 'common/contract'
+import { Bet } from 'common/bet'
+import { calculateDpmShares, getDpmProbability } from 'common/calculate-dpm'
+import { getSellBetInfo } from 'common/sell-bet'
+import { User } from 'common/user'
 
 type DocRef = admin.firestore.DocumentReference
 
diff --git a/functions/src/scripts/pay-out-contract-again.ts b/functions/src/scripts/pay-out-contract-again.ts
index 7672bf7b..0e56429f 100644
--- a/functions/src/scripts/pay-out-contract-again.ts
+++ b/functions/src/scripts/pay-out-contract-again.ts
@@ -4,10 +4,10 @@ import * as _ from 'lodash'
 import { initAdmin } from './script-init'
 initAdmin()
 
-import { Bet } from '../../../common/bet'
-import { Contract } from '../../../common/contract'
-import { getLoanPayouts, getPayouts } from '../../../common/payouts'
-import { filterDefined } from '../../../common/util/array'
+import { Bet } from 'common/bet'
+import { Contract } from 'common/contract'
+import { getLoanPayouts, getPayouts } from 'common/payouts'
+import { filterDefined } from 'common/util/array'
 
 type DocRef = admin.firestore.DocumentReference
 
diff --git a/functions/src/scripts/recalculate-contract-totals.ts b/functions/src/scripts/recalculate-contract-totals.ts
index 39942542..91165781 100644
--- a/functions/src/scripts/recalculate-contract-totals.ts
+++ b/functions/src/scripts/recalculate-contract-totals.ts
@@ -4,8 +4,8 @@ import * as _ from 'lodash'
 import { initAdmin } from './script-init'
 initAdmin()
 
-import { Bet } from '../../../common/bet'
-import { Contract } from '../../../common/contract'
+import { Bet } from 'common/bet'
+import { Contract } from 'common/contract'
 
 type DocRef = admin.firestore.DocumentReference
 
diff --git a/functions/src/scripts/remove-answer-ante.ts b/functions/src/scripts/remove-answer-ante.ts
index eb49af6c..8b026174 100644
--- a/functions/src/scripts/remove-answer-ante.ts
+++ b/functions/src/scripts/remove-answer-ante.ts
@@ -4,8 +4,8 @@ import * as _ from 'lodash'
 import { initAdmin } from './script-init'
 initAdmin()
 
-import { Bet } from '../../../common/bet'
-import { Contract } from '../../../common/contract'
+import { Bet } from 'common/bet'
+import { Contract } from 'common/contract'
 import { getValues } from '../utils'
 
 async function removeAnswerAnte() {
diff --git a/functions/src/scripts/rename-user-contracts.ts b/functions/src/scripts/rename-user-contracts.ts
index 9b0f569b..bcb4fea6 100644
--- a/functions/src/scripts/rename-user-contracts.ts
+++ b/functions/src/scripts/rename-user-contracts.ts
@@ -4,7 +4,7 @@ import * as _ from 'lodash'
 import { initAdmin } from './script-init'
 initAdmin()
 
-import { Contract } from '../../../common/contract'
+import { Contract } from 'common/contract'
 import { getValues } from '../utils'
 
 const firestore = admin.firestore()
diff --git a/functions/src/scripts/update-contract-tags.ts b/functions/src/scripts/update-contract-tags.ts
index 1dda5615..7e671c9f 100644
--- a/functions/src/scripts/update-contract-tags.ts
+++ b/functions/src/scripts/update-contract-tags.ts
@@ -4,8 +4,8 @@ import * as _ from 'lodash'
 import { initAdmin } from './script-init'
 initAdmin()
 
-import { Contract } from '../../../common/contract'
-import { parseTags } from '../../../common/util/parse'
+import { Contract } from 'common/contract'
+import { parseTags } from 'common/util/parse'
 import { getValues } from '../utils'
 
 async function updateContractTags() {
diff --git a/functions/src/scripts/update-feed.ts b/functions/src/scripts/update-feed.ts
index 25a0b14f..f98631dd 100644
--- a/functions/src/scripts/update-feed.ts
+++ b/functions/src/scripts/update-feed.ts
@@ -5,9 +5,9 @@ import { initAdmin } from './script-init'
 initAdmin()
 
 import { getValues } from '../utils'
-import { User } from '../../../common/user'
-import { batchedWaitAll } from '../../../common/util/promise'
-import { Contract } from '../../../common/contract'
+import { User } from 'common/user'
+import { batchedWaitAll } from 'common/util/promise'
+import { Contract } from 'common/contract'
 import { updateWordScores } from '../update-recommendations'
 import { getFeedContracts, doUserFeedUpdate } from '../update-feed'
 
diff --git a/functions/src/scripts/update-last-comment-time.ts b/functions/src/scripts/update-last-comment-time.ts
index ae950fbe..99d7f52d 100644
--- a/functions/src/scripts/update-last-comment-time.ts
+++ b/functions/src/scripts/update-last-comment-time.ts
@@ -4,9 +4,9 @@ import * as _ from 'lodash'
 import { initAdmin } from './script-init'
 initAdmin()
 
-import { Contract } from '../../../common/contract'
+import { Contract } from 'common/contract'
 import { getValues } from '../utils'
-import { Comment } from '../../../common/comment'
+import { Comment } from 'common/comment'
 
 async function updateLastCommentTime() {
   const firestore = admin.firestore()
diff --git a/functions/src/sell-bet.ts b/functions/src/sell-bet.ts
index fff88716..c685498b 100644
--- a/functions/src/sell-bet.ts
+++ b/functions/src/sell-bet.ts
@@ -1,12 +1,12 @@
 import * as admin from 'firebase-admin'
 import * as functions from 'firebase-functions'
 
-import { Contract } from '../../common/contract'
-import { User } from '../../common/user'
-import { Bet } from '../../common/bet'
-import { getSellBetInfo } from '../../common/sell-bet'
-import { addObjects, removeUndefinedProps } from '../../common/util/object'
-import { Fees } from '../../common/fees'
+import { Contract } from 'common/contract'
+import { User } from 'common/user'
+import { Bet } from 'common/bet'
+import { getSellBetInfo } from 'common/sell-bet'
+import { addObjects, removeUndefinedProps } from 'common/util/object'
+import { Fees } from 'common/fees'
 
 export const sellBet = functions.runWith({ minInstances: 1 }).https.onCall(
   async (
diff --git a/functions/src/sell-shares.ts b/functions/src/sell-shares.ts
index e4dbcbc9..158a5f6a 100644
--- a/functions/src/sell-shares.ts
+++ b/functions/src/sell-shares.ts
@@ -2,12 +2,12 @@ import * as _ from 'lodash'
 import * as admin from 'firebase-admin'
 import * as functions from 'firebase-functions'
 
-import { Binary, CPMM, FullContract } from '../../common/contract'
-import { User } from '../../common/user'
-import { getCpmmSellBetInfo } from '../../common/sell-bet'
-import { addObjects, removeUndefinedProps } from '../../common/util/object'
+import { Binary, CPMM, FullContract } from 'common/contract'
+import { User } from 'common/user'
+import { getCpmmSellBetInfo } from 'common/sell-bet'
+import { addObjects, removeUndefinedProps } from 'common/util/object'
 import { getValues } from './utils'
-import { Bet } from '../../common/bet'
+import { Bet } from 'common/bet'
 
 export const sellShares = functions.runWith({ minInstances: 1 }).https.onCall(
   async (
diff --git a/functions/src/transact.ts b/functions/src/transact.ts
index 79b5ccb8..77323638 100644
--- a/functions/src/transact.ts
+++ b/functions/src/transact.ts
@@ -1,9 +1,9 @@
 import * as functions from 'firebase-functions'
 import * as admin from 'firebase-admin'
 
-import { User } from '../../common/user'
-import { Txn } from '../../common/txn'
-import { removeUndefinedProps } from '../../common/util/object'
+import { User } from 'common/user'
+import { Txn } from 'common/txn'
+import { removeUndefinedProps } from 'common/util/object'
 
 export const transact = functions
   .runWith({ minInstances: 1 })
diff --git a/functions/src/unsubscribe.ts b/functions/src/unsubscribe.ts
index c6edee92..7c9442d7 100644
--- a/functions/src/unsubscribe.ts
+++ b/functions/src/unsubscribe.ts
@@ -2,7 +2,7 @@ import * as functions from 'firebase-functions'
 import * as admin from 'firebase-admin'
 import * as _ from 'lodash'
 import { getUser } from './utils'
-import { PrivateUser } from '../../common/user'
+import { PrivateUser } from 'common/user'
 
 export const unsubscribe = functions
   .runWith({ minInstances: 1 })
diff --git a/functions/src/update-contract-metrics.ts b/functions/src/update-contract-metrics.ts
index c3801df6..9214d2dc 100644
--- a/functions/src/update-contract-metrics.ts
+++ b/functions/src/update-contract-metrics.ts
@@ -3,9 +3,9 @@ import * as admin from 'firebase-admin'
 import * as _ from 'lodash'
 
 import { getValues } from './utils'
-import { Contract } from '../../common/contract'
-import { Bet } from '../../common/bet'
-import { batchedWaitAll } from '../../common/util/promise'
+import { Contract } from 'common/contract'
+import { Bet } from 'common/bet'
+import { batchedWaitAll } from 'common/util/promise'
 
 const firestore = admin.firestore()
 
diff --git a/functions/src/update-feed.ts b/functions/src/update-feed.ts
index accd48e8..3bfa7949 100644
--- a/functions/src/update-feed.ts
+++ b/functions/src/update-feed.ts
@@ -3,21 +3,21 @@ import * as functions from 'firebase-functions'
 import * as admin from 'firebase-admin'
 
 import { getValue, getValues } from './utils'
-import { Contract } from '../../common/contract'
-import { logInterpolation } from '../../common/util/math'
-import { DAY_MS } from '../../common/util/time'
+import { Contract } from 'common/contract'
+import { logInterpolation } from 'common/util/math'
+import { DAY_MS } from 'common/util/time'
 import {
   getProbability,
   getOutcomeProbability,
   getTopAnswer,
-} from '../../common/calculate'
-import { Bet } from '../../common/bet'
-import { Comment } from '../../common/comment'
-import { User } from '../../common/user'
+} from 'common/calculate'
+import { Bet } from 'common/bet'
+import { Comment } from 'common/comment'
+import { User } from 'common/user'
 import {
   getContractScore,
   MAX_FEED_CONTRACTS,
-} from '../../common/recommended-contracts'
+} from 'common/recommended-contracts'
 import { callCloudFunction } from './call-cloud-function'
 
 const firestore = admin.firestore()
diff --git a/functions/src/update-recommendations.ts b/functions/src/update-recommendations.ts
index 4e656dda..e18e7c0e 100644
--- a/functions/src/update-recommendations.ts
+++ b/functions/src/update-recommendations.ts
@@ -3,12 +3,12 @@ import * as admin from 'firebase-admin'
 import * as _ from 'lodash'
 
 import { getValue, getValues } from './utils'
-import { Contract } from '../../common/contract'
-import { Bet } from '../../common/bet'
-import { User } from '../../common/user'
-import { ClickEvent } from '../../common/tracking'
-import { getWordScores } from '../../common/recommended-contracts'
-import { batchedWaitAll } from '../../common/util/promise'
+import { Contract } from 'common/contract'
+import { Bet } from 'common/bet'
+import { User } from 'common/user'
+import { ClickEvent } from 'common/tracking'
+import { getWordScores } from 'common/recommended-contracts'
+import { batchedWaitAll } from 'common/util/promise'
 import { callCloudFunction } from './call-cloud-function'
 
 const firestore = admin.firestore()
diff --git a/functions/src/update-user-metrics.ts b/functions/src/update-user-metrics.ts
index 70fd1bc5..6f755622 100644
--- a/functions/src/update-user-metrics.ts
+++ b/functions/src/update-user-metrics.ts
@@ -3,11 +3,11 @@ import * as admin from 'firebase-admin'
 import * as _ from 'lodash'
 
 import { getValues } from './utils'
-import { Contract } from '../../common/contract'
-import { Bet } from '../../common/bet'
-import { User } from '../../common/user'
-import { batchedWaitAll } from '../../common/util/promise'
-import { calculatePayout } from '../../common/calculate'
+import { Contract } from 'common/contract'
+import { Bet } from 'common/bet'
+import { User } from 'common/user'
+import { batchedWaitAll } from 'common/util/promise'
+import { calculatePayout } from 'common/calculate'
 
 const firestore = admin.firestore()
 
diff --git a/functions/src/utils.ts b/functions/src/utils.ts
index 28ef5445..d0ab8c5d 100644
--- a/functions/src/utils.ts
+++ b/functions/src/utils.ts
@@ -1,7 +1,7 @@
 import * as admin from 'firebase-admin'
 
-import { Contract } from '../../common/contract'
-import { PrivateUser, User } from '../../common/user'
+import { Contract } from 'common/contract'
+import { PrivateUser, User } from 'common/user'
 
 export const isProd =
   admin.instanceId().app.options.projectId === 'mantic-markets'
diff --git a/functions/tsconfig.json b/functions/tsconfig.json
index c836df11..e183bb44 100644
--- a/functions/tsconfig.json
+++ b/functions/tsconfig.json
@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "baseUrl": "../",
     "module": "commonjs",
     "noImplicitReturns": true,
     "outDir": "lib",
diff --git a/web/components/add-funds-button.tsx b/web/components/add-funds-button.tsx
index 7ca154ea..566f4716 100644
--- a/web/components/add-funds-button.tsx
+++ b/web/components/add-funds-button.tsx
@@ -1,8 +1,8 @@
 import clsx from 'clsx'
 import { useEffect, useState } from 'react'
 
-import { useUser } from '../hooks/use-user'
-import { checkoutURL } from '../lib/service/stripe'
+import { useUser } from 'web/hooks/use-user'
+import { checkoutURL } from 'web/lib/service/stripe'
 import { FundsSelector } from './yes-no-selector'
 
 export function AddFundsButton(props: { className?: string }) {
diff --git a/web/components/add-liquidity-panel.tsx b/web/components/add-liquidity-panel.tsx
index f04c2b0a..240bde7d 100644
--- a/web/components/add-liquidity-panel.tsx
+++ b/web/components/add-liquidity-panel.tsx
@@ -1,10 +1,10 @@
 import clsx from 'clsx'
 import { useState } from 'react'
 
-import { Contract } from '../../common/contract'
-import { formatMoney } from '../../common/util/format'
-import { useUser } from '../hooks/use-user'
-import { addLiquidity } from '../lib/firebase/api-call'
+import { Contract } from 'common/contract'
+import { formatMoney } from 'common/util/format'
+import { useUser } from 'web/hooks/use-user'
+import { addLiquidity } from 'web/lib/firebase/api-call'
 import { AmountInput } from './amount-input'
 import { Row } from './layout/row'
 
diff --git a/web/components/amount-input.tsx b/web/components/amount-input.tsx
index 76111b6f..ccd668d9 100644
--- a/web/components/amount-input.tsx
+++ b/web/components/amount-input.tsx
@@ -1,13 +1,13 @@
 import clsx from 'clsx'
 import _ from 'lodash'
-import { useUser } from '../hooks/use-user'
-import { formatMoney, formatWithCommas } from '../../common/util/format'
+import { useUser } from 'web/hooks/use-user'
+import { formatMoney, formatWithCommas } from 'common/util/format'
 import { Col } from './layout/col'
 import { Row } from './layout/row'
-import { Bet } from '../../common/bet'
+import { Bet } from 'common/bet'
 import { Spacer } from './layout/spacer'
-import { calculateCpmmSale } from '../../common/calculate-cpmm'
-import { Binary, CPMM, FullContract } from '../../common/contract'
+import { calculateCpmmSale } from 'common/calculate-cpmm'
+import { Binary, CPMM, FullContract } from 'common/contract'
 import { SiteLink } from './site-link'
 
 export function AmountInput(props: {
diff --git a/web/components/analytics/charts.tsx b/web/components/analytics/charts.tsx
index 4bf8d52b..44360c97 100644
--- a/web/components/analytics/charts.tsx
+++ b/web/components/analytics/charts.tsx
@@ -1,7 +1,7 @@
 import { ResponsiveLine } from '@nivo/line'
 import dayjs from 'dayjs'
 import _ from 'lodash'
-import { useWindowSize } from '../../hooks/use-window-size'
+import { useWindowSize } from 'web/hooks/use-window-size'
 
 export function DailyCountChart(props: {
   startDate: number
diff --git a/web/components/answers/answer-bet-panel.tsx b/web/components/answers/answer-bet-panel.tsx
index 18fd949d..e0984f6a 100644
--- a/web/components/answers/answer-bet-panel.tsx
+++ b/web/components/answers/answer-bet-panel.tsx
@@ -3,28 +3,28 @@ import _ from 'lodash'
 import { useEffect, useRef, useState } from 'react'
 import { XIcon } from '@heroicons/react/solid'
 
-import { Answer } from '../../../common/answer'
-import { DPM, FreeResponse, FullContract } from '../../../common/contract'
+import { Answer } from 'common/answer'
+import { DPM, FreeResponse, FullContract } from 'common/contract'
 import { BuyAmountInput } from '../amount-input'
 import { Col } from '../layout/col'
-import { placeBet } from '../../lib/firebase/api-call'
+import { placeBet } from 'web/lib/firebase/api-call'
 import { Row } from '../layout/row'
 import { Spacer } from '../layout/spacer'
 import {
   formatMoney,
   formatPercent,
   formatWithCommas,
-} from '../../../common/util/format'
+} from 'common/util/format'
 import { InfoTooltip } from '../info-tooltip'
-import { useUser } from '../../hooks/use-user'
+import { useUser } from 'web/hooks/use-user'
 import {
   getDpmOutcomeProbability,
   calculateDpmShares,
   calculateDpmPayoutAfterCorrectBet,
   getDpmOutcomeProbabilityAfterBet,
-} from '../../../common/calculate-dpm'
-import { firebaseLogin } from '../../lib/firebase/users'
-import { Bet } from '../../../common/bet'
+} from 'common/calculate-dpm'
+import { firebaseLogin } from 'web/lib/firebase/users'
+import { Bet } from 'common/bet'
 
 export function AnswerBetPanel(props: {
   answer: Answer
diff --git a/web/components/answers/answer-item.tsx b/web/components/answers/answer-item.tsx
index 96746b62..55351083 100644
--- a/web/components/answers/answer-item.tsx
+++ b/web/components/answers/answer-item.tsx
@@ -1,15 +1,15 @@
 import clsx from 'clsx'
 import _ from 'lodash'
 
-import { Answer } from '../../../common/answer'
-import { DPM, FreeResponse, FullContract } from '../../../common/contract'
+import { Answer } from 'common/answer'
+import { DPM, FreeResponse, FullContract } from 'common/contract'
 import { Col } from '../layout/col'
 import { Row } from '../layout/row'
 import { Avatar } from '../avatar'
 import { SiteLink } from '../site-link'
-import { formatPercent } from '../../../common/util/format'
-import { getDpmOutcomeProbability } from '../../../common/calculate-dpm'
-import { tradingAllowed } from '../../lib/firebase/contracts'
+import { formatPercent } from 'common/util/format'
+import { getDpmOutcomeProbability } from 'common/calculate-dpm'
+import { tradingAllowed } from 'web/lib/firebase/contracts'
 import { Linkify } from '../linkify'
 
 export function AnswerItem(props: {
diff --git a/web/components/answers/answer-resolve-panel.tsx b/web/components/answers/answer-resolve-panel.tsx
index 41aa90b2..70eb1299 100644
--- a/web/components/answers/answer-resolve-panel.tsx
+++ b/web/components/answers/answer-resolve-panel.tsx
@@ -2,13 +2,13 @@ import clsx from 'clsx'
 import _ from 'lodash'
 import { useState } from 'react'
 
-import { DPM, FreeResponse, FullContract } from '../../../common/contract'
+import { DPM, FreeResponse, FullContract } from 'common/contract'
 import { Col } from '../layout/col'
-import { resolveMarket } from '../../lib/firebase/api-call'
+import { resolveMarket } from 'web/lib/firebase/api-call'
 import { Row } from '../layout/row'
 import { ChooseCancelSelector } from '../yes-no-selector'
 import { ResolveConfirmationButton } from '../confirmation-button'
-import { removeUndefinedProps } from '../../../common/util/object'
+import { removeUndefinedProps } from 'common/util/object'
 
 export function AnswerResolvePanel(props: {
   contract: FullContract<DPM, FreeResponse>
diff --git a/web/components/answers/answers-graph.tsx b/web/components/answers/answers-graph.tsx
index df56ab93..5853f4a9 100644
--- a/web/components/answers/answers-graph.tsx
+++ b/web/components/answers/answers-graph.tsx
@@ -4,11 +4,11 @@ import dayjs from 'dayjs'
 import _ from 'lodash'
 import { memo } from 'react'
 
-import { Bet } from '../../../common/bet'
-import { DPM, FreeResponse, FullContract } from '../../../common/contract'
-import { getOutcomeProbability } from '../../../common/calculate'
-import { useBets } from '../../hooks/use-bets'
-import { useWindowSize } from '../../hooks/use-window-size'
+import { Bet } from 'common/bet'
+import { DPM, FreeResponse, FullContract } from 'common/contract'
+import { getOutcomeProbability } from 'common/calculate'
+import { useBets } from 'web/hooks/use-bets'
+import { useWindowSize } from 'web/hooks/use-window-size'
 
 const NUM_LINES = 6
 
diff --git a/web/components/answers/answers-panel.tsx b/web/components/answers/answers-panel.tsx
index f315b514..3d9d066b 100644
--- a/web/components/answers/answers-panel.tsx
+++ b/web/components/answers/answers-panel.tsx
@@ -1,21 +1,21 @@
 import _ from 'lodash'
 import { useLayoutEffect, useState } from 'react'
 
-import { DPM, FreeResponse, FullContract } from '../../../common/contract'
+import { DPM, FreeResponse, FullContract } from 'common/contract'
 import { Col } from '../layout/col'
-import { useUser } from '../../hooks/use-user'
-import { getDpmOutcomeProbability } from '../../../common/calculate-dpm'
-import { useAnswers } from '../../hooks/use-answers'
-import { tradingAllowed } from '../../lib/firebase/contracts'
+import { useUser } from 'web/hooks/use-user'
+import { getDpmOutcomeProbability } from 'common/calculate-dpm'
+import { useAnswers } from 'web/hooks/use-answers'
+import { tradingAllowed } from 'web/lib/firebase/contracts'
 import { AnswerItem } from './answer-item'
 import { CreateAnswerPanel } from './create-answer-panel'
 import { AnswerResolvePanel } from './answer-resolve-panel'
 import { Spacer } from '../layout/spacer'
 import { FeedItems } from '../feed/feed-items'
 import { ActivityItem } from '../feed/activity-items'
-import { User } from '../../../common/user'
-import { getOutcomeProbability } from '../../../common/calculate'
-import { Answer } from '../../../common/answer'
+import { User } from 'common/user'
+import { getOutcomeProbability } from 'common/calculate'
+import { Answer } from 'common/answer'
 
 export function AnswersPanel(props: {
   contract: FullContract<DPM, FreeResponse>
diff --git a/web/components/answers/create-answer-panel.tsx b/web/components/answers/create-answer-panel.tsx
index 6a3dd8c6..2075b60d 100644
--- a/web/components/answers/create-answer-panel.tsx
+++ b/web/components/answers/create-answer-panel.tsx
@@ -3,26 +3,26 @@ import _ from 'lodash'
 import { useState } from 'react'
 import Textarea from 'react-expanding-textarea'
 
-import { DPM, FreeResponse, FullContract } from '../../../common/contract'
+import { DPM, FreeResponse, FullContract } from 'common/contract'
 import { BuyAmountInput } from '../amount-input'
 import { Col } from '../layout/col'
-import { createAnswer } from '../../lib/firebase/api-call'
+import { createAnswer } from 'web/lib/firebase/api-call'
 import { Row } from '../layout/row'
 import {
   formatMoney,
   formatPercent,
   formatWithCommas,
-} from '../../../common/util/format'
+} from 'common/util/format'
 import { InfoTooltip } from '../info-tooltip'
-import { useUser } from '../../hooks/use-user'
+import { useUser } from 'web/hooks/use-user'
 import {
   calculateDpmShares,
   calculateDpmPayoutAfterCorrectBet,
   getDpmOutcomeProbabilityAfterBet,
-} from '../../../common/calculate-dpm'
-import { firebaseLogin } from '../../lib/firebase/users'
-import { Bet } from '../../../common/bet'
-import { MAX_ANSWER_LENGTH } from '../../../common/answer'
+} from 'common/calculate-dpm'
+import { firebaseLogin } from 'web/lib/firebase/users'
+import { Bet } from 'common/bet'
+import { MAX_ANSWER_LENGTH } from 'common/answer'
 
 export function CreateAnswerPanel(props: {
   contract: FullContract<DPM, FreeResponse>
diff --git a/web/components/bet-panel.tsx b/web/components/bet-panel.tsx
index c4f5c506..2f9064c7 100644
--- a/web/components/bet-panel.tsx
+++ b/web/components/bet-panel.tsx
@@ -1,8 +1,8 @@
 import clsx from 'clsx'
 import React, { useEffect, useState } from 'react'
 
-import { useUser } from '../hooks/use-user'
-import { Binary, CPMM, DPM, FullContract } from '../../common/contract'
+import { useUser } from 'web/hooks/use-user'
+import { Binary, CPMM, DPM, FullContract } from 'common/contract'
 import { Col } from './layout/col'
 import { Row } from './layout/row'
 import { Spacer } from './layout/spacer'
@@ -11,11 +11,11 @@ import {
   formatMoney,
   formatPercent,
   formatWithCommas,
-} from '../../common/util/format'
+} from 'common/util/format'
 import { Title } from './title'
-import { firebaseLogin, User } from '../lib/firebase/users'
-import { Bet } from '../../common/bet'
-import { placeBet, sellShares } from '../lib/firebase/api-call'
+import { firebaseLogin, User } from 'web/lib/firebase/users'
+import { Bet } from 'common/bet'
+import { placeBet, sellShares } from 'web/lib/firebase/api-call'
 import { BuyAmountInput, SellAmountInput } from './amount-input'
 import { InfoTooltip } from './info-tooltip'
 import { BinaryOutcomeLabel } from './outcome-label'
@@ -24,13 +24,10 @@ import {
   calculateShares,
   getProbability,
   getOutcomeProbabilityAfterBet,
-} from '../../common/calculate'
-import { useFocus } from '../hooks/use-focus'
-import { useUserContractBets } from '../hooks/use-user-bets'
-import {
-  calculateCpmmSale,
-  getCpmmProbability,
-} from '../../common/calculate-cpmm'
+} from 'common/calculate'
+import { useFocus } from 'web/hooks/use-focus'
+import { useUserContractBets } from 'web/hooks/use-user-bets'
+import { calculateCpmmSale, getCpmmProbability } from 'common/calculate-cpmm'
 import { SellRow } from './sell-row'
 import { useSaveShares } from './use-save-shares'
 
diff --git a/web/components/bet-row.tsx b/web/components/bet-row.tsx
index 3deec388..969dc47f 100644
--- a/web/components/bet-row.tsx
+++ b/web/components/bet-row.tsx
@@ -3,11 +3,11 @@ import { useState } from 'react'
 import { BetPanelSwitcher } from './bet-panel'
 import { Row } from './layout/row'
 import { YesNoSelector } from './yes-no-selector'
-import { Binary, CPMM, DPM, FullContract } from '../../common/contract'
+import { Binary, CPMM, DPM, FullContract } from 'common/contract'
 import { Modal } from './layout/modal'
 import { SellButton } from './sell-button'
-import { useUser } from '../hooks/use-user'
-import { useUserContractBets } from '../hooks/use-user-bets'
+import { useUser } from 'web/hooks/use-user'
+import { useUserContractBets } from 'web/hooks/use-user-bets'
 import { useSaveShares } from './use-save-shares'
 
 // Inline version of a bet panel. Opens BetPanel in a new modal.
diff --git a/web/components/bets-list.tsx b/web/components/bets-list.tsx
index 9bad3627..403cb097 100644
--- a/web/components/bets-list.tsx
+++ b/web/components/bets-list.tsx
@@ -4,14 +4,14 @@ import dayjs from 'dayjs'
 import { useEffect, useState } from 'react'
 import clsx from 'clsx'
 
-import { useUserBets } from '../hooks/use-user-bets'
-import { Bet } from '../lib/firebase/bets'
-import { User } from '../lib/firebase/users'
+import { useUserBets } from 'web/hooks/use-user-bets'
+import { Bet } from 'web/lib/firebase/bets'
+import { User } from 'web/lib/firebase/users'
 import {
   formatMoney,
   formatPercent,
   formatWithCommas,
-} from '../../common/util/format'
+} from 'common/util/format'
 import { Col } from './layout/col'
 import { Spacer } from './layout/spacer'
 import {
@@ -19,13 +19,13 @@ import {
   getContractFromId,
   contractPath,
   getBinaryProbPercent,
-} from '../lib/firebase/contracts'
+} from 'web/lib/firebase/contracts'
 import { Row } from './layout/row'
 import { UserLink } from './user-page'
-import { sellBet } from '../lib/firebase/api-call'
+import { sellBet } from 'web/lib/firebase/api-call'
 import { ConfirmationButton } from './confirmation-button'
 import { OutcomeLabel, YesLabel, NoLabel } from './outcome-label'
-import { filterDefined } from '../../common/util/array'
+import { filterDefined } from 'common/util/array'
 import { LoadingIndicator } from './loading-indicator'
 import { SiteLink } from './site-link'
 import {
@@ -36,9 +36,9 @@ import {
   getContractBetMetrics,
   resolvedPayout,
   getContractBetNullMetrics,
-} from '../../common/calculate'
-import { useTimeSinceFirstRender } from '../hooks/use-time-since-first-render'
-import { trackLatency } from '../lib/firebase/tracking'
+} from 'common/calculate'
+import { useTimeSinceFirstRender } from 'web/hooks/use-time-since-first-render'
+import { trackLatency } from 'web/lib/firebase/tracking'
 
 type BetSort = 'newest' | 'profit' | 'closeTime' | 'value'
 type BetFilter = 'open' | 'closed' | 'resolved' | 'all'
diff --git a/web/components/charity/charity-card.tsx b/web/components/charity/charity-card.tsx
index 13a871b1..92fa56d2 100644
--- a/web/components/charity/charity-card.tsx
+++ b/web/components/charity/charity-card.tsx
@@ -2,8 +2,8 @@ import { StarIcon } from '@heroicons/react/solid'
 import _ from 'lodash'
 import Link from 'next/link'
 import Image from 'next/image'
-import { Charity } from '../../../common/charity'
-import { useCharityTxns } from '../../hooks/use-charity-txns'
+import { Charity } from 'common/charity'
+import { useCharityTxns } from 'web/hooks/use-charity-txns'
 import { manaToUSD } from '../../pages/charity/[charitySlug]'
 import { Row } from '../layout/row'
 
diff --git a/web/components/charity/feed-items.tsx b/web/components/charity/feed-items.tsx
index 43d03c7b..368854c9 100644
--- a/web/components/charity/feed-items.tsx
+++ b/web/components/charity/feed-items.tsx
@@ -1,6 +1,6 @@
-import { Txn } from '../../../common/txn'
+import { Txn } from 'common/txn'
 import { Avatar } from '../avatar'
-import { useUserById } from '../../hooks/use-users'
+import { useUserById } from 'web/hooks/use-users'
 import { UserLink } from '../user-page'
 import { manaToUSD } from '../../pages/charity/[charitySlug]'
 import { RelativeTimestamp } from '../relative-timestamp'
diff --git a/web/components/comments-list.tsx b/web/components/comments-list.tsx
index 7461c6f1..bceb2d59 100644
--- a/web/components/comments-list.tsx
+++ b/web/components/comments-list.tsx
@@ -1,12 +1,12 @@
-import { Comment } from '../../common/comment'
-import { Contract } from '../../common/contract'
-import { contractPath } from '../lib/firebase/contracts'
+import { Comment } from 'common/comment'
+import { Contract } from 'common/contract'
+import { contractPath } from 'web/lib/firebase/contracts'
 import { SiteLink } from './site-link'
 import { Row } from './layout/row'
 import { Avatar } from './avatar'
 import { RelativeTimestamp } from './relative-timestamp'
 import { UserLink } from './user-page'
-import { User } from '../../common/user'
+import { User } from 'common/user'
 import { Col } from './layout/col'
 import { Linkify } from './linkify'
 
diff --git a/web/components/contract/contract-card.tsx b/web/components/contract/contract-card.tsx
index 41373679..d1c7dd31 100644
--- a/web/components/contract/contract-card.tsx
+++ b/web/components/contract/contract-card.tsx
@@ -2,12 +2,12 @@ import clsx from 'clsx'
 import Link from 'next/link'
 import _ from 'lodash'
 import { Row } from '../layout/row'
-import { formatPercent } from '../../../common/util/format'
+import { formatPercent } from 'common/util/format'
 import {
   Contract,
   contractPath,
   getBinaryProbPercent,
-} from '../../lib/firebase/contracts'
+} from 'web/lib/firebase/contracts'
 import { Col } from '../layout/col'
 import { Spacer } from '../layout/spacer'
 import {
@@ -17,13 +17,13 @@ import {
   FreeResponse,
   FreeResponseContract,
   FullContract,
-} from '../../../common/contract'
+} from 'common/contract'
 import {
   AnswerLabel,
   BinaryContractOutcomeLabel,
   FreeResponseOutcomeLabel,
 } from '../outcome-label'
-import { getOutcomeProbability, getTopAnswer } from '../../../common/calculate'
+import { getOutcomeProbability, getTopAnswer } from 'common/calculate'
 import { AbbrContractDetails } from './contract-details'
 
 export function ContractCard(props: {
diff --git a/web/components/contract/contract-description.tsx b/web/components/contract/contract-description.tsx
index dea08c6a..86331601 100644
--- a/web/components/contract/contract-description.tsx
+++ b/web/components/contract/contract-description.tsx
@@ -3,10 +3,10 @@ import dayjs from 'dayjs'
 import { useState } from 'react'
 import Textarea from 'react-expanding-textarea'
 
-import { Contract } from '../../../common/contract'
-import { parseTags } from '../../../common/util/parse'
-import { useAdmin } from '../../hooks/use-admin'
-import { updateContract } from '../../lib/firebase/contracts'
+import { Contract } from 'common/contract'
+import { parseTags } from 'common/util/parse'
+import { useAdmin } from 'web/hooks/use-admin'
+import { updateContract } from 'web/lib/firebase/contracts'
 import { Row } from '../layout/row'
 import { Linkify } from '../linkify'
 
diff --git a/web/components/contract/contract-details.tsx b/web/components/contract/contract-details.tsx
index 8cc27496..21849cc4 100644
--- a/web/components/contract/contract-details.tsx
+++ b/web/components/contract/contract-details.tsx
@@ -3,21 +3,21 @@ import _ from 'lodash'
 import { ClockIcon, DatabaseIcon, PencilIcon } from '@heroicons/react/outline'
 import { TrendingUpIcon } from '@heroicons/react/solid'
 import { Row } from '../layout/row'
-import { formatMoney } from '../../../common/util/format'
+import { formatMoney } from 'common/util/format'
 import { UserLink } from '../user-page'
 import {
   Contract,
   contractMetrics,
   updateContract,
-} from '../../lib/firebase/contracts'
+} from 'web/lib/firebase/contracts'
 import { Col } from '../layout/col'
 import dayjs from 'dayjs'
 import { DateTimeTooltip } from '../datetime-tooltip'
-import { fromNow } from '../../lib/util/time'
+import { fromNow } from 'web/lib/util/time'
 import { Avatar } from '../avatar'
 import { useState } from 'react'
 import { ContractInfoDialog } from './contract-info-dialog'
-import { Bet } from '../../../common/bet'
+import { Bet } from 'common/bet'
 import NewContractBadge from '../new-contract-badge'
 
 export function AbbrContractDetails(props: {
diff --git a/web/components/contract/contract-info-dialog.tsx b/web/components/contract/contract-info-dialog.tsx
index 7d94c64a..dca03507 100644
--- a/web/components/contract/contract-info-dialog.tsx
+++ b/web/components/contract/contract-info-dialog.tsx
@@ -3,14 +3,11 @@ import clsx from 'clsx'
 import dayjs from 'dayjs'
 import _ from 'lodash'
 import { useState } from 'react'
-import { Bet } from '../../../common/bet'
+import { Bet } from 'common/bet'
 
-import { Contract } from '../../../common/contract'
-import { formatMoney } from '../../../common/util/format'
-import {
-  contractPath,
-  getBinaryProbPercent,
-} from '../../lib/firebase/contracts'
+import { Contract } from 'common/contract'
+import { formatMoney } from 'common/util/format'
+import { contractPath, getBinaryProbPercent } from 'web/lib/firebase/contracts'
 import { AddLiquidityPanel } from '../add-liquidity-panel'
 import { CopyLinkButton } from '../copy-link-button'
 import { Col } from '../layout/col'
diff --git a/web/components/contract/contract-overview.tsx b/web/components/contract/contract-overview.tsx
index 524a1962..7ebdf09d 100644
--- a/web/components/contract/contract-overview.tsx
+++ b/web/components/contract/contract-overview.tsx
@@ -1,8 +1,8 @@
-import { Contract, tradingAllowed } from '../../lib/firebase/contracts'
+import { Contract, tradingAllowed } from 'web/lib/firebase/contracts'
 import { Col } from '../layout/col'
 import { Spacer } from '../layout/spacer'
 import { ContractProbGraph } from './contract-prob-graph'
-import { useUser } from '../../hooks/use-user'
+import { useUser } from 'web/hooks/use-user'
 import { Row } from '../layout/row'
 import { Linkify } from '../linkify'
 import clsx from 'clsx'
@@ -10,11 +10,11 @@ import {
   FreeResponseResolutionOrChance,
   BinaryResolutionOrChance,
 } from './contract-card'
-import { Bet } from '../../../common/bet'
-import { Comment } from '../../../common/comment'
+import { Bet } from 'common/bet'
+import { Comment } from 'common/comment'
 import BetRow from '../bet-row'
 import { AnswersGraph } from '../answers/answers-graph'
-import { DPM, FreeResponse, FullContract } from '../../../common/contract'
+import { DPM, FreeResponse, FullContract } from 'common/contract'
 import { ContractDescription } from './contract-description'
 import { ContractDetails } from './contract-details'
 import { ShareMarket } from '../share-market'
diff --git a/web/components/contract/contract-prob-graph.tsx b/web/components/contract/contract-prob-graph.tsx
index 18374f0e..e3743e84 100644
--- a/web/components/contract/contract-prob-graph.tsx
+++ b/web/components/contract/contract-prob-graph.tsx
@@ -2,11 +2,11 @@ import { DatumValue } from '@nivo/core'
 import { ResponsiveLine } from '@nivo/line'
 import dayjs from 'dayjs'
 import { memo } from 'react'
-import { Bet } from '../../../common/bet'
-import { getInitialProbability } from '../../../common/calculate'
-import { Binary, CPMM, DPM, FullContract } from '../../../common/contract'
-import { useBetsWithoutAntes } from '../../hooks/use-bets'
-import { useWindowSize } from '../../hooks/use-window-size'
+import { Bet } from 'common/bet'
+import { getInitialProbability } from 'common/calculate'
+import { Binary, CPMM, DPM, FullContract } from 'common/contract'
+import { useBetsWithoutAntes } from 'web/hooks/use-bets'
+import { useWindowSize } from 'web/hooks/use-window-size'
 
 export const ContractProbGraph = memo(function ContractProbGraph(props: {
   contract: FullContract<DPM | CPMM, Binary>
diff --git a/web/components/contract/contract-tabs.tsx b/web/components/contract/contract-tabs.tsx
index ae1203cf..c59a834d 100644
--- a/web/components/contract/contract-tabs.tsx
+++ b/web/components/contract/contract-tabs.tsx
@@ -1,8 +1,8 @@
-import { Bet } from '../../../common/bet'
-import { Contract } from '../../../common/contract'
-import { Comment } from '../../lib/firebase/comments'
-import { User } from '../../../common/user'
-import { useBets } from '../../hooks/use-bets'
+import { Bet } from 'common/bet'
+import { Contract } from 'common/contract'
+import { Comment } from 'web/lib/firebase/comments'
+import { User } from 'common/user'
+import { useBets } from 'web/hooks/use-bets'
 import { ContractActivity } from '../feed/contract-activity'
 import { ContractBetsTable, MyBetsSummary } from '../bets-list'
 import { Spacer } from '../layout/spacer'
diff --git a/web/components/contract/contracts-list.tsx b/web/components/contract/contracts-list.tsx
index e84af1ea..76cc8752 100644
--- a/web/components/contract/contracts-list.tsx
+++ b/web/components/contract/contracts-list.tsx
@@ -8,16 +8,16 @@ import {
   Contract,
   listContracts,
   getBinaryProb,
-} from '../../lib/firebase/contracts'
-import { User } from '../../lib/firebase/users'
+} from 'web/lib/firebase/contracts'
+import { User } from 'web/lib/firebase/users'
 import { Col } from '../layout/col'
 import { SiteLink } from '../site-link'
 import { ContractCard } from './contract-card'
 import {
   Sort,
   useQueryAndSortParams,
-} from '../../hooks/use-sort-and-query-params'
-import { Answer } from '../../../common/answer'
+} from 'web/hooks/use-sort-and-query-params'
+import { Answer } from 'common/answer'
 import { LoadingIndicator } from '../loading-indicator'
 
 export function ContractsGrid(props: {
diff --git a/web/components/copy-link-button.tsx b/web/components/copy-link-button.tsx
index d63d3ff2..6ad22893 100644
--- a/web/components/copy-link-button.tsx
+++ b/web/components/copy-link-button.tsx
@@ -2,10 +2,10 @@ import { Fragment } from 'react'
 import { LinkIcon } from '@heroicons/react/outline'
 import { Menu, Transition } from '@headlessui/react'
 import clsx from 'clsx'
-import { Contract } from '../../common/contract'
-import { copyToClipboard } from '../lib/util/copy'
-import { contractPath } from '../lib/firebase/contracts'
-import { ENV_CONFIG } from '../../common/envs/constants'
+import { Contract } from 'common/contract'
+import { copyToClipboard } from 'web/lib/util/copy'
+import { contractPath } from 'web/lib/firebase/contracts'
+import { ENV_CONFIG } from 'common/envs/constants'
 
 function copyContractUrl(contract: Contract) {
   copyToClipboard(`https://${ENV_CONFIG.domain}${contractPath(contract)}`)
diff --git a/web/components/feed-create.tsx b/web/components/feed-create.tsx
index 7ce1deb5..1f308355 100644
--- a/web/components/feed-create.tsx
+++ b/web/components/feed-create.tsx
@@ -3,13 +3,13 @@ import { Avatar } from './avatar'
 import { useEffect, useRef, useState } from 'react'
 import { Spacer } from './layout/spacer'
 import { NewContract } from '../pages/create'
-import { firebaseLogin, User } from '../lib/firebase/users'
+import { firebaseLogin, User } from 'web/lib/firebase/users'
 import { ContractsGrid } from './contract/contracts-list'
-import { Contract, MAX_QUESTION_LENGTH } from '../../common/contract'
+import { Contract, MAX_QUESTION_LENGTH } from 'common/contract'
 import { Col } from './layout/col'
 import clsx from 'clsx'
 import { Row } from './layout/row'
-import { ENV_CONFIG } from '../../common/envs/constants'
+import { ENV_CONFIG } from 'common/envs/constants'
 import _ from 'lodash'
 import { SiteLink } from './site-link'
 
diff --git a/web/components/feed/activity-feed.tsx b/web/components/feed/activity-feed.tsx
index 19ec1299..c8d14476 100644
--- a/web/components/feed/activity-feed.tsx
+++ b/web/components/feed/activity-feed.tsx
@@ -1,10 +1,10 @@
 import _ from 'lodash'
 
-import { Contract } from '../../lib/firebase/contracts'
-import { Comment } from '../../lib/firebase/comments'
+import { Contract } from 'web/lib/firebase/contracts'
+import { Comment } from 'web/lib/firebase/comments'
 import { Col } from '../layout/col'
-import { Bet } from '../../../common/bet'
-import { useUser } from '../../hooks/use-user'
+import { Bet } from 'common/bet'
+import { useUser } from 'web/hooks/use-user'
 import { ContractActivity } from './contract-activity'
 
 export function ActivityFeed(props: {
diff --git a/web/components/feed/activity-items.ts b/web/components/feed/activity-items.ts
index 71d42621..21baa322 100644
--- a/web/components/feed/activity-items.ts
+++ b/web/components/feed/activity-items.ts
@@ -1,17 +1,12 @@
 import _ from 'lodash'
 
-import { Answer } from '../../../common/answer'
-import { Bet } from '../../../common/bet'
-import { getOutcomeProbability } from '../../../common/calculate'
-import { Comment } from '../../../common/comment'
-import {
-  Contract,
-  DPM,
-  FreeResponse,
-  FullContract,
-} from '../../../common/contract'
-import { User } from '../../../common/user'
-import { mapCommentsByBetId } from '../../lib/firebase/comments'
+import { Answer } from 'common/answer'
+import { Bet } from 'common/bet'
+import { getOutcomeProbability } from 'common/calculate'
+import { Comment } from 'common/comment'
+import { Contract, DPM, FreeResponse, FullContract } from 'common/contract'
+import { User } from 'common/user'
+import { mapCommentsByBetId } from 'web/lib/firebase/comments'
 
 export type ActivityItem =
   | DescriptionItem
diff --git a/web/components/feed/contract-activity.tsx b/web/components/feed/contract-activity.tsx
index a0e40916..40b2dd09 100644
--- a/web/components/feed/contract-activity.tsx
+++ b/web/components/feed/contract-activity.tsx
@@ -1,15 +1,15 @@
-import { Contract } from '../../lib/firebase/contracts'
-import { Comment } from '../../lib/firebase/comments'
-import { Bet } from '../../../common/bet'
-import { useBets } from '../../hooks/use-bets'
-import { useComments } from '../../hooks/use-comments'
+import { Contract } from 'web/lib/firebase/contracts'
+import { Comment } from 'web/lib/firebase/comments'
+import { Bet } from 'common/bet'
+import { useBets } from 'web/hooks/use-bets'
+import { useComments } from 'web/hooks/use-comments'
 import {
   getAllContractActivityItems,
   getRecentContractActivityItems,
   getSpecificContractActivityItems,
 } from './activity-items'
 import { FeedItems } from './feed-items'
-import { User } from '../../../common/user'
+import { User } from 'common/user'
 
 export function ContractActivity(props: {
   contract: Contract
diff --git a/web/components/feed/feed-items.tsx b/web/components/feed/feed-items.tsx
index dbf3ece3..cb089dd7 100644
--- a/web/components/feed/feed-items.tsx
+++ b/web/components/feed/feed-items.tsx
@@ -19,44 +19,38 @@ import {
   Contract,
   contractPath,
   tradingAllowed,
-} from '../../lib/firebase/contracts'
-import { useUser } from '../../hooks/use-user'
+} from 'web/lib/firebase/contracts'
+import { useUser } from 'web/hooks/use-user'
 import { Linkify } from '../linkify'
 import { Row } from '../layout/row'
-import { createComment, MAX_COMMENT_LENGTH } from '../../lib/firebase/comments'
-import { formatMoney, formatPercent } from '../../../common/util/format'
-import { Comment } from '../../../common/comment'
+import { createComment, MAX_COMMENT_LENGTH } from 'web/lib/firebase/comments'
+import { formatMoney, formatPercent } from 'common/util/format'
+import { Comment } from 'common/comment'
 import { BinaryResolutionOrChance } from '../contract/contract-card'
 import { SiteLink } from '../site-link'
 import { Col } from '../layout/col'
 import { UserLink } from '../user-page'
 import { DateTimeTooltip } from '../datetime-tooltip'
-import { Bet } from '../../lib/firebase/bets'
+import { Bet } from 'web/lib/firebase/bets'
 import { JoinSpans } from '../join-spans'
-import { fromNow } from '../../lib/util/time'
+import { fromNow } from 'web/lib/util/time'
 import BetRow from '../bet-row'
 import { Avatar } from '../avatar'
-import { Answer } from '../../../common/answer'
+import { Answer } from 'common/answer'
 import { ActivityItem, GENERAL_COMMENTS_OUTCOME_ID } from './activity-items'
-import {
-  Binary,
-  CPMM,
-  DPM,
-  FreeResponse,
-  FullContract,
-} from '../../../common/contract'
+import { Binary, CPMM, DPM, FreeResponse, FullContract } from 'common/contract'
 import { BuyButton } from '../yes-no-selector'
-import { getDpmOutcomeProbability } from '../../../common/calculate-dpm'
+import { getDpmOutcomeProbability } from 'common/calculate-dpm'
 import { AnswerBetPanel } from '../answers/answer-bet-panel'
-import { useSaveSeenContract } from '../../hooks/use-seen-contracts'
-import { User } from '../../../common/user'
+import { useSaveSeenContract } from 'web/hooks/use-seen-contracts'
+import { User } from 'common/user'
 import { Modal } from '../layout/modal'
-import { trackClick } from '../../lib/firebase/tracking'
-import { firebaseLogin } from '../../lib/firebase/users'
-import { DAY_MS } from '../../../common/util/time'
+import { trackClick } from 'web/lib/firebase/tracking'
+import { firebaseLogin } from 'web/lib/firebase/users'
+import { DAY_MS } from 'common/util/time'
 import NewContractBadge from '../new-contract-badge'
 import { RelativeTimestamp } from '../relative-timestamp'
-import { calculateCpmmSale } from '../../../common/calculate-cpmm'
+import { calculateCpmmSale } from 'common/calculate-cpmm'
 
 export function FeedItems(props: {
   contract: Contract
diff --git a/web/components/feed/find-active-contracts.ts b/web/components/feed/find-active-contracts.ts
index 6f40806f..51965792 100644
--- a/web/components/feed/find-active-contracts.ts
+++ b/web/components/feed/find-active-contracts.ts
@@ -1,7 +1,7 @@
 import _ from 'lodash'
-import { Contract } from '../../lib/firebase/contracts'
-import { Comment } from '../../lib/firebase/comments'
-import { Bet } from '../../../common/bet'
+import { Contract } from 'web/lib/firebase/contracts'
+import { Comment } from 'web/lib/firebase/comments'
+import { Bet } from 'common/bet'
 
 const MAX_ACTIVE_CONTRACTS = 75
 
diff --git a/web/components/folds/create-fold-button.tsx b/web/components/folds/create-fold-button.tsx
index 0d71fa18..d00964c9 100644
--- a/web/components/folds/create-fold-button.tsx
+++ b/web/components/folds/create-fold-button.tsx
@@ -2,10 +2,10 @@ import clsx from 'clsx'
 import { useRouter } from 'next/router'
 import { useState } from 'react'
 import { PlusCircleIcon } from '@heroicons/react/solid'
-import { parseWordsAsTags } from '../../../common/util/parse'
-import { createFold } from '../../lib/firebase/api-call'
-import { foldPath } from '../../lib/firebase/folds'
-import { toCamelCase } from '../../../common/util/format'
+import { parseWordsAsTags } from 'common/util/parse'
+import { createFold } from 'web/lib/firebase/api-call'
+import { foldPath } from 'web/lib/firebase/folds'
+import { toCamelCase } from 'common/util/format'
 import { ConfirmationButton } from '../confirmation-button'
 import { Col } from '../layout/col'
 import { Spacer } from '../layout/spacer'
diff --git a/web/components/folds/edit-fold-button.tsx b/web/components/folds/edit-fold-button.tsx
index d18ab41c..d6c296b2 100644
--- a/web/components/folds/edit-fold-button.tsx
+++ b/web/components/folds/edit-fold-button.tsx
@@ -3,10 +3,10 @@ import _ from 'lodash'
 import clsx from 'clsx'
 import { PencilIcon } from '@heroicons/react/outline'
 
-import { Fold } from '../../../common/fold'
-import { parseWordsAsTags } from '../../../common/util/parse'
-import { deleteFold, updateFold } from '../../lib/firebase/folds'
-import { toCamelCase } from '../../../common/util/format'
+import { Fold } from 'common/fold'
+import { parseWordsAsTags } from 'common/util/parse'
+import { deleteFold, updateFold } from 'web/lib/firebase/folds'
+import { toCamelCase } from 'common/util/format'
 import { Spacer } from '../layout/spacer'
 import { TagsList } from '../tags-list'
 import { useRouter } from 'next/router'
diff --git a/web/components/folds/fast-fold-following.tsx b/web/components/folds/fast-fold-following.tsx
index eea1e592..b714e22b 100644
--- a/web/components/folds/fast-fold-following.tsx
+++ b/web/components/folds/fast-fold-following.tsx
@@ -2,11 +2,11 @@ import clsx from 'clsx'
 import { useState } from 'react'
 import { SearchIcon } from '@heroicons/react/outline'
 
-import { User } from '../../../common/user'
+import { User } from 'common/user'
 import {
   followFoldFromSlug,
   unfollowFoldFromSlug,
-} from '../../lib/firebase/folds'
+} from 'web/lib/firebase/folds'
 import { Row } from '../layout/row'
 import { Spacer } from '../layout/spacer'
 
diff --git a/web/components/folds/fold-tag.tsx b/web/components/folds/fold-tag.tsx
index 370cd0b8..4e975226 100644
--- a/web/components/folds/fold-tag.tsx
+++ b/web/components/folds/fold-tag.tsx
@@ -1,5 +1,5 @@
 import clsx from 'clsx'
-import { Fold } from '../../../common/fold'
+import { Fold } from 'common/fold'
 
 export function FoldTag(props: { fold: Fold }) {
   const { fold } = props
diff --git a/web/components/folds/follow-fold-button.tsx b/web/components/folds/follow-fold-button.tsx
index 496cda42..21278bdf 100644
--- a/web/components/folds/follow-fold-button.tsx
+++ b/web/components/folds/follow-fold-button.tsx
@@ -1,8 +1,8 @@
 import clsx from 'clsx'
-import { Fold } from '../../../common/fold'
-import { useFollowedFoldIds } from '../../hooks/use-fold'
-import { useUser } from '../../hooks/use-user'
-import { followFold, unfollowFold } from '../../lib/firebase/folds'
+import { Fold } from 'common/fold'
+import { useFollowedFoldIds } from 'web/hooks/use-fold'
+import { useUser } from 'web/hooks/use-user'
+import { followFold, unfollowFold } from 'web/lib/firebase/folds'
 
 export function FollowFoldButton(props: { fold: Fold; className?: string }) {
   const { fold, className } = props
diff --git a/web/components/leaderboard.tsx b/web/components/leaderboard.tsx
index 5ae3ddd3..fb104060 100644
--- a/web/components/leaderboard.tsx
+++ b/web/components/leaderboard.tsx
@@ -1,5 +1,5 @@
 import clsx from 'clsx'
-import { User } from '../../common/user'
+import { User } from 'common/user'
 import { Avatar } from './avatar'
 import { Row } from './layout/row'
 import { SiteLink } from './site-link'
diff --git a/web/components/nav/manifold-logo.tsx b/web/components/nav/manifold-logo.tsx
index c7fc9df3..ec15d54b 100644
--- a/web/components/nav/manifold-logo.tsx
+++ b/web/components/nav/manifold-logo.tsx
@@ -1,8 +1,8 @@
 import Link from 'next/link'
 import clsx from 'clsx'
 
-import { useUser } from '../../hooks/use-user'
-import { ENV_CONFIG } from '../../../common/envs/constants'
+import { useUser } from 'web/hooks/use-user'
+import { ENV_CONFIG } from 'common/envs/constants'
 
 export function ManifoldLogo(props: {
   className?: string
diff --git a/web/components/nav/nav-bar.tsx b/web/components/nav/nav-bar.tsx
index 0aded804..f92f6630 100644
--- a/web/components/nav/nav-bar.tsx
+++ b/web/components/nav/nav-bar.tsx
@@ -10,8 +10,8 @@ import {
 import { Transition, Dialog } from '@headlessui/react'
 import { useState, Fragment } from 'react'
 import Sidebar from './sidebar'
-import { useUser } from '../../hooks/use-user'
-import { formatMoney } from '../../../common/util/format'
+import { useUser } from 'web/hooks/use-user'
+import { formatMoney } from 'common/util/format'
 import { Avatar } from '../avatar'
 
 // From https://codepen.io/chris__sev/pen/QWGvYbL
diff --git a/web/components/nav/profile-menu.tsx b/web/components/nav/profile-menu.tsx
index 994f8bc1..b25603d4 100644
--- a/web/components/nav/profile-menu.tsx
+++ b/web/components/nav/profile-menu.tsx
@@ -1,7 +1,7 @@
-import { firebaseLogout, User } from '../../lib/firebase/users'
-import { formatMoney } from '../../../common/util/format'
+import { firebaseLogout, User } from 'web/lib/firebase/users'
+import { formatMoney } from 'common/util/format'
 import { Avatar } from '../avatar'
-import { IS_PRIVATE_MANIFOLD } from '../../../common/envs/constants'
+import { IS_PRIVATE_MANIFOLD } from 'common/envs/constants'
 import { Row } from '../layout/row'
 
 export function getNavigationOptions(user?: User | null) {
diff --git a/web/components/nav/sidebar.tsx b/web/components/nav/sidebar.tsx
index 4fef69f4..80376b6c 100644
--- a/web/components/nav/sidebar.tsx
+++ b/web/components/nav/sidebar.tsx
@@ -14,13 +14,13 @@ import clsx from 'clsx'
 import _ from 'lodash'
 import Link from 'next/link'
 import { useRouter } from 'next/router'
-import { useFollowedFolds } from '../../hooks/use-fold'
-import { useUser } from '../../hooks/use-user'
-import { firebaseLogin, firebaseLogout } from '../../lib/firebase/users'
+import { useFollowedFolds } from 'web/hooks/use-fold'
+import { useUser } from 'web/hooks/use-user'
+import { firebaseLogin, firebaseLogout } from 'web/lib/firebase/users'
 import { ManifoldLogo } from './manifold-logo'
 import { MenuButton } from './menu'
 import { getNavigationOptions, ProfileSummary } from './profile-menu'
-import { useHasCreatedContractToday } from '../../hooks/use-has-created-contract-today'
+import { useHasCreatedContractToday } from 'web/hooks/use-has-created-contract-today'
 
 // Create an icon from the url of an image
 function IconFromUrl(url: string): React.ComponentType<{ className?: string }> {
@@ -46,8 +46,16 @@ const signedOutNavigation = [
 const signedOutMobileNavigation = [
   { name: 'Charity', href: '/charity', icon: HeartIcon },
   { name: 'Leaderboards', href: '/leaderboards', icon: CakeIcon },
-  { name: 'Discord', href: 'https://discord.gg/eHQBNBqXuh', icon: IconFromUrl("/discord-logo.svg") },
-  { name: 'Twitter', href: 'https://twitter.com/ManifoldMarkets', icon: IconFromUrl("/twitter-logo.svg") },
+  {
+    name: 'Discord',
+    href: 'https://discord.gg/eHQBNBqXuh',
+    icon: IconFromUrl('/discord-logo.svg'),
+  },
+  {
+    name: 'Twitter',
+    href: 'https://twitter.com/ManifoldMarkets',
+    icon: IconFromUrl('/twitter-logo.svg'),
+  },
   { name: 'About', href: 'https://docs.manifold.markets', icon: BookOpenIcon },
 ]
 
diff --git a/web/components/outcome-label.tsx b/web/components/outcome-label.tsx
index 95403c75..d578247b 100644
--- a/web/components/outcome-label.tsx
+++ b/web/components/outcome-label.tsx
@@ -1,6 +1,6 @@
 import clsx from 'clsx'
-import { Answer } from '../../common/answer'
-import { getProbability } from '../../common/calculate'
+import { Answer } from 'common/answer'
+import { getProbability } from 'common/calculate'
 import {
   Binary,
   Contract,
@@ -9,8 +9,8 @@ import {
   FreeResponse,
   FreeResponseContract,
   FullContract,
-} from '../../common/contract'
-import { formatPercent } from '../../common/util/format'
+} from 'common/contract'
+import { formatPercent } from 'common/util/format'
 import { ClientRender } from './client-render'
 
 export function OutcomeLabel(props: {
diff --git a/web/components/relative-timestamp.tsx b/web/components/relative-timestamp.tsx
index cd5ca713..160a665d 100644
--- a/web/components/relative-timestamp.tsx
+++ b/web/components/relative-timestamp.tsx
@@ -1,5 +1,5 @@
 import { DateTimeTooltip } from './datetime-tooltip'
-import { fromNow } from '../lib/util/time'
+import { fromNow } from 'web/lib/util/time'
 import React from 'react'
 
 export function RelativeTimestamp(props: { time: number }) {
diff --git a/web/components/resolution-panel.tsx b/web/components/resolution-panel.tsx
index 7645f039..316a5374 100644
--- a/web/components/resolution-panel.tsx
+++ b/web/components/resolution-panel.tsx
@@ -3,16 +3,16 @@ import React, { useEffect, useState } from 'react'
 
 import { Col } from './layout/col'
 import { Title } from './title'
-import { User } from '../lib/firebase/users'
+import { User } from 'web/lib/firebase/users'
 import { YesNoCancelSelector } from './yes-no-selector'
 import { Spacer } from './layout/spacer'
 import { ResolveConfirmationButton } from './confirmation-button'
-import { resolveMarket } from '../lib/firebase/api-call'
+import { resolveMarket } from 'web/lib/firebase/api-call'
 import { ProbabilitySelector } from './probability-selector'
-import { DPM_CREATOR_FEE } from '../../common/fees'
-import { getProbability } from '../../common/calculate'
-import { Binary, CPMM, DPM, FullContract } from '../../common/contract'
-import { formatMoney } from '../../common/util/format'
+import { DPM_CREATOR_FEE } from 'common/fees'
+import { getProbability } from 'common/calculate'
+import { Binary, CPMM, DPM, FullContract } from 'common/contract'
+import { formatMoney } from 'common/util/format'
 
 export function ResolutionPanel(props: {
   creator: User
diff --git a/web/components/sell-button.tsx b/web/components/sell-button.tsx
index 0bccb631..5e71bd77 100644
--- a/web/components/sell-button.tsx
+++ b/web/components/sell-button.tsx
@@ -1,6 +1,6 @@
-import { Binary, CPMM, DPM, FullContract } from '../../common/contract'
-import { User } from '../../common/user'
-import { useUserContractBets } from '../hooks/use-user-bets'
+import { Binary, CPMM, DPM, FullContract } from 'common/contract'
+import { User } from 'common/user'
+import { useUserContractBets } from 'web/hooks/use-user-bets'
 import { useState } from 'react'
 import { Col } from './layout/col'
 import clsx from 'clsx'
diff --git a/web/components/sell-modal.tsx b/web/components/sell-modal.tsx
index 19954d7f..28282766 100644
--- a/web/components/sell-modal.tsx
+++ b/web/components/sell-modal.tsx
@@ -1,10 +1,10 @@
-import { Binary, CPMM, FullContract } from '../../common/contract'
-import { Bet } from '../../common/bet'
-import { User } from '../../common/user'
+import { Binary, CPMM, FullContract } from 'common/contract'
+import { Bet } from 'common/bet'
+import { User } from 'common/user'
 import { Modal } from './layout/modal'
 import { Col } from './layout/col'
 import { Title } from './title'
-import { formatWithCommas } from '../../common/util/format'
+import { formatWithCommas } from 'common/util/format'
 import { OutcomeLabel } from './outcome-label'
 import { SellPanel } from './bet-panel'
 
diff --git a/web/components/sell-row.tsx b/web/components/sell-row.tsx
index c30f799e..2ec50c72 100644
--- a/web/components/sell-row.tsx
+++ b/web/components/sell-row.tsx
@@ -1,11 +1,11 @@
-import { Binary, CPMM, DPM, FullContract } from '../../common/contract'
-import { User } from '../../common/user'
+import { Binary, CPMM, DPM, FullContract } from 'common/contract'
+import { User } from 'common/user'
 import { useState } from 'react'
 import { Col } from './layout/col'
 import { Row } from './layout/row'
-import { formatWithCommas } from '../../common/util/format'
+import { formatWithCommas } from 'common/util/format'
 import { OutcomeLabel } from './outcome-label'
-import { useUserContractBets } from '../hooks/use-user-bets'
+import { useUserContractBets } from 'web/hooks/use-user-bets'
 import { useSaveShares } from './use-save-shares'
 import { SellSharesModal } from './sell-modal'
 
diff --git a/web/components/share-embed-button.tsx b/web/components/share-embed-button.tsx
index eeed7d44..1023b169 100644
--- a/web/components/share-embed-button.tsx
+++ b/web/components/share-embed-button.tsx
@@ -1,10 +1,10 @@
 import { Fragment } from 'react'
 import { CodeIcon } from '@heroicons/react/outline'
 import { Menu, Transition } from '@headlessui/react'
-import { Contract } from '../../common/contract'
-import { contractPath } from '../lib/firebase/contracts'
-import { DOMAIN } from '../../common/envs/constants'
-import { copyToClipboard } from '../lib/util/copy'
+import { Contract } from 'common/contract'
+import { contractPath } from 'web/lib/firebase/contracts'
+import { DOMAIN } from 'common/envs/constants'
+import { copyToClipboard } from 'web/lib/util/copy'
 
 function copyEmbedCode(contract: Contract) {
   const title = contract.question
diff --git a/web/components/share-market.tsx b/web/components/share-market.tsx
index 0fa425ad..28c0e5ad 100644
--- a/web/components/share-market.tsx
+++ b/web/components/share-market.tsx
@@ -1,5 +1,5 @@
 import clsx from 'clsx'
-import { Contract, contractUrl } from '../lib/firebase/contracts'
+import { Contract, contractUrl } from 'web/lib/firebase/contracts'
 import { CopyLinkButton } from './copy-link-button'
 import { Col } from './layout/col'
 import { Row } from './layout/row'
diff --git a/web/components/tags-input.tsx b/web/components/tags-input.tsx
index 83c6bbb1..b52d78e9 100644
--- a/web/components/tags-input.tsx
+++ b/web/components/tags-input.tsx
@@ -1,7 +1,7 @@
 import clsx from 'clsx'
 import { useState } from 'react'
-import { parseWordsAsTags } from '../../common/util/parse'
-import { Contract, updateContract } from '../lib/firebase/contracts'
+import { parseWordsAsTags } from 'common/util/parse'
+import { Contract, updateContract } from 'web/lib/firebase/contracts'
 import { Col } from './layout/col'
 import { Row } from './layout/row'
 import { TagsList } from './tags-list'
diff --git a/web/components/use-save-shares.ts b/web/components/use-save-shares.ts
index c67ea9c9..6a8b251e 100644
--- a/web/components/use-save-shares.ts
+++ b/web/components/use-save-shares.ts
@@ -1,5 +1,5 @@
-import { Binary, CPMM, DPM, FullContract } from '../../common/contract'
-import { Bet } from '../../common/bet'
+import { Binary, CPMM, DPM, FullContract } from 'common/contract'
+import { Bet } from 'common/bet'
 import { useEffect, useState } from 'react'
 import _ from 'lodash'
 
diff --git a/web/components/user-page.tsx b/web/components/user-page.tsx
index 24d58081..a36f754c 100644
--- a/web/components/user-page.tsx
+++ b/web/components/user-page.tsx
@@ -1,5 +1,5 @@
 import clsx from 'clsx'
-import { User } from '../lib/firebase/users'
+import { User } from 'web/lib/firebase/users'
 import { CreatorContractsList } from './contract/contracts-list'
 import { SEO } from './SEO'
 import { Page } from './page'
@@ -10,14 +10,14 @@ import { Linkify } from './linkify'
 import { Spacer } from './layout/spacer'
 import { Row } from './layout/row'
 import { LinkIcon } from '@heroicons/react/solid'
-import { genHash } from '../../common/util/random'
+import { genHash } from 'common/util/random'
 import { PencilIcon } from '@heroicons/react/outline'
 import { Tabs } from './layout/tabs'
 import { UserCommentsList } from './comments-list'
 import { useEffect, useState } from 'react'
-import { Comment, getUsersComments } from '../lib/firebase/comments'
-import { Contract } from '../../common/contract'
-import { getContractFromId, listContracts } from '../lib/firebase/contracts'
+import { Comment, getUsersComments } from 'web/lib/firebase/comments'
+import { Contract } from 'common/contract'
+import { getContractFromId, listContracts } from 'web/lib/firebase/contracts'
 import { LoadingIndicator } from './loading-indicator'
 import { useRouter } from 'next/router'
 import _ from 'lodash'
diff --git a/web/components/yes-no-selector.tsx b/web/components/yes-no-selector.tsx
index 4bb7949f..7c175695 100644
--- a/web/components/yes-no-selector.tsx
+++ b/web/components/yes-no-selector.tsx
@@ -1,6 +1,6 @@
 import clsx from 'clsx'
 import React from 'react'
-import { formatMoney } from '../../common/util/format'
+import { formatMoney } from 'common/util/format'
 import { Col } from './layout/col'
 import { Row } from './layout/row'
 
diff --git a/web/hooks/use-admin.ts b/web/hooks/use-admin.ts
index 7c8b8449..a80b3ac4 100644
--- a/web/hooks/use-admin.ts
+++ b/web/hooks/use-admin.ts
@@ -1,4 +1,4 @@
-import { isAdmin } from '../../common/envs/constants'
+import { isAdmin } from 'common/envs/constants'
 import { usePrivateUser, useUser } from './use-user'
 
 export const useAdmin = () => {
diff --git a/web/hooks/use-algo-feed.ts b/web/hooks/use-algo-feed.ts
index b8cfb7a2..e365c88d 100644
--- a/web/hooks/use-algo-feed.ts
+++ b/web/hooks/use-algo-feed.ts
@@ -1,17 +1,17 @@
 import _ from 'lodash'
 import { useState, useEffect } from 'react'
-import { Bet } from '../../common/bet'
-import { Comment } from '../../common/comment'
-import { Contract } from '../../common/contract'
+import { Bet } from 'common/bet'
+import { Comment } from 'common/comment'
+import { Contract } from 'common/contract'
 import { useTimeSinceFirstRender } from './use-time-since-first-render'
-import { trackLatency } from '../lib/firebase/tracking'
-import { User } from '../../common/user'
-import { getUserFeed } from '../lib/firebase/users'
+import { trackLatency } from 'web/lib/firebase/tracking'
+import { User } from 'common/user'
+import { getUserFeed } from 'web/lib/firebase/users'
 import { useUpdatedContracts } from './use-contracts'
 import {
   getRecentBetsAndComments,
   getTopWeeklyContracts,
-} from '../lib/firebase/contracts'
+} from 'web/lib/firebase/contracts'
 
 type feed = {
   contract: Contract
diff --git a/web/hooks/use-answers.ts b/web/hooks/use-answers.ts
index efac8db7..bcfa6725 100644
--- a/web/hooks/use-answers.ts
+++ b/web/hooks/use-answers.ts
@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react'
-import { Answer } from '../../common/answer'
-import { listenForAnswers } from '../lib/firebase/answers'
+import { Answer } from 'common/answer'
+import { listenForAnswers } from 'web/lib/firebase/answers'
 
 export const useAnswers = (contractId: string) => {
   const [answers, setAnswers] = useState<Answer[] | undefined>()
diff --git a/web/hooks/use-bets.ts b/web/hooks/use-bets.ts
index 5ea66e1c..5cab16a7 100644
--- a/web/hooks/use-bets.ts
+++ b/web/hooks/use-bets.ts
@@ -1,11 +1,11 @@
 import { useEffect, useState } from 'react'
-import { Contract } from '../../common/contract'
+import { Contract } from 'common/contract'
 import {
   Bet,
   listenForBets,
   listenForRecentBets,
   withoutAnteBets,
-} from '../lib/firebase/bets'
+} from 'web/lib/firebase/bets'
 
 export const useBets = (contractId: string) => {
   const [bets, setBets] = useState<Bet[] | undefined>()
diff --git a/web/hooks/use-charity-txns.ts b/web/hooks/use-charity-txns.ts
index 5636e720..13050fb1 100644
--- a/web/hooks/use-charity-txns.ts
+++ b/web/hooks/use-charity-txns.ts
@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react'
-import { Txn } from '../../common/txn'
-import { listenForCharityTxns } from '../lib/firebase/txns'
+import { Txn } from 'common/txn'
+import { listenForCharityTxns } from 'web/lib/firebase/txns'
 
 export const useCharityTxns = (charityId: string) => {
   const [txns, setTxns] = useState<Txn[]>([])
diff --git a/web/hooks/use-comments.ts b/web/hooks/use-comments.ts
index 37f001dd..e56e8179 100644
--- a/web/hooks/use-comments.ts
+++ b/web/hooks/use-comments.ts
@@ -3,7 +3,7 @@ import {
   Comment,
   listenForComments,
   listenForRecentComments,
-} from '../lib/firebase/comments'
+} from 'web/lib/firebase/comments'
 
 export const useComments = (contractId: string) => {
   const [comments, setComments] = useState<Comment[] | undefined>()
diff --git a/web/hooks/use-contract.ts b/web/hooks/use-contract.ts
index ebff7dce..ad2f12a2 100644
--- a/web/hooks/use-contract.ts
+++ b/web/hooks/use-contract.ts
@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react'
-import { Contract, listenForContract } from '../lib/firebase/contracts'
+import { Contract, listenForContract } from 'web/lib/firebase/contracts'
 import { useStateCheckEquality } from './use-state-check-equality'
 
 export const useContract = (contractId: string) => {
diff --git a/web/hooks/use-contracts.ts b/web/hooks/use-contracts.ts
index 0402613f..ef0fd65f 100644
--- a/web/hooks/use-contracts.ts
+++ b/web/hooks/use-contracts.ts
@@ -8,8 +8,8 @@ import {
   listenForHotContracts,
   listenForInactiveContracts,
   listenForNewContracts,
-} from '../lib/firebase/contracts'
-import { listenForTaggedContracts } from '../lib/firebase/folds'
+} from 'web/lib/firebase/contracts'
+import { listenForTaggedContracts } from 'web/lib/firebase/folds'
 
 export const useContracts = () => {
   const [contracts, setContracts] = useState<Contract[] | undefined>()
diff --git a/web/hooks/use-fold.ts b/web/hooks/use-fold.ts
index 2c0230c4..4333c218 100644
--- a/web/hooks/use-fold.ts
+++ b/web/hooks/use-fold.ts
@@ -1,7 +1,7 @@
 import _ from 'lodash'
 import { useEffect, useState } from 'react'
-import { Fold } from '../../common/fold'
-import { User } from '../../common/user'
+import { Fold } from 'common/fold'
+import { User } from 'common/user'
 import {
   listAllFolds,
   listenForFold,
@@ -9,7 +9,7 @@ import {
   listenForFoldsWithTags,
   listenForFollow,
   listenForFollowedFolds,
-} from '../lib/firebase/folds'
+} from 'web/lib/firebase/folds'
 
 export const useFold = (foldId: string | undefined) => {
   const [fold, setFold] = useState<Fold | null | undefined>()
diff --git a/web/hooks/use-has-created-contract-today.ts b/web/hooks/use-has-created-contract-today.ts
index 43fe42f9..0b3f4bdd 100644
--- a/web/hooks/use-has-created-contract-today.ts
+++ b/web/hooks/use-has-created-contract-today.ts
@@ -1,6 +1,6 @@
-import { listContracts } from '../lib/firebase/contracts'
+import { listContracts } from 'web/lib/firebase/contracts'
 import { useEffect, useState } from 'react'
-import { User } from '../../common/user'
+import { User } from 'common/user'
 
 export const useHasCreatedContractToday = (user: User | null | undefined) => {
   const [hasCreatedContractToday, setHasCreatedContractToday] = useState(true)
diff --git a/web/hooks/use-propz.ts b/web/hooks/use-propz.ts
index 5aee4c61..de161e83 100644
--- a/web/hooks/use-propz.ts
+++ b/web/hooks/use-propz.ts
@@ -1,7 +1,7 @@
 import _ from 'lodash'
 import { useRouter } from 'next/router'
 import { useState, useEffect } from 'react'
-import { IS_PRIVATE_MANIFOLD } from '../../common/envs/constants'
+import { IS_PRIVATE_MANIFOLD } from 'common/envs/constants'
 
 type PropzProps = {
   // Params from the router query
diff --git a/web/hooks/use-seen-contracts.ts b/web/hooks/use-seen-contracts.ts
index 58ff1c54..6157f8c7 100644
--- a/web/hooks/use-seen-contracts.ts
+++ b/web/hooks/use-seen-contracts.ts
@@ -1,7 +1,7 @@
 import _ from 'lodash'
 import { useEffect, RefObject, useState } from 'react'
-import { Contract } from '../../common/contract'
-import { trackView } from '../lib/firebase/tracking'
+import { Contract } from 'common/contract'
+import { trackView } from 'web/lib/firebase/tracking'
 import { useIsVisible } from './use-is-visible'
 
 export const useSeenContracts = () => {
diff --git a/web/hooks/use-user-bets.ts b/web/hooks/use-user-bets.ts
index c11af097..ead55729 100644
--- a/web/hooks/use-user-bets.ts
+++ b/web/hooks/use-user-bets.ts
@@ -4,7 +4,7 @@ import {
   Bet,
   listenForUserBets,
   listenForUserContractBets,
-} from '../lib/firebase/bets'
+} from 'web/lib/firebase/bets'
 
 export const useUserBets = (userId: string | undefined) => {
   const [bets, setBets] = useState<Bet[] | undefined>(undefined)
diff --git a/web/hooks/use-user.ts b/web/hooks/use-user.ts
index 022045b9..0b96edc1 100644
--- a/web/hooks/use-user.ts
+++ b/web/hooks/use-user.ts
@@ -1,12 +1,12 @@
 import _ from 'lodash'
 import { useEffect, useState } from 'react'
-import { PrivateUser } from '../../common/user'
+import { PrivateUser } from 'common/user'
 import {
   listenForLogin,
   listenForPrivateUser,
   listenForUser,
   User,
-} from '../lib/firebase/users'
+} from 'web/lib/firebase/users'
 import { useStateCheckEquality } from './use-state-check-equality'
 
 export const useUser = () => {
diff --git a/web/hooks/use-users.ts b/web/hooks/use-users.ts
index 5d2649b6..1b5656a0 100644
--- a/web/hooks/use-users.ts
+++ b/web/hooks/use-users.ts
@@ -1,10 +1,10 @@
 import { useState, useEffect } from 'react'
-import { PrivateUser, User } from '../../common/user'
+import { PrivateUser, User } from 'common/user'
 import {
   getUser,
   listenForAllUsers,
   listenForPrivateUsers,
-} from '../lib/firebase/users'
+} from 'web/lib/firebase/users'
 
 export const useUsers = () => {
   const [users, setUsers] = useState<User[]>([])
diff --git a/web/lib/firebase/answers.ts b/web/lib/firebase/answers.ts
index ab41165b..c7ee5c4f 100644
--- a/web/lib/firebase/answers.ts
+++ b/web/lib/firebase/answers.ts
@@ -2,7 +2,7 @@ import { collection } from 'firebase/firestore'
 
 import { getValues, listenForValues } from './utils'
 import { db } from './init'
-import { Answer } from '../../../common/answer'
+import { Answer } from 'common/answer'
 
 function getAnswersCollection(contractId: string) {
   return collection(db, 'contracts', contractId, 'answers')
diff --git a/web/lib/firebase/api-call.ts b/web/lib/firebase/api-call.ts
index a71c2752..fa786952 100644
--- a/web/lib/firebase/api-call.ts
+++ b/web/lib/firebase/api-call.ts
@@ -1,8 +1,8 @@
 import { httpsCallable } from 'firebase/functions'
-import { Fold } from '../../../common/fold'
-import { Txn } from '../../../common/txn'
-import { User } from '../../../common/user'
-import { randomString } from '../../../common/util/random'
+import { Fold } from 'common/fold'
+import { Txn } from 'common/txn'
+import { User } from 'common/user'
+import { randomString } from 'common/util/random'
 import './init'
 import { functions } from './init'
 
diff --git a/web/lib/firebase/bets.ts b/web/lib/firebase/bets.ts
index 4056e114..b55b0027 100644
--- a/web/lib/firebase/bets.ts
+++ b/web/lib/firebase/bets.ts
@@ -8,8 +8,8 @@ import {
 import _ from 'lodash'
 
 import { db } from './init'
-import { Bet } from '../../../common/bet'
-import { Contract } from '../../../common/contract'
+import { Bet } from 'common/bet'
+import { Contract } from 'common/contract'
 import { getValues, listenForValues } from './utils'
 export type { Bet }
 
diff --git a/web/lib/firebase/comments.ts b/web/lib/firebase/comments.ts
index e97e6f99..4b7d1b36 100644
--- a/web/lib/firebase/comments.ts
+++ b/web/lib/firebase/comments.ts
@@ -11,8 +11,8 @@ import _ from 'lodash'
 
 import { getValues, listenForValues } from './utils'
 import { db } from './init'
-import { User } from '../../../common/user'
-import { Comment } from '../../../common/comment'
+import { User } from 'common/user'
+import { Comment } from 'common/comment'
 
 export type { Comment }
 
diff --git a/web/lib/firebase/contracts.ts b/web/lib/firebase/contracts.ts
index ab408215..72264b72 100644
--- a/web/lib/firebase/contracts.ts
+++ b/web/lib/firebase/contracts.ts
@@ -17,16 +17,16 @@ import _ from 'lodash'
 
 import { app } from './init'
 import { getValues, listenForValue, listenForValues } from './utils'
-import { Binary, Contract, FullContract } from '../../../common/contract'
-import { getDpmProbability } from '../../../common/calculate-dpm'
-import { createRNG, shuffle } from '../../../common/util/random'
-import { getCpmmProbability } from '../../../common/calculate-cpmm'
-import { formatMoney, formatPercent } from '../../../common/util/format'
-import { DAY_MS } from '../../../common/util/time'
-import { MAX_FEED_CONTRACTS } from '../../../common/recommended-contracts'
-import { Bet } from '../../../common/bet'
-import { Comment } from '../../../common/comment'
-import { ENV_CONFIG } from '../../../common/envs/constants'
+import { Binary, Contract, FullContract } from 'common/contract'
+import { getDpmProbability } from 'common/calculate-dpm'
+import { createRNG, shuffle } from 'common/util/random'
+import { getCpmmProbability } from 'common/calculate-cpmm'
+import { formatMoney, formatPercent } from 'common/util/format'
+import { DAY_MS } from 'common/util/time'
+import { MAX_FEED_CONTRACTS } from 'common/recommended-contracts'
+import { Bet } from 'common/bet'
+import { Comment } from 'common/comment'
+import { ENV_CONFIG } from 'common/envs/constants'
 export type { Contract }
 
 export function contractPath(contract: Contract) {
diff --git a/web/lib/firebase/folds.ts b/web/lib/firebase/folds.ts
index 92dc5be0..90268e98 100644
--- a/web/lib/firebase/folds.ts
+++ b/web/lib/firebase/folds.ts
@@ -11,7 +11,7 @@ import {
   where,
 } from 'firebase/firestore'
 import _ from 'lodash'
-import { Fold } from '../../../common/fold'
+import { Fold } from 'common/fold'
 import { Contract, contractCollection } from './contracts'
 import { db } from './init'
 import { User } from './users'
diff --git a/web/lib/firebase/init.ts b/web/lib/firebase/init.ts
index 46f14330..379f7cb6 100644
--- a/web/lib/firebase/init.ts
+++ b/web/lib/firebase/init.ts
@@ -1,6 +1,6 @@
 import { getFirestore } from '@firebase/firestore'
 import { initializeApp, getApps, getApp } from 'firebase/app'
-import { FIREBASE_CONFIG } from '../../../common/envs/constants'
+import { FIREBASE_CONFIG } from 'common/envs/constants'
 import { connectFirestoreEmulator } from 'firebase/firestore'
 import { connectFunctionsEmulator, getFunctions } from 'firebase/functions'
 
diff --git a/web/lib/firebase/tracking.ts b/web/lib/firebase/tracking.ts
index 034ad09d..035ef973 100644
--- a/web/lib/firebase/tracking.ts
+++ b/web/lib/firebase/tracking.ts
@@ -2,7 +2,7 @@ import { doc, collection, setDoc } from 'firebase/firestore'
 import _ from 'lodash'
 
 import { db } from './init'
-import { ClickEvent, LatencyEvent, View } from '../../../common/tracking'
+import { ClickEvent, LatencyEvent, View } from 'common/tracking'
 import { listenForLogin, User } from './users'
 
 let user: User | null = null
diff --git a/web/lib/firebase/txns.ts b/web/lib/firebase/txns.ts
index efb98b45..8fc07525 100644
--- a/web/lib/firebase/txns.ts
+++ b/web/lib/firebase/txns.ts
@@ -1,6 +1,6 @@
 import { collection, query, where, orderBy } from 'firebase/firestore'
 import _ from 'lodash'
-import { Txn } from '../../../common/txn'
+import { Txn } from 'common/txn'
 
 import { db } from './init'
 import { getValues, listenForValues } from './utils'
diff --git a/web/lib/firebase/users.ts b/web/lib/firebase/users.ts
index 8b8523c6..594786ab 100644
--- a/web/lib/firebase/users.ts
+++ b/web/lib/firebase/users.ts
@@ -21,10 +21,10 @@ import {
 import _ from 'lodash'
 
 import { app } from './init'
-import { PrivateUser, User } from '../../../common/user'
+import { PrivateUser, User } from 'common/user'
 import { createUser } from './api-call'
 import { getValue, getValues, listenForValue, listenForValues } from './utils'
-import { DAY_MS } from '../../../common/util/time'
+import { DAY_MS } from 'common/util/time'
 import { Contract } from './contracts'
 import { Bet } from './bets'
 import { Comment } from './comments'
diff --git a/web/lib/service/stripe.ts b/web/lib/service/stripe.ts
index 6c093483..395f7093 100644
--- a/web/lib/service/stripe.ts
+++ b/web/lib/service/stripe.ts
@@ -1,4 +1,4 @@
-import { PROJECT_ID } from '../../../common/envs/constants'
+import { PROJECT_ID } from 'common/envs/constants'
 
 export const checkoutURL = (
   userId: string,
diff --git a/web/pages/404.tsx b/web/pages/404.tsx
index 3d646902..b9f0b72d 100644
--- a/web/pages/404.tsx
+++ b/web/pages/404.tsx
@@ -1,6 +1,6 @@
-import { IS_PRIVATE_MANIFOLD } from '../../common/envs/constants'
-import { Page } from '../components/page'
-import { Title } from '../components/title'
+import { IS_PRIVATE_MANIFOLD } from 'common/envs/constants'
+import { Page } from 'web/components/page'
+import { Title } from 'web/components/title'
 
 export default function Custom404() {
   if (IS_PRIVATE_MANIFOLD) {
diff --git a/web/pages/[username]/[contractSlug].tsx b/web/pages/[username]/[contractSlug].tsx
index 34ed776a..96b5feee 100644
--- a/web/pages/[username]/[contractSlug].tsx
+++ b/web/pages/[username]/[contractSlug].tsx
@@ -1,39 +1,39 @@
 import React, { useEffect, useState } from 'react'
 import { ArrowLeftIcon } from '@heroicons/react/outline'
 
-import { useContractWithPreload } from '../../hooks/use-contract'
-import { ContractOverview } from '../../components/contract/contract-overview'
-import { BetPanel } from '../../components/bet-panel'
-import { Col } from '../../components/layout/col'
-import { useUser } from '../../hooks/use-user'
-import { ResolutionPanel } from '../../components/resolution-panel'
-import { Title } from '../../components/title'
-import { Spacer } from '../../components/layout/spacer'
-import { listUsers, User } from '../../lib/firebase/users'
+import { useContractWithPreload } from 'web/hooks/use-contract'
+import { ContractOverview } from 'web/components/contract/contract-overview'
+import { BetPanel } from 'web/components/bet-panel'
+import { Col } from 'web/components/layout/col'
+import { useUser } from 'web/hooks/use-user'
+import { ResolutionPanel } from 'web/components/resolution-panel'
+import { Title } from 'web/components/title'
+import { Spacer } from 'web/components/layout/spacer'
+import { listUsers, User } from 'web/lib/firebase/users'
 import {
   Contract,
   getContractFromSlug,
   tradingAllowed,
   getBinaryProbPercent,
-} from '../../lib/firebase/contracts'
-import { SEO } from '../../components/SEO'
-import { Page } from '../../components/page'
-import { Bet, listAllBets } from '../../lib/firebase/bets'
-import { Comment, listAllComments } from '../../lib/firebase/comments'
+} from 'web/lib/firebase/contracts'
+import { SEO } from 'web/components/SEO'
+import { Page } from 'web/components/page'
+import { Bet, listAllBets } from 'web/lib/firebase/bets'
+import { Comment, listAllComments } from 'web/lib/firebase/comments'
 import Custom404 from '../404'
-import { AnswersPanel } from '../../components/answers/answers-panel'
-import { fromPropz, usePropz } from '../../hooks/use-propz'
-import { Leaderboard } from '../../components/leaderboard'
+import { AnswersPanel } from 'web/components/answers/answers-panel'
+import { fromPropz, usePropz } from 'web/hooks/use-propz'
+import { Leaderboard } from 'web/components/leaderboard'
 import _ from 'lodash'
-import { resolvedPayout } from '../../../common/calculate'
-import { formatMoney } from '../../../common/util/format'
-import { FeedBet, FeedComment } from '../../components/feed/feed-items'
-import { useUserById } from '../../hooks/use-users'
-import { ContractTabs } from '../../components/contract/contract-tabs'
-import { FirstArgument } from '../../../common/util/types'
-import { DPM, FreeResponse, FullContract } from '../../../common/contract'
-import { contractTextDetails } from '../../components/contract/contract-details'
-import { useWindowSize } from '../../hooks/use-window-size'
+import { resolvedPayout } from 'common/calculate'
+import { formatMoney } from 'common/util/format'
+import { FeedBet, FeedComment } from 'web/components/feed/feed-items'
+import { useUserById } from 'web/hooks/use-users'
+import { ContractTabs } from 'web/components/contract/contract-tabs'
+import { FirstArgument } from 'common/util/types'
+import { DPM, FreeResponse, FullContract } from 'common/contract'
+import { contractTextDetails } from 'web/components/contract/contract-details'
+import { useWindowSize } from 'web/hooks/use-window-size'
 import Confetti from 'react-confetti'
 
 export const getStaticProps = fromPropz(getStaticPropz)
diff --git a/web/pages/[username]/index.tsx b/web/pages/[username]/index.tsx
index e1e63260..cbc53235 100644
--- a/web/pages/[username]/index.tsx
+++ b/web/pages/[username]/index.tsx
@@ -1,9 +1,9 @@
 import { useRouter } from 'next/router'
 import React, { useEffect, useState } from 'react'
 
-import { getUserByUsername, User } from '../../lib/firebase/users'
-import { UserPage } from '../../components/user-page'
-import { useUser } from '../../hooks/use-user'
+import { getUserByUsername, User } from 'web/lib/firebase/users'
+import { UserPage } from 'web/components/user-page'
+import { useUser } from 'web/hooks/use-user'
 import Custom404 from '../404'
 
 export default function UserProfile() {
diff --git a/web/pages/_app.tsx b/web/pages/_app.tsx
index 6a9c4414..1bf84c39 100644
--- a/web/pages/_app.tsx
+++ b/web/pages/_app.tsx
@@ -1,7 +1,7 @@
 import 'tailwindcss/tailwind.css'
 import type { AppProps } from 'next/app'
 import Head from 'next/head'
-import { usePreserveScroll } from '../hooks/use-preserve-scroll'
+import { usePreserveScroll } from 'web/hooks/use-preserve-scroll'
 
 function MyApp({ Component, pageProps }: AppProps) {
   usePreserveScroll()
diff --git a/web/pages/_document.tsx b/web/pages/_document.tsx
index 18329b12..461103bd 100644
--- a/web/pages/_document.tsx
+++ b/web/pages/_document.tsx
@@ -1,5 +1,5 @@
 import { Html, Head, Main, NextScript } from 'next/document'
-import { ENV_CONFIG } from '../../common/envs/constants'
+import { ENV_CONFIG } from 'common/envs/constants'
 
 export default function Document() {
   return (
diff --git a/web/pages/about.tsx b/web/pages/about.tsx
index 3f0fcead..d2a1bee2 100644
--- a/web/pages/about.tsx
+++ b/web/pages/about.tsx
@@ -1,7 +1,7 @@
 import { cloneElement } from 'react'
-import { CREATOR_FEE } from '../../common/fees'
-import { Page } from '../components/page'
-import { SEO } from '../components/SEO'
+import { CREATOR_FEE } from 'common/fees'
+import { Page } from 'web/components/page'
+import { SEO } from 'web/components/SEO'
 import styles from './about.module.css'
 
 export default function About() {
diff --git a/web/pages/account.tsx b/web/pages/account.tsx
index 194e3680..59d938c3 100644
--- a/web/pages/account.tsx
+++ b/web/pages/account.tsx
@@ -1,8 +1,8 @@
 import React from 'react'
-import { Page } from '../components/page'
-import { UserPage } from '../components/user-page'
-import { useUser } from '../hooks/use-user'
-import { firebaseLogin } from '../lib/firebase/users'
+import { Page } from 'web/components/page'
+import { UserPage } from 'web/components/user-page'
+import { useUser } from 'web/hooks/use-user'
+import { firebaseLogin } from 'web/lib/firebase/users'
 
 function SignInCard() {
   return (
diff --git a/web/pages/add-funds.tsx b/web/pages/add-funds.tsx
index 0bf89a3d..9812695c 100644
--- a/web/pages/add-funds.tsx
+++ b/web/pages/add-funds.tsx
@@ -1,11 +1,11 @@
 import { useState } from 'react'
-import { Col } from '../components/layout/col'
-import { SEO } from '../components/SEO'
-import { Title } from '../components/title'
-import { FundsSelector } from '../components/yes-no-selector'
-import { useUser } from '../hooks/use-user'
-import { checkoutURL } from '../lib/service/stripe'
-import { Page } from '../components/page'
+import { Col } from 'web/components/layout/col'
+import { SEO } from 'web/components/SEO'
+import { Title } from 'web/components/title'
+import { FundsSelector } from 'web/components/yes-no-selector'
+import { useUser } from 'web/hooks/use-user'
+import { checkoutURL } from 'web/lib/service/stripe'
+import { Page } from 'web/components/page'
 
 export default function AddFundsPage() {
   const user = useUser()
diff --git a/web/pages/admin.tsx b/web/pages/admin.tsx
index e71e1cf1..cea82e8b 100644
--- a/web/pages/admin.tsx
+++ b/web/pages/admin.tsx
@@ -1,14 +1,14 @@
-import { Page } from '../components/page'
+import { Page } from 'web/components/page'
 import { Grid, _ as r } from 'gridjs-react'
 import 'gridjs/dist/theme/mermaid.css'
 import { html } from 'gridjs'
 import dayjs from 'dayjs'
-import { usePrivateUsers, useUsers } from '../hooks/use-users'
+import { usePrivateUsers, useUsers } from 'web/hooks/use-users'
 import Custom404 from './404'
-import { useContracts } from '../hooks/use-contracts'
+import { useContracts } from 'web/hooks/use-contracts'
 import _ from 'lodash'
-import { useAdmin } from '../hooks/use-admin'
-import { contractPath } from '../lib/firebase/contracts'
+import { useAdmin } from 'web/hooks/use-admin'
+import { contractPath } from 'web/lib/firebase/contracts'
 
 function avatarHtml(avatarUrl: string) {
   return `<img
diff --git a/web/pages/analytics.tsx b/web/pages/analytics.tsx
index ef3b89a2..df8c375e 100644
--- a/web/pages/analytics.tsx
+++ b/web/pages/analytics.tsx
@@ -1,20 +1,20 @@
 import dayjs from 'dayjs'
 import _ from 'lodash'
-import { IS_PRIVATE_MANIFOLD } from '../../common/envs/constants'
+import { IS_PRIVATE_MANIFOLD } from 'common/envs/constants'
 import {
   DailyCountChart,
   DailyPercentChart,
-} from '../components/analytics/charts'
-import { Col } from '../components/layout/col'
-import { Spacer } from '../components/layout/spacer'
-import { Tabs } from '../components/layout/tabs'
-import { Page } from '../components/page'
-import { Title } from '../components/title'
-import { fromPropz, usePropz } from '../hooks/use-propz'
-import { getDailyBets } from '../lib/firebase/bets'
-import { getDailyComments } from '../lib/firebase/comments'
-import { getDailyContracts } from '../lib/firebase/contracts'
-import { getDailyNewUsers } from '../lib/firebase/users'
+} from 'web/components/analytics/charts'
+import { Col } from 'web/components/layout/col'
+import { Spacer } from 'web/components/layout/spacer'
+import { Tabs } from 'web/components/layout/tabs'
+import { Page } from 'web/components/page'
+import { Title } from 'web/components/title'
+import { fromPropz, usePropz } from 'web/hooks/use-propz'
+import { getDailyBets } from 'web/lib/firebase/bets'
+import { getDailyComments } from 'web/lib/firebase/comments'
+import { getDailyContracts } from 'web/lib/firebase/contracts'
+import { getDailyNewUsers } from 'web/lib/firebase/users'
 
 export const getStaticProps = fromPropz(getStaticPropz)
 export async function getStaticPropz() {
diff --git a/web/pages/charity/[charitySlug].tsx b/web/pages/charity/[charitySlug].tsx
index 6869ede8..53e9fecd 100644
--- a/web/pages/charity/[charitySlug].tsx
+++ b/web/pages/charity/[charitySlug].tsx
@@ -1,23 +1,23 @@
 import _ from 'lodash'
 import clsx from 'clsx'
 import { useEffect, useRef, useState } from 'react'
-import { Col } from '../../components/layout/col'
-import { Row } from '../../components/layout/row'
-import { Page } from '../../components/page'
-import { Title } from '../../components/title'
-import { BuyAmountInput } from '../../components/amount-input'
-import { Spacer } from '../../components/layout/spacer'
-import { User } from '../../../common/user'
-import { useUser } from '../../hooks/use-user'
-import { Linkify } from '../../components/linkify'
-import { transact } from '../../lib/firebase/api-call'
-import { charities, Charity } from '../../../common/charity'
+import { Col } from 'web/components/layout/col'
+import { Row } from 'web/components/layout/row'
+import { Page } from 'web/components/page'
+import { Title } from 'web/components/title'
+import { BuyAmountInput } from 'web/components/amount-input'
+import { Spacer } from 'web/components/layout/spacer'
+import { User } from 'common/user'
+import { useUser } from 'web/hooks/use-user'
+import { Linkify } from 'web/components/linkify'
+import { transact } from 'web/lib/firebase/api-call'
+import { charities, Charity } from 'common/charity'
 import { useRouter } from 'next/router'
 import Custom404 from '../404'
-import { useCharityTxns } from '../../hooks/use-charity-txns'
-import { useWindowSize } from '../../hooks/use-window-size'
+import { useCharityTxns } from 'web/hooks/use-charity-txns'
+import { useWindowSize } from 'web/hooks/use-window-size'
 import Confetti from 'react-confetti'
-import { Donation } from '../../components/charity/feed-items'
+import { Donation } from 'web/components/charity/feed-items'
 import Image from 'next/image'
 
 export const manaToUSD = (mana: number) =>
diff --git a/web/pages/charity/index.tsx b/web/pages/charity/index.tsx
index bd729571..a6444053 100644
--- a/web/pages/charity/index.tsx
+++ b/web/pages/charity/index.tsx
@@ -1,13 +1,13 @@
 import _ from 'lodash'
 import { useState, useMemo } from 'react'
-import { charities, Charity as CharityType } from '../../../common/charity'
-import { CharityCard } from '../../components/charity/charity-card'
-import { Col } from '../../components/layout/col'
-import { Spacer } from '../../components/layout/spacer'
-import { Page } from '../../components/page'
-import { SiteLink } from '../../components/site-link'
-import { Title } from '../../components/title'
-import { getAllCharityTxns } from '../../lib/firebase/txns'
+import { charities, Charity as CharityType } from 'common/charity'
+import { CharityCard } from 'web/components/charity/charity-card'
+import { Col } from 'web/components/layout/col'
+import { Spacer } from 'web/components/layout/spacer'
+import { Page } from 'web/components/page'
+import { SiteLink } from 'web/components/site-link'
+import { Title } from 'web/components/title'
+import { getAllCharityTxns } from 'web/lib/firebase/txns'
 
 export async function getStaticProps() {
   const txns = await getAllCharityTxns()
diff --git a/web/pages/create.tsx b/web/pages/create.tsx
index 9f4dae84..26d5e710 100644
--- a/web/pages/create.tsx
+++ b/web/pages/create.tsx
@@ -4,21 +4,21 @@ import clsx from 'clsx'
 import dayjs from 'dayjs'
 import Textarea from 'react-expanding-textarea'
 
-import { Spacer } from '../components/layout/spacer'
-import { useUser } from '../hooks/use-user'
-import { Contract, contractPath } from '../lib/firebase/contracts'
-import { createContract } from '../lib/firebase/api-call'
-import { FIXED_ANTE, MINIMUM_ANTE } from '../../common/antes'
-import { InfoTooltip } from '../components/info-tooltip'
-import { Page } from '../components/page'
-import { Title } from '../components/title'
-import { ProbabilitySelector } from '../components/probability-selector'
-import { parseWordsAsTags } from '../../common/util/parse'
-import { TagsList } from '../components/tags-list'
-import { Row } from '../components/layout/row'
-import { MAX_DESCRIPTION_LENGTH, outcomeType } from '../../common/contract'
-import { formatMoney } from '../../common/util/format'
-import { useHasCreatedContractToday } from '../hooks/use-has-created-contract-today'
+import { Spacer } from 'web/components/layout/spacer'
+import { useUser } from 'web/hooks/use-user'
+import { Contract, contractPath } from 'web/lib/firebase/contracts'
+import { createContract } from 'web/lib/firebase/api-call'
+import { FIXED_ANTE, MINIMUM_ANTE } from 'common/antes'
+import { InfoTooltip } from 'web/components/info-tooltip'
+import { Page } from 'web/components/page'
+import { Title } from 'web/components/title'
+import { ProbabilitySelector } from 'web/components/probability-selector'
+import { parseWordsAsTags } from 'common/util/parse'
+import { TagsList } from 'web/components/tags-list'
+import { Row } from 'web/components/layout/row'
+import { MAX_DESCRIPTION_LENGTH, outcomeType } from 'common/contract'
+import { formatMoney } from 'common/util/format'
+import { useHasCreatedContractToday } from 'web/hooks/use-has-created-contract-today'
 
 export default function Create() {
   const [question, setQuestion] = useState('')
diff --git a/web/pages/embed/[username]/[contractSlug].tsx b/web/pages/embed/[username]/[contractSlug].tsx
index 11b47149..7792a633 100644
--- a/web/pages/embed/[username]/[contractSlug].tsx
+++ b/web/pages/embed/[username]/[contractSlug].tsx
@@ -1,32 +1,24 @@
-import { Bet } from '../../../../common/bet'
-import {
-  Contract,
-  DPM,
-  FreeResponse,
-  FullContract,
-} from '../../../../common/contract'
-import { DOMAIN } from '../../../../common/envs/constants'
-import { AnswersGraph } from '../../../components/answers/answers-graph'
+import { Bet } from 'common/bet'
+import { Contract, DPM, FreeResponse, FullContract } from 'common/contract'
+import { DOMAIN } from 'common/envs/constants'
+import { AnswersGraph } from 'web/components/answers/answers-graph'
 import {
   BinaryResolutionOrChance,
   FreeResponseResolutionOrChance,
-} from '../../../components/contract/contract-card'
-import { ContractDetails } from '../../../components/contract/contract-details'
-import { ContractProbGraph } from '../../../components/contract/contract-prob-graph'
-import { Col } from '../../../components/layout/col'
-import { Row } from '../../../components/layout/row'
-import { Spacer } from '../../../components/layout/spacer'
-import { Linkify } from '../../../components/linkify'
-import { SiteLink } from '../../../components/site-link'
-import { useContractWithPreload } from '../../../hooks/use-contract'
-import { useMeasureSize } from '../../../hooks/use-measure-size'
-import { fromPropz, usePropz } from '../../../hooks/use-propz'
-import { useWindowSize } from '../../../hooks/use-window-size'
-import { listAllBets } from '../../../lib/firebase/bets'
-import {
-  contractPath,
-  getContractFromSlug,
-} from '../../../lib/firebase/contracts'
+} from 'web/components/contract/contract-card'
+import { ContractDetails } from 'web/components/contract/contract-details'
+import { ContractProbGraph } from 'web/components/contract/contract-prob-graph'
+import { Col } from 'web/components/layout/col'
+import { Row } from 'web/components/layout/row'
+import { Spacer } from 'web/components/layout/spacer'
+import { Linkify } from 'web/components/linkify'
+import { SiteLink } from 'web/components/site-link'
+import { useContractWithPreload } from 'web/hooks/use-contract'
+import { useMeasureSize } from 'web/hooks/use-measure-size'
+import { fromPropz, usePropz } from 'web/hooks/use-propz'
+import { useWindowSize } from 'web/hooks/use-window-size'
+import { listAllBets } from 'web/lib/firebase/bets'
+import { contractPath, getContractFromSlug } from 'web/lib/firebase/contracts'
 import Custom404 from '../../404'
 
 export const getStaticProps = fromPropz(getStaticPropz)
diff --git a/web/pages/embed/analytics.tsx b/web/pages/embed/analytics.tsx
index 1441e39e..8ba2951a 100644
--- a/web/pages/embed/analytics.tsx
+++ b/web/pages/embed/analytics.tsx
@@ -1,7 +1,7 @@
-import { FirstArgument } from '../../../common/util/types'
-import { Col } from '../../components/layout/col'
-import { Spacer } from '../../components/layout/spacer'
-import { fromPropz } from '../../hooks/use-propz'
+import { FirstArgument } from 'common/util/types'
+import { Col } from 'web/components/layout/col'
+import { Spacer } from 'web/components/layout/spacer'
+import { fromPropz } from 'web/hooks/use-propz'
 import Analytics, {
   CustomAnalytics,
   FirebaseAnalytics,
@@ -12,7 +12,7 @@ export const getStaticProps = fromPropz(getStaticPropz)
 
 export default function AnalyticsEmbed(props: FirstArgument<typeof Analytics>) {
   return (
-    <Col className="w-full px-2 bg-white">
+    <Col className="w-full bg-white px-2">
       <CustomAnalytics {...props} />
       <Spacer h={8} />
       <FirebaseAnalytics />
diff --git a/web/pages/fold/[...slugs]/index.tsx b/web/pages/fold/[...slugs]/index.tsx
index b0d52793..4101bbeb 100644
--- a/web/pages/fold/[...slugs]/index.tsx
+++ b/web/pages/fold/[...slugs]/index.tsx
@@ -1,40 +1,40 @@
 import _ from 'lodash'
 
-import { Fold } from '../../../../common/fold'
-import { Comment } from '../../../../common/comment'
-import { Page } from '../../../components/page'
-import { Title } from '../../../components/title'
-import { Bet, listAllBets } from '../../../lib/firebase/bets'
-import { Contract } from '../../../lib/firebase/contracts'
+import { Fold } from 'common/fold'
+import { Comment } from 'common/comment'
+import { Page } from 'web/components/page'
+import { Title } from 'web/components/title'
+import { Bet, listAllBets } from 'web/lib/firebase/bets'
+import { Contract } from 'web/lib/firebase/contracts'
 import {
   foldPath,
   getFoldBySlug,
   getFoldContracts,
-} from '../../../lib/firebase/folds'
-import { ActivityFeed } from '../../../components/feed/activity-feed'
-import { TagsList } from '../../../components/tags-list'
-import { Row } from '../../../components/layout/row'
-import { UserLink } from '../../../components/user-page'
-import { getUser, User } from '../../../lib/firebase/users'
-import { Spacer } from '../../../components/layout/spacer'
-import { Col } from '../../../components/layout/col'
-import { useUser } from '../../../hooks/use-user'
-import { useFold } from '../../../hooks/use-fold'
-import { SearchableGrid } from '../../../components/contract/contracts-list'
+} from 'web/lib/firebase/folds'
+import { ActivityFeed } from 'web/components/feed/activity-feed'
+import { TagsList } from 'web/components/tags-list'
+import { Row } from 'web/components/layout/row'
+import { UserLink } from 'web/components/user-page'
+import { getUser, User } 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 { useFold } from 'web/hooks/use-fold'
+import { SearchableGrid } from 'web/components/contract/contracts-list'
 import { useRouter } from 'next/router'
-import { scoreCreators, scoreTraders } from '../../../../common/scoring'
-import { Leaderboard } from '../../../components/leaderboard'
-import { formatMoney } from '../../../../common/util/format'
-import { EditFoldButton } from '../../../components/folds/edit-fold-button'
+import { scoreCreators, scoreTraders } from 'common/scoring'
+import { Leaderboard } from 'web/components/leaderboard'
+import { formatMoney } from 'common/util/format'
+import { EditFoldButton } from 'web/components/folds/edit-fold-button'
 import Custom404 from '../../404'
-import { FollowFoldButton } from '../../../components/folds/follow-fold-button'
-import { SEO } from '../../../components/SEO'
-import { useTaggedContracts } from '../../../hooks/use-contracts'
-import { Linkify } from '../../../components/linkify'
-import { fromPropz, usePropz } from '../../../hooks/use-propz'
-import { filterDefined } from '../../../../common/util/array'
-import { findActiveContracts } from '../../../components/feed/find-active-contracts'
-import { Tabs } from '../../../components/layout/tabs'
+import { FollowFoldButton } from 'web/components/folds/follow-fold-button'
+import { SEO } from 'web/components/SEO'
+import { useTaggedContracts } from 'web/hooks/use-contracts'
+import { Linkify } from 'web/components/linkify'
+import { fromPropz, usePropz } from 'web/hooks/use-propz'
+import { filterDefined } from 'common/util/array'
+import { findActiveContracts } from 'web/components/feed/find-active-contracts'
+import { Tabs } from 'web/components/layout/tabs'
 
 export const getStaticProps = fromPropz(getStaticPropz)
 export async function getStaticPropz(props: { params: { slugs: string[] } }) {
diff --git a/web/pages/folds.tsx b/web/pages/folds.tsx
index 4b4b8892..655b5309 100644
--- a/web/pages/folds.tsx
+++ b/web/pages/folds.tsx
@@ -1,19 +1,19 @@
 import _ from 'lodash'
 import Link from 'next/link'
 import { useEffect, useState } from 'react'
-import { Fold } from '../../common/fold'
-import { CreateFoldButton } from '../components/folds/create-fold-button'
-import { FollowFoldButton } from '../components/folds/follow-fold-button'
-import { Col } from '../components/layout/col'
-import { Row } from '../components/layout/row'
-import { Page } from '../components/page'
-import { TagsList } from '../components/tags-list'
-import { Title } from '../components/title'
-import { UserLink } from '../components/user-page'
-import { useFolds, useFollowedFoldIds } from '../hooks/use-fold'
-import { useUser } from '../hooks/use-user'
-import { foldPath, listAllFolds } from '../lib/firebase/folds'
-import { getUser, User } from '../lib/firebase/users'
+import { Fold } from 'common/fold'
+import { CreateFoldButton } from 'web/components/folds/create-fold-button'
+import { FollowFoldButton } from 'web/components/folds/follow-fold-button'
+import { Col } from 'web/components/layout/col'
+import { Row } from 'web/components/layout/row'
+import { Page } from 'web/components/page'
+import { TagsList } from 'web/components/tags-list'
+import { Title } from 'web/components/title'
+import { UserLink } from 'web/components/user-page'
+import { useFolds, useFollowedFoldIds } from 'web/hooks/use-fold'
+import { useUser } from 'web/hooks/use-user'
+import { foldPath, listAllFolds } from 'web/lib/firebase/folds'
+import { getUser, User } from 'web/lib/firebase/users'
 
 export async function getStaticProps() {
   const folds = await listAllFolds().catch((_) => [])
diff --git a/web/pages/home.tsx b/web/pages/home.tsx
index 6f1ec93c..f4dbc319 100644
--- a/web/pages/home.tsx
+++ b/web/pages/home.tsx
@@ -2,14 +2,14 @@ import React, { useEffect } from 'react'
 import Router, { useRouter } from 'next/router'
 import _ from 'lodash'
 
-import { Page } from '../components/page'
-import { ActivityFeed } from '../components/feed/activity-feed'
-import FeedCreate from '../components/feed-create'
-import { Spacer } from '../components/layout/spacer'
-import { Col } from '../components/layout/col'
-import { useUser } from '../hooks/use-user'
-import { LoadingIndicator } from '../components/loading-indicator'
-import { useAlgoFeed } from '../hooks/use-algo-feed'
+import { Page } from 'web/components/page'
+import { ActivityFeed } from 'web/components/feed/activity-feed'
+import FeedCreate from 'web/components/feed-create'
+import { Spacer } from 'web/components/layout/spacer'
+import { Col } from 'web/components/layout/col'
+import { useUser } from 'web/hooks/use-user'
+import { LoadingIndicator } from 'web/components/loading-indicator'
+import { useAlgoFeed } from 'web/hooks/use-algo-feed'
 import { ContractPageContent } from './[username]/[contractSlug]'
 
 const Home = () => {
diff --git a/web/pages/index.tsx b/web/pages/index.tsx
index eb954f3c..d20da939 100644
--- a/web/pages/index.tsx
+++ b/web/pages/index.tsx
@@ -1,12 +1,12 @@
 import React from 'react'
 import Router from 'next/router'
 
-import { Contract, getContractsBySlugs } from '../lib/firebase/contracts'
-import { Page } from '../components/page'
-import { FeedPromo } from '../components/feed-create'
-import { Col } from '../components/layout/col'
-import { useUser } from '../hooks/use-user'
-import { ManifoldLogo } from '../components/nav/manifold-logo'
+import { Contract, getContractsBySlugs } from 'web/lib/firebase/contracts'
+import { Page } from 'web/components/page'
+import { FeedPromo } from 'web/components/feed-create'
+import { Col } from 'web/components/layout/col'
+import { useUser } from 'web/hooks/use-user'
+import { ManifoldLogo } from 'web/components/nav/manifold-logo'
 
 export async function getStaticProps() {
   const hotContracts = await getContractsBySlugs([
diff --git a/web/pages/landing-page.tsx b/web/pages/landing-page.tsx
index 7bf01fa9..507e67dd 100644
--- a/web/pages/landing-page.tsx
+++ b/web/pages/landing-page.tsx
@@ -7,11 +7,11 @@ import {
   ArrowDownIcon,
 } from '@heroicons/react/outline'
 
-import { firebaseLogin } from '../lib/firebase/users'
-import { ContractsGrid } from '../components/contract/contracts-list'
-import { Col } from '../components/layout/col'
+import { firebaseLogin } from 'web/lib/firebase/users'
+import { ContractsGrid } from 'web/components/contract/contracts-list'
+import { Col } from 'web/components/layout/col'
 import Link from 'next/link'
-import { Contract } from '../lib/firebase/contracts'
+import { Contract } from 'web/lib/firebase/contracts'
 
 export default function LandingPage(props: { hotContracts: Contract[] }) {
   const { hotContracts } = props
diff --git a/web/pages/leaderboards.tsx b/web/pages/leaderboards.tsx
index 38e31cd5..32fc3ad7 100644
--- a/web/pages/leaderboards.tsx
+++ b/web/pages/leaderboards.tsx
@@ -1,11 +1,11 @@
 import _ from 'lodash'
 
-import { Col } from '../components/layout/col'
-import { Leaderboard } from '../components/leaderboard'
-import { Page } from '../components/page'
-import { getTopCreators, getTopTraders, User } from '../lib/firebase/users'
-import { formatMoney } from '../../common/util/format'
-import { fromPropz, usePropz } from '../hooks/use-propz'
+import { Col } from 'web/components/layout/col'
+import { Leaderboard } from 'web/components/leaderboard'
+import { Page } from 'web/components/page'
+import { getTopCreators, getTopTraders, User } from 'web/lib/firebase/users'
+import { formatMoney } from 'common/util/format'
+import { fromPropz, usePropz } from 'web/hooks/use-propz'
 
 export const getStaticProps = fromPropz(getStaticPropz)
 export async function getStaticPropz() {
diff --git a/web/pages/make-predictions.tsx b/web/pages/make-predictions.tsx
index fa7ef5c7..54929bd7 100644
--- a/web/pages/make-predictions.tsx
+++ b/web/pages/make-predictions.tsx
@@ -4,20 +4,20 @@ import Link from 'next/link'
 import { useState } from 'react'
 import Textarea from 'react-expanding-textarea'
 
-import { getProbability } from '../../common/calculate'
-import { Binary, CPMM, DPM, FullContract } from '../../common/contract'
-import { parseWordsAsTags } from '../../common/util/parse'
-import { BuyAmountInput } from '../components/amount-input'
-import { InfoTooltip } from '../components/info-tooltip'
-import { Col } from '../components/layout/col'
-import { Row } from '../components/layout/row'
-import { Spacer } from '../components/layout/spacer'
-import { Linkify } from '../components/linkify'
-import { Page } from '../components/page'
-import { Title } from '../components/title'
-import { useUser } from '../hooks/use-user'
-import { createContract } from '../lib/firebase/api-call'
-import { contractPath } from '../lib/firebase/contracts'
+import { getProbability } from 'common/calculate'
+import { Binary, CPMM, DPM, FullContract } from 'common/contract'
+import { parseWordsAsTags } from 'common/util/parse'
+import { BuyAmountInput } from 'web/components/amount-input'
+import { InfoTooltip } from 'web/components/info-tooltip'
+import { Col } from 'web/components/layout/col'
+import { Row } from 'web/components/layout/row'
+import { Spacer } from 'web/components/layout/spacer'
+import { Linkify } from 'web/components/linkify'
+import { Page } from 'web/components/page'
+import { Title } from 'web/components/title'
+import { useUser } from 'web/hooks/use-user'
+import { createContract } from 'web/lib/firebase/api-call'
+import { contractPath } from 'web/lib/firebase/contracts'
 
 type Prediction = {
   question: string
diff --git a/web/pages/markets.tsx b/web/pages/markets.tsx
index 23ff2adf..b745b8e4 100644
--- a/web/pages/markets.tsx
+++ b/web/pages/markets.tsx
@@ -1,12 +1,12 @@
 import {
   ContractsGrid,
   SearchableGrid,
-} from '../components/contract/contracts-list'
-import { Page } from '../components/page'
-import { SEO } from '../components/SEO'
-import { Title } from '../components/title'
-import { useContracts } from '../hooks/use-contracts'
-import { Contract } from '../lib/firebase/contracts'
+} from 'web/components/contract/contracts-list'
+import { Page } from 'web/components/page'
+import { SEO } from 'web/components/SEO'
+import { Title } from 'web/components/title'
+import { useContracts } from 'web/hooks/use-contracts'
+import { Contract } from 'web/lib/firebase/contracts'
 
 // TODO: Rename endpoint to "Explore"
 export default function Markets() {
diff --git a/web/pages/portfolio.tsx b/web/pages/portfolio.tsx
index 99bb7a0a..8b1f07ad 100644
--- a/web/pages/portfolio.tsx
+++ b/web/pages/portfolio.tsx
@@ -1,11 +1,11 @@
 import Router from 'next/router'
 import { useEffect } from 'react'
 
-import { BetsList } from '../components/bets-list'
-import { Page } from '../components/page'
-import { SEO } from '../components/SEO'
-import { Title } from '../components/title'
-import { useUser } from '../hooks/use-user'
+import { BetsList } from 'web/components/bets-list'
+import { Page } from 'web/components/page'
+import { SEO } from 'web/components/SEO'
+import { Title } from 'web/components/title'
+import { useUser } from 'web/hooks/use-user'
 
 export default function PortfolioPage() {
   const user = useUser()
diff --git a/web/pages/profile.tsx b/web/pages/profile.tsx
index f637a4f2..2fab545b 100644
--- a/web/pages/profile.tsx
+++ b/web/pages/profile.tsx
@@ -2,24 +2,21 @@ import { useEffect, useState } from 'react'
 import { PencilIcon } from '@heroicons/react/outline'
 import Router from 'next/router'
 
-import { AddFundsButton } from '../components/add-funds-button'
-import { Page } from '../components/page'
-import { SEO } from '../components/SEO'
-import { Title } from '../components/title'
-import { usePrivateUser, useUser } from '../hooks/use-user'
-import { formatMoney } from '../../common/util/format'
-import {
-  cleanDisplayName,
-  cleanUsername,
-} from '../../common/util/clean-username'
-import { changeUserInfo } from '../lib/firebase/api-call'
-import { uploadImage } from '../lib/firebase/storage'
-import { Col } from '../components/layout/col'
-import { Row } from '../components/layout/row'
-import { User } from '../../common/user'
-import { updateUser } from '../lib/firebase/users'
-import { defaultBannerUrl } from '../components/user-page'
-import { SiteLink } from '../components/site-link'
+import { AddFundsButton } from 'web/components/add-funds-button'
+import { Page } from 'web/components/page'
+import { SEO } from 'web/components/SEO'
+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/api-call'
+import { uploadImage } from 'web/lib/firebase/storage'
+import { Col } from 'web/components/layout/col'
+import { Row } from 'web/components/layout/row'
+import { User } from 'common/user'
+import { updateUser } from 'web/lib/firebase/users'
+import { defaultBannerUrl } from 'web/components/user-page'
+import { SiteLink } from 'web/components/site-link'
 import Textarea from 'react-expanding-textarea'
 
 function EditUserField(props: {
diff --git a/web/pages/server-sitemap.xml.tsx b/web/pages/server-sitemap.xml.tsx
index 9a3cdfe8..d837b26e 100644
--- a/web/pages/server-sitemap.xml.tsx
+++ b/web/pages/server-sitemap.xml.tsx
@@ -2,7 +2,7 @@ import _ from 'lodash'
 import { GetServerSideProps } from 'next'
 import { getServerSideSitemap, ISitemapField } from 'next-sitemap'
 
-import { DOMAIN } from '../../common/envs/constants'
+import { DOMAIN } from 'common/envs/constants'
 import { LiteMarket } from './api/v0/_types'
 
 export const getServerSideProps: GetServerSideProps = async (ctx) => {
diff --git a/web/pages/simulator.tsx b/web/pages/simulator.tsx
index 7c48302e..bbf7408e 100644
--- a/web/pages/simulator.tsx
+++ b/web/pages/simulator.tsx
@@ -2,8 +2,8 @@ import React, { useMemo, useState } from 'react'
 import { DatumValue } from '@nivo/core'
 import { ResponsiveLine } from '@nivo/line'
 
-import { Entry, makeEntries } from '../lib/simulator/entries'
-import { Col } from '../components/layout/col'
+import { Entry, makeEntries } from 'web/lib/simulator/entries'
+import { Col } from 'web/components/layout/col'
 
 function TableBody(props: { entries: Entry[] }) {
   return (
diff --git a/web/pages/tag/[tag].tsx b/web/pages/tag/[tag].tsx
index cabc6c80..c1d4d01f 100644
--- a/web/pages/tag/[tag].tsx
+++ b/web/pages/tag/[tag].tsx
@@ -1,12 +1,12 @@
 import { useEffect, useState } from 'react'
 import { useRouter } from 'next/router'
-import { SearchableGrid } from '../../components/contract/contracts-list'
-import { Page } from '../../components/page'
-import { Title } from '../../components/title'
+import { SearchableGrid } from 'web/components/contract/contracts-list'
+import { Page } from 'web/components/page'
+import { Title } from 'web/components/title'
 import {
   Contract,
   listTaggedContractsCaseInsensitive,
-} from '../../lib/firebase/contracts'
+} from 'web/lib/firebase/contracts'
 
 export default function TagPage() {
   const router = useRouter()
diff --git a/web/pages/trades.tsx b/web/pages/trades.tsx
index 906b631d..55a08bc6 100644
--- a/web/pages/trades.tsx
+++ b/web/pages/trades.tsx
@@ -1,7 +1,7 @@
 import Router from 'next/router'
 import { useEffect } from 'react'
 
-import { useUser } from '../hooks/use-user'
+import { useUser } from 'web/hooks/use-user'
 
 // Deprecated: redirects to /portfolio.
 // Eventually, this will be removed.

From 5c1bc78408871a562f3638ccf7efae4f655a579a Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Mon, 9 May 2022 10:18:05 -0400
Subject: [PATCH 33/34] Revert avatar component changes

---
 web/components/avatar.tsx | 48 ++++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/web/components/avatar.tsx b/web/components/avatar.tsx
index 706b61f3..318c5498 100644
--- a/web/components/avatar.tsx
+++ b/web/components/avatar.tsx
@@ -8,8 +8,10 @@ export function Avatar(props: {
   noLink?: boolean
   size?: number | 'xs' | 'sm'
   className?: string
+  containerClassName?: string
 }) {
-  const { username, avatarUrl, noLink, size, className } = props
+  const { username, avatarUrl, noLink, size, className, containerClassName } =
+    props
   const s = size == 'xs' ? 6 : size === 'sm' ? 8 : size || 10
 
   const onClick =
@@ -19,28 +21,32 @@ export function Avatar(props: {
           e.stopPropagation()
           Router.push(`/${username}`)
         }
-
-  // there can be no avatar URL or username in the feed, we show a "submit comment"
-  // item with a fake grey user circle guy even if you aren't signed in
-  return avatarUrl ? (
-    <img
+  return (
+    <div
       className={clsx(
-        'flex-shrink-0 rounded-full rounded-full bg-white object-cover',
-        `w-${s} h-${s}`,
-        !noLink && 'cursor-pointer',
-        className
+        `flex-shrink-0 rounded-full bg-white w-${s} h-${s}`,
+        containerClassName
       )}
-      src={avatarUrl}
-      onClick={onClick}
-      alt={username}
-    />
-  ) : (
-    <UserCircleIcon
-      className={clsx(
-        `flex-shrink-0 rounded-full bg-white w-${s} h-${s} text-gray-500`,
-        className
+    >
+      {avatarUrl ? (
+        <img
+          className={clsx(
+            'flex items-center justify-center rounded-full object-cover',
+            `w-${s} h-${s}`,
+            !noLink && 'cursor-pointer',
+            className
+          )}
+          src={avatarUrl}
+          onClick={onClick}
+          alt={username}
+        />
+      ) : (
+        // TODO: After 2022-03-01, can just assume that all contracts have an avatarUrl
+        <UserCircleIcon
+          className={`w-${s} h-${s} text-gray-500`}
+          aria-hidden="true"
+        />
       )}
-      aria-hidden="true"
-    />
+    </div>
   )
 }

From 8fbbeffd3849cecf17c25f7f9535ccca47092ed4 Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Mon, 9 May 2022 10:33:52 -0400
Subject: [PATCH 34/34] Revert one more avatar component change

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

diff --git a/web/components/nav/nav-bar.tsx b/web/components/nav/nav-bar.tsx
index f92f6630..8f7d7424 100644
--- a/web/components/nav/nav-bar.tsx
+++ b/web/components/nav/nav-bar.tsx
@@ -60,7 +60,7 @@ export function BottomNavBar() {
         ) : user ? (
           <>
             <Avatar
-              className="mx-auto my-1"
+              containerClassName={'mx-auto my-1'}
               size="xs"
               username={user.username}
               avatarUrl={user.avatarUrl}