[PM-32403] Update button copy desktop

apps/browser/src/vault/popup/components/vault/add-edit/add-edit.component.spec.ts

@@ -91,7 +91,12 @@ describe("AddEditComponent", () => {
       providers: [
         provideNoopAnimations(),
         { provide: PlatformUtilsService, useValue: mock<PlatformUtilsService>() },
-        { provide: ConfigService, useValue: mock<ConfigService>() },
+        {
+          provide: ConfigService,
+          useValue: mock<ConfigService>({
+            getFeatureFlag$: jest.fn().mockReturnValue(of(false)),
+          }),
+        },
         { provide: PopupRouterCacheService, useValue: { back, setHistory } },
         { provide: PopupCloseWarningService, useValue: { disable } },
         { provide: Router, useValue: { navigate } },

apps/browser/src/vault/popup/components/vault/add-edit/add-edit.component.ts

@@ -2,7 +2,7 @@
 // @ts-strict-ignore
 import { CommonModule } from "@angular/common";
 import { Component, OnInit, OnDestroy, viewChild } from "@angular/core";
-import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { takeUntilDestroyed, toSignal } from "@angular/core/rxjs-interop";
 import { FormsModule } from "@angular/forms";
 import { ActivatedRoute, Params, Router } from "@angular/router";
 import { firstValueFrom, map, Observable, switchMap } from "rxjs";
@@ -192,6 +192,11 @@ export type AddEditQueryParams = Partial<Record<keyof QueryParams, string>>;
   ],
 })
 export class AddEditComponent implements OnInit, OnDestroy {
+  protected readonly btnTextAddCreateFeatureFlag = toSignal(
+    this.configService.getFeatureFlag$(FeatureFlag.PM32380_BtnTextAddCreate),
+    { initialValue: false },
+  );
+
   readonly cipherFormComponent = viewChild(CipherFormComponent);
 
   headerText: string;
@@ -513,18 +518,54 @@ export class AddEditComponent implements OnInit, OnDestroy {
   setHeader(mode: CipherFormMode, type: CipherType) {
     const isEditMode = mode === "edit" || mode === "partial-edit";
     const translation = {
-      [CipherType.Login]: isEditMode ? "editItemHeaderLogin" : "newItemHeaderLogin",
-      [CipherType.Card]: isEditMode ? "editItemHeaderCard" : "newItemHeaderCard",
-      [CipherType.Identity]: isEditMode ? "editItemHeaderIdentity" : "newItemHeaderIdentity",
-      [CipherType.SecureNote]: isEditMode ? "editItemHeaderNote" : "newItemHeaderNote",
-      [CipherType.SshKey]: isEditMode ? "editItemHeaderSshKey" : "newItemHeaderSshKey",
+      [CipherType.Login]: isEditMode
+        ? this.btnTextAddCreateFeatureFlag()
+          ? "editItemHeaderLoginSentenceCase"
+          : "editItemHeaderLogin"
+        : this.btnTextAddCreateFeatureFlag()
+          ? "addItemHeaderLogin"
+          : "newItemHeaderLogin",
+      [CipherType.Card]: isEditMode
+        ? this.btnTextAddCreateFeatureFlag()
+          ? "editItemHeaderCardSentenceCase"
+          : "editItemHeaderCard"
+        : this.btnTextAddCreateFeatureFlag()
+          ? "addItemHeaderCard"
+          : "newItemHeaderCard",
+      [CipherType.Identity]: isEditMode
+        ? this.btnTextAddCreateFeatureFlag()
+          ? "editItemHeaderIdentitySentenceCase"
+          : "editItemHeaderIdentity"
+        : this.btnTextAddCreateFeatureFlag()
+          ? "addItemHeaderIdentity"
+          : "newItemHeaderIdentity",
+      [CipherType.SecureNote]: isEditMode
+        ? this.btnTextAddCreateFeatureFlag()
+          ? "editItemHeaderNoteSentenceCase"
+          : "editItemHeaderNote"
+        : this.btnTextAddCreateFeatureFlag()
+          ? "addItemHeaderNote"
+          : "newItemHeaderNote",
+      [CipherType.SshKey]: isEditMode
+        ? "editItemHeaderSshKey"
+        : this.btnTextAddCreateFeatureFlag()
+          ? "addItemHeaderSshKey"
+          : "newItemHeaderSshKey",
       [CipherType.BankAccount]: isEditMode
         ? "editItemHeaderBankAccount"
-        : "newItemHeaderBankAccount",
+        : this.btnTextAddCreateFeatureFlag()
+          ? "addItemHeaderBankAccount"
+          : "newItemHeaderBankAccount",
       [CipherType.DriversLicense]: isEditMode
         ? "editItemHeaderLicense"
-        : "newItemHeaderDriversLicense",
-      [CipherType.Passport]: isEditMode ? "editItemHeaderPassport" : "newItemHeaderPassport",
+        : this.btnTextAddCreateFeatureFlag()
+          ? "addItemHeaderDriversLicense"
+          : "newItemHeaderDriversLicense",
+      [CipherType.Passport]: isEditMode
+        ? "editItemHeaderPassport"
+        : this.btnTextAddCreateFeatureFlag()
+          ? "addItemHeaderPassport"
+          : "newItemHeaderPassport",
     };
     return this.i18nService.t(translation[type]);
   }

apps/browser/src/vault/popup/components/vault/new-item-dropdown/new-item-dropdown.component.html

@@ -6,7 +6,7 @@
     (click)="navigateToNewItemPage()"
     startIcon="bwi-plus"
   >
-    {{ "new" | i18n }}
+    {{ (btnTextAddCreateFeatureFlag() ? "add" : "new") | i18n }}
   </button>
 } @else {
   <button
@@ -16,7 +16,7 @@
     buttonType="primary"
     type="button"
   >
-    {{ "new" | i18n }}
+    {{ (btnTextAddCreateFeatureFlag() ? "add" : "new") | i18n }}
   </button>
   <bit-menu #itemOptions>
     @for (menuItem of cipherMenuItems$ | async; track menuItem.type) {

apps/browser/src/vault/popup/components/vault/new-item-dropdown/new-item-dropdown.component.ts

@@ -61,6 +61,11 @@ export class NewItemDropdownComponent implements OnInit {
     { initialValue: false },
   );
 
+  protected readonly btnTextAddCreateFeatureFlag = toSignal(
+    this.configService.getFeatureFlag$(FeatureFlag.PM32380_BtnTextAddCreate),
+    { initialValue: false },
+  );
+
   constructor(
     private dialogService: DialogService,
     private restrictedItemTypeService: RestrictedItemTypesService,

apps/browser/src/vault/popup/components/vault/view/view.component.ts

@@ -1,7 +1,7 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 import { CommonModule } from "@angular/common";
-import { Component } from "@angular/core";
+import { Component, inject } from "@angular/core";
 import { takeUntilDestroyed, toSignal } from "@angular/core/rxjs-interop";
 import { FormsModule } from "@angular/forms";
 import { ActivatedRoute, Router } from "@angular/router";
@@ -23,6 +23,8 @@ import {
 } from "@bitwarden/common/autofill/constants";
 import { DomainSettingsService } from "@bitwarden/common/autofill/services/domain-settings.service";
 import { EventCollectionService, EventType } from "@bitwarden/common/dirt/event-logs";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { UserId } from "@bitwarden/common/types/guid";
@@ -111,6 +113,12 @@ type LoadAction =
   ],
 })
 export class ViewComponent {
+  private readonly configService = inject(ConfigService);
+  protected readonly btnTextAddCreateFeatureFlag = toSignal(
+    this.configService.getFeatureFlag$(FeatureFlag.PM32380_BtnTextAddCreate),
+    { initialValue: false },
+  );
+
   private activeUserId: UserId;
 
   headerText: string;
@@ -216,10 +224,18 @@ export class ViewComponent {
 
   setHeader(type: CipherType) {
     const translation = {
-      [CipherType.Login]: "viewItemHeaderLogin",
-      [CipherType.Card]: "viewItemHeaderCard",
-      [CipherType.Identity]: "viewItemHeaderIdentity",
-      [CipherType.SecureNote]: "viewItemHeaderNote",
+      [CipherType.Login]: this.btnTextAddCreateFeatureFlag()
+        ? "viewItemHeaderLoginSentenceCase"
+        : "viewItemHeaderLogin",
+      [CipherType.Card]: this.btnTextAddCreateFeatureFlag()
+        ? "viewItemHeaderCardSentenceCase"
+        : "viewItemHeaderCard",
+      [CipherType.Identity]: this.btnTextAddCreateFeatureFlag()
+        ? "viewItemHeaderIdentitySentenceCase"
+        : "viewItemHeaderIdentity",
+      [CipherType.SecureNote]: this.btnTextAddCreateFeatureFlag()
+        ? "viewItemHeaderNoteSentenceCase"
+        : "viewItemHeaderNote",
       [CipherType.SshKey]: "viewItemHeaderSshKey",
       [CipherType.BankAccount]: "viewItemHeaderBankAccount",
       [CipherType.DriversLicense]: "viewItemHeaderLicense",

apps/desktop/src/app/tools/send/send.component.html

@@ -19,7 +19,7 @@
     <tools-new-send-dropdown-v2
       slot="empty-button"
       [hideIcon]="true"
-      buttonType="primary"
+      [buttonType]="btnTextAddCreateFeatureFlag() ? 'secondary' : 'primary'"
       (addSend)="addSend($event)"
     />
   </tools-send-list>

apps/desktop/src/app/tools/send/send.component.ts

@@ -4,6 +4,8 @@ import { Component, DestroyRef, inject } from "@angular/core";
 import { toSignal } from "@angular/core/rxjs-interop";
 import { combineLatest, lastValueFrom, map } from "rxjs";
 
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
@@ -64,6 +66,12 @@ export class SendComponent {
   private logService = inject(LogService);
   private sendFormService = inject(SendFormService);
   private destroyRef = inject(DestroyRef);
+  private readonly configService = inject(ConfigService);
+
+  protected readonly btnTextAddCreateFeatureFlag = toSignal(
+    this.configService.getFeatureFlag$(FeatureFlag.PM32380_BtnTextAddCreate),
+    { initialValue: false },
+  );
 
   private activeDrawerRef?: DialogRef<SendItemDialogResult>;
 

apps/desktop/src/vault/app/vault-v3/vault-list.component.html

@@ -92,6 +92,8 @@
           [canCreateCipher]="true"
           [canCreateFolder]="true"
           [canCreateSshKey]="true"
+          buttonType="secondary"
+          [icon]="undefined"
           (cipherAdded)="addCipher($event)"
           (folderAdded)="addFolder()"
           (onAddItemDialog)="onAddItemDialog.emit()"

apps/desktop/src/vault/app/vault-v3/vault-list.component.ts

@@ -3,12 +3,14 @@
 import { ScrollingModule } from "@angular/cdk/scrolling";
 import { AsyncPipe } from "@angular/common";
 import { Component, input, output, effect, inject, computed } from "@angular/core";
-import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { takeUntilDestroyed, toSignal } from "@angular/core/rxjs-interop";
 import { Observable, of, switchMap } from "rxjs";
 
 import { BitSvg } from "@bitwarden/assets/svg";
 import { CollectionView } from "@bitwarden/common/admin-console/models/collections";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherAuthorizationService } from "@bitwarden/common/vault/services/cipher-authorization.service";
@@ -92,6 +94,12 @@ export class VaultListComponent<C extends CipherViewLike> {
   protected cipherAuthorizationService = inject(CipherAuthorizationService);
   protected restrictedItemTypesService = inject(RestrictedItemTypesService);
   private premiumUpgradePromptService = inject(PremiumUpgradePromptService);
+  private readonly configService = inject(ConfigService);
+
+  protected readonly btnTextAddCreateFeatureFlag = toSignal(
+    this.configService.getFeatureFlag$(FeatureFlag.PM32380_BtnTextAddCreate),
+    { initialValue: false },
+  );
 
   protected dataSource = new TableDataSource<VaultItem<C>>();
   private restrictedTypes: RestrictedCipherType[] = [];

libs/tools/send/send-ui/src/new-send-dropdown-v2/new-send-dropdown-v2.component.html

@@ -5,7 +5,16 @@
   type="button"
   [startIcon]="!hideIcon() ? 'bwi-plus' : undefined"
 >
-  {{ (hideIcon() ? "createSend" : "new") | i18n }}
+  {{
+    (hideIcon()
+      ? btnTextAddCreateFeatureFlag()
+        ? "createSendV2"
+        : "createSend"
+      : btnTextAddCreateFeatureFlag()
+        ? "create"
+        : "new"
+    ) | i18n
+  }}
 </button>
 <bit-menu #itemOptions>
   <button bitMenuItem type="button" (click)="onTextSendClick()">

libs/tools/send/send-ui/src/new-send-dropdown-v2/new-send-dropdown-v2.component.spec.ts

@@ -4,6 +4,7 @@ import { BehaviorSubject, of } from "rxjs";
 
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { SendType } from "@bitwarden/common/tools/send/types/send-type";
 import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
@@ -16,11 +17,14 @@ describe("NewSendDropdownV2Component", () => {
   let billingService: MockProxy<BillingAccountProfileStateService>;
   let accountService: MockProxy<AccountService>;
   let premiumUpgradeService: MockProxy<PremiumUpgradePromptService>;
+  let configService: MockProxy<ConfigService>;
 
   beforeEach(async () => {
     billingService = mock<BillingAccountProfileStateService>();
     accountService = mock<AccountService>();
     premiumUpgradeService = mock<PremiumUpgradePromptService>();
+    configService = mock<ConfigService>();
+    configService.getFeatureFlag$.mockReturnValue(of(false));
 
     // Default: user has premium
     accountService.activeAccount$ = of({ id: "user-123" } as any);
@@ -36,6 +40,7 @@ describe("NewSendDropdownV2Component", () => {
         { provide: AccountService, useValue: accountService },
         { provide: PremiumUpgradePromptService, useValue: premiumUpgradeService },
         { provide: I18nService, useValue: i18nService },
+        { provide: ConfigService, useValue: configService },
       ],
     }).compileComponents();
 

libs/tools/send/send-ui/src/new-send-dropdown-v2/new-send-dropdown-v2.component.ts

@@ -6,6 +6,8 @@ import { PremiumBadgeComponent } from "@bitwarden/angular/billing/components/pre
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { SendType } from "@bitwarden/common/tools/send/types/send-type";
 import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
 import { ButtonModule, ButtonType, MenuModule } from "@bitwarden/components";
@@ -30,6 +32,12 @@ export class NewSendDropdownV2Component {
   private readonly billingAccountProfileStateService = inject(BillingAccountProfileStateService);
   private readonly accountService = inject(AccountService);
   private readonly premiumUpgradePromptService = inject(PremiumUpgradePromptService);
+  private readonly configService = inject(ConfigService);
+
+  protected readonly btnTextAddCreateFeatureFlag = toSignal(
+    this.configService.getFeatureFlag$(FeatureFlag.PM32380_BtnTextAddCreate),
+    { initialValue: false },
+  );
 
   protected readonly hasNoPremium = toSignal(
     this.accountService.activeAccount$.pipe(

libs/tools/send/send-ui/src/new-send-dropdown/new-send-dropdown.component.html

@@ -5,7 +5,16 @@
   type="button"
   [startIcon]="!hideIcon ? 'bwi-plus' : undefined"
 >
-  {{ (hideIcon ? "createSend" : "new") | i18n }}
+  {{
+    (hideIcon
+      ? btnTextAddCreateFeatureFlag()
+        ? "createSendV2"
+        : "createSend"
+      : btnTextAddCreateFeatureFlag()
+        ? "create"
+        : "new"
+    ) | i18n
+  }}
 </button>
 <bit-menu #itemOptions>
   <a bitMenuItem [routerLink]="buildRouterLink()" [queryParams]="buildQueryParams(sendType.Text)">

libs/tools/send/send-ui/src/new-send-dropdown/new-send-dropdown.component.ts

@@ -1,12 +1,15 @@
 import { CommonModule } from "@angular/common";
-import { Component, Input, OnInit } from "@angular/core";
+import { Component, inject, Input, OnInit } from "@angular/core";
+import { toSignal } from "@angular/core/rxjs-interop";
 import { Router, RouterLink } from "@angular/router";
 import { firstValueFrom } from "rxjs";
 
 import { PremiumBadgeComponent } from "@bitwarden/angular/billing/components/premium-badge";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { SendType } from "@bitwarden/common/tools/send/types/send-type";
 import { PremiumUpgradePromptService } from "@bitwarden/common/vault/abstractions/premium-upgrade-prompt.service";
 import { ButtonModule, ButtonType, MenuModule } from "@bitwarden/components";
@@ -30,6 +33,13 @@ export class NewSendDropdownComponent implements OnInit {
 
   hasNoPremium = false;
 
+  private readonly configService = inject(ConfigService);
+
+  protected readonly btnTextAddCreateFeatureFlag = toSignal(
+    this.configService.getFeatureFlag$(FeatureFlag.PM32380_BtnTextAddCreate),
+    { initialValue: false },
+  );
+
   constructor(
     private billingAccountProfileStateService: BillingAccountProfileStateService,
     private accountService: AccountService,