Skip to content

simpler people components #29062

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chrisnojima-zoom wants to merge 1 commit into
base: nojima/HOTPOT-next-670-clean
Choose a base branch
from
+131 −143
Open

simpler people components #29062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions shared/people/index.shared.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@ import {useSignupState} from '@/stores/signup'
import {usePeopleState} from '@/stores/people'
// import WotTask from './wot-task'

const itemToComponent: (item: T.Immutable<T.People.PeopleScreenItem>, props: Props) => React.ReactNode = (
item,
props
) => {
const renderPeopleItem = (item: T.Immutable<T.People.PeopleScreenItem>, props: Props): React.ReactNode => {
switch (item.type) {
case 'todo':
return (
Expand Down Expand Up @@ -60,6 +57,17 @@ const itemToComponent: (item: T.Immutable<T.People.PeopleScreenItem>, props: Pro
}
}

const shouldRenderNewItem = (item: T.Immutable<T.People.PeopleScreenItem>, signupEmail: string) =>
item.type !== 'todo' || item.todoType !== 'verifyAllEmail' || !signupEmail

const PeopleItems = ({
items,
props,
}: {
items: ReadonlyArray<T.Immutable<T.People.PeopleScreenItem>>
props: Props
}) => items.map(item => renderPeopleItem(item, props))

function EmailVerificationBanner() {
const clearJustSignedUpEmail = useSignupState(s => s.dispatch.clearJustSignedUpEmail)
const signupEmail = useSignupState(s => s.justSignedUpEmail)
Expand Down Expand Up @@ -113,13 +121,13 @@ function ResentEmailVerificationBanner() {
}

export function PeoplePageList(props: Props) {
const visibleNewItems = props.newItems.filter(item => shouldRenderNewItem(item, props.signupEmail))

return (
<Kb.Box2 direction="vertical" fullWidth={true} relative={true}>
<EmailVerificationBanner />
<ResentEmailVerificationBanner />
{props.newItems
.filter(item => item.type !== 'todo' || item.todoType !== 'verifyAllEmail' || !props.signupEmail)
.map((item): React.ReactNode => itemToComponent(item, props))}
<PeopleItems items={visibleNewItems} props={props} />
{/*Array.from(props.wotUpdates, ([key, item]) => (
<WotTask
key={key}
Expand All @@ -131,7 +139,7 @@ export function PeoplePageList(props: Props) {
))*/}

<FollowSuggestions suggestions={props.followSuggestions} />
{props.oldItems.map((item): React.ReactNode => itemToComponent(item, props))}
<PeopleItems items={props.oldItems} props={props} />
</Kb.Box2>
)
}
Loading
Loading