Merge branch 'gil/SP1_space_creation' into gil/143_create_public_space

# Conflicts:
#	RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
This commit is contained in:
Gil Eluard
2022-01-24 09:30:05 +01:00
338 changed files with 7660 additions and 1885 deletions
@@ -97,8 +97,13 @@ final class SideMenuViewModel: SideMenuViewModelType {
return
}
let sideMenuItems: [SideMenuItem] = [
.inviteFriends,
var sideMenuItems: [SideMenuItem] = []
if BuildSettings.sideMenuShowInviteFriends {
sideMenuItems += [.inviteFriends]
}
sideMenuItems += [
.settings,
.feedback
]