Merge branch 'develop' into aleksandrs/6786_inactive_sessions_screen

# Conflicts:
#	RiotSwiftUI/Modules/UserSessions/UserSessionDetails/UserSessionDetailsViewModel.swift
This commit is contained in:
Aleksandrs Proskurins
2022-10-05 11:51:08 +03:00
56 changed files with 712 additions and 216 deletions
@@ -93,6 +93,12 @@ class UserSessionDetailsViewModel: UserSessionDetailsViewModelType, UserSessionD
deviceSectionItems.append(.init(title: VectorL10n.userSessionDetailsDeviceModel,
value: model))
}
if sessionInfo.deviceType == .web,
let clientName = sessionInfo.clientName,
let clientVersion = sessionInfo.clientVersion {
deviceSectionItems.append(.init(title: VectorL10n.userSessionDetailsDeviceBrowser,
value: "\(clientName) \(clientVersion)"))
}
if let deviceOS = sessionInfo.deviceOS {
deviceSectionItems.append(.init(title: VectorL10n.userSessionDetailsDeviceOs,
value: deviceOS))