Fixes bottom sheet intermittently not having the correct height

vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt

@@ -47,7 +47,7 @@ class NewSpaceSummaryController @Inject constructor(
     override fun buildModels() {
         val nonNullViewState = viewState ?: return
         buildGroupModels(
-                nonNullViewState.asyncSpaces(),
+                nonNullViewState.spaces,
                 nonNullViewState.selectedSpace,
                 nonNullViewState.rootSpacesOrdered,
                 nonNullViewState.homeAggregateCount

vector/src/main/java/im/vector/app/features/spaces/SpaceListViewModel.kt

@@ -257,29 +257,29 @@ class SpaceListViewModel @AssistedInject constructor(
         }
 
         combine(
-                session.flow()
+                session.flow().liveSpaceSummaries(params),
-                        .liveSpaceSummaries(params),
                 session.accountDataService()
                         .getLiveRoomAccountDataEvents(setOf(RoomAccountDataTypes.EVENT_TYPE_SPACE_ORDER))
                         .asFlow()
         ) { spaces, _ ->
             spaces
+        }.execute { asyncSpaces ->
+            val spaces = asyncSpaces.invoke().orEmpty()
+            val rootSpaces = asyncSpaces.invoke().orEmpty().filter { it.flattenParentIds.isEmpty() }
+            val orders = rootSpaces.associate {
+                it.roomId to session.getRoom(it.roomId)
+                        ?.roomAccountDataService()
+                        ?.getAccountDataEvent(RoomAccountDataTypes.EVENT_TYPE_SPACE_ORDER)
+                        ?.content.toModel<SpaceOrderContent>()
+                        ?.safeOrder()
+            }
+            copy(
+                    asyncSpaces = asyncSpaces,
+                    spaces = spaces,
+                    rootSpacesOrdered = rootSpaces.sortedWith(TopLevelSpaceComparator(orders)),
+                    spaceOrderInfo = orders
+            )
         }
-                .execute { async ->
-                    val rootSpaces = async.invoke().orEmpty().filter { it.flattenParentIds.isEmpty() }
-                    val orders = rootSpaces.associate {
-                        it.roomId to session.getRoom(it.roomId)
-                                ?.roomAccountDataService()
-                                ?.getAccountDataEvent(RoomAccountDataTypes.EVENT_TYPE_SPACE_ORDER)
-                                ?.content.toModel<SpaceOrderContent>()
-                                ?.safeOrder()
-                    }
-                    copy(
-                            asyncSpaces = async,
-                            rootSpacesOrdered = rootSpaces.sortedWith(TopLevelSpaceComparator(orders)),
-                            spaceOrderInfo = orders
-                    )
-                }
 
         // clear local echos on update
         session.accountDataService()

vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt

@@ -26,6 +26,7 @@ import org.matrix.android.sdk.api.util.MatrixItem
 data class SpaceListViewState(
         val myMxItem: Async<MatrixItem.UserItem> = Uninitialized,
         val asyncSpaces: Async<List<RoomSummary>> = Uninitialized,
+        val spaces: List<RoomSummary> = emptyList(),
         val selectedSpace: RoomSummary? = null,
         val rootSpacesOrdered: List<RoomSummary>? = null,
         val spaceOrderInfo: Map<String, String?>? = null,