Merge branch 'main' into economy

web/components/nav/sidebar.tsx

@@ -58,7 +58,14 @@ function getNavigation() {
 
 function getMoreNavigation(user?: User | null) {
   if (IS_PRIVATE_MANIFOLD) {
-    return [{ name: 'Leaderboards', href: '/leaderboards' }]
+    return [
+      { name: 'Leaderboards', href: '/leaderboards' },
+      {
+        name: 'Sign out',
+        href: '#',
+        onClick: logout,
+      },
+    ]
   }
 
   if (!user) {

web/components/portfolio/portfolio-value-section.tsx

@@ -14,7 +14,7 @@ export const PortfolioValueSection = memo(
   }) {
     const { disableSelector, userId } = props
 
-    const [portfolioPeriod, setPortfolioPeriod] = useState<Period>('allTime')
+    const [portfolioPeriod, setPortfolioPeriod] = useState<Period>('weekly')
     const [portfolioHistory, setUsersPortfolioHistory] = useState<
       PortfolioMetrics[]
     >([])
@@ -53,13 +53,15 @@ export const PortfolioValueSection = memo(
           {!disableSelector && (
             <select
               className="select select-bordered self-start"
+              value={portfolioPeriod}
               onChange={(e) => {
                 setPortfolioPeriod(e.target.value as Period)
               }}
             >
               <option value="allTime">{allTimeLabel}</option>
-              <option value="weekly">7 days</option>
-              <option value="daily">24 hours</option>
+              <option value="weekly">Last 7d</option>
+              {/* Note: 'daily' seems to be broken? */}
+              {/* <option value="daily">Last 24h</option> */}
             </select>
           )}
         </Row>

web/components/user-page.tsx

@@ -29,6 +29,7 @@ import { formatMoney } from 'common/util/format'
 import { ShareIconButton } from 'web/components/share-icon-button'
 import { ENV_CONFIG } from 'common/envs/constants'
 import { BettingStreakModal } from 'web/components/profile/betting-streak-modal'
+import { REFERRAL_AMOUNT } from 'common/user'
 
 export function UserLink(props: {
   name: string
@@ -226,7 +227,7 @@ export function UserPage(props: { user: User }) {
           )}
         </Row>
         <Spacer h={5} />
-        {currentUser?.id === user.id && (
+        {currentUser?.id === user.id && REFERRAL_AMOUNT > 0 && (
           <Row
             className={
               'w-full items-center justify-center gap-2 rounded-md border-2 border-indigo-100 bg-indigo-50 p-2 text-indigo-600'
@@ -234,7 +235,7 @@ export function UserPage(props: { user: User }) {
           >
             <span>
               <SiteLink href="/referrals">
-                Earn {formatMoney(500)} when you refer a friend!
+                Earn {formatMoney(REFERRAL_AMOUNT)} when you refer a friend!
               </SiteLink>{' '}
               You have <ReferralsButton user={user} currentUser={currentUser} />
             </span>

web/pages/charity/index.tsx

@@ -39,8 +39,8 @@ export async function getStaticProps() {
   ])
   const matches = quadraticMatches(txns, totalRaised)
   const numDonors = uniqBy(txns, (txn) => txn.fromId).length
-  const mostRecentDonor = await getUser(txns[0].fromId)
-  const mostRecentCharity = txns[0].toId
+  const mostRecentDonor = txns[0] ? await getUser(txns[0].fromId) : null
+  const mostRecentCharity = txns[0]?.toId ?? ''
 
   return {
     props: {
@@ -94,8 +94,8 @@ export default function Charity(props: {
   matches: { [charityId: string]: number }
   txns: Txn[]
   numDonors: number
-  mostRecentDonor: User
-  mostRecentCharity: string
+  mostRecentDonor?: User | null
+  mostRecentCharity?: string
 }) {
   const {
     totalRaised,
@@ -159,8 +159,8 @@ export default function Charity(props: {
               },
               {
                 name: 'Most recent donor',
-                stat: mostRecentDonor.name ?? 'Nobody',
-                url: `/${mostRecentDonor.username}`,
+                stat: mostRecentDonor?.name ?? 'Nobody',
+                url: `/${mostRecentDonor?.username}`,
               },
               {
                 name: 'Most recent donation',