From ecb1f80ae88a9d4b65cebf8e3bee853b96697501 Mon Sep 17 00:00:00 2001
From: Masum ULU <49063256+masumulu28@users.noreply.github.com>
Date: Thu, 28 Mar 2024 16:22:55 +0300
Subject: [PATCH] Update dynamic-layout.component.ts

---
 .../components/dynamic-layout.component.ts    | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/npm/ng-packs/packages/core/src/lib/components/dynamic-layout.component.ts b/npm/ng-packs/packages/core/src/lib/components/dynamic-layout.component.ts
index e27d372fe5..da29147d9b 100644
--- a/npm/ng-packs/packages/core/src/lib/components/dynamic-layout.component.ts
+++ b/npm/ng-packs/packages/core/src/lib/components/dynamic-layout.component.ts
@@ -33,18 +33,6 @@ export class DynamicLayoutComponent implements OnInit {
   protected readonly routerEvents = inject(RouterEvents);
   protected readonly environment = inject(EnvironmentService);
 
-  ngOnInit(): void {
-    if (this.layout) {
-      return;
-    }
-
-    const { oAuthConfig } = this.environment.getEnvironment() || {};
-
-    if (oAuthConfig.responseType && oAuthConfig.responseType === 'code') {
-      this.getLayout();
-    }
-  }
-
   constructor(@Optional() @SkipSelf() dynamicLayoutComponent: DynamicLayoutComponent) {
     if (dynamicLayoutComponent) {
       if (isDevMode()) console.warn('DynamicLayoutComponent must be used only in AppComponent.');
@@ -53,6 +41,17 @@ export class DynamicLayoutComponent implements OnInit {
     this.checkLayoutOnNavigationEnd();
     this.listenToLanguageChange();
   }
+  
+  ngOnInit(): void {
+    if (this.layout) {
+      return;
+    }
+
+    const { oAuthConfig } = this.environment.getEnvironment();
+    if (oAuthConfig.responseType === 'code') {
+      this.getLayout();
+    }
+  }
 
   private checkLayoutOnNavigationEnd() {
     const navigationEnd$ = this.routerEvents.getNavigationEvents('End');