Merge pull request #471 from GSuma21/release-2.6.1

Release 2.6.1
ELEVATE-Project · Apr 5, 2024 · 8b2a06a · 8b2a06a
2 parents 6cdef22 + 3df650d
commit 8b2a06a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/app/core/services/profile/profile.service.ts b/src/app/core/services/profile/profile.service.ts
@@ -53,7 +53,8 @@ export class ProfileService {
       this.loaderService.stopLoader();
       this._location.back();
       (showToast)?this.toast.showToast(data.message, "success"):null;
-    }
+      return true;
+      }
     catch (error) {
       this.loaderService.stopLoader();
     }

diff --git a/src/app/pages/language/language.page.ts b/src/app/pages/language/language.page.ts
@@ -39,10 +39,12 @@ export class LanguagePage implements OnInit {
   }
 
   onSubmit(){
-    this.setLanguage(this.selectedLanguage);
     let showProfileUpdateToast = false;
-    this.profile.profileUpdate({preferred_language:this.selectedLanguage}, showProfileUpdateToast).then(()=>{
-      this.toast.showToast("LANGUAGE_CHANGED_SUCCESSFULLY","success");
+    this.profile.profileUpdate({preferred_language:this.selectedLanguage}, showProfileUpdateToast).then((result)=>{
+      if(result){
+        this.setLanguage(this.selectedLanguage);
+        this.toast.showToast("LANGUAGE_CHANGED_SUCCESSFULLY","success");
+      }
     })
   }
 

diff --git a/src/app/shared/components/generic-table/generic-table.component.scss b/src/app/shared/components/generic-table/generic-table.component.scss
@@ -158,7 +158,7 @@ ion-popover {
 .cell-text{
   padding: 0px 2px;
   overflow: hidden;
-  max-width: 150px;
+  max-width: 200px;
   text-overflow: ellipsis;
   display: -webkit-box;
   -webkit-box-orient: vertical;