From c1f1af70517df5cdca0780db906d193cd6334f07 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Thu, 5 Aug 2021 12:07:49 -0700
Subject: [PATCH 1/2] Merge pull request #4429 from
Expensify/version-BUILD-bead55c6193270290b1f25ec0b0a0b723ea53ea9
(cherry picked from commit 28add7719fce12d1f059ccce5fe3e67573162038)
---
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 a73edcbdaee12..f0af354be35c7 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -150,8 +150,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001008204
- versionName "1.0.82-4"
+ versionCode 1001008205
+ versionName "1.0.82-5"
}
splits {
abi {
diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist
index e9b593279364d..983adfdbfb31e 100644
--- a/ios/ExpensifyCash/Info.plist
+++ b/ios/ExpensifyCash/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.0.82.4
+ 1.0.82.5
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist
index bc58fb844a40c..27dabd5caf359 100644
--- a/ios/ExpensifyCashTests/Info.plist
+++ b/ios/ExpensifyCashTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.0.82.4
+ 1.0.82.5
diff --git a/package-lock.json b/package-lock.json
index 5e481452746b9..ec1ce2af9a3b8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "expensify.cash",
- "version": "1.0.82-4",
+ "version": "1.0.82-5",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 64566e7f09914..a2e1f9d0e26ff 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "expensify.cash",
- "version": "1.0.82-4",
+ "version": "1.0.82-5",
"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.",
From 6f6026cd6dc3bb62b2485f74359d24f2a380eac7 Mon Sep 17 00:00:00 2001
From: Andrew Gable
Date: Thu, 5 Aug 2021 09:57:51 -0600
Subject: [PATCH 2/2] Merge pull request #4397 from parasharrajat/queueUnlock
Fix: Infinite loader on login
(cherry picked from commit f69323385e4ea6374d31b7a2fa8c91ef6ca75812)
---
src/libs/actions/Session.js | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/libs/actions/Session.js b/src/libs/actions/Session.js
index 94bf1ff064a13..eeb303a25c54e 100644
--- a/src/libs/actions/Session.js
+++ b/src/libs/actions/Session.js
@@ -11,6 +11,8 @@ import CONST from '../../CONST';
import Navigation from '../Navigation/Navigation';
import ROUTES from '../../ROUTES';
import {translateLocal} from '../translate';
+import * as Network from '../Network';
+
let credentials = {};
Onyx.connect({
@@ -162,6 +164,7 @@ function createTemporaryLogin(authToken, encryptedAuthToken, email) {
partnerUserID: autoGeneratedLogin,
partnerUserSecret: autoGeneratedPassword,
doNotRetry: true,
+ forceNetworkRequest: true,
email,
})
.then((createLoginResponse) => {
@@ -187,6 +190,7 @@ function createTemporaryLogin(authToken, encryptedAuthToken, email) {
autoGeneratedLogin,
autoGeneratedPassword,
});
+ Network.unpauseRequestQueue();
})
.catch((error) => {
Onyx.merge(ONYXKEYS.ACCOUNT, {error: error.message});