From c241e5e0b9fc4a84ef7abc5fa3097c11da58cac7 Mon Sep 17 00:00:00 2001
From: SmithThe4th <gsmith@bitwarden.com>
Date: Mon, 27 Mar 2023 09:36:57 -0400
Subject: [PATCH] [PM-1408] Vault Items with null Folder Value not Handled
 Correctly  (#5066)

* Added optional chaining to folder view object to handle when the foilder value is null

* Set folder to null during cleanup and added check on the view component to check if the folder is nul before rendering the html
---
 apps/desktop/src/vault/app/vault/view.component.html | 2 +-
 libs/angular/src/vault/components/view.component.ts  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/desktop/src/vault/app/vault/view.component.html b/apps/desktop/src/vault/app/vault/view.component.html
index 3c2c11a5627..557e7e4f4fc 100644
--- a/apps/desktop/src/vault/app/vault/view.component.html
+++ b/apps/desktop/src/vault/app/vault/view.component.html
@@ -440,7 +440,7 @@
         </div>
       </div>
     </div>
-    <div class="box" *ngIf="cipher.folderId">
+    <div class="box" *ngIf="cipher.folderId && folder">
       <div class="box-content">
         <div class="box-content-row">
           <label
diff --git a/libs/angular/src/vault/components/view.component.ts b/libs/angular/src/vault/components/view.component.ts
index a90578b6b69..e286943216c 100644
--- a/libs/angular/src/vault/components/view.component.ts
+++ b/libs/angular/src/vault/components/view.component.ts
@@ -434,6 +434,7 @@ export class ViewComponent implements OnDestroy, OnInit {
   private cleanUp() {
     this.totpCode = null;
     this.cipher = null;
+    this.folder = null;
     this.showPassword = false;
     this.showCardNumber = false;
     this.showCardCode = false;