From e2c25c6aad47d1e086ee8bb749e413cd93f89ca8 Mon Sep 17 00:00:00 2001
From: Brandon Maharaj <bmaharaj@bitwarden.com>
Date: Mon, 23 Jan 2023 13:41:35 -0500
Subject: [PATCH] [SG-980] Organization name badge color doesn't match their
 organization avatar color from Vault (#4451)

* fix: adjusted color source priority to deprio  ids

* fix: CAPS LOCK ON

* undo: lets not touch base components :)

* fix: don't use id since orgs rely on names
---
 .../web/src/app/components/organization-switcher.component.html | 2 +-
 .../organization-badge/organization-name-badge.component.ts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/web/src/app/components/organization-switcher.component.html b/apps/web/src/app/components/organization-switcher.component.html
index ca3995bf463..235dcf713b6 100644
--- a/apps/web/src/app/components/organization-switcher.component.html
+++ b/apps/web/src/app/components/organization-switcher.component.html
@@ -6,7 +6,7 @@
     [appA11yTitle]="'organizationPicker' | i18n"
     [bitMenuTriggerFor]="orgPickerMenu"
   >
-    <bit-avatar [text]="activeOrganization.name" [id]="activeOrganization.id"></bit-avatar>
+    <bit-avatar [text]="activeOrganization.name"></bit-avatar>
     <div class="tw-flex">
       <div class="org-name tw-ml-3">
         <span>{{ activeOrganization.name }}</span>
diff --git a/apps/web/src/app/vault/organization-badge/organization-name-badge.component.ts b/apps/web/src/app/vault/organization-badge/organization-name-badge.component.ts
index 33c659be559..bddba952b8c 100644
--- a/apps/web/src/app/vault/organization-badge/organization-name-badge.component.ts
+++ b/apps/web/src/app/vault/organization-badge/organization-name-badge.component.ts
@@ -38,7 +38,7 @@ export class OrganizationNameBadgeComponent implements OnInit {
         this.color = Utils.stringToColor(userName.toUpperCase());
       }
     } else {
-      this.color = Utils.stringToColor(this.organizationName);
+      this.color = Utils.stringToColor(this.organizationName.toUpperCase());
     }
     this.textColor = Utils.pickTextColorBasedOnBgColor(this.color, 135, true) + "!important";
   }