From 950635aa965e90374052810af49e67cdb580c7ba Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Thu, 2 Apr 2026 18:47:40 +0200 Subject: [PATCH] Eliminate OnDestroy lifecycle hook --- ...subscription-interstitial-dialog.component.ts | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.component.ts b/apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.component.ts index 0d616b92e..d10be10bd 100644 --- a/apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.component.ts +++ b/apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.component.ts @@ -7,9 +7,11 @@ import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA, + DestroyRef, Inject, OnInit } from '@angular/core'; +import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { MatButtonModule } from '@angular/material/button'; import { MAT_DIALOG_DATA, @@ -21,8 +23,8 @@ import { IonIcon } from '@ionic/angular/standalone'; import { addIcons } from 'ionicons'; import { arrowForwardOutline, checkmarkCircleOutline } from 'ionicons/icons'; import ms from 'ms'; -import { interval, Subject } from 'rxjs'; -import { take, takeUntil, tap } from 'rxjs/operators'; +import { interval } from 'rxjs'; +import { take, tap } from 'rxjs/operators'; import { SubscriptionInterstitialDialogParams } from './interfaces/interfaces'; @@ -51,11 +53,10 @@ export class GfSubscriptionInterstitialDialogComponent implements OnInit { public routerLinkPricing = publicRoutes.pricing.routerLink; public variantIndex: number; - private unsubscribeSubject = new Subject(); - public constructor( private changeDetectorRef: ChangeDetectorRef, @Inject(MAT_DIALOG_DATA) public data: SubscriptionInterstitialDialogParams, + private destroyRef: DestroyRef, public dialogRef: MatDialogRef ) { this.variantIndex = Math.floor( @@ -76,7 +77,7 @@ export class GfSubscriptionInterstitialDialogComponent implements OnInit { this.changeDetectorRef.markForCheck(); }), - takeUntil(this.unsubscribeSubject) + takeUntilDestroyed(this.destroyRef) ) .subscribe(); } @@ -84,9 +85,4 @@ export class GfSubscriptionInterstitialDialogComponent implements OnInit { public closeDialog() { this.dialogRef.close({}); } - - public ngOnDestroy() { - this.unsubscribeSubject.next(); - this.unsubscribeSubject.complete(); - } }