diff --git a/android/app/build.gradle b/android/app/build.gradle index afe12eaac31..52d46bf2937 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 1b63ca0115f..74f7d38d37e 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 ea036e57b69..9e98d142241 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 c24cafd54a2..ee5b32f38d5 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 8c49d413897..12b71600d2b 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.", diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js index d58583855e6..c8dc367a511 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}`}); }); }