Merge pull request #3564 from Expensify/cherry-pick-staging-3535

android/app/build.gradle

@@ -148,8 +148,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001006802
-        versionName "1.0.68-2"
+        versionCode 1001006803
+        versionName "1.0.68-3"
     }
     splits {
         abi {

ios/ExpensifyCash/Info.plist

@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.68.2</string>
+	<string>1.0.68.3</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.68.2</string>
+	<string>1.0.68.3</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "expensify.cash",
-  "version": "1.0.68-2",
+  "version": "1.0.68-3",
   "author": "Expensify, Inc.",
   "homepage": "https://expensify.cash",
   "description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
@@ -79,7 +79,7 @@
     "react-native-image-picker": "^2.3.3",
     "react-native-keyboard-spacer": "^0.4.1",
     "react-native-modal": "^11.10.0",
-    "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#52c254fbc4b96224d2ac087e57ef6efc4210ccc1",
+    "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#1e82e592032c6d0ede8e40f08beb6be790d149e8",
     "react-native-pdf": "^6.2.2",
     "react-native-permissions": "^3.0.1",
     "react-native-picker-select": "8.0.4",

src/libs/actions/Session.js

@@ -58,21 +58,19 @@ function createAccount(login) {
  * Clears the Onyx store and redirects user to the sign in page
  */
 function signOut() {
+    if (credentials && credentials.autoGeneratedLogin) {
+        // Clean up the login that we created
+        API.DeleteLogin({
+            partnerUserID: credentials.autoGeneratedLogin,
+            partnerName: CONFIG.EXPENSIFY.PARTNER_NAME,
+            partnerPassword: CONFIG.EXPENSIFY.PARTNER_PASSWORD,
+            doNotRetry: true,
+        })
+            .catch(error => Onyx.merge(ONYXKEYS.SESSION, {error: error.message}));
+    }
     Timing.clearData();
     redirectToSignIn();
-
     console.debug('Redirecting to Sign In because signOut() was called');
-    if (!credentials || !credentials.autoGeneratedLogin) {
-        return;
-    }
-
-    API.DeleteLogin({
-        partnerUserID: credentials.autoGeneratedLogin,
-        partnerName: CONFIG.EXPENSIFY.PARTNER_NAME,
-        partnerPassword: CONFIG.EXPENSIFY.PARTNER_PASSWORD,
-        doNotRetry: true,
-    })
-        .catch(error => Onyx.merge(ONYXKEYS.SESSION, {error: error.message}));
 }
 
 /**