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