From 705e2329f81eaded654de57fbe858cb4a747c1f6 Mon Sep 17 00:00:00 2001
From: jaasen-livefront <jaasen@livefront.com>
Date: Fri, 7 Nov 2025 14:30:55 -0800
Subject: [PATCH] Update folder and folderview

---
 libs/common/src/vault/models/domain/folder.ts    | 6 +++++-
 libs/common/src/vault/models/view/folder.view.ts | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/libs/common/src/vault/models/domain/folder.ts b/libs/common/src/vault/models/domain/folder.ts
index c06d9ad7872..81df65cae3f 100644
--- a/libs/common/src/vault/models/domain/folder.ts
+++ b/libs/common/src/vault/models/domain/folder.ts
@@ -58,6 +58,10 @@ export class Folder extends Domain {
     if (obj == null) {
       return null;
     }
-    return new Folder({ name: obj.name ?? "", revisionDate: obj.revisionDate, id: obj.id ?? "" });
+    return new Folder({
+      name: EncString.fromJSON(obj.name ?? "").encryptedString ?? "",
+      revisionDate: obj.revisionDate,
+      id: obj.id ?? "",
+    });
   }
 }
diff --git a/libs/common/src/vault/models/view/folder.view.ts b/libs/common/src/vault/models/view/folder.view.ts
index d0126a728ea..aecbd31ab9d 100644
--- a/libs/common/src/vault/models/view/folder.view.ts
+++ b/libs/common/src/vault/models/view/folder.view.ts
@@ -10,13 +10,14 @@ export class FolderView implements View, ITreeNodeObject {
   name: string = "";
   revisionDate: Date;
 
-  constructor(f?: Folder | DecryptedObject<Folder, "name">) {
+  constructor(f?: Folder | DecryptedObject<Folder, undefined>) {
     if (!f) {
       this.revisionDate = new Date();
       return;
     }
 
-    this.id = f.id;
+    this.id = f.id ?? "";
+    this.name = f.name?.decryptedValue ?? "";
     this.revisionDate = f.revisionDate;
   }