From 65219f5705addf9c762e796c31ba914a395a9ff0 Mon Sep 17 00:00:00 2001
From: Addison Beck <addisonbeck1@gmail.com>
Date: Fri, 25 Feb 2022 07:03:13 -0500
Subject: [PATCH] [bug] Store collapsedGroupings in accountSettings (#694)

---
 common/src/models/domain/account.ts  | 2 +-
 common/src/services/state.service.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/src/models/domain/account.ts b/common/src/models/domain/account.ts
index 3eb28631208..a6c0cfd6f88 100644
--- a/common/src/models/domain/account.ts
+++ b/common/src/models/domain/account.ts
@@ -51,7 +51,6 @@ export class AccountData {
     GeneratedPasswordHistory[]
   > = new EncryptionPair<GeneratedPasswordHistory[], GeneratedPasswordHistory[]>();
   addEditCipherInfo?: any;
-  collapsedGroupings?: string[];
   eventCollection?: EventData[];
   organizations?: { [id: string]: OrganizationData };
   providers?: { [id: string]: ProviderData };
@@ -105,6 +104,7 @@ export class AccountSettings {
   biometricLocked?: boolean;
   biometricUnlock?: boolean;
   clearClipboard?: number;
+  collapsedGroupings?: string[];
   defaultUriMatch?: UriMatchType;
   disableAddLoginNotification?: boolean;
   disableAutoBiometricsPrompt?: boolean;
diff --git a/common/src/services/state.service.ts b/common/src/services/state.service.ts
index 6a27d224a09..3af2bc11d67 100644
--- a/common/src/services/state.service.ts
+++ b/common/src/services/state.service.ts
@@ -383,14 +383,14 @@ export class StateService<
   async getCollapsedGroupings(options?: StorageOptions): Promise<string[]> {
     return (
       await this.getAccount(this.reconcileOptions(options, await this.defaultOnDiskLocalOptions()))
-    )?.data?.collapsedGroupings;
+    )?.settings?.collapsedGroupings;
   }
 
   async setCollapsedGroupings(value: string[], options?: StorageOptions): Promise<void> {
     const account = await this.getAccount(
       this.reconcileOptions(options, await this.defaultOnDiskLocalOptions())
     );
-    account.data.collapsedGroupings = value;
+    account.settings.collapsedGroupings = value;
     await this.saveAccount(
       account,
       this.reconcileOptions(options, await this.defaultOnDiskLocalOptions())