From f8e62166e912540be1bcc19425703b3ce67fe31d Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Tue, 20 Aug 2024 09:49:45 +0700
Subject: [PATCH] fix: black page when Navigating back from invited workspace
 chat

---
 src/libs/actions/Session/index.ts     | 1 +
 src/pages/ValidateLoginPage/index.tsx | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/actions/Session/index.ts b/src/libs/actions/Session/index.ts
index 6f29382f25a8..22b8b37c72d2 100644
--- a/src/libs/actions/Session/index.ts
+++ b/src/libs/actions/Session/index.ts
@@ -1001,6 +1001,7 @@ function handleExitToNavigation(exitTo: Route | HybridAppRoute) {
         waitForUserSignIn().then(() => {
             Navigation.waitForProtectedRoutes().then(() => {
                 const url = NativeModules.HybridAppModule ? Navigation.parseHybridAppUrl(exitTo) : (exitTo as Route);
+                Navigation.goBack();
                 Navigation.navigate(url);
             });
         });
diff --git a/src/pages/ValidateLoginPage/index.tsx b/src/pages/ValidateLoginPage/index.tsx
index faf12194ca62..1ecb4ab3e7e3 100644
--- a/src/pages/ValidateLoginPage/index.tsx
+++ b/src/pages/ValidateLoginPage/index.tsx
@@ -23,7 +23,6 @@ function ValidateLoginPage({
                     Session.handleExitToNavigation(exitTo);
                     return;
                 }
-                Navigation.goBack();
             } else {
                 Session.signInWithValidateCodeAndNavigate(Number(accountID), validateCode, '', exitTo);
             }