From f02e399b52b7558528d1d5b0b974aa07e074e644 Mon Sep 17 00:00:00 2001 From: scerelli <hi@stefanocerelli.com> Date: Wed, 26 Mar 2025 11:50:26 +0100 Subject: [PATCH] fix: space inside task is clickable --- core/screens/spaces/tasks/TaskDetails.tsx | 23 +++---------------- .../useTaskDetailsData/useTaskDetailsData.ts | 3 ++- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/core/screens/spaces/tasks/TaskDetails.tsx b/core/screens/spaces/tasks/TaskDetails.tsx index f394ae9ff2..9a46b7011f 100644 --- a/core/screens/spaces/tasks/TaskDetails.tsx +++ b/core/screens/spaces/tasks/TaskDetails.tsx @@ -18,15 +18,7 @@ export type TaskDetailsParams = { } const TaskDetailsContainer = () => { - const { - data: { loading, title, coverImage, infoList, visibility, description, chips, author }, - isOwner, - spaceName, - id, - refetch, - spaceId, - spaceTitle, - } = useTaskDetailsData() + const { data, isOwner, spaceName, id, refetch, spaceId, spaceTitle } = useTaskDetailsData() const displayCta = useFeatureFlag(FeatureFlagKey.TASK_CONTACT_CTA) const renderActionDrawer = useCallback( @@ -67,7 +59,7 @@ const TaskDetailsContainer = () => { {displayCta && ( <ContactOrganization spaceIdOrName={spaceName} - taskName={title} + taskName={data?.title} taskId={id} spaceTitle={spaceTitle} spaceId={spaceId} @@ -76,16 +68,7 @@ const TaskDetailsContainer = () => { </Stack> } > - <DetailsScreen - loading={loading} - coverImage={coverImage} - title={title} - infoList={infoList} - visibility={visibility} - description={description} - author={author} - chips={chips} - /> + <DetailsScreen {...data} /> </Screen> ) } diff --git a/core/screens/spaces/tasks/useTaskDetailsData/useTaskDetailsData.ts b/core/screens/spaces/tasks/useTaskDetailsData/useTaskDetailsData.ts index 9064382acf..22cdf1252b 100644 --- a/core/screens/spaces/tasks/useTaskDetailsData/useTaskDetailsData.ts +++ b/core/screens/spaces/tasks/useTaskDetailsData/useTaskDetailsData.ts @@ -31,7 +31,7 @@ const { useParam, useUUIDParam } = createParamHooks<TaskDetailsParams>() export const useTaskDetailsData = (): UseTaskDetailsData => { const [spaceIdOrName] = useParam('spaceIdOrName') const { displayError } = useErrorHandling() - const { replaceRoute } = useRouting() + const { replaceRoute, navigate } = useRouting() const { t, i18n } = useTranslation() const [taskId] = useUUIDParam('taskId') const loginState = useLoggedInUser() @@ -127,6 +127,7 @@ export const useTaskDetailsData = (): UseTaskDetailsData => { topTitle: `${formattedDate} ∙ ${t('postedOnHoli')}`, title: data?.taskById?.space?.name || data?.taskById?.name || '??', subtitle: data?.taskById?.creator?.fullName, + onPress: () => navigate('/spaces/' + data?.taskById?.space?.id), mainAvatar: { source: data?.taskById?.space?.avatar, initials: data?.taskById?.space?.name || data?.taskById?.name || '??', -- GitLab