From a275411c54db4671d3340d902858e31b1e0fbbc5 Mon Sep 17 00:00:00 2001
From: CarleyDiaz-Bitwarden
 <103955722+CarleyDiaz-Bitwarden@users.noreply.github.com>
Date: Fri, 1 Jul 2022 16:01:41 -0400
Subject: [PATCH] Updates

---
 apps/web/src/app/services/services.module.ts       | 14 ++++++++++++++
 .../app/tools/import-export/export.component.ts    |  6 ++----
 .../app/tools/import-export/import.component.ts    |  2 +-
 libs/angular/src/components/export.component.ts    |  1 +
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/apps/web/src/app/services/services.module.ts b/apps/web/src/app/services/services.module.ts
index e508b255c11..908b29b1f6e 100644
--- a/apps/web/src/app/services/services.module.ts
+++ b/apps/web/src/app/services/services.module.ts
@@ -24,6 +24,7 @@ import { ExportService as ExportServiceAbstraction } from "@bitwarden/common/abs
 import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service";
 import { FolderService as FolderServiceAbstraction } from "@bitwarden/common/abstractions/folder.service";
 import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstractions/i18n.service";
+import { ImportService as ImportServiceAbstraction } from "@bitwarden/common/abstractions/import.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { MessagingService as MessagingServiceAbstraction } from "@bitwarden/common/abstractions/messaging.service";
 import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/abstractions/passwordReprompt.service";
@@ -104,6 +105,19 @@ import { WebFileDownloadService } from "./webFileDownload.service";
     { provide: MessagingServiceAbstraction, useClass: BroadcasterMessagingService },
     { provide: ModalServiceAbstraction, useClass: ModalService },
     { provide: ModalConfigAbstraction, useClass: ModalConfig },
+    {
+      provide: ImportServiceAbstraction,
+      useClass: ImportService,
+      deps: [
+        CipherServiceAbstraction,
+        FolderServiceAbstraction,
+        ApiServiceAbstraction,
+        I18nServiceAbstraction,
+        CollectionServiceAbstraction,
+        PlatformUtilsServiceAbstraction,
+        CryptoServiceAbstraction,
+      ],
+    },
     {
       provide: ExportServiceAbstraction,
       useClass: ExportService,
diff --git a/apps/web/src/app/tools/import-export/export.component.ts b/apps/web/src/app/tools/import-export/export.component.ts
index a1a613b3f9e..9d60f4589b0 100644
--- a/apps/web/src/app/tools/import-export/export.component.ts
+++ b/apps/web/src/app/tools/import-export/export.component.ts
@@ -111,14 +111,12 @@ export class ExportComponent extends BaseExportComponent {
   }
 
   togglePassword() {
-    this.exportForm.get("showPassword").setValue(!this.exportForm.get("showPassword").value);
+    this.showPassword = !this.showPassword;
     document.getElementById("newPassword").focus();
   }
 
   toggleConfirmPassword() {
-    this.exportForm
-      .get("showConfirmPassword")
-      .setValue(!this.exportForm.get("showConfirmPassword").value);
+    this.showConfirmPassword = !this.showConfirmPassword;
     document.getElementById("newConfirmPassword").focus();
   }
 
diff --git a/apps/web/src/app/tools/import-export/import.component.ts b/apps/web/src/app/tools/import-export/import.component.ts
index 8c0875bc989..e94c070da5f 100644
--- a/apps/web/src/app/tools/import-export/import.component.ts
+++ b/apps/web/src/app/tools/import-export/import.component.ts
@@ -3,7 +3,6 @@ import { Router } from "@angular/router";
 import * as JSZip from "jszip";
 import Swal, { SweetAlertIcon } from "sweetalert2";
 
-import { FilePasswordPromptComponent } from "@bitwarden/angular/components/file-password-prompt.component";
 import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { ImportService } from "@bitwarden/common/abstractions/import.service";
@@ -15,6 +14,7 @@ import { ImportOption, ImportType } from "@bitwarden/common/enums/importOptions"
 import { PolicyType } from "@bitwarden/common/enums/policyType";
 import { ImportError } from "@bitwarden/common/importers/importError";
 
+import { FilePasswordPromptComponent } from "src/app/components/file-password-prompt.component";
 
 @Component({
   selector: "app-import",
diff --git a/libs/angular/src/components/export.component.ts b/libs/angular/src/components/export.component.ts
index be865360beb..784cc6c49f2 100644
--- a/libs/angular/src/components/export.component.ts
+++ b/libs/angular/src/components/export.component.ts
@@ -69,6 +69,7 @@ export class ExportComponent implements OnInit {
 
   async ngOnInit() {
     await this.checkExportDisabled();
+    this.exportForm.get("fileEncryptionType").setValue(0);
   }
 
   async checkExportDisabled() {