Merge branch 'develop' into aleksandrs/6786_inactive_sessions_screen

# Conflicts: # RiotSwiftUI/Modules/UserSessions/UserSessionDetails/UserSessionDetailsViewModel.swift
2026-04-19 16:13:42 +02:00 · 2022-10-05 11:51:08 +03:00
parent dccdba9ce9 08c5ea5ff7
commit 8427a87e27
56 changed files with 712 additions and 216 deletions
@@ -113,7 +113,8 @@ class UserSessionDetailsViewModelTests: XCTestCase {
                                       deviceModel: String? = nil,
                                       deviceOS: String? = nil,
                                       lastSeenIPLocation: String? = nil,
-                                       deviceName: String? = nil,
+                                       clientName: String? = nil,
+                                       clientVersion: String? = nil,
                                       isActive: Bool = true,
                                       isCurrent: Bool = true) -> UserSessionInfo {
        UserSessionInfo(id: id,
@@ -128,7 +129,8 @@ class UserSessionDetailsViewModelTests: XCTestCase {
                        deviceModel: deviceModel,
                        deviceOS: deviceOS,
                        lastSeenIPLocation: lastSeenIPLocation,
-                        deviceName: deviceName,
+                        clientName: clientName,
+                        clientVersion: clientVersion,
                        isActive: isActive,
                        isCurrent: isCurrent)
    }