diff --git a/vector/src/main/java/im/vector/app/features/home/PromoteRestrictedViewModel.kt b/vector/src/main/java/im/vector/app/features/home/PromoteRestrictedViewModel.kt
index f332a1fcdb..ae7b495aa2 100644
--- a/vector/src/main/java/im/vector/app/features/home/PromoteRestrictedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/PromoteRestrictedViewModel.kt
@@ -46,17 +46,17 @@ data class ActiveSpaceViewState(
 class PromoteRestrictedViewModel @AssistedInject constructor(
         @Assisted initialState: ActiveSpaceViewState,
         private val activeSessionHolder: ActiveSessionHolder,
-        private val appStateHandler: AppStateHandler
+        appStateHandler: AppStateHandler
 ) : VectorViewModel<ActiveSpaceViewState, EmptyAction, EmptyViewEvents>(initialState) {
 
     init {
-        appStateHandler.selectedRoomGroupingObservable.distinctUntilChanged().execute {
-            val groupingMethod = it.invoke()?.orNull()
+        appStateHandler.selectedRoomGroupingObservable.distinctUntilChanged().execute { state ->
+            val groupingMethod = state.invoke()?.orNull()
             val isSpaceMode = groupingMethod is RoomGroupingMethod.BySpace
             val currentSpace = (groupingMethod as? RoomGroupingMethod.BySpace)?.spaceSummary
             val canManage = currentSpace?.roomId?.let { roomId ->
                 activeSessionHolder.getSafeActiveSession()
-                        ?.getRoom(currentSpace.roomId)
+                        ?.getRoom(roomId)
                         ?.getStateEvent(EventType.STATE_ROOM_POWER_LEVELS, QueryStringValue.NoCondition)
                         ?.content?.toModel<PowerLevelsContent>()?.let {
                             PowerLevelsHelper(it).isUserAllowedToSend(activeSessionHolder.getActiveSession().myUserId, true, EventType.STATE_SPACE_CHILD)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/upgrade/MigrateRoomBottomSheet.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/upgrade/MigrateRoomBottomSheet.kt
index 2fa210a748..6e2a60c94f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/upgrade/MigrateRoomBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/upgrade/MigrateRoomBottomSheet.kt
@@ -72,7 +72,7 @@ class MigrateRoomBottomSheet :
 
         if (state.migrationReason == MigrationReason.MANUAL) {
             views.descriptionText.text = getString(R.string.upgrade_room_warning)
-            views.upgradeFromTo.text = getString(R.string.upgrade_public_room_from_to, state.currentVersion, state.newVersion)
+            views.upgradeFromTo.text = getString(R.string.upgrade_public_room_from_to_version, state.currentVersion, state.newVersion)
         } else if (state.migrationReason == MigrationReason.FOR_RESTRICTED) {
             views.descriptionText.setTextOrHide(state.customDescription)
             views.upgradeFromTo.text = getString(R.string.upgrade_room_for_restricted_note)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/RestrictedPromoBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/RestrictedPromoBottomSheet.kt
index 951b131d4b..dbea6807ce 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/RestrictedPromoBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/RestrictedPromoBottomSheet.kt
@@ -66,7 +66,6 @@ class RestrictedPromoBottomSheet : VectorBaseBottomSheetDialogFragment<BottomShe
             views.imageHint.isVisible = false
             views.bottomDescription.isVisible = false
             views.skipButton.isVisible = true
-            views.learnMore.isVisible = true
             views.learnMore.text = getString(R.string.learn_more)
         }
     }
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 298dc2adf3..405e12fae3 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3505,6 +3505,7 @@
     <string name="upgrade_private_room">Upgrade private room</string>
     <string name="upgrade_room_warning">Upgrading a room is an advanced action and is usually recommended when a room is unstable due to bugs, missing features or security vulnerabilities.\nThis usually only affects how the room is processed on the server.</string>
     <string name="upgrade_public_room_from_to">You\'ll upgrade this room from %s to %s.</string>
+    <string name="upgrade_public_room_from_to_version">You\'ll upgrade this room from %1$s to %2$s.</string>
     <string name="upgrade_room_auto_invite">Automatically invite users</string>
     <string name="upgrade_room_update_parent_space">Automatically update space parent</string>
     <string name="upgrade_room_no_power_to_manage">You need permission to upgrade a room</string>