From 1fd475aaf118b592d710b253bba622ac6142b7b5 Mon Sep 17 00:00:00 2001
From: Anurag Shivarathri <anurag6713@gmail.com>
Date: Wed, 7 Sep 2022 04:29:06 +0530
Subject: [PATCH] fix (#6623)

---
 app/init/push_notifications.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/init/push_notifications.ts b/app/init/push_notifications.ts
index c40e34719..1b42c81a0 100644
--- a/app/init/push_notifications.ts
+++ b/app/init/push_notifications.ts
@@ -25,7 +25,7 @@ import NativeNotifications from '@notifications';
 import {queryServerName} from '@queries/app/servers';
 import {getCurrentChannelId} from '@queries/servers/system';
 import {getIsCRTEnabled, getThreadById} from '@queries/servers/thread';
-import {showOverlay} from '@screens/navigation';
+import {dismissOverlay, showOverlay} from '@screens/navigation';
 import EphemeralStore from '@store/ephemeral_store';
 import NavigationStore from '@store/navigation_store';
 import {isTablet} from '@utils/helpers';
@@ -126,6 +126,9 @@ class PushNotifications {
                     serverUrl,
                 };
 
+                // Dismiss the screen if it's already visible or else it blocks the navigation
+                await dismissOverlay(screen);
+
                 showOverlay(screen, passProps);
             }
         }