diff --git a/dashboard/sharedComponents/sidebar/sideBar.component.ts b/dashboard/sharedComponents/sidebar/sideBar.component.ts index dbc76745..b3a504ff 100644 --- a/dashboard/sharedComponents/sidebar/sideBar.component.ts +++ b/dashboard/sharedComponents/sidebar/sideBar.component.ts @@ -25,7 +25,9 @@ export class SideBarComponent implements AfterViewInit { ngAfterViewInit() { if(this.nav) { setTimeout(() => { - UIkit.nav(this.nav.nativeElement).toggle(this.activeIndex, true); + if(this.items[this.activeIndex].items.length > 0) { + UIkit.nav(this.nav.nativeElement).toggle(this.activeIndex, true); + } }); } } diff --git a/role-verification/role-verification.component.ts b/role-verification/role-verification.component.ts index 1eb7e836..9b9bf7ea 100644 --- a/role-verification/role-verification.component.ts +++ b/role-verification/role-verification.component.ts @@ -63,11 +63,11 @@ import {Composer} from "../utils/email/composer";
We are unable to process the request. What happened? -
    +
    • You are logged in with a different email, than the one you have received the invitation.
    • The invitation has been canceled.
    • The URL is invalid.
    • -
+
` @@ -133,11 +133,12 @@ export class RoleVerificationComponent implements OnInit, OnDestroy, AfterViewIn this.openErrorModal(); })); } else { - this.router.navigate(['/user-info'], { + this.router.navigate(['user-info'], { queryParams: { 'errorCode': LoginErrorCodes.NOT_LOGIN, 'redirectUrl': this.router.url - } + }, + relativeTo: this.route }); } }