Merge branch 'main' into autofill/pm-6426-create-alarms-manager-and-update-usage-of-long-lived-timeouts-rework

apps/browser/src/popup/services/services.module.ts

@@ -189,21 +189,11 @@ const safeProviders: SafeProvider[] = [
     useClass: PopupSearchService,
     deps: [LogService, I18nServiceAbstraction, StateProvider],
   }),
-  safeProvider({
-    provide: CipherService,
-    useFactory: getBgService<CipherService>("cipherService"),
-    deps: [],
-  }),
   safeProvider({
     provide: CryptoFunctionService,
     useFactory: () => new WebCryptoFunctionService(window),
     deps: [],
   }),
-  safeProvider({
-    provide: CollectionService,
-    useFactory: getBgService<CollectionService>("collectionService"),
-    deps: [],
-  }),
   safeProvider({
     provide: LogService,
     useFactory: (platformUtilsService: PlatformUtilsService) =>

apps/web/src/app/layouts/product-switcher/product-switcher-content.component.html

@@ -21,9 +21,10 @@
         ariaCurrentWhenActive="page"
       >
         <i class="bwi {{ product.icon }} tw-text-4xl !tw-m-0 !tw-mb-1"></i>
-        <span class="tw-text-center tw-text-sm tw-leading-snug group-hover:tw-underline">{{
-          product.name
-        }}</span>
+        <span
+          class="tw-max-w-24 tw-text-center tw-text-sm tw-leading-snug group-hover:tw-underline"
+          >{{ product.name }}</span
+        >
       </a>
     </section>
 

apps/web/src/app/layouts/product-switcher/product-switcher-content.component.ts

@@ -97,7 +97,7 @@ export class ProductSwitcherContentComponent {
         },
         ac: {
           name: "Admin Console",
-          icon: "bwi-business",
+          icon: "bwi-user-monitor",
           appRoute: ["/organizations", acOrg?.id],
           marketingRoute: "https://bitwarden.com/products/business/",
           isActive: this.router.url.includes("/organizations/"),