From 47fe3e22193ed63b75fb698b065d6141ed02ec2a Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Fri, 17 Jun 2022 14:51:50 -0400
Subject: [PATCH] Do not show tutorial if screen is closed (#6401)

---
 app/components/user_list_row/index.tsx                     | 6 ++++--
 .../servers/servers_list/server_item/server_item.tsx       | 7 +++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/components/user_list_row/index.tsx b/app/components/user_list_row/index.tsx
index 41c1dbf394..a36559773a 100644
--- a/app/components/user_list_row/index.tsx
+++ b/app/components/user_list_row/index.tsx
@@ -139,8 +139,10 @@ export default function UserListRow({
                 endX: x + w + 20,
                 endY: y + h,
             };
-            setShowTutorial(true);
-            setItemBounds(bounds);
+            if (viewRef.current) {
+                setShowTutorial(true);
+                setItemBounds(bounds);
+            }
         });
     };
 
diff --git a/app/screens/home/channel_list/servers/servers_list/server_item/server_item.tsx b/app/screens/home/channel_list/servers/servers_list/server_item/server_item.tsx
index fe8af87020..340c9e51a8 100644
--- a/app/screens/home/channel_list/servers/servers_list/server_item/server_item.tsx
+++ b/app/screens/home/channel_list/servers/servers_list/server_item/server_item.tsx
@@ -202,8 +202,11 @@ const ServerItem = ({
                 endX: x + w + 20,
                 endY: y + h,
             };
-            setShowTutorial(true);
-            setItemBounds(bounds);
+
+            if (viewRef.current) {
+                setShowTutorial(true);
+                setItemBounds(bounds);
+            }
         });
     };