Commit Graph

14 Commits

Author SHA1 Message Date
Aleksandrs Proskurins 49dac51ec6 Merge branch 'develop' into aleksandrs/6838_filter_sessions
# Conflicts:
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/Test/Unit/UserOtherSessionsViewModelTests.swift
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsViewModel.swift
2022-10-12 10:58:04 +03:00
Doug 6a0112aa95 Device Manager: Verify session (#6832)
* Initial implementation
* Add verificationState to UserSessionInfo
* Listen for changes device changes in the service.
2022-10-11 16:11:52 +01:00
Aleksandrs Proskurins 0a01a1ca9e UI and unit tests 2022-10-11 17:19:32 +03:00
Aleksandrs Proskurins 0923bced4e Fixed swiftformat warnings 2022-10-07 17:00:15 +03:00
Aleksandrs Proskurins 4c9c35bf59 Merge from develop 2022-10-07 14:51:30 +03:00
ismailgulek 429a2f83a3 QR login from device manager (#6818)
* Add link device button into the sessions overview screen

* Run Swift format

* Fix tests

* Fix a crash in tests

* Fix PR remark
2022-10-07 12:58:26 +03:00
Aleksandrs Proskurins dfe5780dc3 'View all' button in other sessions list 2022-10-07 09:45:45 +03:00
Aleksandrs Proskurins bb9c6695ee UI tests 2022-10-06 10:23:33 +03:00
Aleksandrs Proskurins 78e55f56ed Renamed sessionsInfo to sessionInfos 2022-10-05 16:59:15 +03:00
Aleksandrs Proskurins 145cce76f2 Merge fixes 2022-10-05 12:18:23 +03:00
Aleksandrs Proskurins 99574a9d53 Merge branch 'develop' into aleksandrs/6786_inactive_sessions_screen
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	RiotSwiftUI/Modules/UserSessions/Coordinator/UserSessionsFlowCoordinator.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionOverview/Test/Unit/UserSessionOverviewViewModelTests.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/Coordinator/UserSessionsOverviewCoordinator.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/Service/Mock/MockUserSessionsOverviewService.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/UserSessionsOverviewModels.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/View/UserSessionListItemViewData.swift
2022-10-04 15:14:59 +03:00
Aleksandrs Proskurins 2fa3c69bf4 Added translation strings, cleanup 2022-10-04 10:07:04 +03:00
Aleksandrs Proskurins 0cfceb4c5e Cleanup 2022-10-04 09:38:53 +03:00
Aleksandrs Proskurins 20200fd22a User other sessions screen template 2022-10-03 11:27:12 +03:00