From 3a6088c187788e8167d3eac5d580b0d7c7356cdc Mon Sep 17 00:00:00 2001 From: Jordan Aasen <166539328+jaasen-livefront@users.noreply.github.com> Date: Tue, 16 Sep 2025 11:52:46 -0700 Subject: [PATCH] clear orgId when switching to a personal vault (#16396) --- .../src/vault/app/vault/vault-v2.component.ts | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/apps/desktop/src/vault/app/vault/vault-v2.component.ts b/apps/desktop/src/vault/app/vault/vault-v2.component.ts index 13a8fa91bc4..141f05a28aa 100644 --- a/apps/desktop/src/vault/app/vault/vault-v2.component.ts +++ b/apps/desktop/src/vault/app/vault/vault-v2.component.ts @@ -926,17 +926,22 @@ export class VaultV2Component } } else if (this.activeFilter.selectedOrganizationId) { this.addOrganizationId = this.activeFilter.selectedOrganizationId; + } else { + // clear out organizationId when the user switches to a personal vault filter + this.addOrganizationId = null; } if (this.activeFilter.selectedFolderId && this.activeFilter.selectedFolder) { this.folderId = this.activeFilter.selectedFolderId; } - if (this.addOrganizationId && this.config) { - this.config.initialValues = { - ...this.config.initialValues, - organizationId: this.addOrganizationId as OrganizationId, - }; + if (this.config == null) { + return; } + + this.config.initialValues = { + ...this.config.initialValues, + organizationId: this.addOrganizationId as OrganizationId, + }; } private async canNavigateAway(action: string, cipher?: CipherView) {