From fcbc91326f462360d4afd46865b93af9455beab6 Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Tue, 29 Nov 2022 17:56:38 +0100
Subject: [PATCH] Fix setting outdated global after async calls (#2165)

---
 src/global/actions/api/messages.ts | 1 +
 src/global/actions/api/sync.ts     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/global/actions/api/messages.ts b/src/global/actions/api/messages.ts
index e6b559648..81e8367cd 100644
--- a/src/global/actions/api/messages.ts
+++ b/src/global/actions/api/messages.ts
@@ -1285,6 +1285,7 @@ addActionHandler('setForwardChatId', async (global, actions, payload) => {
     if (!user.fullInfo) {
       const { accessHash } = user;
       user = await callApi('fetchFullUser', { id, accessHash });
+      global = getGlobal();
     }
 
     if (user?.fullInfo!.noVoiceMessages) {
diff --git a/src/global/actions/api/sync.ts b/src/global/actions/api/sync.ts
index f2ef7a783..d86fa97d9 100644
--- a/src/global/actions/api/sync.ts
+++ b/src/global/actions/api/sync.ts
@@ -129,6 +129,7 @@ async function loadAndReplaceMessages() {
         const { originChannelId } = threadInfo;
         const currentMessageListInfoOrigin = global.messages.byChatId[originChannelId];
         const resultOrigin = await loadTopMessages(global.chats.byId[originChannelId]);
+        global = getGlobal();
         if (resultOrigin) {
           const byIdOrigin = buildCollectionByKey(resultOrigin.messages, 'id');
           const listedIdsOrigin = Object.keys(byIdOrigin).map(Number);