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

Remove deprecated useUserById implementation (#571)

Browse Source 
* Remove duplicate useUserById implementation

* fix bug: firebase doesn't accept empty paths
This commit is contained in:
Sinclair Chen 2022-07-13 17:43:20 -07:00 committed by GitHub
parent 095af10d4f
commit 5ebd4498a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/components/charity/feed-items.tsx
View File

@ -1,6 +1,6 @@
import { DonationTxn } from 'common/txn' import { DonationTxn } from 'common/txn'
import { Avatar } from '../avatar' import { Avatar } from '../avatar'
import { useUserById } from 'web/hooks/use-users' import { useUserById } from 'web/hooks/use-user'
import { UserLink } from '../user-page' import { UserLink } from '../user-page'
import { manaToUSD } from '../../../common/util/format' import { manaToUSD } from '../../../common/util/format'
import { RelativeTimestamp } from '../relative-timestamp' import { RelativeTimestamp } from '../relative-timestamp'

13
web/hooks/use-users.ts
View File

@ -1,7 +1,6 @@
import { useState, useEffect } from 'react' import { useState, useEffect } from 'react'
import { PrivateUser, User } from 'common/user' import { PrivateUser, User } from 'common/user'
import { import {
getUser,
listenForAllUsers, listenForAllUsers,
listenForPrivateUsers, listenForPrivateUsers,
} from 'web/lib/firebase/users' } from 'web/lib/firebase/users'
@ -20,18 +19,6 @@ export const useUsers = () => {
return users return users
} }
export const useUserById = (userId?: string) => {
const [user, setUser] = useState<User | undefined>(undefined)
useEffect(() => {
if (userId) {
getUser(userId).then(setUser)
}
}, [userId])
return user
}
export const usePrivateUsers = () => { export const usePrivateUsers = () => {
const [users, setUsers] = useState<PrivateUser[]>([]) const [users, setUsers] = useState<PrivateUser[]>([])

2
web/pages/[username]/[contractSlug].tsx
View File

@ -27,7 +27,7 @@ import { fromPropz, usePropz } from 'web/hooks/use-propz'
import { Leaderboard } from 'web/components/leaderboard' import { Leaderboard } from 'web/components/leaderboard'
import { resolvedPayout } from 'common/calculate' import { resolvedPayout } from 'common/calculate'
import { formatMoney } from 'common/util/format' import { formatMoney } from 'common/util/format'
import { useUserById } from 'web/hooks/use-users' import { useUserById } from 'web/hooks/use-user'
import { ContractTabs } from 'web/components/contract/contract-tabs' import { ContractTabs } from 'web/components/contract/contract-tabs'
import { contractTextDetails } from 'web/components/contract/contract-details' import { contractTextDetails } from 'web/components/contract/contract-details'
import { useWindowSize } from 'web/hooks/use-window-size' import { useWindowSize } from 'web/hooks/use-window-size'

4
web/pages/link/[slug].tsx
View File

@ -6,7 +6,7 @@ import { claimManalink } from 'web/lib/firebase/api'
import { useManalink } from 'web/lib/firebase/manalinks' import { useManalink } from 'web/lib/firebase/manalinks'
import { ManalinkCard } from 'web/components/manalink-card' import { ManalinkCard } from 'web/components/manalink-card'
import { useUser } from 'web/hooks/use-user' import { useUser } from 'web/hooks/use-user'
import { useUserById } from 'web/hooks/use-users' import { useUserById } from 'web/hooks/use-user'
import { firebaseLogin } from 'web/lib/firebase/users' import { firebaseLogin } from 'web/lib/firebase/users'
export default function ClaimPage() { export default function ClaimPage() {
@ -17,7 +17,7 @@ export default function ClaimPage() {
const [claiming, setClaiming] = useState(false) const [claiming, setClaiming] = useState(false)
const [error, setError] = useState<string | undefined>(undefined) const [error, setError] = useState<string | undefined>(undefined)
const fromUser = useUserById(manalink?.fromId) const fromUser = useUserById(manalink?.fromId ?? '_loading')
if (!manalink) { if (!manalink) {
return <></> return <></>
} }

2
web/pages/links.tsx
View File

@ -12,7 +12,7 @@ import { Subtitle } from 'web/components/subtitle'
import { useUser } from 'web/hooks/use-user' import { useUser } from 'web/hooks/use-user'
import { useUserManalinks } from 'web/lib/firebase/manalinks' import { useUserManalinks } from 'web/lib/firebase/manalinks'
import { fromNow } from 'web/lib/util/time' import { fromNow } from 'web/lib/util/time'
import { useUserById } from 'web/hooks/use-users' import { useUserById } from 'web/hooks/use-user'
import { ManalinkTxn } from 'common/txn' import { ManalinkTxn } from 'common/txn'
import { Avatar } from 'web/components/avatar' import { Avatar } from 'web/components/avatar'
import { RelativeTimestamp } from 'web/components/relative-timestamp' import { RelativeTimestamp } from 'web/components/relative-timestamp'