diff --git a/src/libs/actions/SignInRedirect.js b/src/libs/actions/SignInRedirect.js index 1fc2108352a4..0226b727c838 100644 --- a/src/libs/actions/SignInRedirect.js +++ b/src/libs/actions/SignInRedirect.js @@ -41,16 +41,18 @@ function redirectToSignIn(errorMessage) { if (preferredLocale) { Onyx.set(ONYXKEYS.NVP_PREFERRED_LOCALE, preferredLocale); } - if (errorMessage) { - Onyx.set(ONYXKEYS.SESSION, {error: errorMessage}); - } if (activeClients && activeClients.length > 0) { Onyx.set(ONYXKEYS.ACTIVE_CLIENTS, activeClients); } - - // We must set the authToken to null so that signOut action is triggered across other clients - // https://github.com/Expensify/App/issues/4971#issuecomment-916101493 - Onyx.set(ONYXKEYS.SESSION, {authToken: null}); + const session = { + // We must set the authToken to null so that signOut action is triggered across other clients + // https://github.com/Expensify/App/issues/4971#issuecomment-916101493 + authToken: null, + }; + if (errorMessage) { + session.error = errorMessage; + } + Onyx.merge(ONYXKEYS.SESSION, session); }); }