Merge pull request #13760 from Expensify/OSBotify-cherry-pick-staging…

…-13758

🍒 Cherry pick PR #13758 to staging 🍒

android/app/build.gradle

@@ -156,8 +156,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001024201
-        versionName "1.2.42-1"
+        versionCode 1001024202
+        versionName "1.2.42-2"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {

ios/NewExpensify/Info.plist

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

ios/NewExpensifyTests/Info.plist

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.2.42-1",
+  "version": "1.2.42-2",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
@@ -100,7 +100,7 @@
     "react-native-image-picker": "^4.10.2",
     "react-native-image-size": "git+https://github.com/Expensify/react-native-image-size#6b5ab5110dc3ed554f8eafbc38d7d87c17147972",
     "react-native-modal": "^13.0.0",
-    "react-native-onyx": "1.0.31",
+    "react-native-onyx": "1.0.29",
     "react-native-pdf": "^6.6.2",
     "react-native-performance": "^2.0.0",
     "react-native-permissions": "^3.0.1",

src/libs/actions/SignInRedirect.js

@@ -6,6 +6,20 @@ import * as Localize from '../Localize';
 import * as PersistedRequests from './PersistedRequests';
 import NetworkConnection from '../NetworkConnection';
 
+let currentActiveClients;
+Onyx.connect({
+    key: ONYXKEYS.ACTIVE_CLIENTS,
+    callback: (val) => {
+        currentActiveClients = !val ? [] : val;
+    },
+});
+
+let currentPreferredLocale;
+Onyx.connect({
+    key: ONYXKEYS.NVP_PREFERRED_LOCALE,
+    callback: val => currentPreferredLocale = val,
+});
+
 let currentIsOffline;
 let currentShouldForceOffline;
 Onyx.connect({
@@ -23,28 +37,31 @@ Onyx.connect({
  * @param {String} errorMessage
  */
 function clearStorageAndRedirect(errorMessage) {
-    // Under certain conditions, there are key-values we'd like to keep in storage even when a user is logged out.
-    // We pass these into the clear() method in order to avoid having to reset them on a delayed tick and getting
-    // flashes of unwanted default state.
-    const keysToPreserve = [];
-    keysToPreserve.push(ONYXKEYS.NVP_PREFERRED_LOCALE);
-    keysToPreserve.push(ONYXKEYS.ACTIVE_CLIENTS);
-
-    // After signing out, set ourselves as offline if we were offline before logging out and we are not forcing it.
-    // If we are forcing offline, ignore it while signed out, otherwise it would require a refresh because there's no way to toggle the switch to go back online while signed out.
-    if (currentIsOffline && !currentShouldForceOffline) {
-        keysToPreserve.push(ONYXKEYS.NETWORK);
-    }
+    const activeClients = currentActiveClients;
+    const preferredLocale = currentPreferredLocale;
+    const isOffline = currentIsOffline;
+    const shouldForceOffline = currentShouldForceOffline;
 
     // Clearing storage discards the authToken. This causes a redirect to the SignIn screen
-    Onyx.clear(keysToPreserve)
+    Onyx.clear()
         .then(() => {
-            if (!errorMessage) {
-                return;
+            if (preferredLocale) {
+                Onyx.set(ONYXKEYS.NVP_PREFERRED_LOCALE, preferredLocale);
+            }
+            if (activeClients && activeClients.length > 0) {
+                Onyx.set(ONYXKEYS.ACTIVE_CLIENTS, activeClients);
             }
 
-            // `Onyx.clear` reinitializes the Onyx instance with initial values so use `Onyx.merge` instead of `Onyx.set`
-            Onyx.merge(ONYXKEYS.SESSION, {errors: {[DateUtils.getMicroseconds()]: Localize.translateLocal(errorMessage)}});
+            // After signing out, set ourselves as offline if we were offline before logging out and we are not forcing it.
+            // If we are forcing offline, ignore it while signed out, otherwise it would require a refresh because there's no way to toggle the switch to go back online while signed out.
+            if (isOffline && !shouldForceOffline) {
+                Onyx.set(ONYXKEYS.NETWORK, {isOffline});
+            }
+
+            // `Onyx.clear` reinitialize the Onyx instance with initial values so use `Onyx.merge` instead of `Onyx.set`
+            if (errorMessage) {
+                Onyx.merge(ONYXKEYS.SESSION, {errors: {[DateUtils.getMicroseconds()]: Localize.translateLocal(errorMessage)}});
+            }
         });
 }
 

tests/ui/UnreadIndicatorsTest.js

@@ -184,7 +184,7 @@ function signInAndGetAppWithUnreadChat() {
 }
 
 describe('Unread Indicators', () => {
-    afterEach(() => Onyx.clear());
+    afterEach(Onyx.clear);
 
     it('Display bold in the LHN for unread chat and new line indicator above the chat message when we navigate to it', () => {
         let renderedApp;

tests/unit/NetworkTest.js

@@ -36,7 +36,7 @@ beforeEach(() => {
     // Wait for any Log command to finish and Onyx to fully clear
     jest.advanceTimersByTime(CONST.NETWORK.PROCESS_REQUEST_DELAY_MS);
     return waitForPromisesToResolve()
-        .then(() => Onyx.clear())
+        .then(Onyx.clear)
         .then(waitForPromisesToResolve);
 });