From 5209491c427f4a1e975afc2dc59b61b282d6431f Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Wed, 11 May 2022 13:23:31 -0700
Subject: [PATCH 1/2] Merge pull request #8949 from
 Expensify/version-BUILD-cf010592e5544ea50cd5f5ff3754ab074f027818

Update version to 1.1.57-13 on main

(cherry picked from commit 783e7e6153210b2133fb9a174437bb745a614071)
---
 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 d735f616c2c..b0b0f3836d9 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 1001015712
-        versionName "1.1.57-12"
+        versionCode 1001015713
+        versionName "1.1.57-13"
     }
     splits {
         abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index a8004a2889d..9e6079cbf90 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.57.12</string>
+	<string>1.1.57.13</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 62702b1a0d8..98126414a6f 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.57.12</string>
+	<string>1.1.57.13</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 6b30b06c02f..614451940cc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.57-12",
+  "version": "1.1.57-13",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index c00fb8b0183..d36ca3cd961 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.57-12",
+  "version": "1.1.57-13",
   "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 27ee78e7b1ab03f0356f9e0787c06ec77117302e Mon Sep 17 00:00:00 2001
From: Jules Rosser <jules@expensify.com>
Date: Wed, 11 May 2022 14:36:18 +0100
Subject: [PATCH 2/2] Merge pull request #8940 from
 thesahindia/thesahindia/forgot-password

Fix unresponsive "forgot" link

(cherry picked from commit cf010592e5544ea50cd5f5ff3754ab074f027818)
---
 src/pages/signin/PasswordForm.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/signin/PasswordForm.js b/src/pages/signin/PasswordForm.js
index 430de26a182..7121a1da4b1 100755
--- a/src/pages/signin/PasswordForm.js
+++ b/src/pages/signin/PasswordForm.js
@@ -83,7 +83,9 @@ class PasswordForm extends React.Component {
      * Trigger the reset password flow and ensure the 2FA input field is reset to avoid it being permanently hidden
      */
     resetPassword() {
-        this.setState({twoFactorAuthCode: ''}, this.input2FA.clear);
+        if (this.input2FA) {
+            this.setState({twoFactorAuthCode: ''}, this.input2FA.clear);
+        }
         Session.resetPassword();
     }