Skip to content

chore: show content on empty follow option state #12014

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

Merged
merged 2 commits into from
Apr 29, 2025
Merged

chore: show content on empty follow option state #12014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d35cd30
chore: show content on empty state
MounirDhahri Apr 29, 2025
7168b4c
chore: hide back buttons on follows
MounirDhahri Apr 29, 2025
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
3 changes: 2 additions & 1 deletion src/app/Scenes/Favorites/Components/FollowedArtists.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ export const FollowedArtists: React.FC<Props> = ({ me }) => {
if (data.followsAndSaves?.artistsConnection?.totalCount === 0) {
return (
<Screen.ScrollView refreshControl={RefreshControl}>
<FollowOptionPicker />
<ZeroState
title="You haven’t followed any artists yet"
subtitle="When you’ve found an artist you like, follow them to get updates on new works that become available."
Expand Down Expand Up @@ -135,7 +136,7 @@ export const FollowedArtistsQueryRenderer = withSuspense({
return (
<LoadFailureView
onRetry={fallbackProps.resetErrorBoundary}
showBackButton={true}
showBackButton={false}
useSafeArea={false}
error={fallbackProps.error}
trackErrorBoundary={false}
Expand Down
3 changes: 2 additions & 1 deletion src/app/Scenes/Favorites/Components/FollowedGalleries.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ export const FollowedGalleries: React.FC<Props> = ({ me }) => {
if (galleries.length === 0) {
return (
<Screen.ScrollView refreshControl={RefreshControl}>
<FollowOptionPicker />
<ZeroState
title="You haven’t followed any galleries yet"
subtitle="When you save galleries, they will show up here."
Expand Down Expand Up @@ -131,7 +132,7 @@ export const FollowedGalleriesQueryRenderer = withSuspense({
return (
<LoadFailureView
onRetry={fallbackProps.resetErrorBoundary}
showBackButton={true}
showBackButton={false}
useSafeArea={false}
error={fallbackProps.error}
trackErrorBoundary={false}
Expand Down
3 changes: 2 additions & 1 deletion src/app/Scenes/Favorites/Components/FollowedShows.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ export const FollowedShows: React.FC<Props> = ({ me }) => {
if (shows.length === 0) {
return (
<Screen.ScrollView refreshControl={RefreshControl}>
<FollowOptionPicker />
<ZeroState
title="You haven’t saved any shows yet"
subtitle="When you save shows, they will show up here for future use."
Expand Down Expand Up @@ -117,7 +118,7 @@ export const FollowedShowsQueryRenderer = withSuspense({
return (
<LoadFailureView
onRetry={fallbackProps.resetErrorBoundary}
showBackButton={true}
showBackButton={false}
useSafeArea={false}
error={fallbackProps.error}
trackErrorBoundary={false}
Expand Down
4 changes: 3 additions & 1 deletion src/app/Scenes/Favorites/Favorites.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
Spacer,
Text,
useScreenDimensions,
useSpace,
} from "@artsy/palette-mobile"
import { useScreenScrollContext } from "@artsy/palette-mobile/dist/elements/Screen/ScreenScrollContext"
import { BOTTOM_TABS_HEIGHT } from "@artsy/palette-mobile/dist/elements/Screen/StickySubHeader"
Expand Down Expand Up @@ -119,6 +120,7 @@ const FavoritesHeaderTapBar: React.FC<MaterialTopTabBarProps> = ({ state, naviga
export const FavoriteTopNavigator = createMaterialTopTabNavigator()

const Content = () => {
const space = useSpace()
const { currentScrollYAnimated } = useScreenScrollContext()
const { headerHeight } = FavoritesContextStore.useStoreState((state) => state)
const { height: screenHeight } = useScreenDimensions()
Expand All @@ -135,7 +137,7 @@ const Content = () => {
}))

return (
<Animated.View style={[animatedStyles, { height: screenHeight + headerHeight }]}>
<Animated.View style={[animatedStyles, { height: screenHeight + headerHeight + space(1) }]}>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this fixes the issue with the white border

Screen.Recording.2025-04-29.at.16.14.56.mov

<Screen.Body fullwidth>
<FavoriteTopNavigator.Navigator
tabBar={FavoritesHeaderTapBar}
Expand Down