From 4e052cdbdaaa1247451bce9f81dc5de43bd141df Mon Sep 17 00:00:00 2001 From: CarleyDiaz-Bitwarden <103955722+CarleyDiaz-Bitwarden@users.noreply.github.com> Date: Tue, 21 Jun 2022 18:24:54 -0400 Subject: [PATCH] changes suggested --- apps/desktop/src/app/vault/export.component.ts | 11 ++++++++--- apps/web/src/app/tools/export.component.ts | 4 ++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/apps/desktop/src/app/vault/export.component.ts b/apps/desktop/src/app/vault/export.component.ts index 83bda3a724..8087504f67 100644 --- a/apps/desktop/src/app/vault/export.component.ts +++ b/apps/desktop/src/app/vault/export.component.ts @@ -4,7 +4,7 @@ import { Component, OnInit } from "@angular/core"; import { FormBuilder } from "@angular/forms"; import { ExportComponent as BaseExportComponent } from "@bitwarden/angular/components/export.component"; -import { ModalService } from "@bitwarden/angular/services/modal.service"; +import { ModalConfig, ModalService } from "@bitwarden/angular/services/modal.service"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; @@ -16,6 +16,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification.service"; +import { UserVerificationPromptService } from "@bitwarden/common/abstractions/userVerificationPrompt.service"; const BroadcasterSubscriptionId = "ExportComponent"; @@ -37,7 +38,9 @@ export class ExportComponent extends BaseExportComponent implements OnInit { logService: LogService, protected modalService: ModalService, protected apiService: ApiService, - protected stateService: StateService + protected stateService: StateService, + protected userVerificationPromptService: UserVerificationPromptService, + protected modalConfig: ModalConfig ) { super( cryptoService, @@ -52,7 +55,9 @@ export class ExportComponent extends BaseExportComponent implements OnInit { formBuilder, modalService, apiService, - stateService + stateService, + userVerificationPromptService, + modalConfig ); } diff --git a/apps/web/src/app/tools/export.component.ts b/apps/web/src/app/tools/export.component.ts index 002060d0e4..8735746612 100644 --- a/apps/web/src/app/tools/export.component.ts +++ b/apps/web/src/app/tools/export.component.ts @@ -61,6 +61,10 @@ export class ExportComponent extends BaseExportComponent { userVerificationPromptService, modalConfig ); + + this.confirmDescription = modalConfig.data.confirmDescription; + this.confirmButtonText = modalConfig.data.confirmButtonText; + this.modalTitle = modalConfig.data.modalTitle; } async submit() {