From ea98f03aeb20b9b3559ba1ebe8d715bcf262da23 Mon Sep 17 00:00:00 2001
From: spvarma <satyaprakashvarma10@gmail.com>
Date: Fri, 11 Dec 2020 14:23:04 +0530
Subject: [PATCH 1/2] fix isLoading issue

---
 .../js/views/settings/UserProfileSetting.vue  | 93 +++++++++----------
 1 file changed, 45 insertions(+), 48 deletions(-)

diff --git a/resources/assets/js/views/settings/UserProfileSetting.vue b/resources/assets/js/views/settings/UserProfileSetting.vue
index ac81c4c3..5da64cc3 100644
--- a/resources/assets/js/views/settings/UserProfileSetting.vue
+++ b/resources/assets/js/views/settings/UserProfileSetting.vue
@@ -313,59 +313,56 @@ export default {
         name: this.formData.name,
         email: this.formData.email,
       }
-
-      if (
-        this.formData.password != null &&
-        this.formData.password !== undefined &&
-        this.formData.password !== ''
-      ) {
-        data = { ...data, password: this.formData.password }
-      }
-
-      let response = await this.updateCurrentUser(data)
-
-      let languageData = {
-        settings: {
-          language: this.language.code,
-        },
-      }
-
-      let languageRes = await this.updateUserSettings(languageData)
-
-      // if(languageRes) {
-      //   window.i18n.locale = this.language.code
-      // }
-
-      if (response.data.success) {
-        this.isLoading = false
-
-        if (this.fileObject && this.previewAvatar) {
-          let avatarData = new FormData()
-
-          avatarData.append(
-            'admin_avatar',
-            JSON.stringify({
-              name: this.fileObject.name,
-              data: this.previewAvatar,
-            })
-          )
-          this.uploadAvatar(avatarData)
+      try {
+        if (
+          this.formData.password != null &&
+          this.formData.password !== undefined &&
+          this.formData.password !== ''
+        ) {
+          data = { ...data, password: this.formData.password }
         }
 
-        window.toastr['success'](
-          this.$t('settings.account_settings.updated_message')
-        )
+        let response = await this.updateCurrentUser(data)
 
-        this.formData.password = ''
-        this.formData.confirm_password = ''
+        let languageData = {
+          settings: {
+            language: this.language.code,
+          },
+        }
+
+        let languageRes = await this.updateUserSettings(languageData)
+
+        // if(languageRes) {
+        //   window.i18n.locale = this.language.code
+        // }
+
+        if (response.data.success) {
+          this.isLoading = false
+
+          if (this.fileObject && this.previewAvatar) {
+            let avatarData = new FormData()
+
+            avatarData.append(
+              'admin_avatar',
+              JSON.stringify({
+                name: this.fileObject.name,
+                data: this.previewAvatar,
+              })
+            )
+            this.uploadAvatar(avatarData)
+          }
+
+          window.toastr['success'](
+            this.$t('settings.account_settings.updated_message')
+          )
+
+          this.formData.password = ''
+          this.formData.confirm_password = ''
+        }
+      } catch (error) {
+        this.isLoading = false
         return true
       }
-
-      window.toastr['error'](response.data.error)
-
-      this.isLoading = false
-
-      return true
     },
   },
 }

From c12e27dbfe8ae2adc2707c22f71d26aa984e73f3 Mon Sep 17 00:00:00 2001
From: Mohit Panjwani <mohit.panjvani@gmail.com>
Date: Tue, 22 Dec 2020 12:12:58 +0530
Subject: [PATCH 2/2] remove unnecessary comment

---
 resources/assets/js/views/settings/UserProfileSetting.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/resources/assets/js/views/settings/UserProfileSetting.vue b/resources/assets/js/views/settings/UserProfileSetting.vue
index 5da64cc3..4844b3cf 100644
--- a/resources/assets/js/views/settings/UserProfileSetting.vue
+++ b/resources/assets/js/views/settings/UserProfileSetting.vue
@@ -332,10 +332,6 @@ export default {
 
         let languageRes = await this.updateUserSettings(languageData)
 
-        // if(languageRes) {
-        //   window.i18n.locale = this.language.code
-        // }
-
         if (response.data.success) {
           this.isLoading = false
 
@@ -349,6 +345,7 @@ export default {
                 data: this.previewAvatar,
               })
             )
+
             this.uploadAvatar(avatarData)
           }