Issue #ED-4211 merge: Merge pull request #3607 from Ajoymaity/release…

…-7.0.0 Issue #ED-4211 fix: Fixed back button issue in profile settings page
Sunbird-Ed · May 3, 2024 · 374c5a4 · 374c5a4
2 parents f5434b9 + cfc693f
commit 374c5a4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 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
@@ -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
@@ -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