From 1fb3056bdfd8f1d99f598115c3a208f522b2f0f4 Mon Sep 17 00:00:00 2001 From: Aleksandrs Proskurins Date: Thu, 13 Oct 2022 09:46:11 +0300 Subject: [PATCH] Correct verificationStatusAdditionalInfoText for other session --- Riot/Assets/en.lproj/Vector.strings | 1 + Riot/Generated/Strings.swift | 4 ++++ .../UserSessions/Common/View/UserSessionCardViewData.swift | 6 ++---- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Riot/Assets/en.lproj/Vector.strings b/Riot/Assets/en.lproj/Vector.strings index fc7f49cbc..3f9fd3b29 100644 --- a/Riot/Assets/en.lproj/Vector.strings +++ b/Riot/Assets/en.lproj/Vector.strings @@ -2430,6 +2430,7 @@ To enable access, tap Settings> Location and select Always"; "user_session_learn_more" = "Learn more"; "user_session_verified_additional_info" = "Your current session is ready for secure messaging."; "user_session_unverified_additional_info" = "Verify your current session for enhanced secure messaging."; +"user_other_session_unverified_additional_info" = "Verify or sign out from this session for best security and reliability."; "user_session_push_notifications" = "Push notifications"; "user_session_push_notifications_message" = "When turned on, this session will receive push notifications."; diff --git a/Riot/Generated/Strings.swift b/Riot/Generated/Strings.swift index c275dc86c..0d3d709b6 100644 --- a/Riot/Generated/Strings.swift +++ b/Riot/Generated/Strings.swift @@ -8675,6 +8675,10 @@ public class VectorL10n: NSObject { public static var userOtherSessionSecurityRecommendationTitle: String { return VectorL10n.tr("Vector", "user_other_session_security_recommendation_title") } + /// Verify or sign out from this session for best security and reliability. + public static var userOtherSessionUnverifiedAdditionalInfo: String { + return VectorL10n.tr("Vector", "user_other_session_unverified_additional_info") + } /// %@ ยท Your current session public static func userOtherSessionUnverifiedCurrentSessionDetails(_ p1: String) -> String { return VectorL10n.tr("Vector", "user_other_session_unverified_current_session_details", p1) diff --git a/RiotSwiftUI/Modules/UserSessions/Common/View/UserSessionCardViewData.swift b/RiotSwiftUI/Modules/UserSessions/Common/View/UserSessionCardViewData.swift index 9112f098b..e38dc3ce7 100644 --- a/RiotSwiftUI/Modules/UserSessions/Common/View/UserSessionCardViewData.swift +++ b/RiotSwiftUI/Modules/UserSessions/Common/View/UserSessionCardViewData.swift @@ -80,10 +80,8 @@ struct UserSessionCardViewData { switch verificationState { case .verified: return VectorL10n.userSessionVerifiedAdditionalInfo - case .unverified: - return VectorL10n.userSessionUnverifiedAdditionalInfo - case .unknown: - return VectorL10n.userSessionUnverifiedAdditionalInfo + case .unverified, .unknown: + return isCurrentSessionDisplayMode ? VectorL10n.userSessionUnverifiedAdditionalInfo : VectorL10n.userOtherSessionUnverifiedAdditionalInfo } }