From 7d4823f7265d0c24204945919f47a67a43e97648 Mon Sep 17 00:00:00 2001 From: cretadn22 Date: Thu, 18 Jul 2024 23:44:11 +0700 Subject: [PATCH 1/3] dismiss modal after going to classic page --- src/pages/settings/ExitSurvey/ExitSurveyConfirmPage.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pages/settings/ExitSurvey/ExitSurveyConfirmPage.tsx b/src/pages/settings/ExitSurvey/ExitSurveyConfirmPage.tsx index db9f3199954f..672c53b50ce9 100644 --- a/src/pages/settings/ExitSurvey/ExitSurveyConfirmPage.tsx +++ b/src/pages/settings/ExitSurvey/ExitSurveyConfirmPage.tsx @@ -88,9 +88,10 @@ function ExitSurveyConfirmPage({exitReason, isLoading, route, navigation}: ExitS if (NativeModules.HybridAppModule) { Navigation.resetToHome(); NativeModules.HybridAppModule.closeReactNativeApp(); - return; + } else { + Link.openOldDotLink(CONST.OLDDOT_URLS.INBOX); } - Link.openOldDotLink(CONST.OLDDOT_URLS.INBOX); + Navigation.dismissModal(); }); }} isLoading={isLoading ?? false} From 6c1cc06810d9a1350d512cbbd76268c2e44155b5 Mon Sep 17 00:00:00 2001 From: cretadn22 Date: Fri, 19 Jul 2024 02:17:35 +0700 Subject: [PATCH 2/3] update comment --- src/pages/settings/ExitSurvey/ExitSurveyConfirmPage.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/settings/ExitSurvey/ExitSurveyConfirmPage.tsx b/src/pages/settings/ExitSurvey/ExitSurveyConfirmPage.tsx index 672c53b50ce9..d9b9285d643f 100644 --- a/src/pages/settings/ExitSurvey/ExitSurveyConfirmPage.tsx +++ b/src/pages/settings/ExitSurvey/ExitSurveyConfirmPage.tsx @@ -88,9 +88,9 @@ function ExitSurveyConfirmPage({exitReason, isLoading, route, navigation}: ExitS if (NativeModules.HybridAppModule) { Navigation.resetToHome(); NativeModules.HybridAppModule.closeReactNativeApp(); - } else { - Link.openOldDotLink(CONST.OLDDOT_URLS.INBOX); - } + return; + } + Link.openOldDotLink(CONST.OLDDOT_URLS.INBOX); Navigation.dismissModal(); }); }} From 3cf023325f4512ae1455a88632dea330c1ec1caf Mon Sep 17 00:00:00 2001 From: cretadn22 Date: Fri, 19 Jul 2024 02:19:02 +0700 Subject: [PATCH 3/3] remove white spaces --- src/pages/settings/ExitSurvey/ExitSurveyConfirmPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/settings/ExitSurvey/ExitSurveyConfirmPage.tsx b/src/pages/settings/ExitSurvey/ExitSurveyConfirmPage.tsx index d9b9285d643f..4b8c22c2cdcb 100644 --- a/src/pages/settings/ExitSurvey/ExitSurveyConfirmPage.tsx +++ b/src/pages/settings/ExitSurvey/ExitSurveyConfirmPage.tsx @@ -89,7 +89,7 @@ function ExitSurveyConfirmPage({exitReason, isLoading, route, navigation}: ExitS Navigation.resetToHome(); NativeModules.HybridAppModule.closeReactNativeApp(); return; - } + } Link.openOldDotLink(CONST.OLDDOT_URLS.INBOX); Navigation.dismissModal(); });