From 0cd41cf91f2c4dd08fecb13a4bf99dde0551346b Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Sat, 29 Aug 2026 20:54:33 +0200
Subject: [PATCH] Add support for filters of assistant to accounts page

---
 apps/client/src/app/app.component.ts                      | 2 ++
 .../src/app/pages/accounts/accounts-page.component.ts     | 8 ++------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/apps/client/src/app/app.component.ts b/apps/client/src/app/app.component.ts
index 65b5e95b0..d97180bc1 100644
--- a/apps/client/src/app/app.component.ts
+++ b/apps/client/src/app/app.component.ts
@@ -147,6 +147,8 @@ export class GfAppComponent implements OnInit {
         }
 
         if (
+          (this.currentRoute === internalRoutes.accounts.path &&
+            !this.currentSubRoute) ||
           (this.currentRoute === internalRoutes.home.path &&
             this.currentSubRoute ===
               internalRoutes.home.subRoutes?.holdings.path) ||
diff --git a/apps/client/src/app/pages/accounts/accounts-page.component.ts b/apps/client/src/app/pages/accounts/accounts-page.component.ts
index 41072948a..1a303c21f 100644
--- a/apps/client/src/app/pages/accounts/accounts-page.component.ts
+++ b/apps/client/src/app/pages/accounts/accounts-page.component.ts
@@ -50,7 +50,6 @@ export class GfAccountsPageComponent implements OnInit {
   protected user: User;
 
   private hasImpersonationId: boolean;
-  private isInitialFetch = true;
 
   private readonly deviceType = computed(
     () => this.deviceDetectorService.deviceInfo().deviceType
@@ -134,7 +133,7 @@ export class GfAccountsPageComponent implements OnInit {
 
   private fetchAccounts() {
     this.dataService
-      .fetchAccounts()
+      .fetchAccounts({ filters: this.userService.getFilters() })
       .pipe(takeUntilDestroyed(this.destroyRef))
       .subscribe(
         ({
@@ -150,17 +149,14 @@ export class GfAccountsPageComponent implements OnInit {
 
           if (
             !this.hasImpersonationId &&
-            this.accounts?.length <= 0 &&
             this.hasPermissionToCreateAccount &&
-            this.isInitialFetch
+            this.user?.accounts?.length === 0
           ) {
             void this.router.navigate(
               internalRoutes.accounts.subRoutes.create.routerLink
             );
           }
 
-          this.isInitialFetch = false;
-
           this.changeDetectorRef.markForCheck();
         }
       );