Skip to content
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.

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

feat: gift tracking #4135

Merged
merged 8 commits into from
Feb 4, 2025
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
7 changes: 5 additions & 2 deletions packages/shared/__tests__/helpers/boot.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import { LazyModalElement } from '../../src/components/modals/LazyModalElement';
import LogContext from '../../src/contexts/LogContext';
import type { LogContextData } from '../../src/hooks/log/useLogContextData';
import { ChecklistViewState } from '../../src/lib/checklist';
import { PaymentContextProvider } from '../../src/contexts/PaymentContext';

interface TestBootProviderProps {
children: ReactNode;
Expand Down Expand Up @@ -116,8 +117,10 @@ export const TestBootProvider = ({
value={{ ...defaultLogContextData, ...log }}
>
<NotificationsContextProvider {...notification}>
{children}
<LazyModalElement />
<PaymentContextProvider>
{children}
<LazyModalElement />
</PaymentContextProvider>
</NotificationsContextProvider>
</LogContext.Provider>
</SettingsContext.Provider>
Expand Down
16 changes: 11 additions & 5 deletions packages/shared/src/components/ProfileMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,13 @@ export default function ProfileMenu({
title: 'Gift daily.dev Plus',
buttonProps: {
icon: <GiftIcon />,
onClick: () => openModal({ type: LazyModal.GiftPlus }),
onClick: () => {
logSubscriptionEvent({
event_name: LogEvent.GiftSubscription,
target_id: TargetId.ProfileDropdown,
});
openModal({ type: LazyModal.GiftPlus });
},
},
});

Expand All @@ -174,14 +180,14 @@ export default function ProfileMenu({

return list.filter(Boolean);
}, [
user.permalink,
isGdprCovered,
isDndActive,
isPlus,
logSubscriptionEvent,
logout,
openModal,
isDndActive,
setShowDnd,
user.permalink,
openModal,
logout,
]);

if (!user) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import {
import { waitForNock } from '../../../../__tests__/helpers/utilities';
import { cloudinarySquadsDirectoryCardBannerDefault } from '../../../lib/image';
import { ActionType, COMPLETE_ACTION_MUTATION } from '../../../graphql/actions';
import { PaymentContextProvider } from '../../../contexts/PaymentContext';

const routerReplace = jest.fn();
const squads = [generateTestSquad()];
Expand Down Expand Up @@ -76,8 +77,10 @@ const renderComponent = (): RenderResult => {
loadedUserFromCache
squads={squads}
>
<LazyModalElement />
<SquadGrid source={admin.source} />
<PaymentContextProvider>
<LazyModalElement />
<SquadGrid source={admin.source} />
</PaymentContextProvider>
</AuthContextProvider>
</QueryClientProvider>,
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import { UserVoteEntity } from '../../hooks';
import { UserVote } from '../../graphql/posts';
import LogContext from '../../contexts/LogContext';
import { ActionType } from '../../graphql/actions';
import { PaymentContextProvider } from '../../contexts/PaymentContext';

const showLogin = jest.fn();
const onComment = jest.fn();
Expand Down Expand Up @@ -76,7 +77,9 @@ const renderComponent = (
sendBeacon: jest.fn(),
}}
>
<CommentActionButtons {...props} />
<PaymentContextProvider>
<CommentActionButtons {...props} />
</PaymentContextProvider>
</LogContext.Provider>
</AuthContext.Provider>
</QueryClientProvider>,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {
} from '../buttons/Button';
import { ClickableText } from '../buttons/ClickableText';
import { SimpleTooltip } from '../tooltips/SimpleTooltip';
import { Origin } from '../../lib/log';
import { LogEvent, Origin, TargetId } from '../../lib/log';
import type { Post } from '../../graphql/posts';
import { UserVote } from '../../graphql/posts';
import { AuthTriggers } from '../../lib/auth';
Expand All @@ -39,7 +39,11 @@ import { useLazyModal } from '../../hooks/useLazyModal';
import { labels, largeNumberFormat } from '../../lib';
import { useToastNotification } from '../../hooks/useToastNotification';
import type { VoteEntityPayload } from '../../hooks';
import { useVoteComment, voteMutationHandlers } from '../../hooks';
import {
usePlusSubscription,
useVoteComment,
voteMutationHandlers,
} from '../../hooks';
import { generateQueryKey, RequestKey } from '../../lib/query';
import { useRequestProtocol } from '../../hooks/useRequestProtocol';
import { getCompanionWrapper } from '../../lib/extension';
Expand All @@ -48,6 +52,7 @@ import { ContentPreferenceType } from '../../graphql/contentPreference';
import { isFollowingContent } from '../../hooks/contentPreference/types';
import { useIsSpecialUser } from '../../hooks/auth/useIsSpecialUser';
import { GiftIcon } from '../icons/gift';
import { usePaymentContext } from '../../contexts/PaymentContext';

export interface CommentActionProps {
onComment: (comment: Comment, parentId: string | null) => void;
Expand Down Expand Up @@ -84,6 +89,8 @@ export default function CommentActionButtons({
const { onMenuClick, isOpen, onHide } = useContextMenu({ id });
const { openModal } = useLazyModal();
const { displayToast } = useToastNotification();
const { isPlusAvailable } = usePaymentContext();
const { logSubscriptionEvent } = usePlusSubscription();
const [voteState, setVoteState] = useState<VoteEntityPayload>(() => {
return {
id: comment.id,
Expand Down Expand Up @@ -262,16 +269,25 @@ export default function CommentActionButtons({
});
}

if (comment.author.id !== user?.id && !comment.author.isPlus) {
if (
isPlusAvailable &&
comment.author.id !== user?.id &&
!comment.author.isPlus
) {
commentOptions.push({
label: 'Gift daily.dev Plus',
action: () =>
action: () => {
logSubscriptionEvent({
event_name: LogEvent.GiftSubscription,
target_id: TargetId.ContextMenu,
});
openModal({
type: LazyModal.GiftPlus,
props: {
preselected: comment.author as UserShortProfile,
},
}),
});
},
icon: <GiftIcon />,
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import comment from '../../../__tests__/fixture/comment';
import post from '../../../__tests__/fixture/post';
import { Origin } from '../../lib/log';
import { useViewSize } from '../../hooks';
import { PaymentContextProvider } from '../../contexts/PaymentContext';

const onDelete = jest.fn();
const mockUseViewSize = useViewSize as jest.MockedFunction<typeof useViewSize>;
Expand Down Expand Up @@ -60,7 +61,9 @@ const renderLayout = (
tokenRefreshed: true,
}}
>
<MainComment {...defaultProps} {...props} />
<PaymentContextProvider>
<MainComment {...defaultProps} {...props} />
</PaymentContextProvider>
</AuthContext.Provider>
</QueryClientProvider>,
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import comment from '../../../__tests__/fixture/comment';
import { Origin } from '../../lib/log';
import post from '../../../__tests__/fixture/post';
import { useViewSize } from '../../hooks';
import { PaymentContextProvider } from '../../contexts/PaymentContext';

const onDelete = jest.fn();
const mockUseViewSize = useViewSize as jest.MockedFunction<typeof useViewSize>;
Expand Down Expand Up @@ -64,7 +65,9 @@ const renderLayout = (
tokenRefreshed: true,
}}
>
<SubComment {...defaultProps} {...props} />
<PaymentContextProvider>
<SubComment {...defaultProps} {...props} />
</PaymentContextProvider>
</AuthContext.Provider>
</QueryClientProvider>,
);
Expand Down
10 changes: 8 additions & 2 deletions packages/shared/src/components/plus/PlusInfo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
ButtonVariant,
} from '../buttons/Button';
import { usePlusSubscription } from '../../hooks/usePlusSubscription';
import { LogEvent } from '../../lib/log';
import { LogEvent, TargetId } from '../../lib/log';
import { useGiftUserContext } from './GiftUserContext';
import { PlusOptionRadio } from './PlusOptionRadio';
import { GiftingSelectedUser } from './GiftingSelectedUser';
Expand Down Expand Up @@ -109,7 +109,13 @@ export const PlusInfo = ({
icon={<GiftIcon />}
size={ButtonSize.XSmall}
variant={ButtonVariant.Float}
onClick={() => openModal({ type: LazyModal.GiftPlus })}
onClick={() => {
logSubscriptionEvent({
event_name: LogEvent.GiftSubscription,
target_id: TargetId.PlusPage,
});
openModal({ type: LazyModal.GiftPlus });
}}
>
Buy as a gift
</Button>
Expand Down
10 changes: 8 additions & 2 deletions packages/shared/src/components/profile/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ export function Header({
entity: ContentPreferenceType.User,
});
const { unblock, block } = useContentPreference();
const { logSubscriptionEvent } = usePlusSubscription();

const onReportUser = React.useCallback(
(defaultBlocked = false) => {
Expand Down Expand Up @@ -103,11 +104,16 @@ export function Header({
options.push({
icon: <MenuIcon Icon={GiftIcon} />,
label: 'Gift daily.dev Plus',
action: () =>
action: () => {
logSubscriptionEvent({
event_name: LogEvent.GiftSubscription,
target_id: TargetId.ProfilePage,
});
openModal({
type: LazyModal.GiftPlus,
props: { preselected: user as UserShortProfile },
}),
});
},
});
}

Expand Down
17 changes: 13 additions & 4 deletions packages/shared/src/components/squads/SquadMemberMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@ import { UserShortInfo } from '../profile/UserShortInfo';
import type { MenuItemProps } from '../fields/ContextMenu';
import ContextMenu from '../fields/ContextMenu';
import type { UseSquadActions } from '../../hooks';
import { useToastNotification } from '../../hooks';
import { usePlusSubscription, useToastNotification } from '../../hooks';
import { verifyPermission } from '../../graphql/squads';
import { ButtonColor, ButtonVariant } from '../buttons/Button';
import { ContextMenu as ContextMenuIds } from '../../hooks/constants';
import { LazyModal } from '../modals/common/types';
import { GiftIcon } from '../icons/gift';
import { useLazyModal } from '../../hooks/useLazyModal';
import { LogEvent, TargetId } from '../../lib/log';
import { usePaymentContext } from '../../contexts/PaymentContext';

interface SquadMemberMenuProps extends Pick<UseSquadActions, 'onUpdateRole'> {
squad: Squad;
Expand Down Expand Up @@ -127,6 +129,8 @@ export default function SquadMemberMenu({
const { user } = useContext(AuthContext);
const { showPrompt } = usePrompt();
const { displayToast } = useToastNotification();
const { isPlusAvailable } = usePaymentContext();
const { logSubscriptionEvent } = usePlusSubscription();
const onUpdateMember = async (
role: SourceMemberRole,
title: MenuItemTitle,
Expand Down Expand Up @@ -213,14 +217,19 @@ export default function SquadMemberMenu({
});
}

if (!member.user.isPlus) {
if (!member.user.isPlus && isPlusAvailable) {
idoshamun marked this conversation as resolved.
Show resolved Hide resolved
menu.push({
label: 'Gift daily.dev Plus',
action: () =>
action: () => {
logSubscriptionEvent({
event_name: LogEvent.GiftSubscription,
target_id: TargetId.Squad,
});
openModal({
type: LazyModal.GiftPlus,
props: { preselected: member.user },
}),
});
},
icon: <GiftIcon />,
});
}
Expand Down
3 changes: 3 additions & 0 deletions packages/shared/src/lib/log.ts
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ export enum LogEvent {
ReceivePayment = 'receive payment',
OnboardingSkipPlus = 'skip upgrade subscription',
OnboardingUpgradePlus = 'upgrade subscription',
GiftSubscription = 'gift subscription',
// End Plus subscription
// Clickbait Shield
ToggleClickbaitShield = 'toggle clickbait shield',
Expand Down Expand Up @@ -308,6 +309,7 @@ export enum TargetId {
Ads = 'ads',
MyProfile = 'my profile',
PlusBadge = 'plus badge',
PlusPage = 'plus page',
Onboarding = 'onboarding',
BlockedWords = 'block words',
CustomFeed = 'custom feed',
Expand All @@ -316,6 +318,7 @@ export enum TargetId {
ClickbaitShield = 'clickbait shield',
StreakTimezoneLabel = 'streak timezone label',
StreakTimezoneMismatchPrompt = 'streak timezone mismatch prompt',
ContextMenu = 'context',
}

export enum NotificationChannel {
Expand Down
Loading