From 755ceb36ec12fc644fe7c0a2a2ca4848d7b83c02 Mon Sep 17 00:00:00 2001
From: war-in <war-in@users.noreply.github.com>
Date: Mon, 4 Aug 2025 18:47:27 +0200
Subject: [PATCH 1/2] pass promise to singleExecution

---
 src/libs/actions/Session/index.ts          | 2 +-
 src/pages/settings/InitialSettingsPage.tsx | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/libs/actions/Session/index.ts b/src/libs/actions/Session/index.ts
index 1df837bbc4f6d..70f95ea13950a 100644
--- a/src/libs/actions/Session/index.ts
+++ b/src/libs/actions/Session/index.ts
@@ -329,7 +329,7 @@ function signOutAndRedirectToSignIn(shouldResetToHome?: boolean, shouldStashSess
     }
 
     // Wait for signOut (if called), then redirect and update Onyx.
-    signOutPromise
+    return signOutPromise
         .then((response) => {
             if (response?.hasOldDotAuthCookies) {
                 Log.info('Redirecting to OldDot sign out');
diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx
index 8c67675dbd931..dc8944c0f5862 100755
--- a/src/pages/settings/InitialSettingsPage.tsx
+++ b/src/pages/settings/InitialSettingsPage.tsx
@@ -135,8 +135,7 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
     const signOut = useCallback(
         (shouldForceSignout = false) => {
             if (!network.isOffline || shouldForceSignout) {
-                signOutAndRedirectToSignIn();
-                return;
+                return signOutAndRedirectToSignIn();
             }
 
             // When offline, warn the user that any actions they took while offline will be lost if they sign out
@@ -285,7 +284,7 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
                     translationKey: signOutTranslationKey,
                     icon: Expensicons.Exit,
                     action: () => {
-                        signOut(false);
+                        return signOut(false);
                     },
                 },
             ],
@@ -338,9 +337,7 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
                                 icon={item.icon}
                                 iconType={item.iconType}
                                 disabled={isExecuting}
-                                onPress={singleExecution(() => {
-                                    item.action();
-                                })}
+                                onPress={singleExecution(item.action)}
                                 iconStyles={item.iconStyles}
                                 badgeText={item.badgeText}
                                 badgeStyle={item.badgeStyle}

From 9c40d1efdb582d7b48f7c19973b0dbb936afce0a Mon Sep 17 00:00:00 2001
From: war-in <war-in@users.noreply.github.com>
Date: Mon, 4 Aug 2025 18:53:23 +0200
Subject: [PATCH 2/2] fix eslint

---
 src/libs/actions/Session/index.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/libs/actions/Session/index.ts b/src/libs/actions/Session/index.ts
index 70f95ea13950a..db617bc14c939 100644
--- a/src/libs/actions/Session/index.ts
+++ b/src/libs/actions/Session/index.ts
@@ -362,7 +362,9 @@ function signOutAndRedirectToSignIn(shouldResetToHome?: boolean, shouldStashSess
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function callFunctionIfActionIsAllowed<TCallback extends ((...args: any[]) => any) | void>(callback: TCallback, isAnonymousAction = false): TCallback | (() => void) {
     if (isAnonymousUser() && !isAnonymousAction) {
-        return () => signOutAndRedirectToSignIn();
+        return () => {
+            signOutAndRedirectToSignIn();
+        }
     }
     return callback;
 }