From da7e4662526eea6cbe998aded75b25041ac6e39b Mon Sep 17 00:00:00 2001
From: Matt Gibson <mgibson@bitwarden.com>
Date: Mon, 1 Jul 2024 13:03:00 -0700
Subject: [PATCH] [PM-9344] Clarify accepted user state (#9861)

* Prefer `Needs confirmation` to `Accepted` display status

This emphasizes that action is still required to complete setup.

* Remove unused message
---
 .../settings/emergency-access/emergency-access.component.html | 4 ++--
 apps/web/src/locales/en/messages.json                         | 3 ---
 .../app/admin-console/providers/manage/people.component.html  | 4 ++--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.html b/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.html
index 2c6a9ba24b..e38f21fde2 100644
--- a/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.html
+++ b/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.html
@@ -64,7 +64,7 @@
                 bitBadge
                 variant="warning"
                 *ngIf="c.status === emergencyAccessStatusType.Accepted"
-                >{{ "accepted" | i18n }}</span
+                >{{ "needsConfirmation" | i18n }}</span
               >
               <span
                 bitBadge
@@ -184,7 +184,7 @@
                 bitBadge
                 variant="warning"
                 *ngIf="c.status === emergencyAccessStatusType.Accepted"
-                >{{ "accepted" | i18n }}</span
+                >{{ "needsConfirmation" | i18n }}</span
               >
               <span
                 bitBadge
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 4dd9962a70..44b05cf26e 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -2795,9 +2795,6 @@
   "invited": {
     "message": "Invited"
   },
-  "accepted": {
-    "message": "Accepted"
-  },
   "confirmed": {
     "message": "Confirmed"
   },
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/people.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/people.component.html
index 9e48c7e795..b145f16daf 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/people.component.html
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/people.component.html
@@ -27,7 +27,7 @@
     </bit-toggle>
 
     <bit-toggle [value]="userStatusType.Accepted">
-      {{ "accepted" | i18n }}
+      {{ "needsConfirmation" | i18n }}
       <span bitBadge variant="warning" *ngIf="acceptedCount">{{ acceptedCount }}</span>
     </bit-toggle>
   </bit-toggle-group>
@@ -123,7 +123,7 @@
               "invited" | i18n
             }}</span>
             <span bitBadge variant="warning" *ngIf="u.status === userStatusType.Accepted">{{
-              "accepted" | i18n
+              "needsConfirmation" | i18n
             }}</span>
             <small class="text-muted d-block" *ngIf="u.name">{{ u.name }}</small>
           </td>