open.source/manifold
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up some markup & dead code

Browse Source
This commit is contained in:
Marshall Polaris 2022-08-30 12:36:08 -07:00
parent d658a48b66
commit 5b6db12720
2 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
web/components/feed/feed-liquidity.tsx
View File

@ -1,3 +1,4 @@
import clsx from 'clsx'
import dayjs from 'dayjs' import dayjs from 'dayjs'
import { User } from 'common/user' import { User } from 'common/user'
import { useUser, useUserById } from 'web/hooks/use-user' import { useUser, useUserById } from 'web/hooks/use-user'
@ -24,26 +25,23 @@ export function FeedLiquidity(props: {
const isSelf = user?.id === userId const isSelf = user?.id === userId
return ( return (
<> <Row className="flex w-full gap-2 pt-3">
<Row className="flex w-full gap-2 pt-3"> {isSelf ? (
{isSelf ? ( <Avatar avatarUrl={user.avatarUrl} username={user.username} />
<Avatar avatarUrl={user.avatarUrl} username={user.username} /> ) : bettor ? (
) : bettor ? ( <Avatar avatarUrl={bettor.avatarUrl} username={bettor.username} />
<Avatar avatarUrl={bettor.avatarUrl} username={bettor.username} /> ) : (
) : ( <div className="relative px-1">
<div className="relative px-1"> <EmptyAvatar />
<EmptyAvatar />
</div>
)}
<div className={'min-w-0 flex-1 py-1.5'}>
<LiquidityStatusText
liquidity={liquidity}
isSelf={isSelf}
bettor={bettor}
/>
</div> </div>
</Row> )}
</> <LiquidityStatusText
liquidity={liquidity}
isSelf={isSelf}
bettor={bettor}
className={'flex-1'}
/>
</Row>
) )
} }
@ -51,8 +49,9 @@ export function LiquidityStatusText(props: {
liquidity: LiquidityProvision liquidity: LiquidityProvision
isSelf: boolean isSelf: boolean
bettor?: User bettor?: User
className?: string
}) { }) {
const { liquidity, bettor, isSelf } = props const { liquidity, bettor, isSelf, className } = props
const { amount, createdTime } = liquidity const { amount, createdTime } = liquidity
// TODO: Withdrawn liquidity will never be shown, since liquidity amounts currently are zeroed out upon withdrawal. // TODO: Withdrawn liquidity will never be shown, since liquidity amounts currently are zeroed out upon withdrawal.
@ -60,7 +59,7 @@ export function LiquidityStatusText(props: {
const money = formatMoney(Math.abs(amount)) const money = formatMoney(Math.abs(amount))
return ( return (
<div className="text-sm text-gray-500"> <div className={clsx(className, 'text-sm text-gray-500')}>
{bettor ? ( {bettor ? (
<UserLink name={bettor.name} username={bettor.username} /> <UserLink name={bettor.name} username={bettor.username} />
) : ( ) : (

4
web/components/user-link.tsx
View File

@ -24,11 +24,10 @@ function shortenName(name: string) {
export function UserLink(props: { export function UserLink(props: {
name: string name: string
username: string username: string
showUsername?: boolean
className?: string className?: string
short?: boolean short?: boolean
}) { }) {
const { name, username, showUsername, className, short } = props const { name, username, className, short } = props
const shortName = short ? shortenName(name) : name const shortName = short ? shortenName(name) : name
return ( return (
<SiteLink <SiteLink
@ -36,7 +35,6 @@ export function UserLink(props: {
className={clsx('z-10 truncate', className)} className={clsx('z-10 truncate', className)}
> >
{shortName} {shortName}
{showUsername && ` (@${username})`}
</SiteLink> </SiteLink>
) )
} }