From 6ba0d1cbbed242edd60d2a5a7c8aa6013b8f26c3 Mon Sep 17 00:00:00 2001
From: Shane Melton <smelton@bitwarden.com>
Date: Fri, 23 Feb 2024 14:43:14 -0800
Subject: [PATCH] [PM-6397] [AC-2141] [PM-6449] VVR Design Follow Up Fixes
 (#8077)

* [AC-2141] Re-order products in product switcher

* [PM-6397] Fix missing accessibility text

* [PM-6449] Fix casing on left side nav
---
 .../layouts/organization-layout.component.html       |  4 ++--
 .../product-switcher-content.component.ts            | 12 ++++++------
 apps/web/src/app/layouts/user-layout.component.html  |  2 +-
 apps/web/src/locales/en/messages.json                |  6 ++++++
 .../providers/providers-layout.component.html        |  2 +-
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.html b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.html
index c548e528ab..ef35b3c2b4 100644
--- a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.html
+++ b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.html
@@ -1,13 +1,13 @@
 <bit-layout variant="secondary">
   <nav slot="sidebar" *ngIf="organization$ | async as organization">
-    <a routerLink="." class="tw-m-5 tw-mt-7 tw-block">
+    <a routerLink="." class="tw-m-5 tw-mt-7 tw-block" [appA11yTitle]="'adminConsole' | i18n">
       <bit-icon [icon]="logo"></bit-icon>
     </a>
     <org-switcher [filter]="orgFilter"></org-switcher>
 
     <bit-nav-item
       icon="bwi-collection"
-      [text]="organization.flexibleCollections ? 'collections' : ('vault' | i18n)"
+      [text]="(organization.flexibleCollections ? 'collections' : 'vault') | i18n"
       route="vault"
       *ngIf="canShowVaultTab(organization)"
     >
diff --git a/apps/web/src/app/layouts/product-switcher/product-switcher-content.component.ts b/apps/web/src/app/layouts/product-switcher/product-switcher-content.component.ts
index ec6efb0ba9..5354dc2b71 100644
--- a/apps/web/src/app/layouts/product-switcher/product-switcher-content.component.ts
+++ b/apps/web/src/app/layouts/product-switcher/product-switcher-content.component.ts
@@ -110,18 +110,18 @@ export class ProductSwitcherContentComponent {
       const bento: ProductSwitcherItem[] = [products.pm];
       const other: ProductSwitcherItem[] = [];
 
-      if (acOrg) {
-        bento.push(products.ac);
-      } else {
-        other.push(products.orgs);
-      }
-
       if (smOrg) {
         bento.push(products.sm);
       } else {
         other.push(products.sm);
       }
 
+      if (acOrg) {
+        bento.push(products.ac);
+      } else {
+        other.push(products.orgs);
+      }
+
       if (providers.length > 0) {
         bento.push(products.provider);
       }
diff --git a/apps/web/src/app/layouts/user-layout.component.html b/apps/web/src/app/layouts/user-layout.component.html
index cadc0c7f88..3593390113 100644
--- a/apps/web/src/app/layouts/user-layout.component.html
+++ b/apps/web/src/app/layouts/user-layout.component.html
@@ -1,6 +1,6 @@
 <bit-layout>
   <nav slot="sidebar">
-    <a routerLink="." class="tw-m-5 tw-mt-7 tw-block">
+    <a routerLink="." class="tw-m-5 tw-mt-7 tw-block" [appA11yTitle]="'passwordManager' | i18n">
       <bit-icon [icon]="logo"></bit-icon>
     </a>
 
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 4350b5de8c..17b98a6534 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -7589,5 +7589,11 @@
   },
   "releaseBlog": {
     "message": "Read release blog"
+  },
+  "adminConsole": {
+    "message": "Admin Console"
+  },
+  "providerPortal": {
+    "message": "Provider Portal"
   }
 }
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.html
index 488a3b99d2..4748374511 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.html
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.html
@@ -1,6 +1,6 @@
 <bit-layout variant="secondary">
   <nav slot="sidebar" *ngIf="provider">
-    <a routerLink="." class="tw-m-5 tw-mt-7 tw-block">
+    <a routerLink="." class="tw-m-5 tw-mt-7 tw-block" [appA11yTitle]="'providerPortal' | i18n">
       <bit-icon [icon]="logo"></bit-icon>
     </a>