Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { AdViewability } from '../common/AdViewability';
import type { ViewabilityData } from '../../../../features/monetization/viewability';
import { storeSquadBoostClick } from '../../../../features/monetization/squadBoostClick';
import { useScrambler } from '../../../../hooks/useScrambler';
import { hasSquadFeature } from '../../../../features/squads/lib/features';
import { showsVerifiedBadge } from '../../../../features/squads/lib/features';
import { VerifiedSquadBadge } from '../../../../features/squads/components/VerifiedSquad';
import { SquadRow } from '../../../../features/squads/components/widgets/SquadRow';
import { useSquadAd } from './common';
Expand Down Expand Up @@ -116,7 +116,7 @@ export function SquadAdEntityCard({
const squadName = (
<span className="flex min-w-0 items-center gap-1">
<span className="truncate">{name}</span>
{hasSquadFeature(squad, 'verified') && <VerifiedSquadBadge />}
{showsVerifiedBadge(squad) && <VerifiedSquadBadge />}
</span>
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { ProfileImageSize, roundClasses } from '../../ProfilePicture';
import { ProfileImageLink } from '../../profile/ProfileImageLink';
import SourceButton from './SourceButton';
import { useViewSize, ViewSize } from '../../../hooks';
import { hasSquadFeature } from '../../../features/squads/lib/features';
import { showsVerifiedBadge } from '../../../features/squads/lib/features';
import { VerifiedLogoCheck } from '../../../features/squads/components/VerifiedSquad';

const HoverCard = dynamic(
Expand Down Expand Up @@ -88,8 +88,7 @@ export const AuthorSourceStack = ({

// The card shows the squad's logo without its name, so a verified squad's
// seal sits on the logo itself
const hasCheck =
showVerifiedCheck && hasSquadFeature(source ?? undefined, 'verified');
const hasCheck = showVerifiedCheck && showsVerifiedBadge(source ?? undefined);
const sourceButton = showSource ? (
<SourceButton source={source as SourceTooltip} size={size} />
) : null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import EntityDescription from './EntityDescription';
import EntityCard from './EntityCard';
import { ContentPreferenceType } from '../../../graphql/contentPreference';
import useShowFollowAction from '../../../hooks/useShowFollowAction';
import { hasSquadFeature } from '../../../features/squads/lib/features';
import { showsVerifiedBadge } from '../../../features/squads/lib/features';
import { VerifiedSquadBadge } from '../../../features/squads/components/VerifiedSquad';

type SquadEntityCardProps = {
Expand Down Expand Up @@ -91,7 +91,7 @@ const SquadEntityCard = ({
bold
>
{name}
{hasSquadFeature(squad, 'verified') && <VerifiedSquadBadge />}
{showsVerifiedBadge(squad) && <VerifiedSquadBadge />}
</Typography>
</Link>
{description && <EntityDescription copy={description} length={100} />}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ export function PostExcoPlayerWidget({
const isAdFree =
shouldSkipSourceAds(post.source) ||
(post.source?.type === SourceType.Squad &&
post.source.features?.hideAds === undefined &&
post.source.features?.adFree === undefined);
const canEvaluate =
isAuthReadyOrCached && !isPlusAdFree && !isAdFree && !qaPlayerId;
Expand Down
4 changes: 2 additions & 2 deletions packages/shared/src/components/post/PostSourceInfo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import type {
ReactElement,
} from 'react';
import React from 'react';
import { hasSquadFeature } from '../../features/squads/lib/features';
import { showsVerifiedBadge } from '../../features/squads/lib/features';
import { VerifiedSquadBadge } from '../../features/squads/components/VerifiedSquad';
import Link from '../utilities/Link';
import { isSourceUserSource, SourceType } from '../../graphql/sources';
Expand Down Expand Up @@ -85,7 +85,7 @@ function PostSourceInfo({
</a>
</Link>
)}
{hasSquadFeature(source, 'verified') && (
{showsVerifiedBadge(source) && (
<VerifiedSquadBadge className="ml-1 size-4" />
)}
{showActionBtn && (
Expand Down
10 changes: 3 additions & 7 deletions packages/shared/src/components/post/composer/AudienceChip.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { ReactElement } from 'react';
import React, { useState } from 'react';
import classNames from 'classnames';
import { hasSquadFeature } from '../../../features/squads/lib/features';
import { showsVerifiedBadge } from '../../../features/squads/lib/features';
import { VerifiedSquadBadge } from '../../../features/squads/components/VerifiedSquad';
import {
DropdownMenu,
Expand Down Expand Up @@ -179,9 +179,7 @@ export const AudienceChip = ({
<TruncateText className="min-w-0 max-w-48 shrink font-bold">
{triggerLabel}
</TruncateText>
{!isMulti && hasSquadFeature(primary, 'verified') && (
<VerifiedSquadBadge />
)}
{!isMulti && showsVerifiedBadge(primary) && <VerifiedSquadBadge />}
{showChevron && (
<ArrowIcon
className={classNames(
Expand Down Expand Up @@ -273,9 +271,7 @@ export const AudienceChip = ({
>
{optionLabel}
</span>
{hasSquadFeature(option, 'verified') && (
<VerifiedSquadBadge />
)}
{showsVerifiedBadge(option) && <VerifiedSquadBadge />}
<span
role="presentation"
className="flex size-5 shrink-0 items-center justify-center"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ import { BoostOriginContextProvider } from '../../../features/boost/BoostOriginC
import { useActions } from '../../../hooks/useActions';
import { ActionType } from '../../../graphql/actions';
import { VerifiedSquadBadge } from '../../../features/squads/components/VerifiedSquad';
import { hasSquadFeature } from '../../../features/squads/lib/features';
import { showsVerifiedBadge } from '../../../features/squads/lib/features';
import { PostTagList } from '../tags/PostTagList';
import { PostSignupWidget } from '../PostSignupWidget';
import { useHasPostCapsule } from '../PostCapsule';
Expand Down Expand Up @@ -519,7 +519,7 @@ export function PostHybridColumn({
/>
)}
{squadAttribution.source.name}
{hasSquadFeature(squadAttribution.source, 'verified') && (
{showsVerifiedBadge(squadAttribution.source) && (
<VerifiedSquadBadge />
)}
</a>
Expand Down
4 changes: 2 additions & 2 deletions packages/shared/src/components/post/reader/SourceStrip.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { ReactElement } from 'react';
import React from 'react';
import classNames from 'classnames';
import { hasSquadFeature } from '../../../features/squads/lib/features';
import { showsVerifiedBadge } from '../../../features/squads/lib/features';
import { VerifiedSquadBadge } from '../../../features/squads/components/VerifiedSquad';
import type { SourceTooltip } from '../../../graphql/sources';
import { FollowButton } from '../../contentPreference/FollowButton';
Expand Down Expand Up @@ -82,7 +82,7 @@ export function SourceStrip({
{source.name}
</Typography>
</Link>
{hasSquadFeature(source, 'verified') && <VerifiedSquadBadge />}
{showsVerifiedBadge(source) && <VerifiedSquadBadge />}
</span>
{sourceHandle && (
<Typography
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { SquadImage } from '../../squads/SquadImage';
import { SquadShortcutPinButton } from '../SquadShortcutPinButton';
import { webappUrl } from '../../../lib/constants';
import type { Squad } from '../../../graphql/sources';
import { hasSquadFeature } from '../../../features/squads/lib/features';
import { showsVerifiedBadge } from '../../../features/squads/lib/features';
import { VerifiedSquadBadge } from '../../../features/squads/components/VerifiedSquad';

// Squad row for the rail panel; the pin adds the squad to the sidebar
Expand All @@ -20,9 +20,7 @@ export const createSquadMenuItem = (squad: Squad): SidebarMenuItem => {
<DefaultSquadIcon />
),
title: name,
titleSuffix: hasSquadFeature(squad, 'verified') ? (
<VerifiedSquadBadge />
) : undefined,
titleSuffix: showsVerifiedBadge(squad) ? <VerifiedSquadBadge /> : undefined,
path: `${webappUrl}squads/${handle}`,
itemClassName: 'group/squad-row',
rightIcon: () => <SquadShortcutPinButton squad={squad} />,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React, { useState } from 'react';
import { useMutation, useQueryClient } from '@tanstack/react-query';
import classNames from 'classnames';
import { VerifiedLogoCheck } from '../../features/squads/components/VerifiedSquad';
import { hasSquadFeature } from '../../features/squads/lib/features';
import { showsVerifiedBadge } from '../../features/squads/lib/features';
import type { Origin } from '../../lib/log';
import { Button, ButtonColor, ButtonVariant } from '../buttons/Button';
import { SimpleSquadJoinButton } from './SquadActionButton';
Expand Down Expand Up @@ -105,7 +105,7 @@ export const SquadCommentJoinBanner = ({
size={isMobile ? ProfileImageSize.Large : ProfileImageSize.XXXXLarge}
/>
{/* The name is only in the sentence, so the seal sits on the logo */}
{hasSquadFeature(squad, 'verified') && (
{showsVerifiedBadge(squad) && (
<VerifiedLogoCheck
className={isMobile ? 'size-4' : 'bottom-1 right-1 size-7 p-0.5'}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import { FollowButton } from '../contentPreference/FollowButton';
import { ContentPreferenceType } from '../../graphql/contentPreference';
import { PlusUserBadge } from '../PlusUserBadge';
import { fallbackImages } from '../../lib/config';
import { hasSquadFeature } from '../../features/squads/lib/features';
import { showsVerifiedBadge } from '../../features/squads/lib/features';
import { VerifiedSquadBadge } from '../../features/squads/components/VerifiedSquad';

interface PostAuthorProps {
Expand Down Expand Up @@ -201,7 +201,7 @@ export const UserHighlight = (props: UserHighlightProps): ReactElement => {
>
<TruncateText>{name}</TruncateText>
</ProfileLink>
{'features' in user && hasSquadFeature(user, 'verified') && (
{'features' in user && showsVerifiedBadge(user) && (
<VerifiedSquadBadge className="ml-1 self-center" />
)}
{isPlus && <PlusUserBadge user={{ isPlus }} tooltip={false} />}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { ReactElement } from 'react';
import React from 'react';
import { hasSquadFeature } from '../../../squads/lib/features';
import { showsVerifiedBadge } from '../../../squads/lib/features';
import { VerifiedSquadBadge } from '../../../squads/components/VerifiedSquad';
import type { Squad } from '../../../../graphql/sources';
import { useAuthContext } from '../../../../contexts/AuthContext';
Expand Down Expand Up @@ -54,7 +54,7 @@ export const SquadListItem = ({
>
{squad.name}
</Typography>
{hasSquadFeature(squad, 'verified') && <VerifiedSquadBadge />}
{showsVerifiedBadge(squad) && <VerifiedSquadBadge />}
</span>
</a>
<Typography
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
import { largeNumberFormat } from '../../../../lib/numberFormat';
import type { ToolTopSquad } from '../../../../graphql/user/userStack';
import { ToolLogo } from '../../../../components/tools/ToolLogo';
import { showsVerifiedBadge } from '../../../squads/lib/features';

interface UserStackTopSquadsTooltipProps {
toolTitle: string;
Expand Down Expand Up @@ -130,7 +131,7 @@ export const UserStackTopSquadsTooltip = ({
>
{squad.name}
</Typography>
{squad.features?.verified && <VerifiedSquadBadge />}
{showsVerifiedBadge(squad) && <VerifiedSquadBadge />}
</div>
<Typography
type={TypographyType.Caption1}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
} from '../../../styles/custom';
import { SourceIcon } from '../../../components/icons';
import { IconSize } from '../../../components/Icon';
import { showsVerifiedBadge } from '../lib/features';

export const verifiedSquadLabel = 'Verified Company Squad';

Expand Down Expand Up @@ -148,6 +149,6 @@ export const SourceNameWithSeal = ({
)}
>
<span className="truncate">{source.name}</span>
{source.features?.verified && <VerifiedSquadBadge />}
{showsVerifiedBadge(source) && <VerifiedSquadBadge />}
</span>
);
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ import {
featuredSquadsQuery,
getSquadBanner,
getSquadMembersLabel,
isVerifiedSquad,
withPromotedSlot,
} from './common';
import { showsVerifiedBadge } from '../../lib/features';

// The Featured area: a mosaic of blocks on tablet and up, a banner rail on
// phones. Featured squads are the only cards with a banner, the promoted
Expand Down Expand Up @@ -74,7 +74,7 @@ const SquadName = ({
>
{squad.name}
</Typography>
{isVerifiedSquad(squad) && (
{showsVerifiedBadge(squad) && (
<VerifiedSquadBadge className="size-5 shrink-0" />
)}
</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ import { VerifiedSquadBadge } from '../VerifiedSquad';
import { SquadJoinButton } from './SquadJoinButton';
import { PromotedLabel, PromotedSquad } from './PromotedSquad';
import type { SquadDiscoverSection } from './common';
import { getSquadMembersLabel, isVerifiedSquad } from './common';
import { getSquadMembersLabel } from './common';
import { showsVerifiedBadge } from '../../lib/features';

interface SquadDiscoverRowProps {
squad: Squad;
Expand Down Expand Up @@ -82,7 +83,7 @@ export const SquadDiscoverRow = ({
>
{squad.name}
</Typography>
{isVerifiedSquad(squad) && (
{showsVerifiedBadge(squad) && (
<VerifiedSquadBadge className="size-4 shrink-0" />
)}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ import { useLazyModal } from '../../../../hooks/useLazyModal';
import { LazyModal } from '../../../../components/modals/common/types';
import { useAuthContext } from '../../../../contexts/AuthContext';
import { useSquadPageContext } from '../../SquadPageContext';
import { getSquadId, hasSquadFeature } from '../../lib/features';
import {
getSquadId,
hasSquadFeature,
showsVerifiedBadge,
} from '../../lib/features';
import { getDisplayUrl, squadLinkRel } from '../../lib/links';
import { SquadViewer } from '../../lib/viewer';
import { getSquadMembersUrl } from '../../lib/routes';
Expand Down Expand Up @@ -307,7 +311,7 @@ export const SquadProfileHeader = (): ReactElement => {
className="flex flex-wrap items-center gap-x-2 gap-y-1 font-bold text-text-primary typo-title2"
>
{squad.name}
{hasSquadFeature(squad, 'verified') && (
{showsVerifiedBadge(squad) && (
<VerifiedSquadBadge className="size-5" />
)}
</h1>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import { LogEvent, Origin } from '../../../../lib/log';
import { getDomainFromUrl } from '../../../../lib/links';
import { useSquadPageContext } from '../../SquadPageContext';
import { useSquadJobs } from '../../hooks/useSquadJobs';
import { hasSquadFeature } from '../../lib/features';
import { showsVerifiedBadge } from '../../lib/features';
import { getSquadJobMeta } from '../../lib/jobs';
import {
getSquadJobFormUrl,
Expand Down Expand Up @@ -220,7 +220,7 @@ const JobSummary = ({ job }: { job: SquadJob }): ReactElement => {
>
{squad.name}
</Typography>
{hasSquadFeature(squad, 'verified') && <VerifiedSquadBadge />}
{showsVerifiedBadge(squad) && <VerifiedSquadBadge />}
</span>
<Typography
type={TypographyType.Footnote}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { ReactElement } from 'react';
import type { ReactElement, ReactNode } from 'react';
import React from 'react';
import { LockIcon } from '../../../../components/icons';
import { IconSize } from '../../../../components/Icon';
Expand All @@ -13,10 +13,13 @@ import {
export const SquadEnterpriseGate = ({
title,
description,
titleSuffix,
plan = 'Enterprise',
}: {
title: string;
description: string;
/** Shown after the title, e.g. what the setting looks like */
titleSuffix?: ReactNode;
/** The plan that includes it */
plan?: string;
}): ReactElement => (
Expand All @@ -29,6 +32,7 @@ export const SquadEnterpriseGate = ({
<Typography type={TypographyType.Callout} bold>
{title}
</Typography>
{titleSuffix}
<Pill
label={plan}
size={PillSize.XSmall}
Expand Down
Loading
Loading