From 5e9f5426a051f9dccc19ad8962c60ef27b42e3e2 Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Fri, 11 Jun 2021 14:31:31 -0700 Subject: [PATCH 1/2] Merge pull request #3563 from Expensify/version-BUILD-be7fee0ddc56a5388ea0f576c2ddfe81669f977b (cherry picked from commit 1ceed16f8d963e2d9a7565c930a93d22bb1ce33d) --- android/app/build.gradle | 4 ++-- ios/ExpensifyCash/Info.plist | 2 +- ios/ExpensifyCashTests/Info.plist | 2 +- package-lock.json | 2 +- package.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 985a814d7ddc..83b20adf0501 100644 --- a/android/app/build.gradle +++ b/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 { diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist index db5c11963078..2d6afbfb3d78 100644 --- a/ios/ExpensifyCash/Info.plist +++ b/ios/ExpensifyCash/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.0.68.2 + 1.0.68.3 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist index 5d606f393e67..5db2e3f79789 100644 --- a/ios/ExpensifyCashTests/Info.plist +++ b/ios/ExpensifyCashTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.0.68.2 + 1.0.68.3 diff --git a/package-lock.json b/package-lock.json index a706fc144fe7..87416bf4a04f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.68-2", + "version": "1.0.68-3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index b21d8bf4082e..181e074ff744 100644 --- a/package.json +++ b/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.", From a7cfb183af8c45070a1003df53cc01ff6211f220 Mon Sep 17 00:00:00 2001 From: Marc Glasser Date: Fri, 11 Jun 2021 10:02:24 -1000 Subject: [PATCH 2/2] Merge pull request #3535 from Expensify/amechler-fix-signout Fix infinite spinner when signing into an account after signing out (cherry picked from commit fad0d88c8d23f2b3b91e5ce5c032384210f0ef89) --- package-lock.json | 4 ++-- package.json | 2 +- src/libs/actions/Session.js | 22 ++++++++++------------ 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index 87416bf4a04f..f8f6d15ddce2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33843,8 +33843,8 @@ } }, "react-native-onyx": { - "version": "git+https://github.com/Expensify/react-native-onyx.git#52c254fbc4b96224d2ac087e57ef6efc4210ccc1", - "from": "git+https://github.com/Expensify/react-native-onyx.git#52c254fbc4b96224d2ac087e57ef6efc4210ccc1", + "version": "git+https://github.com/Expensify/react-native-onyx.git#1e82e592032c6d0ede8e40f08beb6be790d149e8", + "from": "git+https://github.com/Expensify/react-native-onyx.git#1e82e592032c6d0ede8e40f08beb6be790d149e8", "requires": { "@react-native-community/async-storage": "^1.12.1", "expensify-common": "git+https://github.com/Expensify/expensify-common.git#2e5cff552cf132da90a3fb9756e6b4fb6ae7b40c", diff --git a/package.json b/package.json index 181e074ff744..3dff0a1a5b89 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/libs/actions/Session.js b/src/libs/actions/Session.js index afceefe5a092..efbb82abe602 100644 --- a/src/libs/actions/Session.js +++ b/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})); } /**