Fix discard change dialog displayed by mistake when avatar has been updated

CHANGES.md

@@ -8,7 +8,8 @@ Improvements 🙌:
  - Open an existing DM instead of creating a new one (#2319)
 
 Bugfix 🐛:
- - Fix issue when updating the avatar of a room
+ - Fix issue when updating the avatar of a room (new avatar vanishing)
+ - Discard change dialog displayed by mistake when avatar has been updated
 
 Translations 🗣:
  -

vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt

@@ -211,7 +211,10 @@ class RoomSettingsViewModel @AssistedInject constructor(@Assisted initialState:
                             postLoading(false)
                             setState {
                                 deletePendingAvatar(this)
-                                copy(newHistoryVisibility = null)
+                                copy(
+                                        avatarAction = RoomSettingsViewState.AvatarAction.None,
+                                        newHistoryVisibility = null
+                                )
                             }
                             _viewEvents.post(RoomSettingsViewEvents.Success)
                         },