Merge branch 'develop' into aleksandrs/6786_inactive_sessions_screen

# Conflicts: # RiotSwiftUI/Modules/UserSessions/UserSessionDetails/UserSessionDetailsViewModel.swift
2026-04-20 00:24:43 +02:00 · 2022-10-05 11:51:08 +03:00
parent dccdba9ce9 08c5ea5ff7
commit 8427a87e27
56 changed files with 712 additions and 216 deletions
@@ -150,7 +150,8 @@ struct UserSessionCardViewPreview: View {
                                      deviceModel: nil,
                                      deviceOS: "iOS 15.5",
                                      lastSeenIPLocation: nil,
-                                      deviceName: "My iPhone",
+                                      clientName: "Element",
+                                      clientVersion: "1.0.0",
                                      isActive: true,
                                      isCurrent: isCurrent)
        viewData = UserSessionCardViewData(sessionInfo: sessionInfo)