From 414c88f34593d6ce9b47601afdfaf929346ae48a Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Sat, 15 May 2021 02:46:03 +0300
Subject: [PATCH] Message List: Again fix scroll jump when closing chat on
 mobile

---
 src/hooks/usePrevDuringAnimation.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/hooks/usePrevDuringAnimation.ts b/src/hooks/usePrevDuringAnimation.ts
index 3a4d16f53..a01016242 100644
--- a/src/hooks/usePrevDuringAnimation.ts
+++ b/src/hooks/usePrevDuringAnimation.ts
@@ -10,6 +10,8 @@ export default function usePrevDuringAnimation(current: any, duration?: number)
   const forceUpdate = useForceUpdate();
   // eslint-disable-next-line no-null/no-null
   const isCurrentPresent = current !== undefined && current !== null;
+  // eslint-disable-next-line no-null/no-null
+  const isPrevPresent = prev !== undefined && prev !== null;
 
   if (isCurrentPresent && timeoutRef.current) {
     clearTimeout(timeoutRef.current);
@@ -18,7 +20,7 @@ export default function usePrevDuringAnimation(current: any, duration?: number)
 
   useOnChange(() => {
     // When `current` becomes empty
-    if (duration && !isCurrentPresent && prev && !timeoutRef.current) {
+    if (duration && !isCurrentPresent && isPrevPresent && !timeoutRef.current) {
       timeoutRef.current = window.setTimeout(() => {
         timeoutRef.current = undefined;
         forceUpdate();