🍒 Cherry pick PR #9961 to staging 🍒

android/app/build.gradle

@@ -152,8 +152,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001018412
-        versionName "1.1.84-12"
+        versionCode 1001018413
+        versionName "1.1.84-13"
     }
     splits {
         abi {

ios/NewExpensify/Info.plist

@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.84.12</string>
+	<string>1.1.84.13</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.1.84.12</string>
+	<string>1.1.84.13</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.84-12",
+  "version": "1.1.84-13",
   "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.",

src/components/TestToolMenu.js

@@ -9,7 +9,6 @@ import * as Network from '../libs/actions/Network';
 import * as Session from '../libs/actions/Session';
 import ONYXKEYS from '../ONYXKEYS';
 import Button from './Button';
-import * as NetworkStore from '../libs/Network/NetworkStore';
 import TestToolRow from './TestToolRow';
 import networkPropTypes from './networkPropTypes';
 import compose from '../libs/compose';
@@ -60,7 +59,7 @@ const TestToolMenu = props => (
             <Button
                 small
                 text="Invalidate"
-                onPress={() => NetworkStore.setAuthToken('pizza')}
+                onPress={() => Session.invalidateAuthToken()}
             />
         </TestToolRow>
 

src/libs/Middleware/Reauthentication.js

@@ -42,7 +42,7 @@ function Reauthentication(response, request, isFromSequentialQueue) {
                     if (request.resolve) {
                         request.resolve(data);
                     }
-                    return;
+                    return data;
                 }
 
                 // We are already authenticating

src/libs/actions/Session/index.js

@@ -343,6 +343,11 @@ function invalidateCredentials() {
     Onyx.merge(ONYXKEYS.CREDENTIALS, {autoGeneratedLogin: '', autoGeneratedPassword: ''});
 }
 
+function invalidateAuthToken() {
+    NetworkStore.setAuthToken('pizza');
+    Onyx.merge(ONYXKEYS.SESSION, {authToken: 'pizza'});
+}
+
 /**
  * Clear the credentials and partial sign in session so the user can taken back to first Login step
  */
@@ -520,4 +525,5 @@ export {
     setShouldShowComposeInput,
     changePasswordAndSignIn,
     invalidateCredentials,
+    invalidateAuthToken,
 };

src/pages/settings/PreferencesPage.js

@@ -101,7 +101,7 @@ const PreferencesPage = (props) => {
                     </View>
 
                     {/* If we are in the staging environment then we enable additional test features */}
-                    {props.environment === CONST.ENVIRONMENT.STAGING && <TestToolMenu />}
+                    {_.contains([CONST.ENVIRONMENT.STAGING, CONST.ENVIRONMENT.DEV], props.environment) && <TestToolMenu />}
                 </View>
             </ScrollView>
         </ScreenWrapper>