From 8979f83542d3ac52a48fc52c73d67474fa7b9f8c Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Fri, 16 Sep 2022 18:28:47 +0200
Subject: [PATCH] Settings: Fix various flickers (follow-up)

---
 src/components/common/AnimatedIconWithPreview.tsx | 2 +-
 src/components/left/main/ChatFolders.tsx          | 4 ++--
 src/components/left/settings/Settings.scss        | 5 +++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/common/AnimatedIconWithPreview.tsx b/src/components/common/AnimatedIconWithPreview.tsx
index 1eaa0651..1e2169b4 100644
--- a/src/components/common/AnimatedIconWithPreview.tsx
+++ b/src/components/common/AnimatedIconWithPreview.tsx
@@ -41,7 +41,7 @@ function AnimatedIconWithPreview(props: OwnProps) {
         // eslint-disable-next-line jsx-a11y/alt-text
         <img src={thumbDataUri} className={buildClassName(styles.preview)} />
       )}
-      {!isAnimationReady && (
+      {!isAnimationReady && previewUrl && (
         // eslint-disable-next-line jsx-a11y/alt-text
         <img
           src={previewUrl}
diff --git a/src/components/left/main/ChatFolders.tsx b/src/components/left/main/ChatFolders.tsx
index 5596e21c..a1cb459c 100644
--- a/src/components/left/main/ChatFolders.tsx
+++ b/src/components/left/main/ChatFolders.tsx
@@ -13,15 +13,15 @@ import { IS_TOUCH_ENV } from '../../../util/environment';
 import { captureEvents, SwipeDirection } from '../../../util/captureEvents';
 import buildClassName from '../../../util/buildClassName';
 import captureEscKeyListener from '../../../util/captureEscKeyListener';
+import { selectCurrentLimit } from '../../../global/selectors/limits';
 import useShowTransition from '../../../hooks/useShowTransition';
 import useLang from '../../../hooks/useLang';
 import useHistoryBack from '../../../hooks/useHistoryBack';
+import { useFolderManagerForUnreadCounters } from '../../../hooks/useFolderManager';
 
 import Transition from '../../ui/Transition';
 import TabList from '../../ui/TabList';
 import ChatList from './ChatList';
-import { useFolderManagerForUnreadCounters } from '../../../hooks/useFolderManager';
-import { selectCurrentLimit } from '../../../global/selectors/limits';
 
 type OwnProps = {
   onScreenSelect: (screen: SettingsScreens) => void;
diff --git a/src/components/left/settings/Settings.scss b/src/components/left/settings/Settings.scss
index fddeb5f8..e56c740f 100644
--- a/src/components/left/settings/Settings.scss
+++ b/src/components/left/settings/Settings.scss
@@ -97,6 +97,11 @@
 
 .settings-content-icon {
   margin-bottom: 2.5rem;
+
+  &.opacity-transition:not(.shown) {
+    display: block;
+    visibility: hidden;
+  }
 }
 
 .settings-main-menu-premium .PremiumIcon {