From b81843cdf78cfc07c0f5d1875f731e9b9fb71a4e Mon Sep 17 00:00:00 2001
From: Abdullah Atta <abdullahatta@streetwriters.co>
Date: Wed, 6 Sep 2023 19:31:06 +0500
Subject: [PATCH] core: sync settings before everything else

---
 packages/core/src/api/sync/collector.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/core/src/api/sync/collector.js b/packages/core/src/api/sync/collector.js
index 7c83c8dc2..aa033b01a 100644
--- a/packages/core/src/api/sync/collector.js
+++ b/packages/core/src/api/sync/collector.js
@@ -44,6 +44,15 @@ class Collector {
   async *collect(chunkSize, lastSyncedTimestamp, isForceSync) {
     const key = await this._db.user.getEncryptionKey();
 
+    const settings = await this.prepareChunk(
+      [this._db.settings.raw],
+      lastSyncedTimestamp,
+      isForceSync,
+      key,
+      "settings"
+    );
+    if (settings) yield settings;
+
     const attachments = await this.prepareChunk(
       this._db.attachments.syncable,
       lastSyncedTimestamp,
@@ -84,15 +93,6 @@ class Collector {
         yield items;
       }
     }
-
-    const settings = await this.prepareChunk(
-      [this._db.settings.raw],
-      lastSyncedTimestamp,
-      isForceSync,
-      key,
-      "settings"
-    );
-    if (settings) yield settings;
   }
 
   async prepareChunk(chunk, lastSyncedTimestamp, isForceSync, key, itemType) {