From db9003458b81beaaa6242d387917065ee9f93ef5 Mon Sep 17 00:00:00 2001
From: Nick Krantz <125900171+nick-livefront@users.noreply.github.com>
Date: Wed, 11 Sep 2024 11:29:53 -0500
Subject: [PATCH] [PM-11436] New "+" button (#10907)

* replace icon in "new" button on admin-console

* replace icon in "new" button on secrets manager

* reduce flash of "new item" button by checking the availability of the organization
---
 .../vault-header/vault-header.component.html          |  8 ++++++--
 .../secrets-manager/shared/new-menu.component.html    | 11 +++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.html b/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.html
index f583055687c..72b1284b86a 100644
--- a/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.html
+++ b/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.html
@@ -100,7 +100,10 @@
     [placeholder]="'searchCollection' | i18n"
   ></bit-search>
 
-  <div *ngIf="filter.type !== 'trash' && filter.collectionId !== Unassigned" class="tw-shrink-0">
+  <div
+    *ngIf="filter.type !== 'trash' && filter.collectionId !== Unassigned && organization"
+    class="tw-shrink-0"
+  >
     <div *ngIf="canCreateCipher && canCreateCollection" appListDropdown>
       <button
         bitButton
@@ -110,7 +113,8 @@
         id="newItemDropdown"
         appA11yTitle="{{ 'new' | i18n }}"
       >
-        {{ "new" | i18n }}<i class="bwi bwi-angle-down tw-ml-2" aria-hidden="true"></i>
+        <i class="bwi bwi-plus-f" aria-hidden="true"></i>
+        {{ "new" | i18n }}<i class="bwi tw-ml-2" aria-hidden="true"></i>
       </button>
       <bit-menu #addOptions aria-labelledby="newItemDropdown">
         <ng-container [ngSwitch]="extensionRefreshEnabled">
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.html
index 457eff37fac..2238fa9fc87 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.html
@@ -1,11 +1,6 @@
-<button
-  type="button"
-  bitButton
-  class="tw-min-w-max"
-  buttonType="primary"
-  [bitMenuTriggerFor]="newMenu"
->
-  {{ "new" | i18n }} <i class="bwi bwi-angle-down" aria-hidden="true"></i>
+<button type="button" bitButton buttonType="primary" [bitMenuTriggerFor]="newMenu">
+  <i class="bwi bwi-plus-f" aria-hidden="true"></i>
+  {{ "new" | i18n }}<i class="bwi tw-ml-2" aria-hidden="true"></i>
 </button>
 
 <bit-menu #newMenu>