Merge pull request #1659 from bitwarden/encrypted-export-warning

Encrypted export warning

jslib

@@ -1 +1 @@
-Subproject commit 729ab4f20b81d7e465d7570c51cdb67d3cc49e6f
+Subproject commit b7acbcf3a7766eb0a52f21fe90505a69b4c19444

src/_locales/en/messages.json

@@ -612,9 +612,12 @@
   "exportWarningDesc": {
     "message": "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."
   },
-  "encExportWarningDesc": {
+  "encExportKeyWarningDesc": {
     "message": "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."
   },
+  "encExportAccountWarningDesc": {
+    "message": "Account encryption keys are unique to each Bitwarden user account, so you can't import an encrypted export into a different account."
+  },
   "exportMasterPassword": {
     "message": "Enter your master password to export your vault data."
   },

src/services/browserPlatformUtils.service.ts

@@ -148,10 +148,12 @@ export default class BrowserPlatformUtilsService implements PlatformUtilsService
         });
     }
 
-    showDialog(text: string, title?: string, confirmText?: string, cancelText?: string, type?: string) {
+    showDialog(body: string, title?: string, confirmText?: string, cancelText?: string, type?: string,
+        bodyIsHtml: boolean = false) {
         const dialogId = Math.floor(Math.random() * Number.MAX_SAFE_INTEGER);
         this.messagingService.send('showDialog', {
-            text: text,
+            text: bodyIsHtml ? null : body,
+            html: bodyIsHtml ? body : null,
             title: title,
             confirmText: confirmText,
             cancelText: cancelText,