diff --git a/CHANGELOG.md b/CHANGELOG.md index 92ddaa77d..7af3467fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - Fixed the filtering by account name in the transactions table +- Fixed the active menu item state when a modal has opened ## 1.0.0 - 05.05.2021 diff --git a/apps/client/src/app/app.component.ts b/apps/client/src/app/app.component.ts index 22e7fe6f8..ad17b0c4c 100644 --- a/apps/client/src/app/app.component.ts +++ b/apps/client/src/app/app.component.ts @@ -57,9 +57,8 @@ export class AppComponent implements OnDestroy, OnInit { this.router.events .pipe(filter((event) => event instanceof NavigationEnd)) - .subscribe((test) => { + .subscribe(() => { this.currentRoute = this.router.url.toString().substring(1); - // this.initializeTheme(); }); this.tokenStorageService diff --git a/apps/client/src/app/components/header/header.component.html b/apps/client/src/app/components/header/header.component.html index 9f1497436..883f82229 100644 --- a/apps/client/src/app/components/header/header.component.html +++ b/apps/client/src/app/components/header/header.component.html @@ -9,7 +9,7 @@ [routerLink]="['/']" i18n mat-flat-button - [color]="currentRoute === 'home' ? 'primary' : null" + [color]="currentRoute?.startsWith('home') ? 'primary' : null" >Overview Analysis X-ray Transactions Accounts Admin Control Resources About