Skip to content

feat(next): add churn intervention glean events #19946

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.

Sign up for GitHub

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

Draft
StaberindeZA wants to merge 1 commit into
base: main
Choose a base branch
from
+1,405 −597
Draft

feat(next): add churn intervention glean events #19946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion apps/payments/next/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ CURRENCY_CONFIG__CURRENCIES_TO_COUNTRIES={"USD":["AS","CA","GB","GU","MP","MY","

# Churn Intervention Config
CHURN_INTERVENTION_CONFIG__COLLECTION_NAME=churnInterventions
CHURN_INTERVENTION_CONFIG__ENABLED=false
CHURN_INTERVENTION_CONFIG__ENABLED=true

# StatsD Config
STATS_D_CONFIG__SAMPLE_RATE=
Expand Down
16 changes: 8 additions & 8 deletions apps/payments/next/app/[locale]/subscriptions/[subscriptionId]/offer/error/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,16 @@ export default async function InterstitialOfferErrorPage({
const uid = session.user.id;

let interstitialOfferContent;
try {
try {
interstitialOfferContent = await getInterstitialOfferContentAction(
uid,
subscriptionId,
acceptLanguage,
locale
uid,
subscriptionId,
acceptLanguage,
locale
);
} catch (error) {
} catch (error) {
notFound();
}
}

if (!interstitialOfferContent) {
notFound();
Expand All @@ -59,7 +59,7 @@ export default async function InterstitialOfferErrorPage({
redirect(`/${locale}/subscriptions/${subscriptionId}/offer`);
}

const { webIcon, productName} = interstitialOfferContent;
const { webIcon, productName } = interstitialOfferContent;
const reason = interstitialOfferContent.reason ?? 'general_error';

if (webIcon && !productName) {
Expand Down
88 changes: 45 additions & 43 deletions apps/payments/next/app/[locale]/subscriptions/[subscriptionId]/offer/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,56 +94,58 @@ export default async function InterstitialOfferPage({

const { ftlId, fallbackText } = getKeepCurrentSubscriptionFtlIds(currentInterval);
const keepCurrentSubscriptionButtonText = l10n.getString(ftlId, fallbackText);
const searchParamsObj = new URLSearchParams(searchParams);
searchParamsObj.append('entrypoint', 'subscription-management');

return (
<section
className="flex justify-center min-h-[calc(100vh_-_4rem)] tablet:items-center tablet:min-h-[calc(100vh_-_5rem)]"
>
<div className="w-full max-w-[480px] flex flex-col justify-center items-center p-10 tablet:bg-white tablet:rounded-xl tablet:border tablet:border-grey-200 tablet:shadow-[0_0_16px_0_rgba(0,0,0,0.08)]">
<div className="w-full flex flex-col items-center gap-6 text-center">
<Image
src={webIcon}
alt={productName}
height={64}
width={64}
/>
<h1 className="font-bold self-stretch text-center font-header text-xl leading-8 ">
{modalHeading1}
</h1>
</div>
<p className="w-full self-stretch leading-7 text-lg text-grey-900">
{modalMessage &&
modalMessage.map((line, i) => (
<p className="my-2" key={i}>
{line}
</p>
))}
</p>
<div className="w-full max-w-[480px] flex flex-col justify-center items-center p-10 tablet:bg-white tablet:rounded-xl tablet:border tablet:border-grey-200 tablet:shadow-[0_0_16px_0_rgba(0,0,0,0.08)]">
<div className="w-full flex flex-col items-center gap-6 text-center">
<Image
src={webIcon}
alt={productName}
height={64}
width={64}
/>
<h1 className="font-bold self-stretch text-center font-header text-xl leading-8 ">
{modalHeading1}
</h1>
</div>
<p className="w-full self-stretch leading-7 text-lg text-grey-900">
{modalMessage &&
modalMessage.map((line, i) => (
<p className="my-2" key={i}>
{line}
</p>
))}
</p>

<div className="w-full flex flex-col gap-3 mt-12">
<Link
className="border box-border font-header h-14 items-center justify-center rounded-md text-white text-center font-bold py-4 px-6 bg-blue-500 hover:bg-blue-700 flex w-full"
href={upgradeButtonUrl}
>
{upgradeButtonLabel}
</Link>
<Link
className="border box-border font-header h-14 items-center justify-center rounded-md text-center font-bold py-4 px-6 bg-grey-10 border-grey-200 hover:bg-grey-50 flex w-full"
href={`/${locale}/subscriptions/landing`}
>
<span>{keepCurrentSubscriptionButtonText}</span>
</Link>
<Link
className="border box-border font-header h-14 items-center justify-center rounded-md text-center font-bold py-4 px-6 bg-grey-10 border-grey-200 hover:bg-grey-50 flex w-full"
href={`/${locale}/subscriptions/${subscriptionId}/cancel`}
>
<span>{l10n.getString(
'interstitial-offer-button-cancel-subscription',
'Continue to cancel'
)}</span>
</Link>
</div>
<div className="w-full flex flex-col gap-3 mt-12">
<Link
className="border box-border font-header h-14 items-center justify-center rounded-md text-white text-center font-bold py-4 px-6 bg-blue-500 hover:bg-blue-700 flex w-full"
href={`${upgradeButtonUrl}?${searchParamsObj.toString()}`}
>
{upgradeButtonLabel}
</Link>
<Link
className="border box-border font-header h-14 items-center justify-center rounded-md text-center font-bold py-4 px-6 bg-grey-10 border-grey-200 hover:bg-grey-50 flex w-full"
href={`/${locale}/subscriptions/landing`}
>
<span>{keepCurrentSubscriptionButtonText}</span>
</Link>
<Link
className="border box-border font-header h-14 items-center justify-center rounded-md text-center font-bold py-4 px-6 bg-grey-10 border-grey-200 hover:bg-grey-50 flex w-full"
href={`/${locale}/subscriptions/${subscriptionId}/cancel`}
>
<span>{l10n.getString(
'interstitial-offer-button-cancel-subscription',
'Continue to cancel'
)}</span>
</Link>
</div>
</div>
</section>
);
}
Loading
Loading