From e2fe1e1567994e376d82845de09310b612b16579 Mon Sep 17 00:00:00 2001 From: Daniel James Smith <2670567+djsmith85@users.noreply.github.com> Date: Wed, 20 Mar 2024 23:39:25 +0100 Subject: [PATCH] Replace app-callout with bit-callout and fixed the used types forthe styles (#8414) Co-authored-by: Daniel James Smith --- .../user-verification/user-verification-dialog.component.html | 4 ++-- .../user-verification/user-verification-dialog.component.ts | 2 ++ .../user-verification/user-verification-dialog.types.ts | 4 ++-- .../user-verification-form-input.component.html | 4 ++-- .../user-verification-form-input.component.ts | 2 ++ 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/libs/auth/src/angular/user-verification/user-verification-dialog.component.html b/libs/auth/src/angular/user-verification/user-verification-dialog.component.html index 66e006d945..aa4d26ae61 100644 --- a/libs/auth/src/angular/user-verification/user-verification-dialog.component.html +++ b/libs/auth/src/angular/user-verification/user-verification-dialog.component.html @@ -18,12 +18,12 @@ {{ dialogOptions.bodyText | i18n }}

- {{ dialogOptions.calloutOptions.text | i18n }} - + diff --git a/libs/auth/src/angular/user-verification/user-verification-dialog.component.ts b/libs/auth/src/angular/user-verification/user-verification-dialog.component.ts index d3a8947352..7b2c869e3a 100644 --- a/libs/auth/src/angular/user-verification/user-verification-dialog.component.ts +++ b/libs/auth/src/angular/user-verification/user-verification-dialog.component.ts @@ -12,6 +12,7 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl import { AsyncActionsModule, ButtonModule, + CalloutModule, DialogModule, DialogService, } from "@bitwarden/components"; @@ -34,6 +35,7 @@ import { UserVerificationFormInputComponent } from "./user-verification-form-inp DialogModule, AsyncActionsModule, UserVerificationFormInputComponent, + CalloutModule, ], }) export class UserVerificationDialogComponent { diff --git a/libs/auth/src/angular/user-verification/user-verification-dialog.types.ts b/libs/auth/src/angular/user-verification/user-verification-dialog.types.ts index 2480162f86..f4637c770a 100644 --- a/libs/auth/src/angular/user-verification/user-verification-dialog.types.ts +++ b/libs/auth/src/angular/user-verification/user-verification-dialog.types.ts @@ -11,9 +11,9 @@ export type UserVerificationCalloutOptions = { /** * The type of the callout. - * Can be "warning", "danger", "error", or "tip". + * Can be "warning", "danger", "info", or "success". */ - type: "warning" | "danger" | "error" | "tip"; + type: "warning" | "danger" | "info" | "success"; }; /** diff --git a/libs/auth/src/angular/user-verification/user-verification-form-input.component.html b/libs/auth/src/angular/user-verification/user-verification-form-input.component.html index afc99b32cb..f532a3b23f 100644 --- a/libs/auth/src/angular/user-verification/user-verification-form-input.component.html +++ b/libs/auth/src/angular/user-verification/user-verification-form-input.component.html @@ -49,12 +49,12 @@ - + {{ "couldNotCompleteBiometrics" | i18n }} - + diff --git a/libs/auth/src/angular/user-verification/user-verification-form-input.component.ts b/libs/auth/src/angular/user-verification/user-verification-form-input.component.ts index 4f216a76e8..8cb40d9452 100644 --- a/libs/auth/src/angular/user-verification/user-verification-form-input.component.ts +++ b/libs/auth/src/angular/user-verification/user-verification-form-input.component.ts @@ -20,6 +20,7 @@ import { Utils } from "@bitwarden/common/platform/misc/utils"; import { AsyncActionsModule, ButtonModule, + CalloutModule, FormFieldModule, IconButtonModule, IconModule, @@ -62,6 +63,7 @@ import { ActiveClientVerificationOption } from "./active-client-verification-opt IconModule, LinkModule, ButtonModule, + CalloutModule, ], }) // eslint-disable-next-line rxjs-angular/prefer-takeuntil