Skip to content
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

Validate list/feed ownership before prompting to add users in empty list state #7247

Merged
merged 1 commit into from
Dec 23, 2024
Merged

Validate list/feed ownership before prompting to add users in empty list state #7247

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
58 changes: 32 additions & 26 deletions src/view/screens/ProfileList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ function ProfileListScreenLoaded({
scrollElRef={scrollElRef as ListRef}
headerHeight={headerHeight}
isFocused={isScreenFocused && isFocused}
isOwner={isOwner}
onPressAddUser={onPressAddUser}
/>
)}
Expand Down Expand Up @@ -774,11 +775,12 @@ interface FeedSectionProps {
headerHeight: number
scrollElRef: ListRef
isFocused: boolean
isOwner: boolean
onPressAddUser: () => void
}
const FeedSection = React.forwardRef<SectionRef, FeedSectionProps>(
function FeedSectionImpl(
{feed, scrollElRef, headerHeight, isFocused, onPressAddUser},
{feed, scrollElRef, headerHeight, isFocused, isOwner, onPressAddUser},
ref,
) {
const queryClient = useQueryClient()
Expand Down Expand Up @@ -810,20 +812,22 @@ const FeedSection = React.forwardRef<SectionRef, FeedSectionProps>(
return (
<View style={[a.gap_xl, a.align_center]}>
<EmptyState icon="hashtag" message={_(msg`This feed is empty.`)} />
<NewButton
label={_(msg`Start adding people`)}
onPress={onPressAddUser}
color="primary"
size="small"
variant="solid">
<ButtonIcon icon={PersonPlusIcon} />
<ButtonText>
<Trans>Start adding people!</Trans>
</ButtonText>
</NewButton>
{isOwner && (
<NewButton
label={_(msg`Start adding people`)}
onPress={onPressAddUser}
color="primary"
size="small"
variant="solid">
<ButtonIcon icon={PersonPlusIcon} />
<ButtonText>
<Trans>Start adding people!</Trans>
</ButtonText>
</NewButton>
)}
</View>
)
}, [_, onPressAddUser])
}, [_, onPressAddUser, isOwner])

return (
<View>
Expand Down Expand Up @@ -928,21 +932,23 @@ const AboutSection = React.forwardRef<SectionRef, AboutSectionProps>(
icon="users-slash"
message={_(msg`This list is empty.`)}
/>
<NewButton
testID="emptyStateAddUserBtn"
label={_(msg`Start adding people`)}
onPress={onPressAddUser}
color="primary"
size="small"
variant="solid">
<ButtonIcon icon={PersonPlusIcon} />
<ButtonText>
<Trans>Start adding people!</Trans>
</ButtonText>
</NewButton>
{isOwner && (
<NewButton
testID="emptyStateAddUserBtn"
label={_(msg`Start adding people`)}
onPress={onPressAddUser}
color="primary"
size="small"
variant="solid">
<ButtonIcon icon={PersonPlusIcon} />
<ButtonText>
<Trans>Start adding people!</Trans>
</ButtonText>
</NewButton>
)}
</View>
)
}, [_, onPressAddUser])
}, [_, onPressAddUser, isOwner])

return (
<View>
Expand Down