From 0e7700810853f5ce6be54086cec1d996ca3028bb Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Fri, 29 Mar 2024 20:51:22 +0100
Subject: [PATCH] Folder Manager: Init before chat load (#4431)

---
 src/global/actions/api/sync.ts | 3 ++-
 src/lib/teact/teactn.tsx       | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/global/actions/api/sync.ts b/src/global/actions/api/sync.ts
index 652463f29..616f017a9 100644
--- a/src/global/actions/api/sync.ts
+++ b/src/global/actions/api/sync.ts
@@ -68,6 +68,8 @@ addActionHandler('sync', (global, actions): ActionReturnType => {
     loadAllChats, preloadTopChatMessages, loadAllStories, loadAllHiddenStories,
   } = actions;
 
+  initFolderManager();
+
   loadAllChats({
     listType: 'active',
     shouldReplace: true,
@@ -88,7 +90,6 @@ addActionHandler('sync', (global, actions): ActionReturnType => {
         console.log('>>> FINISH SYNC');
       }
 
-      initFolderManager();
       loadAllChats({ listType: 'archived', shouldReplace: true });
       loadAllChats({ listType: 'saved', shouldReplace: true });
       preloadTopChatMessages();
diff --git a/src/lib/teact/teactn.tsx b/src/lib/teact/teactn.tsx
index 0fabdb9b1..1fdf9d338 100644
--- a/src/lib/teact/teactn.tsx
+++ b/src/lib/teact/teactn.tsx
@@ -96,6 +96,10 @@ export function setGlobal(newGlobal?: GlobalState, options?: ActionOptions) {
 
     currentGlobal = newGlobal;
 
+    if (DEBUG) {
+      DEBUG_currentCapturedId = Math.random();
+    }
+
     if (options?.forceSyncOnIOs) {
       forceOnHeavyAnimation = true;
       runCallbacks();
@@ -111,7 +115,6 @@ export function setGlobal(newGlobal?: GlobalState, options?: ActionOptions) {
 
 export function getGlobal() {
   if (DEBUG) {
-    DEBUG_currentCapturedId = Math.random();
     currentGlobal = {
       ...currentGlobal,
       DEBUG_capturedId: DEBUG_currentCapturedId,