From 75f290485dc4f5fd6f2d99ffd6e3f8e5647d4c08 Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Sat, 29 Oct 2022 15:18:37 +0200
Subject: [PATCH] Composer: Fix syncing after editing draft on another device
 (#2089)

---
 src/components/middle/composer/Composer.tsx      |  2 +-
 src/components/middle/composer/hooks/useDraft.ts | 11 ++++++++---
 src/global/actions/api/chats.ts                  |  5 +----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/components/middle/composer/Composer.tsx b/src/components/middle/composer/Composer.tsx
index 2aa8fd0ff..65084a1b5 100644
--- a/src/components/middle/composer/Composer.tsx
+++ b/src/components/middle/composer/Composer.tsx
@@ -540,7 +540,7 @@ const Composer: FC<OwnProps & StateProps> = ({
     draft,
     editingDraft,
   );
-  useDraft(draft, chatId, threadId, htmlRef, setHtml, editingMessage);
+  useDraft(draft, chatId, threadId, htmlRef, setHtml, editingMessage, lastSyncTime);
   useClipboardPaste(isForCurrentMessageList, insertTextAndUpdateCursor, handleSetAttachments, editingMessage);
 
   const handleEmbeddedClear = useCallback(() => {
diff --git a/src/components/middle/composer/hooks/useDraft.ts b/src/components/middle/composer/hooks/useDraft.ts
index 7942829e0..8de75d385 100644
--- a/src/components/middle/composer/hooks/useDraft.ts
+++ b/src/components/middle/composer/hooks/useDraft.ts
@@ -24,18 +24,20 @@ const useDraft = (
   htmlRef: { current: string },
   setHtml: (html: string) => void,
   editedMessage: ApiMessage | undefined,
+  lastSyncTime?: number,
 ) => {
   const { saveDraft, clearDraft } = getActions();
+  const prevDraft = usePrevious(draft);
 
   const updateDraft = useCallback((draftChatId: string, draftThreadId: number) => {
     const currentHtml = htmlRef.current;
-    if (currentHtml === undefined || editedMessage) return;
+    if (currentHtml === undefined || editedMessage || !lastSyncTime) return;
     if (currentHtml.length) {
       saveDraft({ chatId: draftChatId, threadId: draftThreadId, draft: parseMessageInput(currentHtml!) });
     } else {
       clearDraft({ chatId: draftChatId, threadId: draftThreadId });
     }
-  }, [clearDraft, editedMessage, htmlRef, saveDraft]);
+  }, [clearDraft, editedMessage, htmlRef, lastSyncTime, saveDraft]);
 
   // eslint-disable-next-line react-hooks/exhaustive-deps
   const runDebouncedForSaveDraft = useMemo(() => debounce((cb) => cb(), DRAFT_DEBOUNCE, false), [chatId]);
@@ -59,6 +61,9 @@ const useDraft = (
   // Restore draft on chat change
   useEffect(() => {
     if (chatId === prevChatId && threadId === prevThreadId) {
+      if (!draft && prevDraft) {
+        setHtml('');
+      }
       return;
     }
 
@@ -76,7 +81,7 @@ const useDraft = (
         }
       });
     }
-  }, [chatId, threadId, draft, setHtml, updateDraft, prevChatId, prevThreadId, editedMessage]);
+  }, [chatId, threadId, draft, setHtml, updateDraft, prevChatId, prevThreadId, editedMessage, prevDraft]);
 
   const html = htmlRef.current;
   // Update draft when input changes
diff --git a/src/global/actions/api/chats.ts b/src/global/actions/api/chats.ts
index f276bd294..2433277cf 100644
--- a/src/global/actions/api/chats.ts
+++ b/src/global/actions/api/chats.ts
@@ -1245,13 +1245,10 @@ async function loadChats(
 
   global = updateChatListSecondaryInfo(global, listType, result);
 
-  Object.keys(result.draftsById).forEach((chatId) => {
+  result.chatIds.forEach((chatId) => {
     global = replaceThreadParam(
       global, chatId, MAIN_THREAD_ID, 'draft', result.draftsById[chatId],
     );
-  });
-
-  Object.keys(result.replyingToById).forEach((chatId) => {
     global = replaceThreadParam(
       global, chatId, MAIN_THREAD_ID, 'replyingToId', result.replyingToById[chatId],
     );