From bdf1599b90261ade96ae1c50ee410b0c3b5a59ad Mon Sep 17 00:00:00 2001
From: selman koc <64414348+skoc10@users.noreply.github.com>
Date: Wed, 26 Jul 2023 10:50:01 +0300
Subject: [PATCH 1/2] Update common.props

---
 common.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common.props b/common.props
index c11886edf4..f356656fbf 100644
--- a/common.props
+++ b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>7.3.0</Version>
+    <Version>7.3.1</Version>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
     <PackageIconUrl>https://abp.io/assets/abp_nupkg.png</PackageIconUrl>
     <PackageProjectUrl>https://abp.io/</PackageProjectUrl>

From add1f0a8174c0745f34f40b8b4b276278f0e1780 Mon Sep 17 00:00:00 2001
From: Mahmut Gundogdu <mahmutgundogdu@hotmail.com.tr>
Date: Wed, 26 Jul 2023 10:58:32 +0300
Subject: [PATCH 2/2] Dynamic layout musst solve layout oninit. Update guard

---
 .../src/lib/components/dynamic-layout.component.ts    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 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 5adaa0d768..5215c95398 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
@@ -1,4 +1,4 @@
-import { Component, Injector, isDevMode, Optional, SkipSelf, Type } from '@angular/core';
+import { Component, Injector, isDevMode, OnInit, Optional, SkipSelf, Type } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { eLayoutType } from '../enums/common';
 import { ABP } from '../models';
@@ -16,7 +16,7 @@ import { TreeNode } from '../utils/tree-utils';
   template: ` <ng-container *ngIf="isLayoutVisible" [ngComponentOutlet]="layout"></ng-container> `,
   providers: [SubscriptionService],
 })
-export class DynamicLayoutComponent {
+export class DynamicLayoutComponent implements OnInit {
   layout?: Type<any>;
   layoutKey?: eLayoutType;
 
@@ -53,6 +53,13 @@ export class DynamicLayoutComponent {
     this.listenToLanguageChange();
   }
 
+  ngOnInit(): void {
+    if(this.layout){
+      return;
+    }
+    this.getLayout()
+  }
+
   private checkLayoutOnNavigationEnd() {
     const navigationEnd$ = this.routerEvents.getNavigationEvents('End');
     this.subscription.addOne(navigationEnd$, () => this.getLayout());