From 650768ebfb6fdf4975ec7ed67b696eb778d66de5 Mon Sep 17 00:00:00 2001
From: shubhamsharma9199 <shubham.24bcs10320@sst.scaler.com>
Date: Tue, 4 Nov 2025 17:04:05 +0530
Subject: [PATCH] fix(webappcomponent): prevent memory leaks by adding RxJS
 cleanup and takeUntil

---
 src/app/web-app.component.ts | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/app/web-app.component.ts b/src/app/web-app.component.ts
index d11079f9d..d70c97daf 100644
--- a/src/app/web-app.component.ts
+++ b/src/app/web-app.component.ts
@@ -6,8 +6,8 @@ import { MatSnackBar } from '@angular/material/snack-bar';
 import { MatDialog } from '@angular/material/dialog';
 
 /** rxjs Imports */
-import { merge, Subscription } from 'rxjs';
-import { filter, map, mergeMap } from 'rxjs/operators';
+import { merge, Subscription, Subject } from 'rxjs';
+import { filter, map, mergeMap, takeUntil, take } from 'rxjs/operators';
 
 /** Translation Imports */
 import { TranslateService } from '@ngx-translate/core';
@@ -93,6 +93,7 @@ export class WebAppComponent implements OnInit, OnDestroy {
   i18nService: I18nService;
 
   private authSubscription: Subscription;
+  private destroy$ = new Subject<void>();
 
   /**
    * @param {Router} router Router for navigation.
@@ -178,13 +179,17 @@ export class WebAppComponent implements OnInit, OnDestroy {
           return route;
         }),
         filter((route) => route.outlet === 'primary'),
-        mergeMap((route) => route.data)
+        mergeMap((route) => route.data),
+        takeUntil(this.destroy$)
       )
       .subscribe((event) => {
         const title = event['title'] ? `labels.text.${event['title']}` : 'APP_NAME';
-        this.i18nService.translate(title).subscribe((titleTranslated: any) => {
-          this.titleService.setTitle(titleTranslated);
-        });
+        this.i18nService
+          .translate(title)
+          .pipe(take(1))
+          .subscribe((titleTranslated: any) => {
+            this.titleService.setTitle(titleTranslated);
+          });
       });
 
     // Stores top 100 user activites as local storage object.
@@ -195,7 +200,7 @@ export class WebAppComponent implements OnInit, OnDestroy {
       activities = length > 100 ? activitiesArray.slice(length - 100) : activitiesArray;
     }
     // Store route URLs array in local storage on navigation end.
-    onNavigationEnd.subscribe(() => {
+    onNavigationEnd.pipe(takeUntil(this.destroy$)).subscribe(() => {
       activities.push(this.router.url);
       localStorage.setItem('mifosXLocation', JSON.stringify(activities));
     });
@@ -257,6 +262,8 @@ export class WebAppComponent implements OnInit, OnDestroy {
   }
 
   ngOnDestroy() {
+    this.destroy$.next();
+    this.destroy$.complete();
     if (this.authSubscription) {
       this.authSubscription.unsubscribe();
     }