Merge pull request #226 from BinaryStudioAcademy/bug-138/two-notifica…

…tion removed the second notification
BinaryStudioAcademy · Sep 29, 2023 · ca02ec4 · ca02ec4
2 parents 68565ab + c7d723f
commit ca02ec4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/frontend/src/app/modules/user/user-info-editor/user-info-editor.component.ts b/frontend/src/app/modules/user/user-info-editor/user-info-editor.component.ts
@@ -79,16 +79,16 @@ export class UserInfoEditorComponent implements OnInit {
             .pipe(switchMap((user: IUser) => (this.userInfoForm.value.avatar ? this.updateUserAvatar(user) : of(user))))
             .subscribe({
                 next: (user) => {
+                    this.userPreferencesComponent.setPreferences();
                     this.authService.setUserInfo(user);
-                    this.toastrNotification.showSuccess('User information has been updated');
+                    this.toastrNotification.showSuccess('Your data have been updated');
                     this.spinnerService.hide();
                 },
                 error: () => {
                     this.toastrNotification.showError('Something went wrong');
                     this.spinnerService.hide();
                 },
             });
-        this.userPreferencesComponent.setPreferences();
     }
 
     onImagePicked(event: Event) {

diff --git a/frontend/src/app/modules/user/user-preferences/user-preferences.component.ts b/frontend/src/app/modules/user/user-preferences/user-preferences.component.ts
@@ -71,14 +71,7 @@ export class UserPreferencesComponent extends BaseComponent implements OnInit {
     private updateUserPreferences() {
         this.userervice
             .setUserPrefferences(this.newPreferences)
-            .subscribe({
-                next: () => {
-                    this.toastrService.showSuccess('User preferences has been updated');
-                },
-                error: () => {
-                    this.toastrService.showError('Something went wrong');
-                },
-            });
+            .subscribe();
     }
 
     private loadData() {