Merge branch 'develop' into gil/5769_add_trigger_to_join_and_view_room_metrics_event

# Conflicts:
#	Riot/Modules/Analytics/Analytics.swift
This commit is contained in:
Gil Eluard
2022-03-17 13:59:24 +01:00
32 changed files with 422 additions and 139 deletions
@@ -53,7 +53,7 @@ final class SpaceSettingsCoordinator: Coordinator, Presentable {
.addDependency(AvatarService.instantiate(mediaManager: parameters.session.mediaManager))
spaceSettingsViewModel = viewModel
let controller = VectorHostingController(rootView: view)
controller.enableNavigationBarScrollEdgesAppearance = true
controller.enableNavigationBarScrollEdgeAppearance = true
spaceSettingsHostingController = controller
}