Merge branch 'develop' into alfogrillo/learn_more_sheet

# Conflicts:
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsModels.swift
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsViewModel.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionOverview/UserSessionOverviewModels.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionOverview/UserSessionOverviewViewModel.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionOverview/View/UserSessionOverview.swift
This commit is contained in:
Alfonso Grillo
2022-11-03 18:18:08 +01:00
34 changed files with 315 additions and 107 deletions
@@ -33,7 +33,8 @@ struct UserSessionOverview: View {
},
onLearnMoreAction: {
viewModel.send(viewAction: .viewSessionInfo)
}
},
showLocationInformations: viewModel.viewState.showLocationInfo
)
.padding(16)
@@ -75,6 +76,14 @@ struct UserSessionOverview: View {
Label(VectorL10n.manageSessionRename, systemImage: "pencil")
}
.accessibilityIdentifier(VectorL10n.manageSessionRename)
if viewModel.viewState.isCurrentSession == false {
Button {
viewModel.send(viewAction: .showLocationInfo)
} label: {
Label(showLocationInfo: viewModel.viewState.showLocationInfo)
}
}
}
DestructiveButton {
viewModel.send(viewAction: .logoutOfSession)