Small updates to experimental/home (#874)

* Factor out section header

* Remove daily balance change

* Remove dead code

* Layout, add streak

* Fix visibility observer to work on server

* Tweak

* Formatting

web/components/arrange-home.tsx

@@ -111,9 +111,9 @@ export const getHomeItems = (groups: Group[], sections: string[]) => {
   if (!isArray(sections)) sections = []
 
   const items = [
-    { label: 'Daily movers', id: 'daily-movers' },
     { label: 'Trending', id: 'score' },
     { label: 'New for you', id: 'newest' },
+    { label: 'Daily movers', id: 'daily-movers' },
     ...groups.map((g) => ({
       label: g.name,
       id: g.id,

web/components/bets-list.tsx

@@ -754,7 +754,10 @@ function SellButton(props: {
   )
 }
 
-function ProfitBadge(props: { profitPercent: number; className?: string }) {
+export function ProfitBadge(props: {
+  profitPercent: number
+  className?: string
+}) {
   const { profitPercent, className } = props
   if (!profitPercent) return null
   const colors =

web/components/visibility-observer.tsx

@@ -1,4 +1,4 @@
-import { useEffect, useRef, useState } from 'react'
+import { useEffect, useState } from 'react'
 import { useEvent } from '../hooks/use-event'
 
 export function VisibilityObserver(props: {
@@ -8,18 +8,16 @@ export function VisibilityObserver(props: {
   const { className } = props
   const [elem, setElem] = useState<HTMLElement | null>(null)
   const onVisibilityUpdated = useEvent(props.onVisibilityUpdated)
-  const observer = useRef(
-    new IntersectionObserver(([entry]) => {
-      onVisibilityUpdated(entry.isIntersecting)
-    }, {})
-  ).current
 
   useEffect(() => {
     if (elem) {
+      const observer = new IntersectionObserver(([entry]) => {
+        onVisibilityUpdated(entry.isIntersecting)
+      }, {})
       observer.observe(elem)
       return () => observer.unobserve(elem)
     }
-  }, [elem, observer])
+  }, [elem, onVisibilityUpdated])
 
   return <div ref={setElem} className={className}></div>
 }

web/hooks/use-contracts.ts

@@ -1,10 +1,8 @@
 import { useFirestoreQueryData } from '@react-query-firebase/firestore'
-import { isEqual } from 'lodash'
+import { useEffect, useState } from 'react'
-import { useEffect, useRef, useState } from 'react'
 import {
   Contract,
   listenForActiveContracts,
-  listenForContract,
   listenForContracts,
   listenForHotContracts,
   listenForInactiveContracts,
@@ -62,39 +60,6 @@ export const useHotContracts = () => {
   return hotContracts
 }
 
-export const useUpdatedContracts = (contracts: Contract[] | undefined) => {
-  const [__, triggerUpdate] = useState(0)
-  const contractDict = useRef<{ [id: string]: Contract }>({})
-
-  useEffect(() => {
-    if (contracts === undefined) return
-
-    contractDict.current = Object.fromEntries(contracts.map((c) => [c.id, c]))
-
-    const disposes = contracts.map((contract) => {
-      const { id } = contract
-
-      return listenForContract(id, (contract) => {
-        const curr = contractDict.current[id]
-        if (!isEqual(curr, contract)) {
-          contractDict.current[id] = contract as Contract
-          triggerUpdate((n) => n + 1)
-        }
-      })
-    })
-
-    triggerUpdate((n) => n + 1)
-
-    return () => {
-      disposes.forEach((dispose) => dispose())
-    }
-  }, [!!contracts])
-
-  return contracts && Object.keys(contractDict.current).length > 0
-    ? contracts.map((c) => contractDict.current[c.id])
-    : undefined
-}
-
 export const usePrefetchUserBetContracts = (userId: string) => {
   const queryClient = useQueryClient()
   return queryClient.prefetchQuery(

web/pages/experimental/home/edit.tsx

@@ -28,7 +28,7 @@ export default function Home() {
     <Page>
       <Col className="pm:mx-10 gap-4 px-4 pb-6 pt-2">
         <Row className={'w-full items-center justify-between'}>
-          <Title text="Edit your home page" />
+          <Title text="Customize your home page" />
           <DoneButton />
         </Row>
 
@@ -47,7 +47,11 @@ function DoneButton(props: { className?: string }) {
 
   return (
     <SiteLink href="/experimental/home">
-      <Button size="lg" color="blue" className={clsx(className, 'flex')}>
+      <Button
+        size="lg"
+        color="blue"
+        className={clsx(className, 'flex whitespace-nowrap')}
+      >
         Done
       </Button>
     </SiteLink>

web/pages/experimental/home/index.tsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import Router from 'next/router'
 import {
-  PencilIcon,
+  AdjustmentsIcon,
   PlusSmIcon,
   ArrowSmRightIcon,
 } from '@heroicons/react/solid'
@@ -26,11 +26,12 @@ import { Row } from 'web/components/layout/row'
 import { ProbChangeTable } from 'web/components/contract/prob-change-table'
 import { groupPath } from 'web/lib/firebase/groups'
 import { usePortfolioHistory } from 'web/hooks/use-portfolio-history'
-import { calculatePortfolioProfit } from 'common/calculate-metrics'
 import { formatMoney } from 'common/util/format'
 import { useProbChanges } from 'web/hooks/use-prob-changes'
+import { ProfitBadge } from 'web/components/bets-list'
+import { calculatePortfolioProfit } from 'common/calculate-metrics'
 
-const Home = () => {
+export default function Home() {
   const user = useUser()
 
   useTracking('view home')
@@ -44,13 +45,13 @@ const Home = () => {
   return (
     <Page>
       <Col className="pm:mx-10 gap-4 px-4 pb-12">
-        <Row className={'w-full items-center justify-between'}>
+        <Row className={'mt-4 w-full items-start justify-between'}>
-          <Title className="!mb-0" text="Home" />
+          <Row className="items-end gap-4">
-
+            <Title className="!mb-1 !mt-0" text="Home" />
             <EditButton />
           </Row>
-
+          <DailyProfitAndBalance className="" user={user} />
-        <DailyProfitAndBalance userId={user?.id} />
+        </Row>
 
         {sections.map((item) => {
           const { id } = item
@@ -97,17 +98,10 @@ function SearchSection(props: {
   followed?: boolean
 }) {
   const { label, user, sort, yourBets, followed } = props
-  const href = `/home?s=${sort}`
 
   return (
     <Col>
-      <SiteLink className="mb-2 text-xl" href={href}>
+      <SectionHeader label={label} href={`/home?s=${sort}`} />
-        {label}{' '}
-        <ArrowSmRightIcon
-          className="mb-0.5 inline h-6 w-6 text-gray-500"
-          aria-hidden="true"
-        />
-      </SiteLink>
       <ContractSearch
         user={user}
         defaultSort={sort}
@@ -134,13 +128,7 @@ function GroupSection(props: {
 
   return (
     <Col>
-      <SiteLink className="mb-2 text-xl" href={groupPath(group.slug)}>
+      <SectionHeader label={group.name} href={groupPath(group.slug)} />
-        {group.name}{' '}
-        <ArrowSmRightIcon
-          className="mb-0.5 inline h-6 w-6 text-gray-500"
-          aria-hidden="true"
-        />
-      </SiteLink>
       <ContractSearch
         user={user}
         defaultSort={'score'}
@@ -159,15 +147,25 @@ function DailyMoversSection(props: { userId: string | null | undefined }) {
 
   return (
     <Col className="gap-2">
-      <SiteLink className="text-xl" href={'/daily-movers'}>
+      <SectionHeader label="Daily movers" href="daily-movers" />
-        Daily movers{' '}
+      <ProbChangeTable changes={changes} />
+    </Col>
+  )
+}
+
+function SectionHeader(props: { label: string; href: string }) {
+  const { label, href } = props
+
+  return (
+    <Row className="mb-3 items-center justify-between">
+      <SiteLink className="text-xl" href={href}>
+        {label}{' '}
         <ArrowSmRightIcon
           className="mb-0.5 inline h-6 w-6 text-gray-500"
           aria-hidden="true"
         />
       </SiteLink>
-      <ProbChangeTable changes={changes} />
+    </Row>
-    </Col>
   )
 }
 
@@ -176,45 +174,42 @@ function EditButton(props: { className?: string }) {
 
   return (
     <SiteLink href="/experimental/home/edit">
-      <Button size="lg" color="gray-white" className={clsx(className, 'flex')}>
+      <Button size="sm" color="gray-white" className={clsx(className, 'flex')}>
-        <PencilIcon className={clsx('mr-2 h-[24px] w-5')} aria-hidden="true" />{' '}
+        <AdjustmentsIcon className={clsx('h-[24px] w-5')} aria-hidden="true" />
-        Edit
       </Button>
     </SiteLink>
   )
 }
 
 function DailyProfitAndBalance(props: {
-  userId: string | null | undefined
+  user: User | null | undefined
   className?: string
 }) {
-  const { userId, className } = props
+  const { user, className } = props
-  const metrics = usePortfolioHistory(userId ?? '', 'daily') ?? []
+  const metrics = usePortfolioHistory(user?.id ?? '', 'daily') ?? []
   const [first, last] = [metrics[0], metrics[metrics.length - 1]]
 
   if (first === undefined || last === undefined) return null
 
   const profit =
     calculatePortfolioProfit(last) - calculatePortfolioProfit(first)
-
+  const profitPercent = profit / first.investmentValue
-  const balanceChange = last.balance - first.balance
 
   return (
-    <div className={clsx(className, 'text-lg')}>
+    <Row className={'gap-4'}>
-      <span className={clsx(profit >= 0 ? 'text-green-500' : 'text-red-500')}>
+      <Col>
-        {profit >= 0 && '+'}
+        <div className="text-gray-500">Daily profit</div>
-        {formatMoney(profit)}
+        <Row className={clsx(className, 'items-center text-lg')}>
-      </span>{' '}
+          <span>{formatMoney(profit)}</span>{' '}
-      profit and{' '}
+          <ProfitBadge profitPercent={profitPercent * 100} />
-      <span
+        </Row>
-        className={clsx(balanceChange >= 0 ? 'text-green-500' : 'text-red-500')}
+      </Col>
-      >
+      <Col>
-        {balanceChange >= 0 && '+'}
+        <div className="text-gray-500">Streak</div>
-        {formatMoney(balanceChange)}
+        <Row className={clsx(className, 'items-center text-lg')}>
-      </span>{' '}
+          <span>🔥 {user?.currentBettingStreak ?? 0}</span>
-      balance today
+        </Row>
-    </div>
+      </Col>
+    </Row>
   )
 }
-
-export default Home