Unsubscribe subscriptions

apps/client/src/app/app.component.ts

@@ -73,16 +73,19 @@ export class AppComponent implements OnDestroy, OnInit {
         this.isLoggedIn = !!this.tokenStorageService.getToken();
 
         if (this.isLoggedIn) {
-          this.userService.get().subscribe((user) => {
+          this.userService
-            this.user = user;
+            .get()
-
+            .pipe(takeUntil(this.unsubscribeSubject))
-            this.canCreateAccount = hasPermission(
+            .subscribe((user) => {
-              this.user.permissions,
+              this.user = user;
-              permissions.createUserAccount
+
-            );
+              this.canCreateAccount = hasPermission(
-
+                this.user.permissions,
-            this.cd.markForCheck();
+                permissions.createUserAccount
-          });
+              );
+
+              this.cd.markForCheck();
+            });
         } else {
           this.user = null;
         }

apps/client/src/app/pages/about/about-page.component.ts

@@ -44,11 +44,14 @@ export class AboutPageComponent implements OnInit {
         .onChangeHasToken()
         .pipe(takeUntil(this.unsubscribeSubject))
         .subscribe(() => {
-          this.userService.get().subscribe((user) => {
+          this.userService
-            this.user = user;
+            .get()
-
+            .pipe(takeUntil(this.unsubscribeSubject))
-            this.cd.markForCheck();
+            .subscribe((user) => {
-          });
+              this.user = user;
+
+              this.cd.markForCheck();
+            });
         });
   }
 

apps/client/src/app/pages/account/account-page.component.ts

@@ -50,16 +50,19 @@ export class AccountPageComponent implements OnDestroy, OnInit {
       .onChangeHasToken()
       .pipe(takeUntil(this.unsubscribeSubject))
       .subscribe(() => {
-        this.userService.get().subscribe((user) => {
+        this.userService
-          this.user = user;
+          .get()
+          .pipe(takeUntil(this.unsubscribeSubject))
+          .subscribe((user) => {
+            this.user = user;
 
-          this.hasPermissionToUpdateUserSettings = hasPermission(
+            this.hasPermissionToUpdateUserSettings = hasPermission(
-            this.user.permissions,
+              this.user.permissions,
-            permissions.updateUserSettings
+              permissions.updateUserSettings
-          );
+            );
 
-          this.cd.markForCheck();
+            this.cd.markForCheck();
-        });
+          });
       });
   }
 
@@ -82,11 +85,14 @@ export class AccountPageComponent implements OnDestroy, OnInit {
       .subscribe(() => {
         this.userService.remove();
 
-        this.userService.get().subscribe((user) => {
+        this.userService
-          this.user = user;
+          .get()
+          .pipe(takeUntil(this.unsubscribeSubject))
+          .subscribe((user) => {
+            this.user = user;
 
-          this.cd.markForCheck();
+            this.cd.markForCheck();
-        });
+          });
       });
   }
 

apps/client/src/app/pages/accounts/accounts-page.component.ts

@@ -81,20 +81,23 @@ export class AccountsPageComponent implements OnInit {
       .onChangeHasToken()
       .pipe(takeUntil(this.unsubscribeSubject))
       .subscribe(() => {
-        this.userService.get().subscribe((user) => {
+        this.userService
-          this.user = user;
+          .get()
-
+          .pipe(takeUntil(this.unsubscribeSubject))
-          this.hasPermissionToCreateAccount = hasPermission(
+          .subscribe((user) => {
-            user.permissions,
+            this.user = user;
-            permissions.createAccount
+
-          );
+            this.hasPermissionToCreateAccount = hasPermission(
-          this.hasPermissionToDeleteAccount = hasPermission(
+              user.permissions,
-            user.permissions,
+              permissions.createAccount
-            permissions.deleteAccount
+            );
-          );
+            this.hasPermissionToDeleteAccount = hasPermission(
-
+              user.permissions,
-          this.cd.markForCheck();
+              permissions.deleteAccount
-        });
+            );
+
+            this.cd.markForCheck();
+          });
       });
 
     this.fetchAccounts();

apps/client/src/app/pages/admin/admin-page.component.ts

@@ -49,9 +49,12 @@ export class AdminPageComponent implements OnInit {
       .onChangeHasToken()
       .pipe(takeUntil(this.unsubscribeSubject))
       .subscribe(() => {
-        this.userService.get().subscribe((user) => {
+        this.userService
-          this.user = user;
+          .get()
-        });
+          .pipe(takeUntil(this.unsubscribeSubject))
+          .subscribe((user) => {
+            this.user = user;
+          });
       });
   }
 

apps/client/src/app/pages/analysis/analysis-page.component.ts

@@ -85,11 +85,14 @@ export class AnalysisPageComponent implements OnDestroy, OnInit {
       .onChangeHasToken()
       .pipe(takeUntil(this.unsubscribeSubject))
       .subscribe(() => {
-        this.userService.get().subscribe((user) => {
+        this.userService
-          this.user = user;
+          .get()
-
+          .pipe(takeUntil(this.unsubscribeSubject))
-          this.cd.markForCheck();
+          .subscribe((user) => {
-        });
+            this.user = user;
+
+            this.cd.markForCheck();
+          });
       });
   }
 

apps/client/src/app/pages/home/home-page.component.ts

@@ -82,32 +82,35 @@ export class HomePageComponent implements OnDestroy, OnInit {
       .onChangeHasToken()
       .pipe(takeUntil(this.unsubscribeSubject))
       .subscribe(() => {
-        this.userService.get().subscribe((user) => {
+        this.userService
-          this.user = user;
+          .get()
-
+          .pipe(takeUntil(this.unsubscribeSubject))
-          this.hasPermissionToAccessFearAndGreedIndex = hasPermission(
+          .subscribe((user) => {
-            user.permissions,
+            this.user = user;
-            permissions.accessFearAndGreedIndex
+
-          );
+            this.hasPermissionToAccessFearAndGreedIndex = hasPermission(
-
+              user.permissions,
-          if (this.hasPermissionToAccessFearAndGreedIndex) {
+              permissions.accessFearAndGreedIndex
-            this.dataService
+            );
-              .fetchSymbolItem('GF.FEAR_AND_GREED_INDEX')
+
-              .pipe(takeUntil(this.unsubscribeSubject))
+            if (this.hasPermissionToAccessFearAndGreedIndex) {
-              .subscribe(({ marketPrice }) => {
+              this.dataService
-                this.fearAndGreedIndex = marketPrice;
+                .fetchSymbolItem('GF.FEAR_AND_GREED_INDEX')
-
+                .pipe(takeUntil(this.unsubscribeSubject))
-                this.cd.markForCheck();
+                .subscribe(({ marketPrice }) => {
-              });
+                  this.fearAndGreedIndex = marketPrice;
-          }
+
-
+                  this.cd.markForCheck();
-          this.hasPermissionToReadForeignPortfolio = hasPermission(
+                });
-            user.permissions,
+            }
-            permissions.readForeignPortfolio
+
-          );
+            this.hasPermissionToReadForeignPortfolio = hasPermission(
-
+              user.permissions,
-          this.cd.markForCheck();
+              permissions.readForeignPortfolio
-        });
+            );
+
+            this.cd.markForCheck();
+          });
       });
   }
 

apps/client/src/app/pages/pricing/pricing-page.component.ts

@@ -40,11 +40,14 @@ export class PricingPageComponent implements OnInit {
         .onChangeHasToken()
         .pipe(takeUntil(this.unsubscribeSubject))
         .subscribe(() => {
-          this.userService.get().subscribe((user) => {
+          this.userService
-            this.user = user;
+            .get()
+            .pipe(takeUntil(this.unsubscribeSubject))
+            .subscribe((user) => {
+              this.user = user;
 
-            this.cd.markForCheck();
+              this.cd.markForCheck();
-          });
+            });
         });
   }
 

apps/client/src/app/pages/transactions/transactions-page.component.ts

@@ -81,20 +81,23 @@ export class TransactionsPageComponent implements OnInit {
       .onChangeHasToken()
       .pipe(takeUntil(this.unsubscribeSubject))
       .subscribe(() => {
-        this.userService.get().subscribe((user) => {
+        this.userService
-          this.user = user;
+          .get()
-
+          .pipe(takeUntil(this.unsubscribeSubject))
-          this.hasPermissionToCreateOrder = hasPermission(
+          .subscribe((user) => {
-            user.permissions,
+            this.user = user;
-            permissions.createOrder
+
-          );
+            this.hasPermissionToCreateOrder = hasPermission(
-          this.hasPermissionToDeleteOrder = hasPermission(
+              user.permissions,
-            user.permissions,
+              permissions.createOrder
-            permissions.deleteOrder
+            );
-          );
+            this.hasPermissionToDeleteOrder = hasPermission(
-
+              user.permissions,
-          this.cd.markForCheck();
+              permissions.deleteOrder
-        });
+            );
+
+            this.cd.markForCheck();
+          });
       });
 
     this.fetchOrders();

apps/client/src/app/pages/zen/zen-page.component.ts

@@ -43,16 +43,19 @@ export class ZenPageComponent implements OnDestroy, OnInit {
       .onChangeHasToken()
       .pipe(takeUntil(this.unsubscribeSubject))
       .subscribe(() => {
-        this.userService.get().subscribe((user) => {
+        this.userService
-          this.user = user;
+          .get()
+          .pipe(takeUntil(this.unsubscribeSubject))
+          .subscribe((user) => {
+            this.user = user;
 
-          this.hasPermissionToReadForeignPortfolio = hasPermission(
+            this.hasPermissionToReadForeignPortfolio = hasPermission(
-            user.permissions,
+              user.permissions,
-            permissions.readForeignPortfolio
+              permissions.readForeignPortfolio
-          );
+            );
 
-          this.cd.markForCheck();
+            this.cd.markForCheck();
-        });
+          });
       });
   }