Skip to content

Commit ac5dcfa

Browse files
PM-9836: Update password protected vault export confirmation alert (#755)
1 parent 3ec242e commit ac5dcfa

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

BitwardenShared/UI/Platform/Application/Support/Localizations/en.lproj/Localizable.strings

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -479,8 +479,6 @@
479479
"CodeSent" = "Code sent!";
480480
"ConfirmYourIdentity" = "Confirm your identity to continue.";
481481
"ExportVaultWarning" = "This export contains your vault data in an unencrypted format. You should not store or send the exported file over unsecure channels (such as email). Delete it immediately after you are done using it.";
482-
"EncExportKeyWarning" = "This export encrypts your data using your account's encryption key. If you ever rotate your account's encryption key you should export again since you will not be able to decrypt this export file.";
483-
"EncExportAccountWarning" = "Account encryption keys are unique to each Bitwarden user account, so you can't import an encrypted export into a different account.";
484482
"ExportVaultConfirmationTitle" = "Confirm vault export";
485483
"Warning" = "Warning";
486484
"ExportVaultFailure" = "There was a problem exporting your vault. If the problem persists, you'll need to export from the web vault.";
@@ -920,3 +918,4 @@
920918
"UnknownAccount" = "Unknown account";
921919
"UserVerificationForPasskey" = "User verification for passkey";
922920
"NewItem" = "New item";
921+
"ExportVaultFilePwProtectInfo" = "This file export will be password protected and require the file password to decrypt.";

BitwardenShared/UI/Platform/Settings/Extensions/Alert+Settings.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,7 @@ extension Alert {
6666
static func confirmExportVault(encrypted: Bool, action: @escaping () async -> Void) -> Alert {
6767
Alert(
6868
title: Localizations.exportVaultConfirmationTitle,
69-
message: encrypted ?
70-
(Localizations.encExportKeyWarning + .newLine + Localizations.encExportAccountWarning) :
71-
Localizations.exportVaultWarning,
69+
message: encrypted ? Localizations.exportVaultFilePwProtectInfo : Localizations.exportVaultWarning,
7270
alertActions: [
7371
AlertAction(title: Localizations.exportVault, style: .default) { _ in await action() },
7472
AlertAction(title: Localizations.cancel, style: .cancel),

BitwardenShared/UI/Platform/Settings/Extensions/AlertSettingsTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class AlertSettingsTests: BitwardenTestCase {
5454
XCTAssertEqual(subject.title, Localizations.exportVaultConfirmationTitle)
5555
XCTAssertEqual(
5656
subject.message,
57-
Localizations.encExportKeyWarning + .newLine + Localizations.encExportAccountWarning
57+
Localizations.exportVaultFilePwProtectInfo
5858
)
5959

6060
subject = Alert.confirmExportVault(encrypted: false) {}

0 commit comments

Comments
 (0)