Issue #ED-2873 merge: Merge pull request #3493 from Ajoymaity/release…

…-6.0.0_v13 Issue #ED-2873 fix: Fixed navigation issue for update profile type
Sunbird-Ed · Sep 15, 2023 · b20f8ce · b20f8ce
2 parents 6844bdd + e2ec167
commit b20f8ce
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/app/district-mapping/district-mapping.page.ts b/src/app/district-mapping/district-mapping.page.ts
@@ -275,7 +275,10 @@ export class DistrictMappingPage implements OnDestroy {
                 this.location.back();
             } else if (this.profile && this.source === PageId.PROFILE) {
                 this.location.back();
-                this.events.publish('UPDATE_TABS', {type: 'SWITCH_TABS_USERTYPE'});
+                if (this.profile.serverProfile && (!Object.keys(this.profile.serverProfile.profileUserType).length
+                    || (this.formGroup.value.persona !== this.profile.serverProfile.profileUserType.type))) {
+                  this.events.publish('UPDATE_TABS', {type: 'SWITCH_TABS_USERTYPE'});
+                }
             } else {
               if (this.profile && !isSSOUser) {
                 await this.appGlobalService.showYearOfBirthPopup(this.profile.serverProfile);