From cfc693f8057d7470c490453401d0e695b0b3e1e8 Mon Sep 17 00:00:00 2001
From: Ajoymaity <ajoy.maity@tarento.com>
Date: Fri, 3 May 2024 14:18:40 +0530
Subject: [PATCH] Issue #ED-4211 fix: Fixed back button issue in profile
 settings page

---
 .../relevant-content-card.component.html                      | 2 +-
 src/app/profile-settings/profile-settings.page.ts             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/components/relevant-content-card/relevant-content-card.component.html b/src/app/components/relevant-content-card/relevant-content-card.component.html
index fbf774a27..e41037de1 100644
--- a/src/app/components/relevant-content-card/relevant-content-card.component.html
+++ b/src/app/components/relevant-content-card/relevant-content-card.component.html
@@ -23,7 +23,7 @@
                 <strong>{{'FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS' | categoryKeyTranslate : contentData }}</strong>
             </ion-card-title>
             <div *ngFor="let category of frameworkCategories">
-                    <p *ngIf="contentData[category.code] || contentData[category.alterNativeCode]">{{category.label | translateJson}} : {{contentData[category.code] || contentData[category.alterNativeCode]}}</p>
+                    <p *ngIf="contentData?.[category.code] || contentData?.[category.alterNativeCode]">{{category.label | translateJson}} : {{contentData[category.code] || contentData[category.alterNativeCode]}}</p>
             </div>
             <p *ngIf="contentData?.audience">{{'USER_TYPE' | translate}} : {{contentData?.audience}}</p>
         </div>
diff --git a/src/app/profile-settings/profile-settings.page.ts b/src/app/profile-settings/profile-settings.page.ts
index 06777ed0b..f09bab5cf 100644
--- a/src/app/profile-settings/profile-settings.page.ts
+++ b/src/app/profile-settings/profile-settings.page.ts
@@ -234,8 +234,8 @@ export class ProfileSettingsPage implements OnInit, OnDestroy, AfterViewInit {
 
     if (history.state && history.state.hideBackButton !== undefined) {
       this.hideBackButton = history.state.hideBackButton;
-    } else if (this.navParams) {
-      this.hideBackButton = Boolean(this.navParams.hideBackButton);
+    } else {
+      this.hideBackButton = this.navParams ? Boolean(this.navParams.hideBackButton) : false;
     }
 
     // should be called everytime when entered to this page