From 88de7d2b47df390ad02bcaeccf34edd2db635275 Mon Sep 17 00:00:00 2001
From: Justin Baur <19896123+justindbaur@users.noreply.github.com>
Date: Tue, 8 Nov 2022 16:45:32 -0500
Subject: [PATCH] Remove local vaultFilter (#4014)

* Use vault filter item from vaultFilterService
---
 .../browser/src/popup/vault/vault-select.component.ts | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/apps/browser/src/popup/vault/vault-select.component.ts b/apps/browser/src/popup/vault/vault-select.component.ts
index 57daa894962..5193f520edc 100644
--- a/apps/browser/src/popup/vault/vault-select.component.ts
+++ b/apps/browser/src/popup/vault/vault-select.component.ts
@@ -15,7 +15,6 @@ import {
 } from "@angular/core";
 import { BehaviorSubject, concatMap, map, merge, Observable, Subject, takeUntil } from "rxjs";
 
-import { VaultFilter } from "@bitwarden/angular/vault/vault-filter/models/vault-filter.model";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
@@ -61,7 +60,6 @@ export class VaultSelectComponent implements OnInit, OnDestroy {
   organizations$: Observable<Organization[]>;
   selectedVault$: Observable<string | null> = this._selectedVault.asObservable();
 
-  vaultFilter: VaultFilter = new VaultFilter();
   enforcePersonalOwnership = false;
   overlayPostition: ConnectedPosition[] = [
     {
@@ -111,16 +109,15 @@ export class VaultSelectComponent implements OnInit, OnDestroy {
             await this.vaultFilterService.checkForPersonalOwnershipPolicy();
 
           if (this.shouldShow(organizations)) {
-            if (this.enforcePersonalOwnership && !this.vaultFilter.myVaultOnly) {
+            if (this.enforcePersonalOwnership && !this.vaultFilterService.vaultFilter.myVaultOnly) {
               const firstOrganization = organizations[0];
               this._selectedVault.next(firstOrganization.name);
               this.vaultFilterService.setVaultFilter(firstOrganization.id);
-              this.vaultFilter.selectedOrganizationId = firstOrganization.id;
-            } else if (this.vaultFilter.myVaultOnly) {
+            } else if (this.vaultFilterService.vaultFilter.myVaultOnly) {
               this._selectedVault.next(this.i18nService.t(this.vaultFilterService.myVault));
-            } else if (this.vaultFilter.selectedOrganizationId != null) {
+            } else if (this.vaultFilterService.vaultFilter.selectedOrganizationId != null) {
               const selectedOrganization = organizations.find(
-                (o) => o.id === this.vaultFilter.selectedOrganizationId
+                (o) => o.id === this.vaultFilterService.vaultFilter.selectedOrganizationId
               );
               this._selectedVault.next(selectedOrganization.name);
             } else {