fix

Author: xlisachan

libs/payments/management/src/lib/churn-intervention.service.ts

@@ -306,9 +306,6 @@ export class ChurnInterventionService {
   async determineCancellationIntervention(args: {
     uid: string;
     subscriptionId: string;
-    offeringApiIdentifier: string;
-    currentInterval: SubplatInterval;
-    upgradeInterval: SubplatInterval;
     acceptLanguage?: string | null;
     selectedLanguage?: string;
   }) {

libs/payments/ui/src/lib/actions/determineCancellationIntervention.ts

@@ -5,23 +5,16 @@
 'use server';
 
 import { getApp } from '../nestapp/app';
-import { SubplatInterval } from '@fxa/payments/customer';
 
 export const determineCancellationInterventionAction = async (args: {
   uid: string;
   subscriptionId: string;
-  offeringApiIdentifier: string;
-  currentInterval: SubplatInterval;
-  upgradeInterval: SubplatInterval;
   acceptLanguage?: string | null;
   selectedLanguage?: string;
 }) => {
   return await getApp().getActionsService().determineCancellationIntervention({
     uid: args.uid,
     subscriptionId: args.subscriptionId,
-    offeringApiIdentifier: args.offeringApiIdentifier,
-    currentInterval: args.currentInterval,
-    upgradeInterval: args.upgradeInterval,
     acceptLanguage: args.acceptLanguage,
     selectedLanguage: args.selectedLanguage,
   });

libs/payments/ui/src/lib/nestapp/nextjs-actions.service.ts

@@ -318,19 +318,13 @@ export class NextJSActionsService {
   async determineCancellationIntervention(args: {
     uid: string;
     subscriptionId: string;
-    offeringApiIdentifier: string;
-    currentInterval: SubplatInterval;
-    upgradeInterval: SubplatInterval;
     acceptLanguage?: string | null;
     selectedLanguage?: string;
   }) {
     return await this.churnInterventionService.determineCancellationIntervention(
       {
         uid: args.uid,
         subscriptionId: args.subscriptionId,
-        offeringApiIdentifier: args.offeringApiIdentifier,
-        currentInterval: args.currentInterval,
-        upgradeInterval: args.upgradeInterval,
         acceptLanguage: args.acceptLanguage,
         selectedLanguage: args.selectedLanguage,
       }
@@ -678,30 +672,23 @@ export class NextJSActionsService {
       );
 
     const churnCancelEligibility =
-      await this.churnInterventionService.determineCancelChurnContentEligibility(
-        {
-          uid: args.uid,
-          subscriptionId: args.subscriptionId,
-          acceptLanguage: args.acceptLanguage,
-          selectedLanguage: args.selectedLanguage,
-        }
-      );
-
-    const cancelInterstitialOfferEligibility =
-      await this.churnInterventionService.determineCancelInterstitialOfferEligibility(
-        {
-          uid: args.uid,
-          subscriptionId: args.subscriptionId,
-          acceptLanguage: args.acceptLanguage,
-          selectedLanguage: args.selectedLanguage,
-        }
-      );
+      await this.churnInterventionService.determineCancellationIntervention({
+        uid: args.uid,
+        subscriptionId: args.subscriptionId,
+        acceptLanguage: args.acceptLanguage,
+        selectedLanguage: args.selectedLanguage,
+      });
 
     return {
       ...result,
-      isEligibleForChurnCancel: churnCancelEligibility.isEligible,
+      isEligibleForChurnCancel:
+        churnCancelEligibility.reason === 'eligible' &&
+        churnCancelEligibility.cancelChurnInterventionType ===
+          'cancel_churn_intervention',
       isEligibleForCancelInterstitialOffer:
-        cancelInterstitialOfferEligibility.isEligible,
+        churnCancelEligibility.reason === 'eligible' &&
+        churnCancelEligibility.cancelChurnInterventionType ===
+          'cancel_interstitial_offer',
     };
   }