Merge pull request #335 from rahulramakrishnan3/release-2.5.0

bug fix 1131, 1129 hotfix
ELEVATE-Project · Dec 15, 2023 · 274d91c · 274d91c
2 parents 9592624 + a5b34bb
commit 274d91c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/app/app.component.scss b/src/app/app.component.scss
@@ -10,6 +10,7 @@
     margin-left: 20px;
     overflow: hidden;
     overflow-y: auto;
+    scrollbar-width: none !important;
 }
 
 .sub-menu-list{

diff --git a/src/app/pages/tabs/profile/profile.page.ts b/src/app/pages/tabs/profile/profile.page.ts
@@ -100,7 +100,7 @@ public buttonConfig = {
     }
     this.formData.data = this.user;
     this.formData.data.emailId = this.user.email.address;
-    this.formData.data.organizationName = this.user.organization.name;
+    this.formData.data.organizationName = this.user?.organization?.name;
     this.isMentor = this.profileService.isMentor;
     if (!this.formData?.data?.about) {
       (!this.visited && !this.formData.data.deleted)?this.router.navigate([CommonRoutes.EDIT_PROFILE]):null;
@@ -129,7 +129,7 @@ public buttonConfig = {
     if(result){
       this.formData.data = result;
       this.formData.data.emailId = result.email;
-      this.formData.data.organizationName = this.user.organization.name;
+      this.formData.data.organizationName = this.user.organization?.name;
     }
   }
 }