From 49c242e300adf1c28235551581fe43eabb5d65d3 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Thu, 22 Dec 2022 20:46:19 +0200
Subject: [PATCH] Fix race condition for keyboard tracker (#6902)

---
 app/hooks/keyboard_tracking.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/hooks/keyboard_tracking.ts b/app/hooks/keyboard_tracking.ts
index ad1b8670c..95da89684 100644
--- a/app/hooks/keyboard_tracking.ts
+++ b/app/hooks/keyboard_tracking.ts
@@ -24,10 +24,13 @@ export const useKeyboardTrackingPaused = (keyboardTrackingRef: RefObject<Keyboar
         };
 
         const commandListener = Navigation.events().registerCommandListener(() => {
-            if (!isPostDraftPaused.current) {
-                isPostDraftPaused.current = true;
-                keyboardTrackingRef.current?.pauseTracking(trackerId);
-            }
+            setTimeout(() => {
+                const visibleScreen = NavigationStore.getVisibleScreen();
+                if (!isPostDraftPaused.current && !screens.includes(visibleScreen)) {
+                    isPostDraftPaused.current = true;
+                    keyboardTrackingRef.current?.pauseTracking(trackerId);
+                }
+            });
         });
 
         const commandCompletedListener = Navigation.events().registerCommandCompletedListener(() => {