From 3249504ae25e58e4eed04271b5a57ace0c5bfe90 Mon Sep 17 00:00:00 2001
From: Andreas Coroiu <andreas.coroiu@gmail.com>
Date: Tue, 16 May 2023 16:26:36 +0200
Subject: [PATCH] [PM-2014] feat: change toast depending on existing passkeys

---
 .../create-credential-dialog.component.html      |  2 +-
 .../create-credential-dialog.component.ts        | 16 ++++++++++++++--
 apps/web/src/locales/en/messages.json            |  3 +++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/apps/web/src/app/auth/settings/fido2-login-settings/create-credential-dialog/create-credential-dialog.component.html b/apps/web/src/app/auth/settings/fido2-login-settings/create-credential-dialog/create-credential-dialog.component.html
index b516636bf15..57a2c545ca1 100644
--- a/apps/web/src/app/auth/settings/fido2-login-settings/create-credential-dialog/create-credential-dialog.component.html
+++ b/apps/web/src/app/auth/settings/fido2-login-settings/create-credential-dialog/create-credential-dialog.component.html
@@ -59,7 +59,7 @@
           {{ "tryAgain" | i18n }}
         </ng-container>
         <ng-container *ngIf="currentStep === 'credentialNaming'">
-          {{ ((hasPasskeys$ | async) ? "save" : "turnOn ") | i18n }}
+          {{ ((hasPasskeys$ | async) ? "save" : "enable") | i18n }}
         </ng-container>
       </button>
       <button type="button" bitButton bitFormButton buttonType="secondary" bitDialogClose>
diff --git a/apps/web/src/app/auth/settings/fido2-login-settings/create-credential-dialog/create-credential-dialog.component.ts b/apps/web/src/app/auth/settings/fido2-login-settings/create-credential-dialog/create-credential-dialog.component.ts
index 06b2276af87..ca1c5e2b6ce 100644
--- a/apps/web/src/app/auth/settings/fido2-login-settings/create-credential-dialog/create-credential-dialog.component.ts
+++ b/apps/web/src/app/auth/settings/fido2-login-settings/create-credential-dialog/create-credential-dialog.component.ts
@@ -1,7 +1,7 @@
 import { DialogConfig, DialogRef } from "@angular/cdk/dialog";
 import { Component, OnInit } from "@angular/core";
 import { FormBuilder, Validators } from "@angular/forms";
-import { map, Observable } from "rxjs";
+import { firstValueFrom, map, Observable } from "rxjs";
 
 import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
@@ -144,7 +144,19 @@ export class CreateCredentialDialogComponent implements OnInit {
       return;
     }
 
-    this.platformUtilsService.showToast("success", null, this.i18nService.t("passkeySaved", name));
+    if (firstValueFrom(this.hasPasskeys$)) {
+      this.platformUtilsService.showToast(
+        "success",
+        null,
+        this.i18nService.t("passkeySaved", name)
+      );
+    } else {
+      this.platformUtilsService.showToast(
+        "success",
+        null,
+        this.i18nService.t("loginWithPasskeyEnabled")
+      );
+    }
 
     this.dialogRef.close(CreateCredentialDialogResult.Success);
   }
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 691492b6c79..644eac17d36 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -664,6 +664,9 @@
   "supportsEncryption": {
     "message": "supports encryption"
   },
+  "loginWithPasskeyEnabled": {
+    "message": "Log in with passkey turned on"
+  },
   "passkeySaved": {
     "message": "$NAME$ saved",
     "placeholders": {