Merge branch 'develop' into aleksandrs/6864_fixes_from_testing

# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	RiotSwiftUI/Modules/UserSessions/Common/View/UserSessionCardViewData.swift
This commit is contained in:
Aleksandrs Proskurins
2022-10-13 10:42:53 +03:00
56 changed files with 1414 additions and 614 deletions
@@ -80,8 +80,10 @@ struct UserSessionCardViewData {
switch verificationState {
case .verified:
return VectorL10n.userSessionVerifiedAdditionalInfo
case .unverified, .unknown:
case .unverified:
return isCurrentSessionDisplayMode ? VectorL10n.userSessionUnverifiedAdditionalInfo : VectorL10n.userOtherSessionUnverifiedAdditionalInfo
case .unknown:
return VectorL10n.userSessionVerificationUnknownAdditionalInfo
}
}