From 0bb8bb9583889ed83d15b122b8c8831fac009fb3 Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Wed, 29 Apr 2026 14:58:01 +0530
Subject: [PATCH 01/21] Add localization keys for go-back-just-once picker

---
 src/languages/en.ts | 2 ++
 src/languages/es.ts | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index e9730712658c..4f6808a692dd 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -8501,6 +8501,8 @@ const translations = {
         bookACallTextTop: 'By switching to Expensify Classic, you will miss out on:',
         bookACallTextBottom: 'We’d be excited to get on a call with you to understand why. You can book a call with one of our senior product managers to discuss your needs.',
         takeMeToExpensifyClassic: 'Take me to Expensify Classic',
+        switchToClassic: 'Switch to Classic',
+        goBackJustOnce: 'Go back just once',
     },
     listBoundary: {
         errorMessage: 'An error occurred while loading more messages',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 24c64d59ceef..6fa1dfc41cf1 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -8722,6 +8722,8 @@ ${amount} para ${merchant} - ${date}`,
         bookACallTextTop: 'Al cambiar a Expensify Classic, se perderá:',
         bookACallTextBottom: 'Nos encantaría hablar con usted para entender por qué. Puede concertar una llamada con uno de nuestros jefes de producto para hablar de sus necesidades.',
         takeMeToExpensifyClassic: 'Llévame a Expensify Classic',
+        switchToClassic: 'Cambiar a Classic',
+        goBackJustOnce: 'Volver solo esta vez',
     },
     listBoundary: {
         errorMessage: 'Se ha producido un error al cargar más mensajes',

From 79fbb059b9e91890dc4da34b4aa7b0cacda1ccef Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Wed, 29 Apr 2026 15:02:16 +0530
Subject: [PATCH 02/21] Add two-button footer scaffold to reason page

---
 .../DynamicExitSurveyReasonPage.tsx           | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx b/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
index 43c860112258..39bdfbb8d1fd 100644
--- a/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
+++ b/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
@@ -1,5 +1,7 @@
 import React, {useCallback} from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
+import Button from '@components/Button';
+import FixedFooter from '@components/FixedFooter';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
 import type {FormOnyxValues} from '@components/Form/types';
@@ -79,7 +81,7 @@ function DynamicExitSurveyReasonPage() {
                 formID={ONYXKEYS.FORMS.EXIT_SURVEY_RESPONSE_FORM}
                 style={[styles.flex1, styles.mh5, formTopMarginsStyle, StyleUtils.getMaximumHeight(formMaxHeight)]}
                 onSubmit={submitForm}
-                submitButtonText={translate('common.next')}
+                isSubmitButtonVisible={false}
                 shouldValidateOnBlur
                 validate={(values: FormOnyxValues<typeof ONYXKEYS.FORMS.EXIT_SURVEY_RESPONSE_FORM>) => {
                     const errors: Errors = {};
@@ -115,6 +117,21 @@ function DynamicExitSurveyReasonPage() {
                     </>
                 )}
             </FormProvider>
+            <FixedFooter>
+                <Button
+                    large
+                    text={translate('exitSurvey.switchToClassic')}
+                    onPress={() => {}}
+                />
+                <Button
+                    success
+                    large
+                    pressOnEnter
+                    text={translate('exitSurvey.goBackJustOnce')}
+                    onPress={() => {}}
+                    style={styles.mt3}
+                />
+            </FixedFooter>
         </ScreenWrapper>
     );
 }

From ab62c2ebd94c4ba3135c09c604ec1b09f0da99da Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Wed, 29 Apr 2026 15:02:51 +0530
Subject: [PATCH 03/21] Wire Go back just once button

---
 .../ExitSurvey/DynamicExitSurveyReasonPage.tsx   | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx b/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
index 39bdfbb8d1fd..61cf9f93e1a8 100644
--- a/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
+++ b/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
@@ -21,13 +21,17 @@ import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import {saveResponse} from '@libs/actions/ExitSurvey';
+import {closeReactNativeApp} from '@libs/actions/HybridApp';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import StatusBar from '@libs/StatusBar';
 import Navigation from '@navigation/Navigation';
 import variables from '@styles/variables';
+import {openOldDotLink} from '@userActions/Link';
+import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import {DYNAMIC_ROUTES} from '@src/ROUTES';
+import {isTrackingSelector} from '@src/selectors/GPSDraftDetails';
 import type {ExitSurveyResponseForm} from '@src/types/form/ExitSurveyResponseForm';
 import INPUT_IDS from '@src/types/form/ExitSurveyResponseForm';
 import type {Errors} from '@src/types/onyx/OnyxCommon';
@@ -38,6 +42,7 @@ const draftResponseSelector = (value: OnyxEntry<ExitSurveyResponseForm>) => valu
 function DynamicExitSurveyReasonPage() {
     const {isOffline} = useNetwork();
     const [draftResponse = ''] = useOnyx(ONYXKEYS.FORMS.EXIT_SURVEY_RESPONSE_FORM_DRAFT, {selector: draftResponseSelector});
+    const [isTrackingGPS = false] = useOnyx(ONYXKEYS.GPS_DRAFT_DETAILS, {selector: isTrackingSelector});
     const backPath = useDynamicBackPath(DYNAMIC_ROUTES.EXIT_SURVEY_REASON.path);
     const {translate} = useLocalize();
     const styles = useThemeStyles();
@@ -56,6 +61,15 @@ function DynamicExitSurveyReasonPage() {
     }, [draftResponse]);
     useKeyboardShortcut(CONST.KEYBOARD_SHORTCUTS.CTRL_ENTER, submitForm);
 
+    const goBackJustOnce = useCallback(() => {
+        if (CONFIG.IS_HYBRID_APP) {
+            closeReactNativeApp({shouldSetNVP: false, isTrackingGPS});
+            return;
+        }
+        Navigation.dismissModal();
+        openOldDotLink(CONST.OLDDOT_URLS.INBOX);
+    }, [isTrackingGPS]);
+
     const formTopMarginsStyle = styles.mt3;
     const baseResponseInputContainerStyle = styles.mt3;
     const formMaxHeight = Math.floor(
@@ -128,7 +142,7 @@ function DynamicExitSurveyReasonPage() {
                     large
                     pressOnEnter
                     text={translate('exitSurvey.goBackJustOnce')}
-                    onPress={() => {}}
+                    onPress={goBackJustOnce}
                     style={styles.mt3}
                 />
             </FixedFooter>

From cf8a30d453ff5755abc57f3aee14c5a9740b2a30 Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Wed, 29 Apr 2026 15:03:09 +0530
Subject: [PATCH 04/21] Wire Switch to Classic button

---
 .../ExitSurvey/DynamicExitSurveyReasonPage.tsx      | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx b/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
index 61cf9f93e1a8..0850df84eaed 100644
--- a/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
+++ b/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
@@ -70,6 +70,16 @@ function DynamicExitSurveyReasonPage() {
         openOldDotLink(CONST.OLDDOT_URLS.INBOX);
     }, [isTrackingGPS]);
 
+    const switchToClassic = useCallback(() => {
+        if (CONFIG.IS_HYBRID_APP) {
+            closeReactNativeApp({shouldSetNVP: true, isTrackingGPS});
+            return;
+        }
+        submitForm();
+    }, [isTrackingGPS, submitForm]);
+
+    const isSwitchToClassicDisabled = !CONFIG.IS_HYBRID_APP && !draftResponse.trim();
+
     const formTopMarginsStyle = styles.mt3;
     const baseResponseInputContainerStyle = styles.mt3;
     const formMaxHeight = Math.floor(
@@ -135,7 +145,8 @@ function DynamicExitSurveyReasonPage() {
                 <Button
                     large
                     text={translate('exitSurvey.switchToClassic')}
-                    onPress={() => {}}
+                    onPress={switchToClassic}
+                    isDisabled={isSwitchToClassicDisabled}
                 />
                 <Button
                     success

From 8fc5b651a47f19f90cb41c6eef8f1f6bb2b92881 Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Wed, 29 Apr 2026 15:03:23 +0530
Subject: [PATCH 05/21] Hide reason input on HybridApp

---
 .../DynamicExitSurveyReasonPage.tsx           | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx b/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
index 0850df84eaed..49131c65128b 100644
--- a/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
+++ b/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
@@ -125,19 +125,21 @@ function DynamicExitSurveyReasonPage() {
                     <>
                         <Text style={styles.headerAnonymousFooter}>{translate('exitSurvey.reasonPage.title')}</Text>
                         <Text style={styles.mt2}>{translate('exitSurvey.reasonPage.subtitle')}</Text>
-                        <InputWrapper
-                            InputComponent={TextInput}
-                            inputID={INPUT_IDS.RESPONSE}
-                            label={translate(`exitSurvey.responsePlaceholder`)}
-                            accessibilityLabel={translate(`exitSurvey.responsePlaceholder`)}
-                            role={CONST.ROLE.PRESENTATION}
-                            autoGrowHeight
-                            maxAutoGrowHeight={variables.textInputAutoGrowMaxHeight}
-                            ref={inputCallbackRef}
-                            containerStyles={[baseResponseInputContainerStyle]}
-                            shouldSaveDraft
-                            shouldSubmitForm
-                        />
+                        {!CONFIG.IS_HYBRID_APP && (
+                            <InputWrapper
+                                InputComponent={TextInput}
+                                inputID={INPUT_IDS.RESPONSE}
+                                label={translate(`exitSurvey.responsePlaceholder`)}
+                                accessibilityLabel={translate(`exitSurvey.responsePlaceholder`)}
+                                role={CONST.ROLE.PRESENTATION}
+                                autoGrowHeight
+                                maxAutoGrowHeight={variables.textInputAutoGrowMaxHeight}
+                                ref={inputCallbackRef}
+                                containerStyles={[baseResponseInputContainerStyle]}
+                                shouldSaveDraft
+                                shouldSubmitForm
+                            />
+                        )}
                     </>
                 )}
             </FormProvider>

From 4c961b1ed1280a82d8c2757eed4936e5044e4cb3 Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Wed, 29 Apr 2026 15:04:47 +0530
Subject: [PATCH 06/21] Disable picker buttons when web is offline

---
 src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx b/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
index 49131c65128b..5781a1157298 100644
--- a/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
+++ b/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
@@ -78,7 +78,8 @@ function DynamicExitSurveyReasonPage() {
         submitForm();
     }, [isTrackingGPS, submitForm]);
 
-    const isSwitchToClassicDisabled = !CONFIG.IS_HYBRID_APP && !draftResponse.trim();
+    const isSwitchToClassicDisabled = !CONFIG.IS_HYBRID_APP && (isOffline || !draftResponse.trim());
+    const isGoBackJustOnceDisabled = !CONFIG.IS_HYBRID_APP && isOffline;
 
     const formTopMarginsStyle = styles.mt3;
     const baseResponseInputContainerStyle = styles.mt3;
@@ -156,6 +157,7 @@ function DynamicExitSurveyReasonPage() {
                     pressOnEnter
                     text={translate('exitSurvey.goBackJustOnce')}
                     onPress={goBackJustOnce}
+                    isDisabled={isGoBackJustOnceDisabled}
                     style={styles.mt3}
                 />
             </FixedFooter>

From 26daf97262bcbec77282b41c63b9efbb8873e01b Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Wed, 29 Apr 2026 15:05:18 +0530
Subject: [PATCH 07/21] Log user choice between Go back just once and Switch to
 Classic

---
 src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx b/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
index 5781a1157298..96d0dcf0357b 100644
--- a/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
+++ b/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
@@ -22,6 +22,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import {saveResponse} from '@libs/actions/ExitSurvey';
 import {closeReactNativeApp} from '@libs/actions/HybridApp';
+import Log from '@libs/Log';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import StatusBar from '@libs/StatusBar';
 import Navigation from '@navigation/Navigation';
@@ -62,6 +63,7 @@ function DynamicExitSurveyReasonPage() {
     useKeyboardShortcut(CONST.KEYBOARD_SHORTCUTS.CTRL_ENTER, submitForm);
 
     const goBackJustOnce = useCallback(() => {
+        Log.info('[ExitSurvey] User chose Go back just once', false, {isHybridApp: CONFIG.IS_HYBRID_APP});
         if (CONFIG.IS_HYBRID_APP) {
             closeReactNativeApp({shouldSetNVP: false, isTrackingGPS});
             return;
@@ -71,6 +73,7 @@ function DynamicExitSurveyReasonPage() {
     }, [isTrackingGPS]);
 
     const switchToClassic = useCallback(() => {
+        Log.info('[ExitSurvey] User chose Switch to Classic', false, {isHybridApp: CONFIG.IS_HYBRID_APP});
         if (CONFIG.IS_HYBRID_APP) {
             closeReactNativeApp({shouldSetNVP: true, isTrackingGPS});
             return;

From 3420d21d159fd71a21e98071139e5fbaa7cb4163 Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Wed, 29 Apr 2026 15:07:07 +0530
Subject: [PATCH 08/21] Route HybridApp dismissed:false users to picker instead
 of direct redirect

---
 src/pages/settings/InitialSettingsPage.tsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx
index 4cc3ebef27d1..490737ed1d51 100755
--- a/src/pages/settings/InitialSettingsPage.tsx
+++ b/src/pages/settings/InitialSettingsPage.tsx
@@ -327,7 +327,13 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
             sentryLabel: CONST.SENTRY_LABEL.SETTINGS_GENERAL.GO_TO_CLASSIC,
             ...(CONFIG.IS_HYBRID_APP
                 ? {
-                      action: () => closeReactNativeApp({shouldSetNVP: true, isTrackingGPS}),
+                      action() {
+                          if (shouldOpenSurveyReasonPage) {
+                              Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.EXIT_SURVEY_REASON.path));
+                              return;
+                          }
+                          closeReactNativeApp({shouldSetNVP: true, isTrackingGPS});
+                      },
                   }
                 : {
                       action() {

From ea6e8fd36259f0a39c3d155a5cf548cf33d42407 Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Wed, 29 Apr 2026 15:08:54 +0530
Subject: [PATCH 09/21] Add empty submitButtonText to satisfy FormProvider type

---
 src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx b/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
index 96d0dcf0357b..91bad1cf6d91 100644
--- a/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
+++ b/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
@@ -109,6 +109,7 @@ function DynamicExitSurveyReasonPage() {
                 formID={ONYXKEYS.FORMS.EXIT_SURVEY_RESPONSE_FORM}
                 style={[styles.flex1, styles.mh5, formTopMarginsStyle, StyleUtils.getMaximumHeight(formMaxHeight)]}
                 onSubmit={submitForm}
+                submitButtonText=""
                 isSubmitButtonVisible={false}
                 shouldValidateOnBlur
                 validate={(values: FormOnyxValues<typeof ONYXKEYS.FORMS.EXIT_SURVEY_RESPONSE_FORM>) => {

From 7767a2b6e1f3f48d6c2781a3dcfb317cddd5cd0d Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Wed, 29 Apr 2026 15:10:36 +0530
Subject: [PATCH 10/21] Add picker localization keys to non-English languages

---
 src/languages/de.ts      | 2 ++
 src/languages/fr.ts      | 2 ++
 src/languages/it.ts      | 2 ++
 src/languages/ja.ts      | 2 ++
 src/languages/nl.ts      | 2 ++
 src/languages/pl.ts      | 2 ++
 src/languages/pt-BR.ts   | 2 ++
 src/languages/zh-hans.ts | 2 ++
 8 files changed, 16 insertions(+)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index 2a370da3ab52..6e93726bc53b 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -8514,6 +8514,8 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
         bookACallTextBottom:
             'Wir würden uns freuen, mit Ihnen zu telefonieren, um die Gründe besser zu verstehen. Sie können einen Anruf mit einer*m unserer leitenden Produktmanager*innen buchen, um Ihre Bedürfnisse zu besprechen.',
         takeMeToExpensifyClassic: 'Bring mich zu Expensify Classic',
+        switchToClassic: 'Zu Classic wechseln',
+        goBackJustOnce: 'Nur dieses Mal zurück',
     },
     listBoundary: {
         errorMessage: 'Beim Laden weiterer Nachrichten ist ein Fehler aufgetreten',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index bf74d10d8008..e3e3bec99da1 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -8537,6 +8537,8 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
         bookACallTextBottom:
             'Nous serions ravis d’organiser un appel avec vous pour comprendre pourquoi. Vous pouvez réserver un appel avec l’un de nos chefs de produit senior pour discuter de vos besoins.',
         takeMeToExpensifyClassic: 'M’emmener vers Expensify Classic',
+        switchToClassic: 'Passer à Classic',
+        goBackJustOnce: 'Revenir une seule fois',
     },
     listBoundary: {
         errorMessage: 'Une erreur est survenue lors du chargement de messages supplémentaires',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 5514109962ca..9ceee4dc36cd 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -8504,6 +8504,8 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
         bookACallTextBottom:
             'Saremmo felici di fare una chiamata con te per capirne il motivo. Puoi prenotare una chiamata con uno dei nostri senior product manager per discutere delle tue esigenze.',
         takeMeToExpensifyClassic: 'Portami a Expensify Classic',
+        switchToClassic: 'Passa a Classic',
+        goBackJustOnce: 'Torna solo per questa volta',
     },
     listBoundary: {
         errorMessage: 'Si è verificato un errore durante il caricamento di altri messaggi',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index ee022d5eeaf7..f84ec66ec596 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -8399,6 +8399,8 @@ ${reportName}
         bookACallTextTop: 'Expensify Classic に切り替えると、次の機能が利用できなくなります：',
         bookACallTextBottom: 'ぜひお電話で理由をお聞かせください。お客様のニーズについて話し合うために、シニアプロダクトマネージャーとの通話を予約できます。',
         takeMeToExpensifyClassic: 'Expensify Classic に移動',
+        switchToClassic: 'Classicに切り替える',
+        goBackJustOnce: '一度だけ戻る',
     },
     listBoundary: {
         errorMessage: 'さらにメッセージを読み込む際にエラーが発生しました',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index d3854fc85403..952616171a74 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -8476,6 +8476,8 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
         bookACallTextTop: 'Als je overschakelt naar Expensify Classic, loop je het volgende mis:',
         bookACallTextBottom: 'We spreken graag met je om te begrijpen waarom. Je kunt een gesprek inplannen met een van onze senior productmanagers om je behoeften te bespreken.',
         takeMeToExpensifyClassic: 'Breng me naar Expensify Classic',
+        switchToClassic: 'Wisselen naar Classic',
+        goBackJustOnce: 'Eenmalig teruggaan',
     },
     listBoundary: {
         errorMessage: 'Er is een fout opgetreden bij het laden van meer berichten',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index b4b5578e9ec1..59ae0e454fe2 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -8463,6 +8463,8 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
         bookACallTextBottom:
             'Chętnie umówimy się z Tobą na rozmowę, aby zrozumieć dlaczego. Możesz zarezerwować rozmowę z jednym z naszych starszych menedżerów produktu, aby omówić swoje potrzeby.',
         takeMeToExpensifyClassic: 'Przejdź do Expensify Classic',
+        switchToClassic: 'Przejdź do Classic',
+        goBackJustOnce: 'Wróć tylko raz',
     },
     listBoundary: {
         errorMessage: 'Wystąpił błąd podczas wczytywania kolejnych wiadomości',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 5720a86a8418..56a4cccffc64 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -8470,6 +8470,8 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
         bookACallTextBottom:
             'Ficaríamos muito animados em fazer uma ligação com você para entender o motivo. Você pode agendar uma chamada com um de nossos gerentes de produto sêniores para discutir suas necessidades.',
         takeMeToExpensifyClassic: 'Leve-me para o Expensify Classic',
+        switchToClassic: 'Mudar para o Classic',
+        goBackJustOnce: 'Voltar apenas desta vez',
     },
     listBoundary: {
         errorMessage: 'Ocorreu um erro ao carregar mais mensagens',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index c504140ee688..14a57bf09d5f 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -8249,6 +8249,8 @@ ${reportName}
         bookACallTextTop: '切换回 Expensify 经典版后，您将无法享受：',
         bookACallTextBottom: '我们非常期待与您通话以了解原因。您可以预约与我们的一位资深产品经理通话，讨论您的需求。',
         takeMeToExpensifyClassic: '带我前往 Expensify 经典版',
+        switchToClassic: '切换到 Classic',
+        goBackJustOnce: '仅此一次返回',
     },
     listBoundary: {
         errorMessage: '加载更多消息时出错',

From c074748d0b1afc88e4426c18408226eaa73fc4f7 Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Mon, 11 May 2026 18:09:16 +0530
Subject: [PATCH 11/21] Revert "Route HybridApp dismissed:false users to picker
 instead of direct redirect"

This reverts commit 3420d21d159fd71a21e98071139e5fbaa7cb4163.
---
 src/pages/settings/InitialSettingsPage.tsx | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx
index 490737ed1d51..4cc3ebef27d1 100755
--- a/src/pages/settings/InitialSettingsPage.tsx
+++ b/src/pages/settings/InitialSettingsPage.tsx
@@ -327,13 +327,7 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
             sentryLabel: CONST.SENTRY_LABEL.SETTINGS_GENERAL.GO_TO_CLASSIC,
             ...(CONFIG.IS_HYBRID_APP
                 ? {
-                      action() {
-                          if (shouldOpenSurveyReasonPage) {
-                              Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.EXIT_SURVEY_REASON.path));
-                              return;
-                          }
-                          closeReactNativeApp({shouldSetNVP: true, isTrackingGPS});
-                      },
+                      action: () => closeReactNativeApp({shouldSetNVP: true, isTrackingGPS}),
                   }
                 : {
                       action() {

From de064c6dc3db09962755fa21148549820cf6cdcd Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Mon, 11 May 2026 18:09:31 +0530
Subject: [PATCH 12/21] Drop HybridApp branch from Go back just once handler

---
 .../settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx   | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx b/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
index 91bad1cf6d91..4dccfcaca2d1 100644
--- a/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
+++ b/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
@@ -63,14 +63,10 @@ function DynamicExitSurveyReasonPage() {
     useKeyboardShortcut(CONST.KEYBOARD_SHORTCUTS.CTRL_ENTER, submitForm);
 
     const goBackJustOnce = useCallback(() => {
-        Log.info('[ExitSurvey] User chose Go back just once', false, {isHybridApp: CONFIG.IS_HYBRID_APP});
-        if (CONFIG.IS_HYBRID_APP) {
-            closeReactNativeApp({shouldSetNVP: false, isTrackingGPS});
-            return;
-        }
+        Log.info('[ExitSurvey] User chose Go back just once');
         Navigation.dismissModal();
         openOldDotLink(CONST.OLDDOT_URLS.INBOX);
-    }, [isTrackingGPS]);
+    }, []);
 
     const switchToClassic = useCallback(() => {
         Log.info('[ExitSurvey] User chose Switch to Classic', false, {isHybridApp: CONFIG.IS_HYBRID_APP});

From 99ca79501dba861f7e5c3d9fab272aad2574367f Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Mon, 11 May 2026 18:09:42 +0530
Subject: [PATCH 13/21] Drop HybridApp branch from Switch to Classic handler

---
 .../settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx   | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx b/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
index 4dccfcaca2d1..8ec465d9035e 100644
--- a/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
+++ b/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
@@ -69,13 +69,9 @@ function DynamicExitSurveyReasonPage() {
     }, []);
 
     const switchToClassic = useCallback(() => {
-        Log.info('[ExitSurvey] User chose Switch to Classic', false, {isHybridApp: CONFIG.IS_HYBRID_APP});
-        if (CONFIG.IS_HYBRID_APP) {
-            closeReactNativeApp({shouldSetNVP: true, isTrackingGPS});
-            return;
-        }
+        Log.info('[ExitSurvey] User chose Switch to Classic');
         submitForm();
-    }, [isTrackingGPS, submitForm]);
+    }, [submitForm]);
 
     const isSwitchToClassicDisabled = !CONFIG.IS_HYBRID_APP && (isOffline || !draftResponse.trim());
     const isGoBackJustOnceDisabled = !CONFIG.IS_HYBRID_APP && isOffline;

From 0183be7608e29726895e30af659ef948f8a1b4e9 Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Mon, 11 May 2026 18:10:02 +0530
Subject: [PATCH 14/21] Always show reason input on the picker page

---
 .../DynamicExitSurveyReasonPage.tsx           | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx b/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
index 8ec465d9035e..308f3935776d 100644
--- a/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
+++ b/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
@@ -73,8 +73,8 @@ function DynamicExitSurveyReasonPage() {
         submitForm();
     }, [submitForm]);
 
-    const isSwitchToClassicDisabled = !CONFIG.IS_HYBRID_APP && (isOffline || !draftResponse.trim());
-    const isGoBackJustOnceDisabled = !CONFIG.IS_HYBRID_APP && isOffline;
+    const isSwitchToClassicDisabled = isOffline || !draftResponse.trim();
+    const isGoBackJustOnceDisabled = isOffline;
 
     const formTopMarginsStyle = styles.mt3;
     const baseResponseInputContainerStyle = styles.mt3;
@@ -122,21 +122,19 @@ function DynamicExitSurveyReasonPage() {
                     <>
                         <Text style={styles.headerAnonymousFooter}>{translate('exitSurvey.reasonPage.title')}</Text>
                         <Text style={styles.mt2}>{translate('exitSurvey.reasonPage.subtitle')}</Text>
-                        {!CONFIG.IS_HYBRID_APP && (
-                            <InputWrapper
-                                InputComponent={TextInput}
-                                inputID={INPUT_IDS.RESPONSE}
-                                label={translate(`exitSurvey.responsePlaceholder`)}
-                                accessibilityLabel={translate(`exitSurvey.responsePlaceholder`)}
-                                role={CONST.ROLE.PRESENTATION}
-                                autoGrowHeight
-                                maxAutoGrowHeight={variables.textInputAutoGrowMaxHeight}
-                                ref={inputCallbackRef}
-                                containerStyles={[baseResponseInputContainerStyle]}
-                                shouldSaveDraft
-                                shouldSubmitForm
-                            />
-                        )}
+                        <InputWrapper
+                            InputComponent={TextInput}
+                            inputID={INPUT_IDS.RESPONSE}
+                            label={translate(`exitSurvey.responsePlaceholder`)}
+                            accessibilityLabel={translate(`exitSurvey.responsePlaceholder`)}
+                            role={CONST.ROLE.PRESENTATION}
+                            autoGrowHeight
+                            maxAutoGrowHeight={variables.textInputAutoGrowMaxHeight}
+                            ref={inputCallbackRef}
+                            containerStyles={[baseResponseInputContainerStyle]}
+                            shouldSaveDraft
+                            shouldSubmitForm
+                        />
                     </>
                 )}
             </FormProvider>

From eed02f2107125ba0ba7c45c39ac25505493b2810 Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Mon, 11 May 2026 18:10:28 +0530
Subject: [PATCH 15/21] Remove unused HybridApp imports from reason page

---
 src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx b/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
index 308f3935776d..baac13b4a5a0 100644
--- a/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
+++ b/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
@@ -21,18 +21,15 @@ import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import {saveResponse} from '@libs/actions/ExitSurvey';
-import {closeReactNativeApp} from '@libs/actions/HybridApp';
 import Log from '@libs/Log';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import StatusBar from '@libs/StatusBar';
 import Navigation from '@navigation/Navigation';
 import variables from '@styles/variables';
 import {openOldDotLink} from '@userActions/Link';
-import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import {DYNAMIC_ROUTES} from '@src/ROUTES';
-import {isTrackingSelector} from '@src/selectors/GPSDraftDetails';
 import type {ExitSurveyResponseForm} from '@src/types/form/ExitSurveyResponseForm';
 import INPUT_IDS from '@src/types/form/ExitSurveyResponseForm';
 import type {Errors} from '@src/types/onyx/OnyxCommon';
@@ -43,7 +40,6 @@ const draftResponseSelector = (value: OnyxEntry<ExitSurveyResponseForm>) => valu
 function DynamicExitSurveyReasonPage() {
     const {isOffline} = useNetwork();
     const [draftResponse = ''] = useOnyx(ONYXKEYS.FORMS.EXIT_SURVEY_RESPONSE_FORM_DRAFT, {selector: draftResponseSelector});
-    const [isTrackingGPS = false] = useOnyx(ONYXKEYS.GPS_DRAFT_DETAILS, {selector: isTrackingSelector});
     const backPath = useDynamicBackPath(DYNAMIC_ROUTES.EXIT_SURVEY_REASON.path);
     const {translate} = useLocalize();
     const styles = useThemeStyles();

From ce04c41c39b4b70a8e0ad21955ac1ac5a580a288 Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Mon, 11 May 2026 18:16:30 +0530
Subject: [PATCH 16/21] Open OldDot in same tab on Go back just once to match
 other redirect paths

---
 src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx b/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
index baac13b4a5a0..d160af8955bb 100644
--- a/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
+++ b/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
@@ -61,7 +61,7 @@ function DynamicExitSurveyReasonPage() {
     const goBackJustOnce = useCallback(() => {
         Log.info('[ExitSurvey] User chose Go back just once');
         Navigation.dismissModal();
-        openOldDotLink(CONST.OLDDOT_URLS.INBOX);
+        openOldDotLink(CONST.OLDDOT_URLS.INBOX, true);
     }, []);
 
     const switchToClassic = useCallback(() => {

From 505ae490166dd936cfda17774c9111184826d633 Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Tue, 12 May 2026 09:43:07 +0530
Subject: [PATCH 17/21] Reuse existing goToExpensifyClassic copy on the picker
 button

---
 src/languages/de.ts                                           | 1 -
 src/languages/en.ts                                           | 1 -
 src/languages/es.ts                                           | 1 -
 src/languages/fr.ts                                           | 1 -
 src/languages/it.ts                                           | 1 -
 src/languages/ja.ts                                           | 1 -
 src/languages/nl.ts                                           | 1 -
 src/languages/pl.ts                                           | 1 -
 src/languages/pt-BR.ts                                        | 1 -
 src/languages/zh-hans.ts                                      | 1 -
 src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx | 2 +-
 11 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index 6e93726bc53b..812b8b5de172 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -8514,7 +8514,6 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
         bookACallTextBottom:
             'Wir würden uns freuen, mit Ihnen zu telefonieren, um die Gründe besser zu verstehen. Sie können einen Anruf mit einer*m unserer leitenden Produktmanager*innen buchen, um Ihre Bedürfnisse zu besprechen.',
         takeMeToExpensifyClassic: 'Bring mich zu Expensify Classic',
-        switchToClassic: 'Zu Classic wechseln',
         goBackJustOnce: 'Nur dieses Mal zurück',
     },
     listBoundary: {
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 4f6808a692dd..29e7fdadd169 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -8501,7 +8501,6 @@ const translations = {
         bookACallTextTop: 'By switching to Expensify Classic, you will miss out on:',
         bookACallTextBottom: 'We’d be excited to get on a call with you to understand why. You can book a call with one of our senior product managers to discuss your needs.',
         takeMeToExpensifyClassic: 'Take me to Expensify Classic',
-        switchToClassic: 'Switch to Classic',
         goBackJustOnce: 'Go back just once',
     },
     listBoundary: {
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 6fa1dfc41cf1..bb81fa814f05 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -8722,7 +8722,6 @@ ${amount} para ${merchant} - ${date}`,
         bookACallTextTop: 'Al cambiar a Expensify Classic, se perderá:',
         bookACallTextBottom: 'Nos encantaría hablar con usted para entender por qué. Puede concertar una llamada con uno de nuestros jefes de producto para hablar de sus necesidades.',
         takeMeToExpensifyClassic: 'Llévame a Expensify Classic',
-        switchToClassic: 'Cambiar a Classic',
         goBackJustOnce: 'Volver solo esta vez',
     },
     listBoundary: {
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index e3e3bec99da1..90b489e9a28b 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -8537,7 +8537,6 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
         bookACallTextBottom:
             'Nous serions ravis d’organiser un appel avec vous pour comprendre pourquoi. Vous pouvez réserver un appel avec l’un de nos chefs de produit senior pour discuter de vos besoins.',
         takeMeToExpensifyClassic: 'M’emmener vers Expensify Classic',
-        switchToClassic: 'Passer à Classic',
         goBackJustOnce: 'Revenir une seule fois',
     },
     listBoundary: {
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 9ceee4dc36cd..36b1214d39e2 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -8504,7 +8504,6 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
         bookACallTextBottom:
             'Saremmo felici di fare una chiamata con te per capirne il motivo. Puoi prenotare una chiamata con uno dei nostri senior product manager per discutere delle tue esigenze.',
         takeMeToExpensifyClassic: 'Portami a Expensify Classic',
-        switchToClassic: 'Passa a Classic',
         goBackJustOnce: 'Torna solo per questa volta',
     },
     listBoundary: {
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index f84ec66ec596..ddcc94497472 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -8399,7 +8399,6 @@ ${reportName}
         bookACallTextTop: 'Expensify Classic に切り替えると、次の機能が利用できなくなります：',
         bookACallTextBottom: 'ぜひお電話で理由をお聞かせください。お客様のニーズについて話し合うために、シニアプロダクトマネージャーとの通話を予約できます。',
         takeMeToExpensifyClassic: 'Expensify Classic に移動',
-        switchToClassic: 'Classicに切り替える',
         goBackJustOnce: '一度だけ戻る',
     },
     listBoundary: {
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 952616171a74..a50c649828a7 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -8476,7 +8476,6 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
         bookACallTextTop: 'Als je overschakelt naar Expensify Classic, loop je het volgende mis:',
         bookACallTextBottom: 'We spreken graag met je om te begrijpen waarom. Je kunt een gesprek inplannen met een van onze senior productmanagers om je behoeften te bespreken.',
         takeMeToExpensifyClassic: 'Breng me naar Expensify Classic',
-        switchToClassic: 'Wisselen naar Classic',
         goBackJustOnce: 'Eenmalig teruggaan',
     },
     listBoundary: {
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 59ae0e454fe2..5119012bc2d5 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -8463,7 +8463,6 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
         bookACallTextBottom:
             'Chętnie umówimy się z Tobą na rozmowę, aby zrozumieć dlaczego. Możesz zarezerwować rozmowę z jednym z naszych starszych menedżerów produktu, aby omówić swoje potrzeby.',
         takeMeToExpensifyClassic: 'Przejdź do Expensify Classic',
-        switchToClassic: 'Przejdź do Classic',
         goBackJustOnce: 'Wróć tylko raz',
     },
     listBoundary: {
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 56a4cccffc64..86235f6dacb1 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -8470,7 +8470,6 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
         bookACallTextBottom:
             'Ficaríamos muito animados em fazer uma ligação com você para entender o motivo. Você pode agendar uma chamada com um de nossos gerentes de produto sêniores para discutir suas necessidades.',
         takeMeToExpensifyClassic: 'Leve-me para o Expensify Classic',
-        switchToClassic: 'Mudar para o Classic',
         goBackJustOnce: 'Voltar apenas desta vez',
     },
     listBoundary: {
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 14a57bf09d5f..500fc04f9ef8 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -8249,7 +8249,6 @@ ${reportName}
         bookACallTextTop: '切换回 Expensify 经典版后，您将无法享受：',
         bookACallTextBottom: '我们非常期待与您通话以了解原因。您可以预约与我们的一位资深产品经理通话，讨论您的需求。',
         takeMeToExpensifyClassic: '带我前往 Expensify 经典版',
-        switchToClassic: '切换到 Classic',
         goBackJustOnce: '仅此一次返回',
     },
     listBoundary: {
diff --git a/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx b/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
index d160af8955bb..6cb6b2304af5 100644
--- a/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
+++ b/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
@@ -137,7 +137,7 @@ function DynamicExitSurveyReasonPage() {
             <FixedFooter>
                 <Button
                     large
-                    text={translate('exitSurvey.switchToClassic')}
+                    text={translate('exitSurvey.goToExpensifyClassic')}
                     onPress={switchToClassic}
                     isDisabled={isSwitchToClassicDisabled}
                 />

From a4102ae570e052e5168a1acf37cb5d12ea8fdd05 Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Tue, 12 May 2026 09:45:09 +0530
Subject: [PATCH 18/21] Show field-required error on click instead of disabling
 Switch button

---
 .../DynamicExitSurveyReasonPage.tsx           | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx b/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
index 6cb6b2304af5..ff95fc7aa740 100644
--- a/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
+++ b/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
@@ -21,6 +21,8 @@ import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import {saveResponse} from '@libs/actions/ExitSurvey';
+import {setErrorFields} from '@libs/actions/FormActions';
+import {getMicroSecondOnyxErrorWithMessage} from '@libs/ErrorUtils';
 import Log from '@libs/Log';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import StatusBar from '@libs/StatusBar';
@@ -66,11 +68,20 @@ function DynamicExitSurveyReasonPage() {
 
     const switchToClassic = useCallback(() => {
         Log.info('[ExitSurvey] User chose Switch to Classic');
+        if (!draftResponse.trim()) {
+            setErrorFields(ONYXKEYS.FORMS.EXIT_SURVEY_RESPONSE_FORM, {
+                [INPUT_IDS.RESPONSE]: getMicroSecondOnyxErrorWithMessage(translate('common.error.fieldRequired')),
+            });
+            return;
+        }
+        if (draftResponse.length > CONST.MAX_COMMENT_LENGTH) {
+            setErrorFields(ONYXKEYS.FORMS.EXIT_SURVEY_RESPONSE_FORM, {
+                [INPUT_IDS.RESPONSE]: getMicroSecondOnyxErrorWithMessage(translate('common.error.characterLimitExceedCounter', draftResponse.length, CONST.MAX_COMMENT_LENGTH)),
+            });
+            return;
+        }
         submitForm();
-    }, [submitForm]);
-
-    const isSwitchToClassicDisabled = isOffline || !draftResponse.trim();
-    const isGoBackJustOnceDisabled = isOffline;
+    }, [draftResponse, submitForm, translate]);
 
     const formTopMarginsStyle = styles.mt3;
     const baseResponseInputContainerStyle = styles.mt3;
@@ -139,7 +150,7 @@ function DynamicExitSurveyReasonPage() {
                     large
                     text={translate('exitSurvey.goToExpensifyClassic')}
                     onPress={switchToClassic}
-                    isDisabled={isSwitchToClassicDisabled}
+                    isDisabled={isOffline}
                 />
                 <Button
                     success
@@ -147,7 +158,7 @@ function DynamicExitSurveyReasonPage() {
                     pressOnEnter
                     text={translate('exitSurvey.goBackJustOnce')}
                     onPress={goBackJustOnce}
-                    isDisabled={isGoBackJustOnceDisabled}
+                    isDisabled={isOffline}
                     style={styles.mt3}
                 />
             </FixedFooter>

From e0ad430410729ceaef6b5c640ac2dccc2899ae68 Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Wed, 13 May 2026 09:35:02 +0530
Subject: [PATCH 19/21] Drop shouldValidateOnBlur so Go back just once does not
 surface a stale error

---
 src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx b/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
index ff95fc7aa740..5767dbf5984b 100644
--- a/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
+++ b/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
@@ -110,7 +110,6 @@ function DynamicExitSurveyReasonPage() {
                 onSubmit={submitForm}
                 submitButtonText=""
                 isSubmitButtonVisible={false}
-                shouldValidateOnBlur
                 validate={(values: FormOnyxValues<typeof ONYXKEYS.FORMS.EXIT_SURVEY_RESPONSE_FORM>) => {
                     const errors: Errors = {};
                     const response = values[INPUT_IDS.RESPONSE] ?? '';

From b78b48ea3d2b16c4eb0cb65aa74747b751b8b60b Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Wed, 13 May 2026 09:35:46 +0530
Subject: [PATCH 20/21] Make Enter behavior consistent: newline in input, Go
 back just once outside, Ctrl+Enter for Switch

---
 src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx b/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
index 5767dbf5984b..633b1266ea93 100644
--- a/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
+++ b/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
@@ -58,7 +58,6 @@ function DynamicExitSurveyReasonPage() {
         saveResponse(draftResponse);
         Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.EXIT_SURVEY_CONFIRM.path), {forceReplace: true});
     }, [draftResponse]);
-    useKeyboardShortcut(CONST.KEYBOARD_SHORTCUTS.CTRL_ENTER, submitForm);
 
     const goBackJustOnce = useCallback(() => {
         Log.info('[ExitSurvey] User chose Go back just once');
@@ -82,6 +81,7 @@ function DynamicExitSurveyReasonPage() {
         }
         submitForm();
     }, [draftResponse, submitForm, translate]);
+    useKeyboardShortcut(CONST.KEYBOARD_SHORTCUTS.CTRL_ENTER, switchToClassic);
 
     const formTopMarginsStyle = styles.mt3;
     const baseResponseInputContainerStyle = styles.mt3;
@@ -139,7 +139,6 @@ function DynamicExitSurveyReasonPage() {
                             ref={inputCallbackRef}
                             containerStyles={[baseResponseInputContainerStyle]}
                             shouldSaveDraft
-                            shouldSubmitForm
                         />
                     </>
                 )}

From 5e98c2ae15826ccd4b62b9a09baeac3a1b91c55e Mon Sep 17 00:00:00 2001
From: allgandaf <whogandalf@gmail.com>
Date: Fri, 15 May 2026 20:05:55 +0530
Subject: [PATCH 21/21] Explicitly set shouldValidateOnBlur to false since
 default is true

---
 src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx b/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
index 633b1266ea93..10f588cd79ec 100644
--- a/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
+++ b/src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx
@@ -110,6 +110,7 @@ function DynamicExitSurveyReasonPage() {
                 onSubmit={submitForm}
                 submitButtonText=""
                 isSubmitButtonVisible={false}
+                shouldValidateOnBlur={false}
                 validate={(values: FormOnyxValues<typeof ONYXKEYS.FORMS.EXIT_SURVEY_RESPONSE_FORM>) => {
                     const errors: Errors = {};
                     const response = values[INPUT_IDS.RESPONSE] ?? '';