🍒 Cherry pick PR #4614 to staging 🍒

android/app/build.gradle

@@ -150,8 +150,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001008501
-        versionName "1.0.85-1"
+        versionCode 1001008502
+        versionName "1.0.85-2"
     }
     splits {
         abi {

ios/ExpensifyCash/Info.plist

@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.85.1</string>
+	<string>1.0.85.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/ExpensifyCashTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.85.1</string>
+	<string>1.0.85.2</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.0.85-1",
+  "version": "1.0.85-2",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

src/libs/actions/SignInRedirect.js

@@ -45,21 +45,18 @@ function redirectToSignIn(errorMessage) {
     const activeClients = currentActiveClients;
     const preferredLocale = currentPreferredLocale;
 
-    // We must set the authToken to null so we can navigate to "signin" it's not possible to navigate to the route as
-    // it only exists when the authToken is null.
-    Onyx.set(ONYXKEYS.SESSION, {authToken: null})
+    // Clearing storage discards the authToken. This causes a redirect to the SignIn screen
+    Onyx.clear()
         .then(() => {
-            Onyx.clear().then(() => {
-                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);
-                }
-            });
+            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);
+            }
         });
 }