From 8a2aa1eac23cc0443a215ddc98500db43587c202 Mon Sep 17 00:00:00 2001
From: Evan Bassler <ebassler@livefront.com>
Date: Thu, 23 Jan 2025 13:59:39 -0600
Subject: [PATCH] [PM-16807] Update text and behavior for show id/card vault
 settings (#12808)

* update text and behavior for show id/card vault settings

* add new crowdin entry

* update crowdin entries

* revert default

---------

Co-authored-by: Evan Bassler <evanbassler@Mac.attlocal.net>
---
 apps/browser/src/_locales/en/messages.json                | 8 ++++----
 .../src/autofill/popup/settings/autofill.component.html   | 4 ++--
 .../src/vault/popup/services/vault-popup-items.service.ts | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json
index ac875064570..c7dca5ff1f7 100644
--- a/apps/browser/src/_locales/en/messages.json
+++ b/apps/browser/src/_locales/en/messages.json
@@ -992,8 +992,8 @@
   "addLoginNotificationDescAlt": {
     "message": "Ask to add an item if one isn't found in your vault. Applies to all logged in accounts."
   },
-  "showCardsInVaultView": {
-    "message": "Show cards as Autofill suggestions on Vault view"
+  "showCardsInVaultViewV2": {
+    "message": "Always show cards as Autofill suggestions on Vault view"
   },
   "showCardsCurrentTab": {
     "message": "Show cards on Tab page"
@@ -1001,8 +1001,8 @@
   "showCardsCurrentTabDesc": {
     "message": "List card items on the Tab page for easy autofill."
   },
-  "showIdentitiesInVaultView": {
-    "message": "Show identities as Autofill suggestions on Vault view"
+  "showIdentitiesInVaultViewV2": {
+    "message": "Always show identities as Autofill suggestions on Vault view"
   },
   "showIdentitiesCurrentTab": {
     "message": "Show identities on Tab page"
diff --git a/apps/browser/src/autofill/popup/settings/autofill.component.html b/apps/browser/src/autofill/popup/settings/autofill.component.html
index eeae0a85e3f..e8299f01166 100644
--- a/apps/browser/src/autofill/popup/settings/autofill.component.html
+++ b/apps/browser/src/autofill/popup/settings/autofill.component.html
@@ -118,7 +118,7 @@
             (change)="updateShowCardsCurrentTab()"
             [(ngModel)]="showCardsCurrentTab"
           />
-          <bit-label for="showCardsSuggestions">{{ "showCardsInVaultView" | i18n }}</bit-label>
+          <bit-label for="showCardsSuggestions">{{ "showCardsInVaultViewV2" | i18n }}</bit-label>
         </bit-form-control>
         <bit-form-control>
           <input
@@ -129,7 +129,7 @@
             [(ngModel)]="showIdentitiesCurrentTab"
           />
           <bit-label for="showIdentitiesSuggestions" class="tw-whitespace-normal">
-            {{ "showIdentitiesInVaultView" | i18n }}
+            {{ "showIdentitiesInVaultViewV2" | i18n }}
           </bit-label>
         </bit-form-control>
         <bit-form-control disableMargin>
diff --git a/apps/browser/src/vault/popup/services/vault-popup-items.service.ts b/apps/browser/src/vault/popup/services/vault-popup-items.service.ts
index 2afa5b9a140..519b8e6867f 100644
--- a/apps/browser/src/vault/popup/services/vault-popup-items.service.ts
+++ b/apps/browser/src/vault/popup/services/vault-popup-items.service.ts
@@ -71,9 +71,9 @@ export class VaultPopupItemsService {
     this.vaultPopupAutofillService.nonLoginCipherTypesOnPage$,
   ]).pipe(
     map(([showCardsSettingEnabled, showIdentitiesSettingEnabled, nonLoginCipherTypesOnPage]) => {
-      const showCards = showCardsSettingEnabled && nonLoginCipherTypesOnPage[CipherType.Card];
+      const showCards = showCardsSettingEnabled || nonLoginCipherTypesOnPage[CipherType.Card];
       const showIdentities =
-        showIdentitiesSettingEnabled && nonLoginCipherTypesOnPage[CipherType.Identity];
+        showIdentitiesSettingEnabled || nonLoginCipherTypesOnPage[CipherType.Identity];
 
       return [
         ...(showCards ? [CipherType.Card] : []),