From 2b1d202b70ed1568653c8fee20582c95e160a896 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Fri, 25 Mar 2022 16:05:21 -0700
Subject: [PATCH 1/2] Merge pull request #8326 from
Expensify/version-BUILD-986b648239a076ca3497808f89c13e6d4836510f
Update version to 1.1.46-2 on main
(cherry picked from commit b347866b2af95bd2c51eb6bb65098bd1d756e7d0)
---
android/app/build.gradle | 4 ++--
ios/NewExpensify/Info.plist | 2 +-
ios/NewExpensifyTests/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 afe12eaac310..52d46bf29379 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -152,8 +152,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001014601
- versionName "1.1.46-1"
+ versionCode 1001014602
+ versionName "1.1.46-2"
}
splits {
abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 1b63ca0115ff..74f7d38d37e5 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.1.46.1
+ 1.1.46.2
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index ea036e57b69c..9e98d142241f 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.1.46.1
+ 1.1.46.2
diff --git a/package-lock.json b/package-lock.json
index c24cafd54a27..ee5b32f38d5b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.46-1",
+ "version": "1.1.46-2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 8c49d4138976..12b71600d2bd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.46-1",
+ "version": "1.1.46-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.",
From 358b676aecd5beb3febf9871f8ef924b67eb4a9c Mon Sep 17 00:00:00 2001
From: Marc Glasser
Date: Fri, 25 Mar 2022 12:54:14 -1000
Subject: [PATCH 2/2] Merge pull request #8322 from
Expensify/cmartins-fixExpensifyLogin
Fix blank screen when signing in with Expensifail account
(cherry picked from commit 986b648239a076ca3497808f89c13e6d4836510f)
---
src/libs/actions/Session/index.js | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index d58583855e66..c8dc367a5112 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -50,21 +50,18 @@ function setSuccessfulSignInData(data) {
* @param {String} login
*/
function createAccount(login) {
- Onyx.merge(ONYXKEYS.SESSION, {error: ''});
+ Onyx.merge(ONYXKEYS.ACCOUNT, {error: ''});
API.User_SignUp({
email: login,
}).then((response) => {
- if (response.jsonCode === 200) {
+ // A 405 means that the account needs to be validated. We should let the user proceed to the ResendValidationForm view.
+ if (response.jsonCode === 200 || response.jsonCode === 405) {
return;
}
- let errorMessage = response.message || `Unknown API Error: ${response.jsonCode}`;
- if (!response.message && response.jsonCode === 405) {
- errorMessage = 'Cannot create an account that is under a controlled domain';
- }
- Onyx.merge(ONYXKEYS.SESSION, {error: errorMessage});
Onyx.merge(ONYXKEYS.CREDENTIALS, {login: null});
+ Onyx.merge(ONYXKEYS.ACCOUNT, {error: response.message || `Unknown API Error: ${response.jsonCode}`});
});
}