From 76476845afecaee7d44f13be8789ebb7233a294b Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Mon, 16 Aug 2021 16:01:54 -0700
Subject: [PATCH 1/2] Merge pull request #4682 from
Expensify/version-BUILD-10a422a3e91b5e26b0da0a808206eeaa3e640bdb
(cherry picked from commit d62e986adc9d1fe7e5922b4811b1eeaff9327b01)
---
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 6b2351ea4bd..43f7bc6a571 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 1001008506
- versionName "1.0.85-6"
+ versionCode 1001008507
+ versionName "1.0.85-7"
}
splits {
abi {
diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist
index 638712115c8..02d828e050c 100644
--- a/ios/ExpensifyCash/Info.plist
+++ b/ios/ExpensifyCash/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.0.85.6
+ 1.0.85.7
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist
index 1f8977d4e1b..99e238ded1a 100644
--- a/ios/ExpensifyCashTests/Info.plist
+++ b/ios/ExpensifyCashTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.0.85.6
+ 1.0.85.7
diff --git a/package-lock.json b/package-lock.json
index e624ec13a76..9e6679fc202 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.0.85-6",
+ "version": "1.0.85-7",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 479d14700c0..b7f7193b7c6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.0.85-6",
+ "version": "1.0.85-7",
"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 66f8aca5a78157277bdbd6faca4e5fadfdd2d34e Mon Sep 17 00:00:00 2001
From: Andrew Gable
Date: Mon, 16 Aug 2021 16:59:40 -0600
Subject: [PATCH 2/2] Merge pull request #4607 from
mananjadhav/fix/password-confirm-validation
Hide Password mismatch incase both the passwords are empty
(cherry picked from commit 10a422a3e91b5e26b0da0a808206eeaa3e640bdb)
---
src/pages/settings/PasswordPage.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/pages/settings/PasswordPage.js b/src/pages/settings/PasswordPage.js
index d959d39a5c7..b1febd78bfa 100755
--- a/src/pages/settings/PasswordPage.js
+++ b/src/pages/settings/PasswordPage.js
@@ -71,15 +71,15 @@ class PasswordPage extends Component {
if (this.state.newPassword && this.state.confirmNewPassword && !this.doPasswordsMatch()) {
stateToUpdate.shouldShowPasswordConfirmError = true;
+ } else {
+ stateToUpdate.shouldShowPasswordConfirmError = false;
}
- if (!isEmpty(stateToUpdate)) {
- this.setState(stateToUpdate);
- }
+ this.setState(stateToUpdate);
}
onBlurConfirmPassword() {
- if (!this.state.confirmNewPassword || !this.doPasswordsMatch()) {
+ if ((this.state.newPassword && !this.state.confirmNewPassword) || !this.doPasswordsMatch()) {
this.setState({shouldShowPasswordConfirmError: true});
} else {
this.setState({shouldShowPasswordConfirmError: false});