Merge pull request #43275 from software-mansion-labs/fix-switch-to-od

[HybridApp] Change `switchToOldDot` to return a promise
Expensify · Jun 7, 2024 · 9c5bf21 · 9c5bf21
2 parents 617426b + 6ed95d1
commit 9c5bf21
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/libs/actions/ExitSurvey.ts b/src/libs/actions/ExitSurvey.ts
@@ -65,7 +65,8 @@ function switchToOldDot() {
         },
     ];
 
-    API.write(
+    // eslint-disable-next-line rulesdir/no-api-side-effects-method
+    return API.makeRequestWithSideEffects(
         'SwitchToOldDot',
         {
             reason: exitReason,

diff --git a/src/pages/settings/ExitSurvey/ExitSurveyConfirmPage.tsx b/src/pages/settings/ExitSurvey/ExitSurveyConfirmPage.tsx
@@ -84,15 +84,14 @@ function ExitSurveyConfirmPage({exitReason, isLoading, route, navigation}: ExitS
                     large
                     text={translate('exitSurvey.goToExpensifyClassic')}
                     onPress={() => {
-                        ExitSurvey.switchToOldDot();
-
-                        if (NativeModules.HybridAppModule) {
-                            Navigation.resetToHome();
-                            NativeModules.HybridAppModule.closeReactNativeApp();
-                            return;
-                        }
-
-                        Link.openOldDotLink(CONST.OLDDOT_URLS.INBOX);
+                        ExitSurvey.switchToOldDot().then(() => {
+                            if (NativeModules.HybridAppModule) {
+                                Navigation.resetToHome();
+                                NativeModules.HybridAppModule.closeReactNativeApp();
+                                return;
+                            }
+                            Link.openOldDotLink(CONST.OLDDOT_URLS.INBOX);
+                        });
                     }}
                     isLoading={isLoading ?? false}
                     isDisabled={isOffline}