From 6ac7de030b1a20b7853f2551a7f7359b04769aea Mon Sep 17 00:00:00 2001
From: Ilya Laktyushin <ilya@laktyush.in>
Date: Sun, 27 Dec 2020 16:48:27 +0400
Subject: [PATCH] Various UI fixes

---
 .../ChatListUI/Sources/ChatListSearchListPaneNode.swift  | 5 +++--
 .../Sources/ChatMessageAnimatedStickerItemNode.swift     | 9 ++++++---
 .../TelegramUI/Sources/ChatMessageStickerItemNode.swift  | 9 ++++++---
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/submodules/ChatListUI/Sources/ChatListSearchListPaneNode.swift b/submodules/ChatListUI/Sources/ChatListSearchListPaneNode.swift
index 9a821d9103..b96f9c7210 100644
--- a/submodules/ChatListUI/Sources/ChatListSearchListPaneNode.swift
+++ b/submodules/ChatListUI/Sources/ChatListSearchListPaneNode.swift
@@ -785,13 +785,14 @@ final class ChatListSearchListPaneNode: ASDisplayNode, ChatListSearchPaneNode {
         self.addSubnode(self.recentListNode)
         self.addSubnode(self.listNode)
         self.addSubnode(self.mediaNode)
-        self.addSubnode(self.shimmerNode)
-        self.addSubnode(self.mediaAccessoryPanelContainer)
         
         self.addSubnode(self.emptyResultsAnimationNode)
         self.addSubnode(self.emptyResultsTitleNode)
         self.addSubnode(self.emptyResultsTextNode)
 
+        self.addSubnode(self.shimmerNode)
+        self.addSubnode(self.mediaAccessoryPanelContainer)
+        
         let searchContext = Promise<ChatListSearchMessagesContext?>(nil)
         let searchContextValue = self.searchContextValue
         let updateSearchContext: ((ChatListSearchMessagesContext?) -> (ChatListSearchMessagesContext?, Bool)) -> Void = { f in
diff --git a/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift b/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift
index 2c3cb9270c..44ebb79321 100644
--- a/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift
@@ -242,12 +242,15 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
                 return
             }
             if image != nil {
-                strongSelf.removePlaceholder(animated: !firstTime)
                 if firstTime {
-                    strongSelf.animationNode?.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+                    strongSelf.animationNode?.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3, completion: { [weak self] _ in
+                        self?.removePlaceholder(animated: false)
+                    })
+                } else {
+                    strongSelf.removePlaceholder(animated: true)
                 }
+                firstTime = false
             }
-            firstTime = false
         }
                 
         self.imageNode.displaysAsynchronously = false
diff --git a/submodules/TelegramUI/Sources/ChatMessageStickerItemNode.swift b/submodules/TelegramUI/Sources/ChatMessageStickerItemNode.swift
index 868fb0c351..f81eb4b7f1 100644
--- a/submodules/TelegramUI/Sources/ChatMessageStickerItemNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageStickerItemNode.swift
@@ -64,12 +64,15 @@ class ChatMessageStickerItemNode: ChatMessageItemView {
                 return
             }
             if image != nil {
-                strongSelf.removePlaceholder(animated: !firstTime)
                 if firstTime {
-                    strongSelf.imageNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+                    strongSelf.imageNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3, completion: { [weak self] _ in
+                        self?.removePlaceholder(animated: false)
+                    })
+                } else {
+                    strongSelf.removePlaceholder(animated: true)
                 }
+                firstTime = false
             }
-            firstTime = false
         }
         
         self.containerNode.shouldBegin = { [weak self] location in