From d1fdeea70dbcfbdee763f0e43aa516180b70df59 Mon Sep 17 00:00:00 2001
From: CarleyDiaz-Bitwarden
 <103955722+CarleyDiaz-Bitwarden@users.noreply.github.com>
Date: Thu, 23 Jun 2022 12:42:35 -0400
Subject: [PATCH] Updating error messages

---
 apps/browser/tsconfig.json                   | 21 ------
 apps/web/src/app/tools/export.component.html | 68 ++++++++++++--------
 apps/web/src/locales/en/messages.json        |  2 +-
 3 files changed, 42 insertions(+), 49 deletions(-)
 delete mode 100644 apps/browser/tsconfig.json

diff --git a/apps/browser/tsconfig.json b/apps/browser/tsconfig.json
deleted file mode 100644
index 5c35b45fde8..00000000000
--- a/apps/browser/tsconfig.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "compilerOptions": {
-    "moduleResolution": "node",
-    "noImplicitAny": true,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "module": "es6",
-    "target": "ES2016",
-    "allowJs": true,
-    "sourceMap": true,
-    "baseUrl": ".",
-    "paths": {
-      "@bitwarden/common/*": ["../../libs/common/src/*"],
-      "@bitwarden/angular/*": ["../../libs/angular/src/*"]
-    }
-  },
-  "angularCompilerOptions": {
-    "preserveWhitespaces": true
-  },
-  "include": ["src"]
-}
diff --git a/apps/web/src/app/tools/export.component.html b/apps/web/src/app/tools/export.component.html
index e030428e7ea..fc08a9437c5 100644
--- a/apps/web/src/app/tools/export.component.html
+++ b/apps/web/src/app/tools/export.component.html
@@ -20,7 +20,7 @@
 
   <div class="row">
     <div class="form-group col-6">
-      <label for="format">{{ "fileFormat" | i18n }}</label>
+      <label class="tw-text-sm tw-semi-bold" for="format">{{ "fileFormat" | i18n }}</label>
       <select class="form-control" name="format" formControlName="format">
         <option *ngFor="let f of formatOptions" [value]="f.value">{{ f.name }}</option>
       </select>
@@ -30,39 +30,53 @@
     <div class="form-group col-6">
       <ng-container *ngIf="format === 'encrypted_json'">
         <div role="radiogroup" aria-labelledby="fileTypeHeading">
-          <label id="fileTypeHeading" class="radio-header">
+          <label id="fileTypeHeading" class="tw-text-sm tw-semi-bold">
             {{ "fileTypeHeading" | i18n }}
           </label>
 
-          <div appBoxRow name="FileTypeOptions">
-            <input
-              type="radio"
-              class="radio"
-              name="fileEncryptionType"
-              id="1"
-              [value]="0"
-              formControlName="fileEncryptionType"
-            />
-            <label class="unstyled"> {{ "accountBackup" | i18n }} </label>
-            <div class="small text-muted" style="margin-left: 1.25em">
-              {{ "accountBackupOptionDescription" | i18n }}
+          <div appBoxRow name="FileTypeOptions" class="tw-flex tw-items-center">
+            <div>
+              <input
+                type="radio"
+                class="radio"
+                name="fileEncryptionType"
+                id="1"
+                [value]="0"
+                formControlName="fileEncryptionType"
+              />
             </div>
-            <input
-              type="radio"
-              class="radio"
-              name="fileEncryptionType"
-              id="2"
-              [value]="1"
-              formControlName="fileEncryptionType"
-            />
-
-            <label class="unstyled">{{ "passwordProtected" | i18n }}</label>
-            <div class="small text-muted" style="margin-left: 1.25em">
-              {{ "passwordProtectedOptionDescription" | i18n }}
+            <div>
+              <label class="tw-text-xs tw-semi-bold tw-ml-1"> {{ "accountBackup" | i18n }} </label>
             </div>
           </div>
-          <br />
+
+          <div class="tw-text-xs tw-regular ml-3 pb-2">
+            {{ "accountBackupOptionDescription" | i18n }}
+          </div>
+
+          <div class="tw-flex tw-items-center">
+            <div>
+              <input
+                type="radio"
+                class="radio"
+                name="fileEncryptionType"
+                id="2"
+                [value]="1"
+                formControlName="fileEncryptionType"
+              />
+            </div>
+            <div>
+              <label class="tw-text-xs tw-semi-bold tw-ml-1">{{
+                "passwordProtected" | i18n
+              }}</label>
+            </div>
+          </div>
+
+          <div class="tw-text-xs tw-regular ml-3 pb-2">
+            {{ "passwordProtectedOptionDescription" | i18n }}
+          </div>
         </div>
+        <br />
 
         <ng-container *ngIf="fileEncryptionType == 1">
           <label for="format">{{ "filePassword" | i18n }}</label>
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 33768505ba1..c232bcf02ff 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -915,7 +915,7 @@
     "message": "Password Protected"
   },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
-    "message": "File Password and Confirm File Password do not match."
+    "message": "“File password”  and “Confirm File Password“ do not match."
   },
   "confirmVaultImport": {
     "message": "Confirm Vault Import"