diff --git a/src/app/(main)/reports/create/ReportTemplates.tsx b/src/app/(main)/reports/create/ReportTemplates.tsx index dbff9f10..fcfa6f6a 100644 --- a/src/app/(main)/reports/create/ReportTemplates.tsx +++ b/src/app/(main)/reports/create/ReportTemplates.tsx @@ -4,7 +4,6 @@ import Magnet from 'assets/magnet.svg'; import Path from 'assets/path.svg'; import Tag from 'assets/tag.svg'; import Target from 'assets/target.svg'; -import Money from 'assets/money.svg'; import { useMessages, useTeamUrl } from 'components/hooks'; import PageHeader from 'components/layout/PageHeader'; import Link from 'next/link'; @@ -52,12 +51,12 @@ export function ReportTemplates({ showHeader = true }: { showHeader?: boolean }) url: renderTeamUrl('/reports/journey'), icon: , }, - { - title: formatMessage(labels.revenue), - description: formatMessage(labels.revenueDescription), - url: renderTeamUrl('/reports/revenue'), - icon: , - }, + // { + // title: formatMessage(labels.revenue), + // description: formatMessage(labels.revenueDescription), + // url: renderTeamUrl('/reports/revenue'), + // icon: , + // }, ]; return ( diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx index 017a91f9..bc6a3169 100644 --- a/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx +++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx @@ -13,11 +13,18 @@ export function WebsiteData({ websiteId, onSave }: { websiteId: string; onSave?: const { teamId, renderTeamUrl } = useTeamUrl(); const router = useRouter(); const { result } = useTeams(user.id); - const hasTeams = result?.data?.length > 0; - const isTeamOwner = - (!teamId && hasTeams) || - (hasTeams && - result?.data + const canTransferWebsite = + ( + !teamId && + result.data.filter(({ teamUser }) => + teamUser.find( + ({ role, userId }) => + [ROLES.teamOwner, ROLES.teamManager].includes(role) && userId === user.id, + ), + ) + ).length > 0 || + (teamId && + !!result?.data ?.find(({ id }) => id === teamId) ?.teamUser.find(({ role, userId }) => role === ROLES.teamOwner && userId === user.id)); @@ -37,8 +44,8 @@ export function WebsiteData({ websiteId, onSave }: { websiteId: string; onSave?: label={formatMessage(labels.transferWebsite)} description={formatMessage(messages.transferWebsite)} > - -