diff --git a/src/app/Scenes/MyCollection/Components/MyCollectionBottomSheetModals/MyCollectionBottomSheetModalArtistPreview.tsx b/src/app/Scenes/MyCollection/Components/MyCollectionBottomSheetModals/MyCollectionBottomSheetModalArtistPreview.tsx index 4d1f5769675..c766c478416 100644 --- a/src/app/Scenes/MyCollection/Components/MyCollectionBottomSheetModals/MyCollectionBottomSheetModalArtistPreview.tsx +++ b/src/app/Scenes/MyCollection/Components/MyCollectionBottomSheetModals/MyCollectionBottomSheetModalArtistPreview.tsx @@ -11,6 +11,7 @@ import { import { BottomSheetView } from "@gorhom/bottom-sheet" import { MyCollectionBottomSheetModalArtistPreviewQuery } from "__generated__/MyCollectionBottomSheetModalArtistPreviewQuery.graphql" import { MyCollectionBottomSheetModalArtistPreview_artist$data } from "__generated__/MyCollectionBottomSheetModalArtistPreview_artist.graphql" +import { MyCollectionBottomSheetModalArtistPreview_me$data } from "__generated__/MyCollectionBottomSheetModalArtistPreview_me.graphql" import { ArtistListItemContainer, ArtistListItemPlaceholder } from "app/Components/ArtistListItem" import { ArtistKindPills } from "app/Scenes/MyCollection/Components/MyCollectionBottomSheetModals/MyCollectionBottomSheetModalArtistPreview/ArtistKindPills" import { getRelayEnvironment } from "app/system/relay/defaultEnvironment" @@ -20,20 +21,21 @@ import { graphql } from "relay-runtime" interface MyCollectionBottomSheetModalArtistPreviewProps { artist: MyCollectionBottomSheetModalArtistPreview_artist$data - uploadsCount: number | null + me: MyCollectionBottomSheetModalArtistPreview_me$data } export const MyCollectionBottomSheetModalArtistPreview: React.FC< MyCollectionBottomSheetModalArtistPreviewProps -> = ({ artist, uploadsCount }) => { - const canBeRemoved = uploadsCount === 0 +> = ({ artist, me }) => { + const artworksCountWithMyCollection = me?.myCollectionConnection?.totalCount ?? 0 + const canBeRemoved = artworksCountWithMyCollection === 0 return ( }> }> - + @@ -87,13 +89,19 @@ export const MyCollectionBottomSheetModalArtistPreviewFragmentContainer = create ...ArtistKindPills_artist } `, + me: graphql` + fragment MyCollectionBottomSheetModalArtistPreview_me on Me { + myCollectionConnection(artistIDs: [$artistID]) { + totalCount + } + } + `, } ) export const MyCollectionBottomSheetModalArtistPreviewQueryRenderer: React.FC<{ artistID: string - uploadsCount: number | null -}> = ({ artistID, uploadsCount }) => { +}> = ({ artistID }) => { return ( environment={getRelayEnvironment()} @@ -102,6 +110,9 @@ export const MyCollectionBottomSheetModalArtistPreviewQueryRenderer: React.FC<{ artist(id: $artistID) { ...MyCollectionBottomSheetModalArtistPreview_artist } + me { + ...MyCollectionBottomSheetModalArtistPreview_me + } } `} cacheConfig={{ force: true }} @@ -112,7 +123,6 @@ export const MyCollectionBottomSheetModalArtistPreviewQueryRenderer: React.FC<{ Container: MyCollectionBottomSheetModalArtistPreviewFragmentContainer, renderPlaceholder: LoadingSkeleton, renderFallback: () => null, - initialProps: { uploadsCount }, })} /> ) diff --git a/src/app/Scenes/MyCollection/Components/MyCollectionBottomSheetModals/MyCollectionBottomSheetModals.tsx b/src/app/Scenes/MyCollection/Components/MyCollectionBottomSheetModals/MyCollectionBottomSheetModals.tsx index 82e9ac7ed70..ce08c903e1d 100644 --- a/src/app/Scenes/MyCollection/Components/MyCollectionBottomSheetModals/MyCollectionBottomSheetModals.tsx +++ b/src/app/Scenes/MyCollection/Components/MyCollectionBottomSheetModals/MyCollectionBottomSheetModals.tsx @@ -13,8 +13,6 @@ export const MyCollectionBottomSheetModals: React.FC<{}> = () => { const setViewKind = MyCollectionTabsStore.useStoreActions((actions) => actions.setViewKind) const view = MyCollectionTabsStore.useStoreState((state) => state.viewKind) const id = MyCollectionTabsStore.useStoreState((state) => state.id) - // TODO: Implement this - const uploadsCount = 0 const snapPoints = useMemo(() => [view === "Artist" ? 410 : 370], []) @@ -48,10 +46,7 @@ export const MyCollectionBottomSheetModals: React.FC<{}> = () => { > {view === "Add" && } {view === "Artist" && !!id && ( - + )}